From 1d863e4718771227cbf3994418ba419c86e10c7e Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 14 Dec 2014 23:03:21 +0100 Subject: [PATCH] fix #2307 --- common/buildcraft/core/utils/FluidUtils.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/common/buildcraft/core/utils/FluidUtils.java b/common/buildcraft/core/utils/FluidUtils.java index 658cb6ac..5b539120 100644 --- a/common/buildcraft/core/utils/FluidUtils.java +++ b/common/buildcraft/core/utils/FluidUtils.java @@ -18,15 +18,12 @@ public final class FluidUtils { if (stack != null) { if (stack.getItem() instanceof IFluidContainerItem) { IFluidContainerItem ctr = (IFluidContainerItem) stack.getItem(); - if (ctr.getFluid(stack) != null) { - return ctr.getFluid(stack); - } - } else if (FluidContainerRegistry.isFilledContainer(stack) && - FluidContainerRegistry.getFluidForFilledItem(stack) != null) { + return ctr.getFluid(stack); + } else if (FluidContainerRegistry.isFilledContainer(stack)) { return FluidContainerRegistry.getFluidForFilledItem(stack); } else if (stack.getItem() instanceof ItemBlock) { Block b = Block.getBlockFromItem(stack.getItem()); - if (b instanceof IFluidBlock) { + if (b != null && b instanceof IFluidBlock && ((IFluidBlock) b).getFluid() != null) { return new FluidStack(((IFluidBlock) b).getFluid(), 1000); } } @@ -35,10 +32,11 @@ public final class FluidUtils { } public static Fluid getFluidFromItemStack(ItemStack stack) { - return getFluidStackFromItemStack(stack).getFluid(); + FluidStack fluidStack = getFluidStackFromItemStack(stack); + return fluidStack != null ? fluidStack.getFluid() : null; } public static boolean isFluidContainer(ItemStack stack) { - return stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isFilledContainer(stack); + return stack != null && stack.getItem() != null && (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isFilledContainer(stack)); } }