mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 12:02:53 +00:00

This PR reduces the number of sync loads occurring on any teleport caused by essentials. Fixes #2861 Fixes #2287 Fixes #3274 Fixes #3201 Fixes #2120 Before this PR, essentials would get a block multiple times causing sync loads to check if it was safe to teleport to. Now, the target block's chunk if fetched async with PaperLib and passed along to `LocationUtil#isBlockUnsafeForUser` (which internally calls other LocationUtil methods what that chunk object) resulting in the chunk only loading once, off the main thread. The only operations remaining on the main thread is `LocationUtil#getSafeDestination`. This is due to the method's recursion which would be a pain to move async. **However:** since the chunk was already loaded async, `LocationUtil#getSafeDestination` most of the time won't cause sync chunk loads. The only time it would cause sync chunk loads is with an unsafe location near a chunk border. ----------------------------------------- * Reduce sync teleporting loads * Avoid argument re-assigning * Remove async teleports when unnecessary * Make exceptions cleaner * Async all the things Made an async version of every method with fallbacks for deprecated methods. * Remove old now fallback method * Migrate everything to the new async teleport API * Update ITeleport javadocs * Fix invoking via async context * Fix /jail using deprecated method * Fix jail join handler using deprecated method * Rename all teleport classes to indicate async * Remove deprecated methods * Add (and deprecate) old teleport api * Revert TimedTeleport.java * Reduce Diff * Add legacy sendToJail method * Reduce Diff Further * Use getNewExceptionFuture in Commandtpo * Use getNewExceptionFuture everywhere * Fix even more usages * Revert LocationUtil.java * Fix issue causing unsafe locations to not work properly * Add deprecated notice in IUser implementation * Use CompletableFuture#completeExceptionally for exceptions * Use Essentials' logger in EssentialsCommand#showError * Return implementation rather than interface * Avoid possible deadlocks with entity ejections * Nuke some sync loads with homes Took 7 hours and 2 PRs to paper but it's here! * Fix ABI and make the codestyle worse * Make the codestyle worse because muh diff * Further ruin the codestyle * Fix error messages not showing in TimedTeleports * Improve messages around beds for /home * Fix #3274 Allow unsafe locations for different worlds + spectator mode * Fix fly safety operators
72 lines
3.1 KiB
Java
72 lines
3.1 KiB
Java
package com.earth2me.essentials.spawn;
|
|
|
|
import com.earth2me.essentials.CommandSource;
|
|
import com.earth2me.essentials.Console;
|
|
import com.earth2me.essentials.Trade;
|
|
import com.earth2me.essentials.User;
|
|
import com.earth2me.essentials.commands.EssentialsCommand;
|
|
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Server;
|
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
import static com.earth2me.essentials.I18n.tl;
|
|
|
|
|
|
public class Commandspawn extends EssentialsCommand {
|
|
public Commandspawn() {
|
|
super("spawn");
|
|
}
|
|
|
|
@Override
|
|
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
|
|
final Trade charge = new Trade(this.getName(), ess);
|
|
charge.isAffordableFor(user);
|
|
if (args.length > 0 && user.isAuthorized("essentials.spawn.others")) {
|
|
final User otherUser = getPlayer(server, user, args, 0);
|
|
CompletableFuture<Boolean> future = new CompletableFuture<>();
|
|
future.thenAccept(success -> {
|
|
if (success) {
|
|
if (!otherUser.equals(user)) {
|
|
otherUser.sendMessage(tl("teleportAtoB", user.getDisplayName(), "spawn"));
|
|
}
|
|
}
|
|
});
|
|
respawn(user.getSource(), user, otherUser, charge, commandLabel, future);
|
|
} else {
|
|
respawn(user.getSource(), user, user, charge, commandLabel, new CompletableFuture<>());
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
|
|
if (args.length < 1) {
|
|
throw new NotEnoughArgumentsException();
|
|
}
|
|
final User user = getPlayer(server, args, 0, true, false);
|
|
CompletableFuture<Boolean> future = new CompletableFuture<>();
|
|
respawn(sender, null, user, null, commandLabel, future);
|
|
future.thenAccept(success -> {
|
|
if (success) {
|
|
user.sendMessage(tl("teleportAtoB", Console.NAME, "spawn"));
|
|
}
|
|
});
|
|
}
|
|
|
|
private void respawn(final CommandSource sender, final User teleportOwner, final User teleportee, final Trade charge, String commandLabel, CompletableFuture<Boolean> future) throws Exception {
|
|
final SpawnStorage spawns = (SpawnStorage) this.module;
|
|
final Location spawn = spawns.getSpawn(teleportee.getGroup());
|
|
sender.sendMessage(tl("teleporting", spawn.getWorld().getName(), spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()));
|
|
future.exceptionally(e -> {
|
|
showError(sender.getSender(), e, commandLabel);
|
|
return false;
|
|
});
|
|
if (teleportOwner == null) {
|
|
teleportee.getAsyncTeleport().now(spawn, false, TeleportCause.COMMAND, future);
|
|
} else {
|
|
teleportOwner.getAsyncTeleport().teleportPlayer(teleportee, spawn, charge, TeleportCause.COMMAND, future);
|
|
}
|
|
}
|
|
}
|