Merge branch 'master' into weaponry

This commit is contained in:
Bernhard Bonigl committed 2014-10-22 17:39:19 +02:00
commit bd16981499
2 files changed
+3 -2

No files matched your search

@@ -37,7 +37,8 @@ public class InventoryCraftingStation extends InventoryCrafting
@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
@@ -90,7 +90,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent
@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