diff options
| author | miozune <miozune@gmail.com> | 2023-03-05 19:10:48 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-05 11:10:48 +0100 |
| commit | 3f2f2f3e37e46c8d3ad5d65a3c47af34c6675b34 (patch) | |
| tree | 69d005417a247d90e3c74366e8b3be9b551ec918 /src | |
| parent | 3baa08c9f4363303fd8ad35e3f7a210d9bffb11a (diff) | |
| download | GT5-Unofficial-3f2f2f3e37e46c8d3ad5d65a3c47af34c6675b34.tar.gz GT5-Unofficial-3f2f2f3e37e46c8d3ad5d65a3c47af34c6675b34.tar.bz2 GT5-Unofficial-3f2f2f3e37e46c8d3ad5d65a3c47af34c6675b34.zip | |
Fix basic machine ignoring fluid capacity when fluid output is empty (#1784)
* updateBuildScript
* Fix basic machine ignoring fluid capacity when fluid output is empty
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 62d6868286..7ff173615a 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -794,9 +794,10 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B } protected boolean canOutput(FluidStack aOutput) { - return getDrainableStack() == null || aOutput == null - || (getDrainableStack().isFluidEqual(aOutput) && (getDrainableStack().amount <= 0 - || getDrainableStack().amount + aOutput.amount <= getCapacity())); + if (aOutput == null) return true; + FluidStack drainableStack = getDrainableStack(); + if (drainableStack != null && !drainableStack.isFluidEqual(aOutput)) return false; + return (drainableStack != null ? drainableStack.amount : 0) + aOutput.amount <= getCapacity(); } protected ItemStack getInputAt(int aIndex) { |