diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-04-04 00:40:58 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-04-04 00:40:58 +0100 |
commit | 100541bca29e1b840c89ad25ad14c3792618db0a (patch) | |
tree | 56755c5299d13ea5f952b654d872fc37095a88ff | |
parent | d59aaae2fc282426a63c2aa2a820cde84fb80072 (diff) | |
download | Essentials-100541bca29e1b840c89ad25ad14c3792618db0a.tar Essentials-100541bca29e1b840c89ad25ad14c3792618db0a.tar.gz Essentials-100541bca29e1b840c89ad25ad14c3792618db0a.tar.lz Essentials-100541bca29e1b840c89ad25ad14c3792618db0a.tar.xz Essentials-100541bca29e1b840c89ad25ad14c3792618db0a.zip |
Little bit of powertools code cleanup.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java index 679937897..d1d0fb582 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpowertool.java @@ -51,26 +51,18 @@ public class Commandpowertool extends EssentialsCommand { user.sendMessage(_("powerToolList", Util.joinList(powertools), itemName)); } - return; + throw new NoChargeException(); } if (command.startsWith("r:")) { - try + command = command.substring(2); + if (!powertools.contains(command)) { - command = command.substring(2); - if (!powertools.contains(command)) - { - throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName)); - } - - powertools.remove(command); - user.sendMessage(_("powerToolRemove", command, itemName)); - } - catch (Exception e) - { - user.sendMessage(e.getMessage()); - return; + throw new Exception(_("powerToolNoSuchCommandAssigned", command, itemName)); } + + powertools.remove(command); + user.sendMessage(_("powerToolRemove", command, itemName)); } else { @@ -85,7 +77,6 @@ public class Commandpowertool extends EssentialsCommand { throw new Exception(_("powerToolAlreadySet", command, itemName)); } - } else if (powertools != null && !powertools.isEmpty()) { @@ -110,7 +101,8 @@ public class Commandpowertool extends EssentialsCommand user.sendMessage(_("powerToolRemoveAll", itemName)); } - if (!user.arePowerToolsEnabled()) { + if (!user.arePowerToolsEnabled()) + { user.setPowerToolsEnabled(true); user.sendMessage(_("powerToolsEnabled")); } |