From 4168f739e1feaacb75a86989edaba995a7ca7a33 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 3 Oct 2012 19:01:34 +0000 Subject: Fixed saplings not growing into trees git-svn-id: http://mc-server.googlecode.com/svn/trunk@924 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Chunk.cpp | 6 +++--- source/World.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/Chunk.cpp b/source/Chunk.cpp index 01a6640e2..149adaa62 100644 --- a/source/Chunk.cpp +++ b/source/Chunk.cpp @@ -479,14 +479,14 @@ void cChunk::TickBlocks(MTRand & a_TickRandom) } unsigned int Index = MakeIndexNoCheck( m_BlockTickX, m_BlockTickY, m_BlockTickZ ); - BLOCKTYPE ID = m_BlockTypes[Index]; - switch( ID ) + BLOCKTYPE BlockType = m_BlockTypes[Index]; + switch (BlockType) { case E_BLOCK_FARMLAND: TickFarmland (m_BlockTickX, m_BlockTickY, m_BlockTickZ); break; default: { - cBlockHandler * Handler = BlockHandler(ID); + cBlockHandler * Handler = BlockHandler(BlockType); ASSERT(Handler != NULL); // Happenned on server restart, FS #243 Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width); break; diff --git a/source/World.cpp b/source/World.cpp index 3a4cf789e..7acbf8a39 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -795,7 +795,7 @@ void cWorld::GrowTreeFromSapling(int a_X, int a_Y, int a_Z, char a_SaplingMeta) } Other.insert(Other.begin(), Logs.begin(), Logs.end()); Logs.clear(); - GrowTreeImage(Logs); + GrowTreeImage(Other); } -- cgit v1.2.3