aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann Bernhardt <johann.bernhardt@tum.de>2021-12-01 16:18:17 +0100
committerJohann Bernhardt <johann.bernhardt@tum.de>2021-12-01 16:18:17 +0100
commit066a8cf9fd2691fa3a157f8688fa889e587dc2c3 (patch)
tree36090fadd64c1699aecab8b01f102bb47e0c5204
parent342b0b7cef44d3647862890063fc81f40a9217c3 (diff)
parent9ca59dd58d42e5cb6d6f47c3318e3f443d72e646 (diff)
downloadGT5-Unofficial-066a8cf9fd2691fa3a157f8688fa889e587dc2c3.tar.gz
GT5-Unofficial-066a8cf9fd2691fa3a157f8688fa889e587dc2c3.tar.bz2
GT5-Unofficial-066a8cf9fd2691fa3a157f8688fa889e587dc2c3.zip
Merge remote-tracking branch 'origin/experimental' into unify-build-script
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
index 289a43fdd8..92f04a4676 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
@@ -332,7 +332,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
@Override
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
- return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (getFuelValue(aStack) > 0 || getFuelValue(aStack, true) > 0) || (getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true), true) > 0);
+ return super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack) && (getFuelValue(aStack) > 0 || getFuelValue(aStack, true) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true)) > 0 || getFuelValue(GT_Utility.getFluidForFilledItem(aStack, true), true) > 0);
}
@Override