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
commit9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2 (patch)
tree042956f885e90c77d18d7c2da52bdfaf45ba3850
parent5840c02efce3d937cfaaf8dbb7dfdb1fa5f85e28 (diff)
parentf1e4e49779addfd957183441478403195db971d7 (diff)
downloadEssentials-9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2.tar
Essentials-9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2.tar.gz
Essentials-9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2.tar.lz
Essentials-9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2.tar.xz
Essentials-9186ca2c9afccb2e8e4ba7f9b37e8f0e5d7aecb2.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(":");