From f5b71f9db1fd299884863da5e4c05fec24dbf464 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 9 Mar 2016 15:44:14 -0600 Subject: [PATCH] Possible fixes for #171 --- .../java/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +- .../vazkii/botania/common/block/tile/mana/TileSpreader.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index efede3c3b..bd5bb55a3 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -206,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override 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 5ef11c8b0..bb9051089 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 @@ -464,7 +464,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, fakeBurst.setScanBeam(); TileEntity receiver = fakeBurst.getCollidedTile(true); - if(receiver != null && receiver instanceof IManaReceiver) + if(receiver != null + && receiver instanceof IManaReceiver + && receiver.hasWorldObj() + && receiver.getWorld().isBlockLoaded(receiver.getPos(), !receiver.getWorld().isRemote)) this.receiver = (IManaReceiver) receiver; else this.receiver = null; lastTentativeBurst = fakeBurst.propsList;