bukkit: Lock registration on PlayerSpawnLocationEvent

Paper has deprecated PlayerLoginEvent

Users should move to the PaperCommandManager

Author: jpenilla

cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/CloudBukkitListener.java

@@ -26,10 +26,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
-
+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 
 final class CloudBukkitListener<C> implements Listener {
 
@@ -40,11 +39,11 @@ final class CloudBukkitListener<C> implements Listener {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    void onPlayerLogin(final @NonNull PlayerLoginEvent event) {
+    void onPlayerLogin(final @NonNull PlayerSpawnLocationEvent 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 PlayerLoginEvent to lock before that happens. */
+           so we have to perform this state change at PlayerSpawnLocationEvent to lock before that happens. */
         this.bukkitCommandManager.lockIfBrigadierCapable();
     }
 

examples/example-bukkit/build.gradle.kts

@@ -50,7 +50,7 @@ tasks {
         8 to setOf("1.8.8"),
         11 to setOf("1.9.4", "1.10.2", "1.11.2"),
         17 to setOf("1.12.2", "1.13.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.4"),
-        21 to setOf("1.20.6", "1.21")
+        21 to setOf("1.20.6", "1.21.7"),
     )
 
     runServer {

gradle/libs.versions.toml

@@ -42,7 +42,7 @@ immutables = { group = "org.immutables", name = "value", version.ref = "immutabl
 immutablesAnnotate = { group = "org.immutables", name = "annotate", version.ref = "immutables" }
 
 brigadier = { group = "com.mojang", name = "brigadier", version.ref = "brigadier" }
-bukkit = { group = "org.bukkit", name = "bukkit", version.ref = "bukkit" }
+bukkit = { group = "org.spigotmc", name = "spigot-api", version.ref = "bukkit" }
 reflectionRemapper = "xyz.jpenilla:reflection-remapper:0.1.3"
 commodore = { group = "me.lucko", name = "commodore", version.ref = "commodore" }
 bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }