diff options
author | Iaccidentally <coryhuckaby@gmail.com> | 2014-02-01 16:49:54 -0500 |
---|---|---|
committer | Iaccidentally <coryhuckaby@gmail.com> | 2014-02-01 16:49:54 -0500 |
commit | 18b31a7e50dbbce3410b7244eebeaa06c0147321 (patch) | |
tree | b2f91353b1370e0087b9cfc64108b17ac22c3466 | |
parent | 5b5be164b6e4a103cef1c3be1dc477f77540c0e9 (diff) | |
download | Essentials-18b31a7e50dbbce3410b7244eebeaa06c0147321.tar Essentials-18b31a7e50dbbce3410b7244eebeaa06c0147321.tar.gz Essentials-18b31a7e50dbbce3410b7244eebeaa06c0147321.tar.lz Essentials-18b31a7e50dbbce3410b7244eebeaa06c0147321.tar.xz Essentials-18b31a7e50dbbce3410b7244eebeaa06c0147321.zip |
[FIX] Print a proper error when using tpaccept with no requester
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index afff0f4ab..73d408ddd 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -18,10 +18,17 @@ public class Commandtpaccept extends EssentialsCommand @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + final User requester; + try + { + requester = ess.getUser(user.getTeleportRequest()); + } + catch (Exception ex) + { + throw new Exception(_("noPendingRequest")); + } - final User requester = ess.getUser(user.getTeleportRequest()); - - if (requester == null || !requester.isOnline()) + if (!requester.isOnline()) { throw new Exception(_("noPendingRequest")); } @@ -73,8 +80,9 @@ public class Commandtpaccept extends EssentialsCommand { user.sendMessage(_("pendingTeleportCancelled")); ess.showError(requester.getSource(), ex, commandLabel); - } + } user.requestTeleport(null, false); throw new NoChargeException(); } + } |