diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-10-03 06:42:38 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-10-03 06:42:38 +0100 |
| commit | b2614e363be2b77aa9163bca94f0bee06a2e6ea6 (patch) | |
| tree | 68589ba33d8437d69aad7a609ab2c853adae26aa | |
| parent | ea76161ba5195613655395fffbdff1e565027785 (diff) | |
| download | Essentials-b2614e363be2b77aa9163bca94f0bee06a2e6ea6.tar Essentials-b2614e363be2b77aa9163bca94f0bee06a2e6ea6.tar.gz Essentials-b2614e363be2b77aa9163bca94f0bee06a2e6ea6.tar.lz Essentials-b2614e363be2b77aa9163bca94f0bee06a2e6ea6.tar.xz Essentials-b2614e363be2b77aa9163bca94f0bee06a2e6ea6.zip | |
Fixing mail argument errors.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandmail.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index e08a6c8e5..acffd57a1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -23,13 +23,15 @@ public class Commandmail extends EssentialsCommand List<String> mail = user.getMails(); if (mail.isEmpty()) { - throw new Exception(Util.i18n("noMail")); + user.sendMessage(Util.i18n("noMail")); + throw new NoChargeException(); } for (String s : mail) { user.sendMessage(s); } - throw new Exception(Util.i18n("mailClear")); + user.sendMessage(Util.i18n("mailClear")); + return; } if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) { @@ -62,8 +64,9 @@ public class Commandmail extends EssentialsCommand if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) { user.setMails(null); - throw new Exception(Util.i18n("mailCleared")); + user.sendMessage(Util.i18n("mailCleared")); + return; } - throw new NoChargeException(); + throw new NotEnoughArgumentsException(); } } |