From dfce9715659380a1b9b3c4f27046c60bba813603 Mon Sep 17 00:00:00 2001
From: pop4959 <pop4959@gmail.com>
Date: Tue, 4 Aug 2020 02:37:37 -0700
Subject: [PATCH] Fix stale tpaccept

---
 .../com/earth2me/essentials/commands/Commandtpaccept.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
index d1d7dc684..d7e80d11e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
@@ -56,11 +56,6 @@ public class Commandtpaccept extends EssentialsCommand {
             user.sendMessage(tl("pendingTeleportCancelled"));
             return false;
         });
-        future.thenAccept(success -> {
-           if (success) {
-               user.requestTeleport(null, false);
-           }
-        });
         if (user.isTpRequestHere()) {
             final Location loc = user.getTpRequestLocation();
             AsyncTeleport teleport = (AsyncTeleport) requester.getAsyncTeleport();
@@ -76,6 +71,7 @@ public class Commandtpaccept extends EssentialsCommand {
             teleport.setTpType(AsyncTeleport.TeleportType.TPA);
             teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND, future);
         }
+        user.requestTeleport(null, false);
     }
 
 }