From f0c7b100695fa8737d8ae90b0f6532f28e5e1c4b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 30 Apr 2016 09:34:28 +0200 Subject: [PATCH] Fix picking up from crafting result slot --- .../java/refinedstorage/container/ContainerGrid.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 33ac2e3a1..a76a5f33d 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -20,7 +20,7 @@ import java.util.List; public class ContainerGrid extends ContainerBase { private List craftingSlots = new ArrayList(); - + private SlotGridCraftingResult craftingResultSlot; private IGrid grid; public ContainerGrid(EntityPlayer player, IGrid grid) { @@ -49,7 +49,7 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(new SlotGridCraftingResult(this, player, ((TileGrid) grid).getCraftingInventory(), ((TileGrid) grid).getCraftingResultInventory(), (TileGrid) grid, 0, 133 + 4, 120 + 4)); + addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, ((TileGrid) grid).getCraftingInventory(), ((TileGrid) grid).getCraftingResultInventory(), (TileGrid) grid, 0, 133 + 4, 120 + 4)); } else if (grid.getType() == EnumGridType.PATTERN) { int x = 8; int y = 106; @@ -123,4 +123,9 @@ public class ContainerGrid extends ContainerBase { return super.func_184996_a(id, clickedButton, clickType, player); } + + @Override + public boolean canMergeSlot(ItemStack stack, Slot slot) { + return slot != craftingResultSlot; + } }