Fix IndexOutOfBoundsException (mc???)

Fesaa · Jan 2, 2024 · fc4de31 · fc4de31
1 parent 2983e84
commit fc4de31
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/game-runner/src/v1_19_4/java/org/cubepanion/v1_19_4/mixins/MultiPlayerGameModeMixin.java b/game-runner/src/v1_19_4/java/org/cubepanion/v1_19_4/mixins/MultiPlayerGameModeMixin.java
@@ -33,7 +33,12 @@ private void handleInventoryMouseClick(int $$0, int $$1, int $$2, ClickType $$3,
       cubepanion$addon = Cubepanion.get();
     }
     AbstractContainerMenu inv = $$4.containerMenu;
-    Slot slot = inv.getSlot($$1);
+    Slot slot;
+    try {
+      slot = inv.getSlot($$1);
+    } catch (IndexOutOfBoundsException e) {
+      return;
+    }
     ItemStack itemStack = slot.getItem();
     if ((itemStack.is(ItemTags.TOOLS) || itemStack.is(Items.BOW)
         || itemStack.getItem() instanceof ArmorItem)

diff --git a/game-runner/src/v1_20_1/java/org/cubepanion/v1_20_1/mixins/MultiPlayerGameModeMixin.java b/game-runner/src/v1_20_1/java/org/cubepanion/v1_20_1/mixins/MultiPlayerGameModeMixin.java
@@ -33,7 +33,12 @@ private void handleInventoryMouseClick(int $$0, int $$1, int $$2, ClickType $$3,
       cubepanion$addon = Cubepanion.get();
     }
     AbstractContainerMenu inv = $$4.containerMenu;
-    Slot slot = inv.getSlot($$1);
+    Slot slot;
+    try {
+      slot = inv.getSlot($$1);
+    } catch (IndexOutOfBoundsException e) {
+      return;
+    }
     ItemStack itemStack = slot.getItem();
     if ((itemStack.is(ItemTags.TOOLS) || itemStack.is(Items.BOW)
         || itemStack.getItem() instanceof ArmorItem)

diff --git a/game-runner/src/v1_20_2/java/org/cubepanion/v1_20_2/mixins/MultiPlayerGameModeMixin.java b/game-runner/src/v1_20_2/java/org/cubepanion/v1_20_2/mixins/MultiPlayerGameModeMixin.java
@@ -33,7 +33,12 @@ private void handleInventoryMouseClick(int $$0, int $$1, int $$2, ClickType $$3,
       cubepanion$addon = Cubepanion.get();
     }
     AbstractContainerMenu inv = $$4.containerMenu;
-    Slot slot = inv.getSlot($$1);
+    Slot slot;
+    try {
+      slot = inv.getSlot($$1);
+    } catch (IndexOutOfBoundsException e) {
+      return;
+    }
     ItemStack itemStack = slot.getItem();
     if ((itemStack.is(ItemTags.TOOLS) || itemStack.is(Items.BOW)
         || itemStack.getItem() instanceof ArmorItem)

diff --git a/game-runner/src/v1_20_4/java/org/cubepanion/v1_20_4/mixins/MultiPlayerGameModeMixin.java b/game-runner/src/v1_20_4/java/org/cubepanion/v1_20_4/mixins/MultiPlayerGameModeMixin.java
@@ -33,7 +33,12 @@ private void handleInventoryMouseClick(int $$0, int $$1, int $$2, ClickType $$3,
       cubepanion$addon = Cubepanion.get();
     }
     AbstractContainerMenu inv = $$4.containerMenu;
-    Slot slot = inv.getSlot($$1);
+    Slot slot;
+    try {
+      slot = inv.getSlot($$1);
+    } catch (IndexOutOfBoundsException e) {
+      return;
+    }
     ItemStack itemStack = slot.getItem();
     if ((itemStack.is(ItemTags.TOOLS) || itemStack.is(Items.BOW)
         || itemStack.getItem() instanceof ArmorItem)