Update FakeItem slot translations

DenizenScript · Apr 6, 2016 · 76ba784 · 76ba784
1 parent 7ebf0b2
commit 76ba784
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/item/FakeItemCommand.java
@@ -132,12 +132,22 @@ static void setSlot(CraftPlayer craftPlayer, int slot, ItemStack itemStack, bool
     }
 
     static int translateSlot(CraftPlayer craftPlayer, int slot, boolean player_only) {
-        int total = player_only ? 41 : craftPlayer.getOpenInventory().countSlots();
-        if (total == 41) {
-            total += 4;
-            if (slot > 35) {
-                slot = 44 + 36 - slot;
+        if (slot < 0) {
+            return 0;
+        }
+        int total = player_only ? 46 : craftPlayer.getOpenInventory().countSlots();
+        if (total == 46) {
+            if (slot == 45) {
+                return slot;
+            }
+            else if (slot > 35) {
+                slot = 8 - (slot - 36);
+                return slot;
             }
+            total -= 1;
+        }
+        if (slot > total) {
+            return total;
         }
         return (int) (slot + (total - 9) - (9 * (2 * Math.floor(slot / 9))));
     }