fix: trigger onJoin on spawn instead of during configuration

Author: emortaldev

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/emortal/minestom/gamesdk/internal/ProductionGameHandler.java

@@ -6,6 +6,7 @@
 import net.minestom.server.event.EventNode;
 import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
 import net.minestom.server.event.player.PlayerDisconnectEvent;
+import net.minestom.server.event.player.PlayerSpawnEvent;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,6 +21,7 @@ final class ProductionGameHandler {
 
         EventNode<Event> eventNode = GameEventNodes.GAME_MANAGER;
         eventNode.addListener(AsyncPlayerConfigurationEvent.class, this::onJoin);
+        eventNode.addListener(PlayerSpawnEvent.class, this::onSpawn);
         eventNode.addListener(PlayerDisconnectEvent.class, this::onLeave);
     }
 
@@ -39,10 +41,28 @@ private void onJoin(@NotNull AsyncPlayerConfigurationEvent event) {
             return;
         }
 
-        GamePlayerTracker.addPlayer(game, player);
         event.setSpawningInstance(game.getSpawningInstance(player));
     }
 
+    void onSpawn(@NotNull PlayerSpawnEvent event) {
+        Player player = event.getPlayer();
+
+        Game game = null;
+        for (Game currentGame : this.gameManager.getGames()) {
+            if (!currentGame.getCreationInfo().playerIds().contains(player.getUuid())) continue; // the game is not for this player
+
+            game = currentGame;
+            break;
+        }
+
+        if (game == null) {
+            LOGGER.error("No game could be found for player {}", player.getUsername());
+            return;
+        }
+        GamePlayerTracker.addPlayer(game, player);
+    }
+
+
     private void onLeave(@NotNull PlayerDisconnectEvent event) {
         Player player = event.getPlayer();
 

src/main/java/dev/emortal/minestom/gamesdk/internal/TestGameHandler.java

@@ -81,13 +81,15 @@ private static final class GameHolder {
         void onJoin(@NotNull AsyncPlayerConfigurationEvent event) {
             Player player = event.getPlayer();
 
-            this.players.add(player.getUuid());
-            GamePlayerTracker.addPlayer(this.game, player);
-
             event.setSpawningInstance(this.game.getSpawningInstance(player));
         }
 
         void onFirstSpawn(@NotNull PlayerSpawnEvent event) {
+            Player player = event.getPlayer();
+
+            this.players.add(player.getUuid());
+            GamePlayerTracker.addPlayer(this.game, player);
+
             event.getPlayer().sendMessage(Component.text("The server is in test mode. Use /gamesdk start to start a game."));
         }