From c2437a8a133e00f205fe5f7802c2d57598884653 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 12 Dec 2015 18:08:40 -0800 Subject: [PATCH] Fix #1009 Minor fluid dupe on right-clicking nearly-full machine --- .../java/forestry/core/fluids/FluidHelper.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 9403ed339..e06077391 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -49,11 +49,19 @@ public final class FluidHelper { FluidStack liquid = getFluidStackInContainer(current); if (fill && liquid != null) { - int used = tank.fill(side, liquid, true); + int canUseAmount = tank.fill(side, liquid, false); + if (canUseAmount == 0) { + return false; + } - if (used > 0) { + ItemStack drainedContainer = getDrainedContainer(current, canUseAmount); + if (ItemStackUtil.isIdenticalItem(current, drainedContainer)) { + return false; + } + + int usedAmount = tank.fill(side, liquid, true); + if (usedAmount > 0) { if (!player.capabilities.isCreativeMode) { - ItemStack drainedContainer = getDrainedContainer(current, used); if (current.stackSize > 1) { player.inventory.decrStackSize(player.inventory.currentItem, 1); if (drainedContainer != null && !player.inventory.addItemStackToInventory(drainedContainer)) {