From 2fd5777a4adafc3bc3fcaf38d49ff1e96e4755eb Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Sep 2013 06:35:53 +0100 Subject: Properly handle negative /clear amounts. --- .../com/earth2me/essentials/commands/Commandclearinventory.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java index 9119b1696..1d4d82dcf 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java @@ -62,7 +62,7 @@ public class Commandclearinventory extends EssentialsCommand } for (Player player : players) { - clearHandler(sender, player, args, offset, players.size() < EXTENDED_CAP); + clearHandler(sender, player, args, offset, players.size() < EXTENDED_CAP); } } @@ -121,7 +121,8 @@ public class Commandclearinventory extends EssentialsCommand if (data == -1) // data -1 means that all subtypes will be cleared { ItemStack stack = new ItemStack(type); - if (showExtended) { + if (showExtended) + { sender.sendMessage(_("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); } player.getInventory().clear(type, data); @@ -138,6 +139,10 @@ public class Commandclearinventory extends EssentialsCommand } else { + if (amount < 0) + { + amount = 1; + } ItemStack stack = new ItemStack(type, amount, data); if (player.getInventory().containsAtLeast(stack, amount)) { -- cgit v1.2.3