fix selector info max stack size check

TeamLapen · Jul 6, 2024 · 3a89903 · 3a89903
1 parent b1c358d
commit 3a89903
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/java/de/teamlapen/lib/lib/inventory/InventoryContainerMenu.java b/src/lib/java/de/teamlapen/lib/lib/inventory/InventoryContainerMenu.java
@@ -159,7 +159,7 @@ public void setContainer(InventoryContainerMenu container) {
 
         @Override
         public int getMaxStackSize(@NotNull ItemStack stack) {
-            return info.stackLimit;
+            return Math.min(stack.getMaxStackSize(), info.stackLimit);
         }
 
         @Override

diff --git a/src/lib/java/de/teamlapen/lib/lib/inventory/InventoryHelper.java b/src/lib/java/de/teamlapen/lib/lib/inventory/InventoryHelper.java
@@ -110,7 +110,7 @@ public static void readInventoryFromTag(@NotNull CompoundTag tag, @NotNull Simpl
     }
 
     public static boolean canMergeStacks(@NotNull ItemStack stack1, @NotNull ItemStack stack2, int invLimit) {
-        return !stack1.isEmpty() && ItemStackUtil.stackEqualExact(stack1, stack2) && stack1.isStackable() && stack1.getCount() < stack1.getMaxStackSize() && stack1.getCount() < invLimit;
+        return !stack1.isEmpty() && ItemStack.isSameItemSameTags(stack1, stack2) && stack1.isStackable() && stack1.getCount() < stack1.getMaxStackSize() && stack1.getCount() < Math.min(invLimit, stack1.getMaxStackSize());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public static boolean canMergeStacks(@NotNull ItemStack stack1, @NotNull ItemStack stack2, int invLimit) {
-            return !stack1.isEmpty() && ItemStackUtil.stackEqualExact(stack1, stack2) && stack1.isStackable() && stack1.getCount() < stack1.getMaxStackSize() && stack1.getCount() < invLimit;
+            return !stack1.isEmpty() && ItemStack.isSameItemSameTags(stack1, stack2) && stack1.isStackable() && stack1.getCount() < stack1.getMaxStackSize() && stack1.getCount() < Math.min(invLimit, stack1.getMaxStackSize());
         }
         /**
@@ Expand Down @@