From 459cdc67e87dac87579c43ef52c791ce367cbe70 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 25 Nov 2016 12:25:26 -0500 Subject: [PATCH] Crash fixes! --- build.properties | 2 +- src/main/java/mekanism/common/base/FluidHandlerWrapper.java | 3 ++- src/main/java/mekanism/common/tile/TileEntityFluidTank.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index e26e3ba06..427f0dcb6 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.10.2 mappings_version=snapshot_20160627 forge_version=12.18.1.2014 -mcmp_version=1.3.0_83 +mcmp_version=2.0.0_88 jei_version=3.7.6.231 mod_version=9.2.1 diff --git a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java index 559c87c29..0e01a94f2 100644 --- a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java @@ -21,7 +21,8 @@ public class FluidHandlerWrapper implements IFluidHandler @Override public IFluidTankProperties[] getTankProperties() { - return FluidTankProperties.convert(wrapper.getTankInfo(side)); + return wrapper.getTankInfo(side) != null ? FluidTankProperties.convert(wrapper.getTankInfo(side)) + : new IFluidTankProperties[]{}; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index cb7c7729c..53615084c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -542,7 +542,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { if(resource != null && canDrain(from, resource.getFluid())) { - return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE); + return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE && doDrain); } return null; @@ -553,7 +553,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { if(canDrain(from, null)) { - return fluidTank.drain(maxDrain, tier != FluidTankTier.CREATIVE); + return fluidTank.drain(maxDrain, tier != FluidTankTier.CREATIVE && doDrain); } return null;