From 48ef020dc9f795eebbbdbc2883ce56817f459cac Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 5 Oct 2015 21:59:56 -0700 Subject: [PATCH] Fix #868 Last tin can won't be consumed by Farm GUI --- src/main/java/forestry/core/fluids/FluidHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index a864f22ca..648260ab1 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -151,16 +151,18 @@ public final class FluidHelper { return false; } - if (!hasRoomForDrainedContainer(input, output, drainedItem, inputSlot, outputSlot)) { + // consume forestry containers if there is only one slot + if (outputSlot == inputSlot && drainedItem != null) { Item item = drainedItem.getItem(); - // consume forestry containers if there is no room for them if (ForestryItem.canEmpty.isItemEqual(item) || ForestryItem.waxCapsule.isItemEqual(item) || ForestryItem.refractoryEmpty.isItemEqual(item)) { drainedItem = null; - } else { - return false; } } + if (!hasRoomForDrainedContainer(input, output, drainedItem, inputSlot, outputSlot)) { + return false; + } + fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, true); if (drainedItem != null) {