TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression in /tpaccept (#3567)

Browse source 
d9bf099c3d introduced a regression where `/tpaccept` no longer unconditionally cancels the teleportation request when it is accepted. This restores the previous request cancellation behaviour.

Fixes #3563.
This commit is contained in:
MD 2020-08-04 16:20:24 +01:00 committed by GitHub
commit 1ef4e15a4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View file

@ -56,11 +56,6 @@ public class Commandtpaccept extends EssentialsCommand {
user.sendMessage(tl("pendingTeleportCancelled")); user.sendMessage(tl("pendingTeleportCancelled"));
return false; return false;
}); });
future.thenAccept(success -> {
if (success) {
user.requestTeleport(null, false);
}
});
if (user.isTpRequestHere()) { if (user.isTpRequestHere()) {
final Location loc = user.getTpRequestLocation(); final Location loc = user.getTpRequestLocation();
AsyncTeleport teleport = (AsyncTeleport) requester.getAsyncTeleport(); AsyncTeleport teleport = (AsyncTeleport) requester.getAsyncTeleport();
@ -76,6 +71,7 @@ public class Commandtpaccept extends EssentialsCommand {
teleport.setTpType(AsyncTeleport.TeleportType.TPA); teleport.setTpType(AsyncTeleport.TeleportType.TPA);
teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND, future); teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND, future);
} }
user.requestTeleport(null, false);
} }
} }