Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-15 20:01:57 +01:00
Code Issues Projects Releases Wiki Activity

Properly handle negative /clear amounts.

Browse Source
This commit is contained in:
KHobbits 2013-09-04 06:35:53 +01:00
parent df5d9a4db8
commit c056ba0059
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
View File

@ -121,7 +121,8 @@ public class Commandclearinventory extends EssentialsCommand
if (data == -1) // data -1 means that all subtypes will be cleared if (data == -1) // data -1 means that all subtypes will be cleared
{ {
ItemStack stack = new ItemStack(type); ItemStack stack = new ItemStack(type);
if (showExtended) { if (showExtended)
{
sender.sendMessage(_("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName())); sender.sendMessage(_("inventoryClearingAllStack", stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName()));
} }
player.getInventory().clear(type, data); player.getInventory().clear(type, data);
@ -138,6 +139,10 @@ public class Commandclearinventory extends EssentialsCommand
} }
else else
{ {
if (amount < 0)
{
amount = 1;
}
ItemStack stack = new ItemStack(type, amount, data); ItemStack stack = new ItemStack(type, amount, data);
if (player.getInventory().containsAtLeast(stack, amount)) if (player.getInventory().containsAtLeast(stack, amount))
{ {