From 1ae1b192b7394cc058541fd7783241d732d7eb7f Mon Sep 17 00:00:00 2001 From: Irmo van den Berge Date: Sat, 11 Oct 2025 23:47:01 +0200 Subject: [PATCH] Use PreLoginEvent instead of PlayerSpawnLocationEvent Signed-off-by: Irmo van den Berge --- .../java/org/incendo/cloud/bukkit/CloudBukkitListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/CloudBukkitListener.java b/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/CloudBukkitListener.java index 2fec751c..c579fbbe 100644 --- a/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/CloudBukkitListener.java +++ b/cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/CloudBukkitListener.java @@ -26,9 +26,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.server.PluginDisableEvent; import org.checkerframework.checker.nullness.qual.NonNull; -import org.spigotmc.event.player.PlayerSpawnLocationEvent; final class CloudBukkitListener implements Listener { @@ -39,11 +39,11 @@ final class CloudBukkitListener implements Listener { } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - void onPlayerLogin(final @NonNull PlayerSpawnLocationEvent event) { + void onPlayerLogin(final @NonNull AsyncPlayerPreLoginEvent event) { /* If the server is brigadier-capable, any registration after players have joined (and been sent a command tree) is unsafe. Bukkit's PlayerJoinEvent is called just after the command tree is sent, - so we have to perform this state change at PlayerSpawnLocationEvent to lock before that happens. */ + so we have to perform this state change at AsyncPlayerPreLoginEvent to lock before that happens. */ this.bukkitCommandManager.lockIfBrigadierCapable(); }