Skip to content

Commit

Permalink
Safer tile entity casting in SearedBlock.getCollisionBoundingBoxFromPool
Browse files Browse the repository at this point in the history
Fixes #586 and #557

Conflicts:
	src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
  • Loading branch information
squeek502 committed Jul 7, 2014
1 parent 9b27847 commit 8075cb0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
Expand Up @@ -320,9 +320,10 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y,
}
else
{
FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z);
if (logic != null)
TileEntity tile = world.getBlockTileEntity(x, y, z);
if (tile != null && tile instanceof FaucetLogic)
{
FaucetLogic logic = (FaucetLogic) tile;
float xMin = 0.25F;
float xMax = 0.75F;
float zMin = 0.25F;
Expand Down

0 comments on commit 8075cb0

Please sign in to comment.