From 22a1da1b8d60158374f826812b01221dc384f40b Mon Sep 17 00:00:00 2001 From: Gabriel Tofvesson Date: Sat, 24 Apr 2021 00:56:44 +0200 Subject: [PATCH] Fix stack merge count bug --- .../invtweaks/command/SortCommandExecutor.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java b/src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java index f50fc73..763e60b 100644 --- a/src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java +++ b/src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java @@ -196,17 +196,11 @@ public class SortCommandExecutor implements CommandExecutor { if (amount == 0) { stacks[i] = new ItemStack(Material.AIR); } else { - final int currentAmount = current.getAmount(); + final int newAmount = Math.min(amount, current.getMaxStackSize()); + current.setAmount(newAmount); - if (currentAmount < current.getMaxStackSize()) { - final int newAmount = Math.min(amount, current.getMaxStackSize()); - current.setAmount(newAmount); - - // Update remaining count of given material - count.put(key, amount - newAmount); - } else { - count.put(key, amount - currentAmount); - } + // Update remaining count of given material + count.put(key, amount - newAmount); } } else { logger.warning("Found untracked ItemStack while merging stacks");