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

cHopperEntity: Simplified chest conditions.

Browse Source
This commit is contained in:
madmaxoft 2014-07-12 23:34:32 +02:00
parent c4f1284d9c
commit d72a81cb8e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BlockEntities/HopperEntity.cpp
View File

@ -403,12 +403,9 @@ bool cHopperEntity::MoveItemsFromChest(cChunk & a_Chunk)
} }
BLOCKTYPE Block = Neighbor->GetBlock(x, m_PosY + 1, z); BLOCKTYPE Block = Neighbor->GetBlock(x, m_PosY + 1, z);
if ( if (Block != Chest->GetBlockType())
((Block != E_BLOCK_CHEST) && (Block != E_BLOCK_TRAPPED_CHEST)) ||
((Block == E_BLOCK_CHEST) && (Chest->GetBlockType() != E_BLOCK_CHEST)) ||
((Block == E_BLOCK_TRAPPED_CHEST) && (Chest->GetBlockType() != E_BLOCK_TRAPPED_CHEST))
)
{ {
// Not the same kind of chest
continue; continue;
} }
@ -589,12 +586,9 @@ bool cHopperEntity::MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_Block
} }
BLOCKTYPE Block = Neighbor->GetBlock(x, a_BlockY, z); BLOCKTYPE Block = Neighbor->GetBlock(x, a_BlockY, z);
if ( if (Block != Chest->GetBlockType())
((Block != E_BLOCK_CHEST) && (Block != E_BLOCK_TRAPPED_CHEST)) ||
((Block == E_BLOCK_CHEST) && (Chest->GetBlockType() != E_BLOCK_CHEST)) ||
((Block == E_BLOCK_TRAPPED_CHEST) && (Chest->GetBlockType() != E_BLOCK_TRAPPED_CHEST))
)
{ {
// Not the same kind of chest
continue; continue;
} }