From 3f2f2f3e37e46c8d3ad5d65a3c47af34c6675b34 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 5 Mar 2023 19:10:48 +0900 Subject: Fix basic machine ignoring fluid capacity when fluid output is empty (#1784) * updateBuildScript * Fix basic machine ignoring fluid capacity when fluid output is empty --- .../implementations/GT_MetaTileEntity_BasicMachine.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity/implementations') 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) { -- cgit