Possible fixes for #171

This commit is contained in:
Vincent Lee committed 2016-03-09 15:44:14 -06:00
1 parent 769528ceed
commit f5b71f9db1
2 files changed
+5 -2

No files matched your search

@@ -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
@@ -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;