From d47feef78dfad91ebc45cc4149ff7a99b4bb666e Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 20 Jan 2017 22:45:47 +0100 Subject: [PATCH] Fixes #891 --- .../network/grid/FluidGridHandler.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java index 2f27279fa..cc5b10e47 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java @@ -32,20 +32,22 @@ public class FluidGridHandler implements IFluidGridHandler { } if (RSUtils.hasFluidBucket(stack)) { - ItemStack bucket = network.extractItem(RSUtils.EMPTY_BUCKET, 1, false); + ItemStack bucket = null; + + for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { + ItemStack slot = player.inventory.getStackInSlot(i); + + if (API.instance().getComparer().isEqualNoQuantity(RSUtils.EMPTY_BUCKET, slot)) { + bucket = RSUtils.EMPTY_BUCKET.copy(); + + player.inventory.decrStackSize(i, 1); + + break; + } + } if (bucket == null) { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { - ItemStack slot = player.inventory.getStackInSlot(i); - - if (API.instance().getComparer().isEqualNoQuantity(RSUtils.EMPTY_BUCKET, slot)) { - bucket = RSUtils.EMPTY_BUCKET.copy(); - - player.inventory.decrStackSize(i, 1); - - break; - } - } + bucket = network.extractItem(RSUtils.EMPTY_BUCKET, 1, false); } if (bucket != null) {