Fixed saplings not growing into trees
git-svn-id: http://mc-server.googlecode.com/svn/trunk@924 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
parent
5bbeeb3d66
commit
4168f739e1
@ -479,14 +479,14 @@ void cChunk::TickBlocks(MTRand & a_TickRandom)
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned int Index = MakeIndexNoCheck( m_BlockTickX, m_BlockTickY, m_BlockTickZ );
|
unsigned int Index = MakeIndexNoCheck( m_BlockTickX, m_BlockTickY, m_BlockTickZ );
|
||||||
BLOCKTYPE ID = m_BlockTypes[Index];
|
BLOCKTYPE BlockType = m_BlockTypes[Index];
|
||||||
switch( ID )
|
switch (BlockType)
|
||||||
{
|
{
|
||||||
case E_BLOCK_FARMLAND: TickFarmland (m_BlockTickX, m_BlockTickY, m_BlockTickZ); break;
|
case E_BLOCK_FARMLAND: TickFarmland (m_BlockTickX, m_BlockTickY, m_BlockTickZ); break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
cBlockHandler * Handler = BlockHandler(ID);
|
cBlockHandler * Handler = BlockHandler(BlockType);
|
||||||
ASSERT(Handler != NULL); // Happenned on server restart, FS #243
|
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);
|
Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width);
|
||||||
break;
|
break;
|
||||||
|
@ -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());
|
Other.insert(Other.begin(), Logs.begin(), Logs.end());
|
||||||
Logs.clear();
|
Logs.clear();
|
||||||
GrowTreeImage(Logs);
|
GrowTreeImage(Other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user