From f2a0c71bb61e18c967078ec670eb03a29854cbc3 Mon Sep 17 00:00:00 2001 From: repo_alt Date: Sun, 19 Sep 2021 17:09:05 +0300 Subject: fix crash when empty flask gets into pyrotheum hatch --- .../base/GT_MetaTileEntity_Hatch_CustomFluidBase.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java index 127d4c8407..e0ff04763d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java @@ -44,8 +44,14 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, final ItemStack aStack) { - return aSide == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0 - && (this.mRecipeMap == null || GT_Utility.getFluidForFilledItem(aStack, true).getFluid() == this.mLockedFluid); + if (aSide == aBaseMetaTileEntity.getFrontFacing() && aIndex == 0) { + if (this.mRecipeMap == null) + return true; + FluidStack fs = GT_Utility.getFluidForFilledItem(aStack, true); + if (fs != null && fs.getFluid() == this.mLockedFluid) + return true; + } + return false; } public ITexture[] getTexturesActive(final ITexture aBaseTexture) { -- cgit