Merge branch 'master' into weaponry

SlimeKnights · Oct 22, 2014 · bd16981 · bd16981
2 parents a1434c0 + b3632e6
commit bd16981
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java
@@ -37,7 +37,8 @@ public int getSizeInventory ()
     @Override
     public ItemStack getStackInSlot (int slot)
     {
-        return slot >= this.getSizeInventory() + 1 ? null : logic.getStackInSlot(slot + 1);
+        // the 9 slots + 1 output slot that's not accessible, we therefore have to add 1 to the slot accessed
+        return slot > this.getSizeInventory() ? null : logic.getStackInSlot(slot+1);
     }
 
     @Override

diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java
@@ -90,7 +90,7 @@ public boolean canDropInventorySlot (int slot)
     @Override
     public int[] getAccessibleSlotsFromSide (int var1)
     {
-        return new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+        return new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
     }
 
     @Override