feat: create prejoin phase

Author: emortaldev

Diff for: src/main/java/dev/emortal/minestom/gamesdk/game/Game.java

@@ -15,10 +15,8 @@
 import net.minestom.server.instance.Instance;
 import org.jetbrains.annotations.NotNull;
 
-import java.time.Instant;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -57,7 +55,15 @@ protected Game(@NotNull GameCreationInfo creationInfo) {
     public abstract void cleanUp();
 
     /**
-     * Called when a player logs in.
+     * Called when a player is joining.
+     *
+     * <p>
+     * Can be used to set spawn points, called <b>after</b> the player has been added to the players list..
+     */
+    public abstract void onPreJoin(@NotNull Player player);
+
+    /**
+     * Called when a player is fully spawned in.
      *
      * <p>
      * This is called <b>after</b> the player has been added to the players list.

Diff for: src/main/java/dev/emortal/minestom/gamesdk/internal/GamePlayerTracker.java

@@ -8,7 +8,7 @@ final class GamePlayerTracker {
 
     static void addPlayer(@NotNull Game game, @NotNull Player player) {
         game.getPlayers().add(player);
-        game.onJoin(player);
+        game.onPreJoin(player);
     }
 
     static void removePlayer(@NotNull Game game, @NotNull Player player) {

Diff for: src/main/java/dev/emortal/minestom/gamesdk/internal/ProductionGameHandler.java

@@ -41,6 +41,8 @@ private void onJoin(@NotNull AsyncPlayerConfigurationEvent event) {
             return;
         }
 
+        GamePlayerTracker.addPlayer(game, player);
+
         event.setSpawningInstance(game.getSpawningInstance(player));
     }
 
@@ -59,7 +61,8 @@ void onSpawn(@NotNull PlayerSpawnEvent event) {
             LOGGER.error("No game could be found for player {}", player.getUsername());
             return;
         }
-        GamePlayerTracker.addPlayer(game, player);
+
+        game.onJoin(player);
     }
 
 

Diff for: src/main/java/dev/emortal/minestom/gamesdk/internal/TestGameHandler.java

@@ -36,6 +36,7 @@ final class TestGameHandler {
 
         EventNode<Event> eventNode = GameEventNodes.GAME_MANAGER;
         eventNode.addListener(AsyncPlayerConfigurationEvent.class, this::onJoin);
+        eventNode.addListener(PlayerSpawnEvent.class, this::onPlayerSpawn);
         eventNode.addListener(PlayerDisconnectEvent.class, this::onLeave);
     }
 
@@ -47,14 +48,12 @@ private void onJoin(@NotNull AsyncPlayerConfigurationEvent event) {
         this.holder.onJoin(event);
     }
 
-    private void onFirstPlayerSpawn(@NotNull PlayerSpawnEvent event) {
-        if (!event.isFirstSpawn()) return;
-
+    private void onPlayerSpawn(@NotNull PlayerSpawnEvent event) {
         if (this.holder == null) {
             this.holder = new GameHolder(this.gameManager);
         }
 
-        this.holder.onFirstSpawn(event);
+        this.holder.onSpawn(event);
     }
 
     private void onLeave(@NotNull PlayerDisconnectEvent event) {
@@ -81,14 +80,16 @@ 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) {
+        void onSpawn(@NotNull PlayerSpawnEvent event) {
             Player player = event.getPlayer();
 
-            this.players.add(player.getUuid());
-            GamePlayerTracker.addPlayer(this.game, player);
+            this.game.onJoin(player);
 
             event.getPlayer().sendMessage(Component.text("The server is in test mode. Use /gamesdk start to start a game."));
         }