summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-16 08:40:44 -0800
committerKHobbits <rob@khobbits.co.uk>2013-02-16 08:40:44 -0800
commit686f33125379e94db64ec92b214546619406ba2e (patch)
tree05731c6fb3989cbb0d61762913d92f55fea1683f
parentcfe1244774004ed8ca6ef33bdaae32c8cea234d8 (diff)
parent0a2582ebdc49d39e5711b78d09b535419bc355c4 (diff)
downloadEssentials-686f33125379e94db64ec92b214546619406ba2e.tar
Essentials-686f33125379e94db64ec92b214546619406ba2e.tar.gz
Essentials-686f33125379e94db64ec92b214546619406ba2e.tar.lz
Essentials-686f33125379e94db64ec92b214546619406ba2e.tar.xz
Essentials-686f33125379e94db64ec92b214546619406ba2e.zip
Merge pull request #333 from GunfighterJ/patch-12
Adds optional argument to clear both inventory and armor with /clear
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
index 070e74c44..5f521fa25 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
@@ -126,6 +126,11 @@ public class Commandclearinventory extends EssentialsCommand
{
player.getInventory().clear();
}
+ else if (arg.equalsIgnoreCase("**"))
+ {
+ player.getInventory().clear();
+ player.getInventory().setArmorContents(null);
+ }
else
{
final String[] split = arg.split(":");