From ae2c783e1efa30d8528b449ddd5f5743e43be07f Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 14 Jun 2015 22:29:38 +0200 Subject: [PATCH] #2584 don't crash on empty fluid containers --- src/main/java/crazypants/util/FluidUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index e7ff8df1..117af4b9 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -250,7 +250,8 @@ public class FluidUtil { if (source != null && source.getItem() != null) { if (source.getItem() instanceof IFluidContainerItem) { - IFluidTank targetTank = tank.getInputTank(((IFluidContainerItem) source.getItem()).getFluid(source)); + FluidStack fluid = ((IFluidContainerItem) source.getItem()).getFluid(source); + IFluidTank targetTank = fluid != null ? tank.getInputTank(fluid) : null; if (targetTank != null) { FluidStack target = targetTank.getFluid(); int maxDrain = targetTank.getCapacity() - (target != null ? target.amount : 0);