TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 04:23:02 +00:00
Code Issues Projects Releases Wiki Activity

Check for timeout in /tpa and /tpaccept. Fixes #818.

Browse source 
This commit adds a method called hasOutstandingTeleportRequest() in IUser - implemented fully in User.
This commit is contained in:
Ali Moghnieh 2016-11-22 20:39:31 +00:00
parent 6ade8132af
commit ad94cca95b
No known key found for this signature in database
GPG key ID: F09D3A1BAF2E6D70
5 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
View file

@ -28,7 +28,7 @@ public class Commandtpa extends EssentialsCommand {
throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName()));
}
// Don't let sender request teleport twice to the same player.
if (user.getConfigUUID().equals(player.getTeleportRequest())
if (user.getConfigUUID().equals(player.getTeleportRequest()) && player.hasOutstandingTeleportRequest() // Check timeout
&& player.isTpRequestHere() == false) { // Make sure the last teleport request was actually tpa and not tpahere
throw new Exception(tl("requestSentAlready", player.getDisplayName()));
}