From c1faf6ac9750b3b16855d95d13e801939013d9b2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 25 Dec 2015 04:16:28 +0000 Subject: [PATCH] Revert #1685 as it was causing items to get destroyed. --- .../block/subtile/functional/SubTileHopperhock.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 29bc787df..bfd7a78a3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -79,7 +79,6 @@ public class SubTileHopperhock extends SubTileFunctional { IInventory invToPutItemIn = null; ForgeDirection sideToPutItemIn = ForgeDirection.UNKNOWN; boolean priorityInv = false; - int amountToPutIn = 0; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { int x_ = x + dir.offsetX; @@ -90,8 +89,8 @@ public class SubTileHopperhock extends SubTileFunctional { if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir); - canAccept &= availablePut > 0; + int stackSize = InventoryHelper.testInventoryInsertion(inv, stack, dir); + canAccept &= stackSize == stack.stackSize; if(canAccept) { boolean priority = !filter.isEmpty(); @@ -103,7 +102,6 @@ public class SubTileHopperhock extends SubTileFunctional { invToPutItemIn = inv; priorityInv = priority; sideToPutItemIn = dir.getOpposite(); - amountToPutIn = availablePut; } } } @@ -117,11 +115,9 @@ public class SubTileHopperhock extends SubTileFunctional { particled.add(item); } } else { - InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.splitStack(amountToPutIn), sideToPutItemIn, -1); + InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); invToPutItemIn.markDirty(); - item.setEntityItemStack(stack.splitStack(stack.stackSize - amountToPutIn)); - if(item.getEntityItem().stackSize == 0) - item.setDead(); + item.setDead(); pulledAny = true; } }