From 60098d3ede23b86d8b6c57841144185fce1af0c3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Sep 2015 23:21:13 +0100 Subject: [PATCH] Tweaks to mana spreader pool mana absorbing. Fixed spreaders pulling mana from pools before even being added to the network. Redstone spreaders can now pull mana from their target pool. --- .../botania/common/block/tile/mana/TileSpreader.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 2cda857b9..67dd689b4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -165,8 +165,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void updateEntity() { - if(!ManaNetworkHandler.instance.isCollectorIn(this) && !isInvalid()) + boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(this); + boolean wasInNetwork = inNetwork; + if(!inNetwork && !isInvalid()) { ManaNetworkEvent.addCollector(this); + inNetwork = true; + } boolean redstone = false; @@ -174,7 +178,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, TileEntity tileAt = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); if(tileAt instanceof IManaPool) { IManaPool pool = (IManaPool) tileAt; - if(pool != receiver) { + if(wasInNetwork && (pool != receiver || isRedstone())) { if(pool instanceof IKeyLocked && !((IKeyLocked) pool).getOutputKey().equals(getInputKey())) continue;