Skip to content

Commit 263dab5

Browse files
itsme-toJRoy
andauthored
Fix spawn command sending message before teleportation (#6025)
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
1 parent e3e247d commit 263dab5

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
7171
if (spawn == null) {
7272
return;
7373
}
74-
sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
7574
future.exceptionally(e -> {
7675
showError(sender.getSender(), e, commandLabel);
7776
return false;
@@ -83,8 +82,14 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
8382
}
8483
if (teleportOwner == null) {
8584
teleportee.getAsyncTeleport().now(spawn, false, TeleportCause.COMMAND, future);
86-
return;
85+
} else {
86+
teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
8787
}
88-
teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
88+
future.thenAccept(success -> {
89+
if (success) {
90+
sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
91+
}
92+
});
93+
8994
}
9095
}

0 commit comments

Comments
 (0)