From 2d81be02d39939cf4867b7433855ed861bbf4c6c Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 14 Jan 2015 23:37:18 +0100 Subject: [PATCH] Fix comparators on drains crashing if the smeltery is invalid (or there is none) #1342 --- .../java/tconstruct/smeltery/logic/SmelteryDrainLogic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 0c5d80c2f8f..344899c67fc 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -186,6 +186,9 @@ public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) public int comparatorStrength () { CoordTuple master = this.getMasterPosition(); + // invalid smeltery + if(master == null) + return 0; SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(master.x, master.y, master.z); return 15 * smeltery.currentLiquid / smeltery.maxLiquid; }