From f71dc6a3211e6b5c6da941a6a874dc2a2cd1c3da Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 4 Jun 2014 15:21:20 +0100 Subject: [PATCH] Fixed the pool not checking for dead items. Closes #86. --- MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java index e84020925..84b011c1f 100644 --- a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java @@ -83,7 +83,7 @@ public class TilePool extends TileMod implements IManaPool { } public boolean collideEntityItem(EntityItem item) { - if(craftCooldown > 0) + if(craftCooldown > 0 || item.isDead) return false; boolean didChange = false; @@ -150,6 +150,9 @@ public class TilePool extends TileMod implements IManaPool { List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) { + if(item.isDead) + continue; + ItemStack stack = item.getEntityItem(); if(stack != null && stack.getItem() instanceof IManaItem) { IManaItem mana = (IManaItem) stack.getItem();