Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spawn teleportation message sent after teleportation #6025

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Spawn teleportation message sent after teleportation #6025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
if (spawn == null) {
return;
}
sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
future.exceptionally(e -> {
showError(sender.getSender(), e, commandLabel);
return false;
Expand All @@ -83,8 +82,14 @@ private void respawn(final CommandSource sender, final User teleportOwner, final
}
if (teleportOwner == null) {
teleportee.getAsyncTeleport().now(spawn, false, TeleportCause.COMMAND, future);
return;
} else {
teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
}
teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
future.thenAccept(success -> {
if (success) {
sender.sendTl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
}
});

}
}