From 646e0fdb5ac17de026a3784b96fa93ff1b841ce0 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 21:24:51 -0700 Subject: [PATCH] Fix #201: Worktable crash on shift-clicking items in. --- src/main/java/forestry/factory/gadgets/TileWorktable.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 7b33d2c78..f8c1306f8 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -461,7 +461,9 @@ public class TileWorktable extends TileBase implements ICrafter { craftingInventory.setInventorySlotContents(SLOT_CRAFTING_RESULT, null); } - private boolean validateResources() { + private boolean canCraftCurrentRecipe() { + if (currentRecipe == null) + return false; ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); return StackUtils.containsSets(set, stock, currentRecipe.getRecipeOutput(), true, true) > 0; @@ -474,7 +476,9 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public boolean canTakeStack(int slotIndex) { - return validateResources(); + if (slotIndex == SLOT_CRAFTING_RESULT) + return canCraftCurrentRecipe(); + return true; } @Override