From 7268e1965d24b443d3ec4b2eddd6cde1967250e2 Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 28 Nov 2011 17:58:06 +0100 Subject: [PATCH] Ignore defaultstacksize from config, just use 64 --- .../com/earth2me/essentials/InventoryWorkaround.java | 10 +++++----- .../com/earth2me/essentials/commands/Commandgive.java | 2 +- .../com/earth2me/essentials/commands/Commanditem.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java index 0b8121f89..53bb5c7f7 100644 --- a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java +++ b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java @@ -81,10 +81,10 @@ public final class InventoryWorkaround public static Map addItem(final Inventory cinventory, final boolean forceDurability, final ItemStack... items) { - return addItem(cinventory, forceDurability, false, null, items); + return addItem(cinventory, forceDurability, false, items); } - public static Map addItem(final Inventory cinventory, final boolean forceDurability, final boolean dontBreakStacks, final IEssentials ess, final ItemStack... items) + public static Map addItem(final Inventory cinventory, final boolean forceDurability, final boolean dontBreakStacks, final ItemStack... items) { final Map leftover = new HashMap(); @@ -147,10 +147,10 @@ public final class InventoryWorkaround else { // More than a single stack! - if (item.getAmount() > (dontBreakStacks ? ess.getSettings().getDefaultStackSize() : item.getType().getMaxStackSize())) + if (item.getAmount() > (dontBreakStacks ? 64 : item.getType().getMaxStackSize())) { ItemStack stack = item.clone(); - stack.setAmount(dontBreakStacks ? ess.getSettings().getDefaultStackSize() : item.getType().getMaxStackSize()); + stack.setAmount(dontBreakStacks ? 64 : item.getType().getMaxStackSize()); if (cinventory instanceof FakeInventory) { cinventory.setItem(firstFree, stack); @@ -183,7 +183,7 @@ public final class InventoryWorkaround final int amount = item.getAmount(); final int partialAmount = partialItem.getAmount(); - final int maxAmount = dontBreakStacks ? ess.getSettings().getDefaultStackSize() : partialItem.getType().getMaxStackSize(); + final int maxAmount = dontBreakStacks ? 64 : partialItem.getType().getMaxStackSize(); // Check if it fully fits if (amount + partialAmount <= maxAmount) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java index 32b0564b7..2147392a6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java @@ -77,7 +77,7 @@ public class Commandgive extends EssentialsCommand final User giveTo = getPlayer(server, args, 0); final String itemName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '); sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + "."); - InventoryWorkaround.addItem(giveTo.getInventory(), true, true, ess, stack); + InventoryWorkaround.addItem(giveTo.getInventory(), true, true, stack); giveTo.updateInventory(); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java index 0d30b4e77..5f9e80ed9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java @@ -72,7 +72,7 @@ public class Commanditem extends EssentialsCommand final String displayName = stack.getType().toString().toLowerCase(Locale.ENGLISH).replace('_', ' '); user.sendMessage(_("itemSpawn", stack.getAmount(), displayName)); - InventoryWorkaround.addItem(user.getInventory(), true, true, ess, stack); + InventoryWorkaround.addItem(user.getInventory(), true, true, stack); user.updateInventory(); } }