From e3f9d26196726f35d40e59ff90dca726cd8befea Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 14 Oct 2014 23:29:35 +0100 Subject: [PATCH] Fixed Mana Pools not registering the catalyst below them on the first tick. --- MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java index 91d4341cf..3857889aa 100644 --- a/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java @@ -68,6 +68,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt boolean outputting = false; public boolean alchemy = false; public boolean conjuration = false; + boolean catalystsRegistered = false; public int color = 0; int mana; @@ -110,7 +111,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } public boolean collideEntityItem(EntityItem item) { - if(item.isDead || item.age > 100 && item.age < 130) + if(item.isDead || (item.age > 100 && item.age < 130) || !catalystsRegistered) return false; boolean didChange = false; @@ -191,7 +192,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt alchemy = worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.alchemyCatalyst; conjuration = worldObj.getBlock(xCoord, yCoord - 1, zCoord) == ModBlocks.conjurationCatalyst; - + catalystsRegistered = true; + List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) { if(item.isDead)