From 9e080b1e078ad88ab3e2984b25bbfd49ecec21a5 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:04:12 -0600 Subject: [PATCH] Fix fluid containers with null empty items not deleting in fluid terminal --- .../gui/container/ContainerFluidMonitor.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java index a5bc00bf..3b7f4bbe 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java @@ -332,10 +332,15 @@ public class ContainerFluidMonitor extends FCContainerMonitor { if (targetStack.getItem() instanceof IFluidContainerItem fcItem) { if (emptiedTanks > 0) { - emptiedTanksStack = targetStack.copy(); - emptiedTanksStack.stackSize = 1; - fcItem.drain(emptiedTanksStack, fluidPerContainer, true); - emptiedTanksStack.stackSize = emptiedTanks; + final ItemStack testDrainStack = targetStack.copy(); + testDrainStack.stackSize = 1; + fcItem.drain(testDrainStack, fluidPerContainer, true); + if (testDrainStack.stackSize == 0) { + emptiedTanksStack = null; + } else { + emptiedTanksStack = targetStack.copy(); + emptiedTanksStack.stackSize = emptiedTanks; + } } else { emptiedTanksStack = null; } @@ -391,7 +396,11 @@ public class ContainerFluidMonitor extends FCContainerMonitor { player.inventory.setInventorySlotContents(slotIndex, partialTanksStack); } else { player.inventory.setItemStack(null); - shouldSendStack = false; + if (shift) { + player.inventory.setInventorySlotContents(slotIndex, null); + } else { + shouldSendStack = false; + } } } if (shouldSendStack) {