From e0f3ba881dce5282fb72025ef3ce05fa9ff7b5c8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 2 May 2017 11:02:44 -0500 Subject: [PATCH] Fix #2254, #2228 --- .../java/vazkii/botania/common/block/tile/mana/TilePool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 6f1fbb58e..4ce35b34a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -161,7 +161,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } public boolean collideEntityItem(EntityItem item) { - if(world.isRemote || item.isDead) + if(world.isRemote || item.isDead || item.getEntityItem().isEmpty()) return false; ItemStack stack = item.getEntityItem();