Update spawn location handling for Bedrock players and bump Paper version

Author: TheMeinerLP

settings.gradle.kts

@@ -11,7 +11,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
 
-            version("paper", "1.21.1-R0.1-SNAPSHOT")
+            version("paper", "1.21.10-R0.1-SNAPSHOT")
             version("apacheCommons", "3.17.0")
             version("geyser", "2.4.2-SNAPSHOT")
 

src/main/java/de/theshadowsdust/ultimatespawn/listener/BedrockSpawnLocationListener.java

@@ -3,6 +3,7 @@
 import de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin;
 import de.theshadowsdust.ultimatespawn.position.SpawnPosition;
 import de.theshadowsdust.ultimatespawn.position.WrappedLocation;
+import io.papermc.paper.event.player.AsyncPlayerSpawnLocationEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -25,24 +26,23 @@ public BedrockSpawnLocationListener(UltimateSpawnPlugin plugin) {
     }
 
     @EventHandler
-    public void onPlayerJoin(PlayerSpawnLocationEvent event) {
-        Player player = event.getPlayer();
-        if (GeyserApi.api().isBedrockPlayer(event.getPlayer().getUniqueId())) {
+    public void onPlayerJoin(AsyncPlayerSpawnLocationEvent event) {
+        if (GeyserApi.api().isBedrockPlayer(event.getConnection().getProfile().getUniqueId())) {
             try {
-                if(!player.hasPlayedBefore() && plugin.getConfigurationService().getConfig().isFirstJoinSpawn()) {
+                if(event.isNewPlayer() && plugin.getConfigurationService().getConfig().isFirstJoinSpawn()) {
                     if(getLocation() == null) return;
                     event.setSpawnLocation(getLocation());
                 }
                 else {
                     if (this.plugin.getConfigurationService().getConfig().isJoinAtSpawn()) {
-                        getLocation();
+                        if(getLocation() == null) return;
+                        event.setSpawnLocation(getLocation());
                     }
                 }
             } catch (ExecutionException | InterruptedException e) {
                 this.plugin.getLogger().log(Level.SEVERE, "Cannot set spawn location for Bedrock player", e);
                 Thread.currentThread().interrupt();
             }
-            player.teleport(event.getSpawnLocation());
         }
 
     }

src/main/java/de/theshadowsdust/ultimatespawn/listener/SpawnLocationListener.java

@@ -4,6 +4,7 @@
 import de.theshadowsdust.ultimatespawn.position.SpawnPosition;
 import de.theshadowsdust.ultimatespawn.position.WrappedLocation;
 import de.theshadowsdust.ultimatespawn.UltimateSpawnPlugin;
+import io.papermc.paper.event.player.AsyncPlayerSpawnLocationEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -27,10 +28,9 @@ public SpawnLocationListener(@NotNull UltimateSpawnPlugin plugin) {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
-    public void handlePlayerSpawnLocation(PlayerSpawnLocationEvent event) {
-        Player player = event.getPlayer();
+    public void handlePlayerSpawnLocation(AsyncPlayerSpawnLocationEvent event) {
         try {
-            if(!player.hasPlayedBefore() && plugin.getConfigurationService().getConfig().isFirstJoinSpawn()) {
+            if(event.isNewPlayer() && plugin.getConfigurationService().getConfig().isFirstJoinSpawn()) {
                 if(getLocation() == null) return;
                 event.setSpawnLocation(getLocation());
             }