Merge in master changes from EnderIO

This commit is contained in:
tterrag1098 committed 2015-05-03 23:28:25 -04:00
1 parent 8beb043ff3
commit fda1e41a3c
1 file changed
+4 -4
@@ -81,6 +81,10 @@ public abstract class BlockEnder extends Block {
TileEntity te = world.getTileEntity(x, y, z);
if (entityPlayer.isSneaking()) {
return false;
}
if (te instanceof ITankAccess) {
if (FluidUtil.fillInternalTankFromPlayerHandItem(world, x, y, z, entityPlayer, (ITankAccess) te)) {
return true;
@@ -90,10 +94,6 @@ public abstract class BlockEnder extends Block {
}
}
if (entityPlayer.isSneaking()) {
return false;
}
return openGui(world, x, y, z, entityPlayer, side);
}