Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-05 15:02:16 +01:00
Code Issues Projects 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 5b5be164b6
commit 18b31a7e50
1 changed files with 12 additions and 4 deletions
Show Stats 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
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();
}
}