From 85164fab8e5298ce1c0582b2aebb7e6a283d4a0c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Oct 2012 21:08:15 +0000 Subject: Slight refactoring of BlockHandlers - dropping unneeded virtual functions ( 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 --- source/Chunk.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/Chunk.cpp') diff --git a/source/Chunk.cpp b/source/Chunk.cpp index 606134f38..ec0ad01e0 100644 --- a/source/Chunk.cpp +++ b/source/Chunk.cpp @@ -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; } } -- cgit v1.2.3