diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2021-02-25 01:14:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 01:14:49 +0800 |
| commit | 39b50c5f90ee97c3eb0219d3ba9aee4e9fe3e38f (patch) | |
| tree | 6b7ded41268094f845dbed43b59fe3cb5b167d2e | |
| parent | 92d0fb5b6657fe673b60c426dcfadee7cf1a683f (diff) | |
| parent | 32a49d1cbbae44cac7ec6094e4bf8f94ae8ab46a (diff) | |
| download | GT5-Unofficial-39b50c5f90ee97c3eb0219d3ba9aee4e9fe3e38f.tar.gz GT5-Unofficial-39b50c5f90ee97c3eb0219d3ba9aee4e9fe3e38f.tar.bz2 GT5-Unofficial-39b50c5f90ee97c3eb0219d3ba9aee4e9fe3e38f.zip | |
Merge pull request #440 from GTNewHorizons/patch-water-bottle-divide-0
Fix bottled water filling
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java | 2 |
1 files changed, 2 insertions, 0 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 4939c975d5..28fd2983f4 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java @@ -212,6 +212,8 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; FluidStack tInputFluid = machine.getFillableStack(); FluidStack tFluidHeld = GT_Utility.getFluidForFilledItem(tStackSizedOne, true); + if (tFluidHeld != null && tFluidHeld.amount <= 0) + tFluidHeld = null; if (tInputFluid == null) { if (tFluidHeld == null) // both null -> no op |