summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-11 13:22:26 +0200
committerMattes D <github@xoft.cz>2014-08-11 13:22:26 +0200
commitef513720fbfc01a72e70ee80ee440dc85d396ec5 (patch)
treeb4573a78c2de17ad2bd09be967f71fbf8ff540a0 /src
parentMerge pull request #1301 from mc-server/Ores (diff)
parentFixed potential null dereference (diff)
downloadcuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar.gz
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar.bz2
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar.lz
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar.xz
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.tar.zst
cuberite-ef513720fbfc01a72e70ee80ee440dc85d396ec5.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockEntities/HopperEntity.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp
index 48d3b8dcc..88e7b8e1b 100644
--- a/src/BlockEntities/HopperEntity.cpp
+++ b/src/BlockEntities/HopperEntity.cpp
@@ -549,13 +549,13 @@ bool cHopperEntity::MoveItemsFromSlot(cBlockEntityWithItems & a_Entity, int a_Sl
bool cHopperEntity::MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ)
{
// Try the chest directly connected to the hopper:
- cChestEntity * Chest = (cChestEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ);
- if (Chest == NULL)
+ cChestEntity * ConnectedChest = (cChestEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ);
+ if (ConnectedChest == NULL)
{
LOGWARNING("%s: A chest entity was not found where expected, at {%d, %d, %d}", __FUNCTION__, a_BlockX, a_BlockY, a_BlockZ);
return false;
}
- if (MoveItemsToGrid(*Chest))
+ if (MoveItemsToGrid(*ConnectedChest))
{
// Chest block directly connected was not full
return true;
@@ -586,13 +586,13 @@ bool cHopperEntity::MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_Block
}
BLOCKTYPE Block = Neighbor->GetBlock(x, a_BlockY, z);
- if (Block != Chest->GetBlockType())
+ if (Block != ConnectedChest->GetBlockType())
{
// Not the same kind of chest
continue;
}
- Chest = (cChestEntity *)Neighbor->GetBlockEntity(a_BlockX + Coords[i].x, a_BlockY, a_BlockZ + Coords[i].z);
+ cChestEntity * Chest = (cChestEntity *)Neighbor->GetBlockEntity(a_BlockX + Coords[i].x, a_BlockY, a_BlockZ + Coords[i].z);
if (Chest == NULL)
{
LOGWARNING("%s: A chest entity was not found where expected, at {%d, %d, %d} (%d, %d)", __FUNCTION__, a_BlockX + Coords[i].x, a_BlockY, a_BlockZ + Coords[i].z, x, z);