diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-03-18 16:20:45 -0700 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-03-18 16:20:45 -0700 |
commit | fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a (patch) | |
tree | e6a2625605b0467b4cbe9d4ac80a390f97b4a44e | |
parent | 66e87bdd1c77f6cbcf1da88cb4e116a20b893581 (diff) | |
parent | 8b97a8465284b449f252124080410721c93430a3 (diff) | |
download | Essentials-fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a.tar Essentials-fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a.tar.gz Essentials-fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a.tar.lz Essentials-fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a.tar.xz Essentials-fe28faf79dfeb0e293ce1fd13a86dbbc0ab7847a.zip |
Merge pull request #396 from GunfighterJ/2.9
Allow potion clear/apply commands to work
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandpotion.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java index 257509d4f..1e0937e6f 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpotion.java @@ -42,11 +42,6 @@ public class Commandpotion extends EssentialsCommand } throw new NotEnoughArgumentsException(_("potions", Util.joinList(potionslist.toArray()))); } - - if (args.length < 3) - { - throw new NotEnoughArgumentsException(); - } if (stack.getType() == Material.POTION) { @@ -60,11 +55,15 @@ public class Commandpotion extends EssentialsCommand } else if (args[0].equalsIgnoreCase("apply") && user.isAuthorized("essentials.potion.apply")) { - for(PotionEffect effect : pmeta.getCustomEffects()) + for (PotionEffect effect : pmeta.getCustomEffects()) { effect.apply(user); } } + else if (args.length < 3) + { + throw new NotEnoughArgumentsException(); + } else { final MetaItemStack mStack = new MetaItemStack(stack); |