Fabric: Check slot index for cursorItem

Closes #9
hpfxd · Jul 2, 2024 · fb5f570 · fb5f570
1 parent 5903f80
commit fb5f570
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...java/com/hpfxd/spectatorplus/fabric/client/mixin/screen/AbstractContainerScreenMixin.java b/...java/com/hpfxd/spectatorplus/fabric/client/mixin/screen/AbstractContainerScreenMixin.java
@@ -91,7 +91,7 @@ public abstract class AbstractContainerScreenMixin {
             if (cursorSlot != -1 && this.cursorSlot != -1 && this.cursorSlot != cursorSlot) {
                 final ItemStack animationItem = this.cursorItem.isEmpty() ? cursorItem : this.cursorItem;
 
-                if (!animationItem.isEmpty()) {
+                if (!animationItem.isEmpty() && this.menu.isValidSlotIndex(this.cursorSlot) && this.menu.isValidSlotIndex(cursorSlot)) {
                     this.animations.add(new ItemMoveAnimation(this.cursorSlot, cursorSlot, animationItem));
                 }
             }
@@ -111,7 +111,7 @@ public abstract class AbstractContainerScreenMixin {
             this.spectatorplus$renderCursorItem(guiGraphics, animation.itemStack, cursorX, cursorY);
         }
 
-        if (!this.cursorItem.isEmpty() && this.cursorSlot > 0) {
+        if (!this.cursorItem.isEmpty() && this.cursorSlot > 0 && this.menu.isValidSlotIndex(this.cursorSlot)) {
             final Slot slot = this.menu.getSlot(this.cursorSlot);
             this.spectatorplus$renderCursorItem(guiGraphics, this.cursorItem, slot.x, slot.y);
         }