summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-03 21:01:34 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-03 21:01:34 +0200
commit4168f739e1feaacb75a86989edaba995a7ca7a33 (patch)
treead09e9b0b8b31c1954457a0a372eb2cb06705f8f /source
parentAdded the "collect pickup" sound to 1.3.2 (diff)
downloadcuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar.gz
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar.bz2
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar.lz
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar.xz
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.tar.zst
cuberite-4168f739e1feaacb75a86989edaba995a7ca7a33.zip
Diffstat (limited to '')
-rw-r--r--source/Chunk.cpp6
-rw-r--r--source/World.cpp2
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);
}