diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2021-02-22 13:48:11 +0800 |
|---|---|---|
| committer | Glease <4586901+Glease@users.noreply.github.com> | 2021-02-22 13:48:11 +0800 |
| commit | e2d26747b7fcbdf04d079d0657b2febe6284b635 (patch) | |
| tree | f42ce1a2a30a7ad3abd503fff5fe5bdbfcfcb1fe /src/main/java/gregtech/api/gui | |
| parent | 7203229d417f72036f0fdbaf54390d02c6d0dd1d (diff) | |
| download | GT5-Unofficial-e2d26747b7fcbdf04d079d0657b2febe6284b635.tar.gz GT5-Unofficial-e2d26747b7fcbdf04d079d0657b2febe6284b635.tar.bz2 GT5-Unofficial-e2d26747b7fcbdf04d079d0657b2febe6284b635.zip | |
Pickup fluid instead if the input tank is full
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/gui')
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java index 38f8bd3b35..4939c975d5 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java @@ -218,8 +218,9 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { return null; return fillFluid(machine, aPlayer, tFluidHeld, aMouseclick == 0); } else { - if (tFluidHeld != null) { - // both nonnull. actually both pickup and fill is reasonable, but I'll go with fill here + if (tFluidHeld != null && tInputFluid.amount < machine.getCapacity()) { + // both nonnull and have space left for filling. + // actually both pickup and fill is reasonable, but I'll go with fill here return fillFluid(machine, aPlayer, tFluidHeld, aMouseclick == 0); } else { tResultStack = pickupFluid(tInputFluid, aPlayer, aMouseclick == 0); |