flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Slight refactoring of BlockHandlers - dropping unneeded virtual functions

Browse Source 
( http://forum.mc-server.org/showthread.php?tid=434&pid=4734#pid4734 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@917 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-10-01 21:08:15 +00:00
parent 673fdcd768
commit 85164fab8e
42 changed files with 862 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Chunk.cpp
View File

@@ -430,9 +430,9 @@ void cChunk::CheckBlocks(void)
Vector3i WorldPos = PositionToWorldPosition( BlockPos );
cBlockHandler * Handler = BlockHandler(GetBlock(index));
if(!Handler->CanBeAt(m_World, WorldPos.x, WorldPos.y, WorldPos.z))
if (!Handler->CanBeAt(m_World, WorldPos.x, WorldPos.y, WorldPos.z))
{
if(Handler->DropOnUnsuitable())
if (Handler->DoesDropOnUnsuitable())
{
Handler->DropBlock(m_World, WorldPos.x, WorldPos.y, WorldPos.z);
}
@@ -503,10 +503,7 @@ void cChunk::TickBlocks(MTRand & a_TickRandom)
{
cBlockHandler * Handler = BlockHandler(ID);
ASSERT(Handler != NULL); // Happenned on server restart, FS #243
if (Handler->NeedsRandomTicks())
{
Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width);
}
Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width);
break;
}
}