chore: include PendingMatch in MatchmakingSession creation

build.gradle.kts

@@ -46,6 +46,8 @@ java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(21))
     }
+
+    withSourcesJar()
 }
 
 tasks {

src/main/java/dev/emortal/minestom/core/module/matchmaker/session/DefaultMatchmakingSessionImpl.java

@@ -11,6 +11,7 @@
 import net.minestom.server.entity.Player;
 import net.minestom.server.timer.TaskSchedule;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.time.Instant;
 import java.util.concurrent.Executors;
@@ -33,7 +34,7 @@ public final class DefaultMatchmakingSessionImpl extends MatchmakingSession {
     private final @NotNull ScheduledFuture<?> notificationTask;
     private final @NotNull GameModeConfig gameMode;
 
-    public DefaultMatchmakingSessionImpl(@NotNull Player player, @NotNull GameModeConfig gameMode, @NotNull Ticket ticket) {
+    public DefaultMatchmakingSessionImpl(@NotNull Player player, @NotNull GameModeConfig gameMode, @NotNull Ticket ticket, @Nullable PendingMatch pendingMatch) {
         super(player, ticket);
 
         this.notificationTask = SCHEDULER.scheduleAtFixedRate(this::notifyPlayer, 30, 30, TimeUnit.SECONDS);

src/main/java/dev/emortal/minestom/core/module/matchmaker/session/MatchmakingSession.java

@@ -5,6 +5,7 @@
 import dev.emortal.api.model.matchmaker.Ticket;
 import net.minestom.server.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class MatchmakingSession {
 
@@ -54,6 +55,6 @@ public void setTicket(@NotNull Ticket ticket) {
     @FunctionalInterface
     public interface Creator {
 
-        @NotNull MatchmakingSession create(@NotNull Player player, @NotNull GameModeConfig gameMode, @NotNull Ticket ticket);
+        @NotNull MatchmakingSession create(@NotNull Player player, @NotNull GameModeConfig gameMode, @NotNull Ticket ticket, @Nullable PendingMatch pendingMatch);
     }
 }

src/main/java/dev/emortal/minestom/core/module/matchmaker/session/MatchmakingSessionManager.java

@@ -25,6 +25,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;
@@ -54,7 +55,7 @@ public MatchmakingSessionManager(@NotNull EventNode<Event> eventNode, @NotNull M
         this.sessionCreator = sessionCreator;
         this.gameModes = gameModes;
 
-        eventNode.addListener(AsyncPlayerConfigurationEvent.class, this::handlePlayerLogin);
+        eventNode.addListener(PlayerSpawnEvent.class, this::handlePlayerLogin);
 
         eventNode.addListener(PlayerDisconnectEvent.class, event -> {
             UUID playerId = event.getPlayer().getUuid();
@@ -104,7 +105,7 @@ private void onTicketCreate(@NotNull Ticket ticket) {
             if (player == null) continue;
 
             GameModeConfig gameMode = this.gameModes.getConfig(ticket.getGameModeId());
-            MatchmakingSession session = this.sessionCreator.create(player, gameMode, ticket);
+            MatchmakingSession session = this.sessionCreator.create(player, gameMode, ticket, null);
             this.sessions.put(uuid, session);
             shouldCache = true;
         }
@@ -146,7 +147,7 @@ private void onTicketUpdated(@NotNull Ticket newTicket) {
             Player player = MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(uuid);
             if (player == null) continue;
 
-            session = this.sessionCreator.create(player, gameMode, newTicket);
+            session = this.sessionCreator.create(player, gameMode, newTicket, null);
             this.sessions.put(uuid, session);
         }
 
@@ -197,7 +198,7 @@ private void destroySession(@NotNull MatchmakingSession session) {
         session.destroy();
     }
 
-    private void handlePlayerLogin(@NotNull AsyncPlayerConfigurationEvent event) {
+    private void handlePlayerLogin(@NotNull PlayerSpawnEvent event) {
         Player player = event.getPlayer();
         UUID playerId = player.getUuid();
 
@@ -206,7 +207,7 @@ private void handlePlayerLogin(@NotNull AsyncPlayerConfigurationEvent event) {
             queueInfo = this.matchmaker.getPlayerQueueInfo(playerId);
         } catch (StatusRuntimeException exception) {
             LOGGER.error("Failed to get queue info for '{}'", player.getUsername(), exception);
-            player.sendMessage(Component.text("An unknown error occurred", NamedTextColor.RED));
+            player.sendMessage(Component.text("An unknown error occurred retrieving queue info", NamedTextColor.RED));
             return;
         }
 
@@ -223,7 +224,7 @@ private void handlePlayerLogin(@NotNull AsyncPlayerConfigurationEvent event) {
             return;
         }
 
-        MatchmakingSession session = this.sessionCreator.create(player, mode, ticket);
+        MatchmakingSession session = this.sessionCreator.create(player, mode, ticket, queueInfo.getPendingMatch());
         this.sessions.put(playerId, session);
         this.ticketCache.put(ticket.getId(), ticket);