correct negative stack size to 1

xGinko · Aug 6, 2024 · 2a89adb · 2a89adb
1 parent 1b2554f
commit 2a89adb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/...xploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/InvalidStackSize.java b/...xploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/InvalidStackSize.java
@@ -70,7 +70,16 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
         if (handling == IllegalHandling.PREVENT_USE_ONLY) return; // We are cancelling the action in the super class
 
         switch (legality) {
-            case ILLEGAL -> itemStack.setAmount(itemStack.getMaxStackSize());
+            case ILLEGAL -> {
+                if (itemStack.getAmount() < 1) {
+                    itemStack.setAmount(1);
+                    return;
+                }
+
+                if (itemStack.getAmount() > itemStack.getMaxStackSize()) {
+                    itemStack.setAmount(itemStack.getMaxStackSize());
+                }
+            }
             case CONTAINS_ILLEGAL -> itemStack.setAmount(0);
         }
     }

diff --git a/...ploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/InvalidStackSize.java b/...ploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/InvalidStackSize.java
@@ -73,8 +73,15 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
 
         switch (legality) {
             case ILLEGAL:
-                itemStack.setAmount(itemStack.getMaxStackSize());
-                break;
+                if (itemStack.getAmount() < 1) {
+                    itemStack.setAmount(1);
+                    return;
+                }
+
+                if (itemStack.getAmount() > itemStack.getMaxStackSize()) {
+                    itemStack.setAmount(itemStack.getMaxStackSize());
+                }
+                return;
             case CONTAINS_ILLEGAL:
                 itemStack.setAmount(0);
         }