diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-04-14 17:53:33 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-04-14 17:53:33 +0100 |
| commit | 6d111eb8d7882d62eaf223556cf97005449aedd8 (patch) | |
| tree | 6ab2ab9c535652e2da909a75caff7a7d4f2804a8 | |
| parent | 87832b2731482695b2dca1f082019440e9637ae8 (diff) | |
| download | Essentials-6d111eb8d7882d62eaf223556cf97005449aedd8.tar Essentials-6d111eb8d7882d62eaf223556cf97005449aedd8.tar.gz Essentials-6d111eb8d7882d62eaf223556cf97005449aedd8.tar.lz Essentials-6d111eb8d7882d62eaf223556cf97005449aedd8.tar.xz Essentials-6d111eb8d7882d62eaf223556cf97005449aedd8.zip | |
Throw syntax error on /item, if syntax is wrong.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commanditem.java | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java index 405b8b799..0e35dda71 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java @@ -36,42 +36,47 @@ public class Commanditem extends EssentialsCommand { throw new Exception(_("cantSpawnItem", itemname)); } - - if (args.length > 1 && Integer.parseInt(args[1]) > 0) - { - stack.setAmount(Integer.parseInt(args[1])); - } - else if (ess.getSettings().getDefaultStackSize() > 0) + try { - stack.setAmount(ess.getSettings().getDefaultStackSize()); - } - else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks")) - { - stack.setAmount(ess.getSettings().getOversizedStackSize()); - } - - if (args.length > 2) - { - for (int i = 2; i < args.length; i++) + if (args.length > 1 && Integer.parseInt(args[1]) > 0) { - final String[] split = args[i].split("[:+',;.]", 2); - if (split.length < 1) - { - continue; - } - final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user); - int level; - if (split.length > 1) - { - level = Integer.parseInt(split[1]); - } - else + stack.setAmount(Integer.parseInt(args[1])); + } + else if (ess.getSettings().getDefaultStackSize() > 0) + { + stack.setAmount(ess.getSettings().getDefaultStackSize()); + } + else if (ess.getSettings().getOversizedStackSize() > 0 && user.isAuthorized("essentials.oversizedstacks")) + { + stack.setAmount(ess.getSettings().getOversizedStackSize()); + } + if (args.length > 2) + { + for (int i = 2; i < args.length; i++) { - level = enchantment.getMaxLevel(); + final String[] split = args[i].split("[:+',;.]", 2); + if (split.length < 1) + { + continue; + } + final Enchantment enchantment = Commandenchant.getEnchantment(split[0], user); + int level; + if (split.length > 1) + { + level = Integer.parseInt(split[1]); + } + else + { + level = enchantment.getMaxLevel(); + } + stack.addEnchantment(enchantment, level); } - stack.addEnchantment(enchantment, level); } } + catch (NumberFormatException e) + { + throw new NotEnoughArgumentsException(); + } if (stack.getType() == Material.AIR) { |