diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-09-19 16:27:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 16:27:07 +0200 |
| commit | f0e20a9fe4d987f0116b72e2e04750e1d191790e (patch) | |
| tree | cc3b913aefb30d1c7d7c59b08f5414b364fe354c | |
| parent | e05f848689514bfc142826b1d731eb5526f6ff3d (diff) | |
| parent | f2a0c71bb61e18c967078ec670eb03a29854cbc3 (diff) | |
| download | GT5-Unofficial-f0e20a9fe4d987f0116b72e2e04750e1d191790e.tar.gz GT5-Unofficial-f0e20a9fe4d987f0116b72e2e04750e1d191790e.tar.bz2 GT5-Unofficial-f0e20a9fe4d987f0116b72e2e04750e1d191790e.zip | |
Merge pull request #26 from repo-alt/master
fix crash when empty flask gets into pyrotheum hatch
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java | 10 |
1 files changed, 8 insertions, 2 deletions
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) { |