minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-15 11:04:29 +02:00
Code Issues Releases Wiki Activity

[FIX] Print a proper error when using tpaccept with no requester

Browse Source
This commit is contained in:
Iaccidentally
2014-02-01 16:49:54 -05:00
parent 14e190282c
commit 938e539463
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View File

@@ -18,10 +18,17 @@ public class Commandtpaccept extends EssentialsCommand
@Override @Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception 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.isOnline())
if (requester == null || !requester.isOnline())
{ {
throw new Exception(_("noPendingRequest")); throw new Exception(_("noPendingRequest"));
} }
@@ -73,8 +80,9 @@ public class Commandtpaccept extends EssentialsCommand
{ {
user.sendMessage(_("pendingTeleportCancelled")); user.sendMessage(_("pendingTeleportCancelled"));
ess.showError(requester.getSource(), ex, commandLabel); ess.showError(requester.getSource(), ex, commandLabel);
} }
user.requestTeleport(null, false); user.requestTeleport(null, false);
throw new NoChargeException(); throw new NoChargeException();
} }
} }