From 6ca11c5dbff5dcf82b543f02c5423033ee46f3fe Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 29 Sep 2014 16:53:54 +0200 Subject: [PATCH] Fix crash from invalid canFill/Drain calls. #1042 --- .../java/tconstruct/smeltery/logic/CastingBlockLogic.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 7c803657..b1246575 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -105,12 +105,17 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid @Override public boolean canFill (ForgeDirection from, Fluid fluid) { + if(fluid == null) + return false; return fill(from, new FluidStack(fluid, 1), false) > 0; } @Override public boolean canDrain (ForgeDirection from, Fluid fluid) { + if(fluid == null) + return false; + FluidStack drained = drain(from, new FluidStack(fluid, 1), false); return drained != null && drained.amount > 0; }