diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 7df731d99..8b76f3c6c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -21,6 +21,7 @@ public class TilePump extends TileMod { public float innerRingPos; public boolean active = false; public boolean hasCart = false; + public boolean hasCartOnTop = false; public float moving = 0F; public int comparator; @@ -59,15 +60,16 @@ public class TilePump extends TileMod { } } - if(!hasCart) { + if(!hasCartOnTop) comparator = 0; - if(active) - setActive(false); - } + if(!hasCart && active) + setActive(false); if(active && hasRedstone) setActive(false); + hasCart = false; - + hasCartOnTop = false; + if(comparator != lastComparator) worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); lastComparator = comparator; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 0cfbec9f9..e17cdfb4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -108,10 +108,11 @@ public class EntityPoolMinecart extends EntityMinecart { if(did) { worldObj.markBlockForUpdate(xp_, y, zp_); pump.hasCart = true; - pump.comparator = (int) (((double) getMana() / (double) TilePool.MAX_MANA) * 15); if(!pump.active) pump.setActive(true); } + pump.hasCartOnTop = true; + pump.comparator = (int) (((double) getMana() / (double) TilePool.MAX_MANA) * 15); } } }