From b314b14f1422df94e4db16015753866157e6a5a1 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 25 Jul 2015 18:57:28 +0100 Subject: [PATCH] Fixed flowers being able to pull mana from and put mana into mana pools or spreaders that no longer exist. Closes #1201 --- src/main/java/vazkii/botania/api/package-info.java | 2 +- .../java/vazkii/botania/api/subtile/SubTileFunctional.java | 4 ++-- .../java/vazkii/botania/api/subtile/SubTileGenerating.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index b94416a77..5c66b7462 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "57", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "58", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 144f42a81..148696ee5 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -62,7 +62,7 @@ public class SubTileFunctional extends SubTileEntity { linkPool(); - if(linkedPool != null) { + if(linkedPool != null && isValidBinding()) { IManaPool pool = (IManaPool) linkedPool; int manaInPool = pool.getCurrentMana(); int manaMissing = getMaxMana() - mana; @@ -208,7 +208,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid(); + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorldObj().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index cfed61122..a5b28b9e2 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -122,7 +122,7 @@ public class SubTileGenerating extends SubTileEntity { } public void emptyManaIntoCollector() { - if(linkedCollector != null) { + if(linkedCollector != null && isValidBinding()) { IManaCollector collector = (IManaCollector) linkedCollector; if(!collector.isFull() && mana > 0) { int manaval = Math.min(mana, collector.getMaxMana() - collector.getCurrentMana()); @@ -236,7 +236,7 @@ public class SubTileGenerating extends SubTileEntity { public boolean isValidBinding() { - return linkedCollector != null && !linkedCollector.isInvalid(); + return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorldObj().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; } @Override