diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java index 2ceab395f..0279db830 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java @@ -128,7 +128,15 @@ public abstract class BaseTournament implements Tournament { for(var player : _players) { if(!_droppedPlayers.contains(player)) { - _playerList += player + ", "; + _playerList += player; + if (!_tournamentInfo._params.requiresDeck) { + // limited game, show who already made a deck + var registeredDeck = getPlayerDeck(player); + if (registeredDeck != null && !StringUtils.isEmpty(registeredDeck.getDeckName())) { + _playerList += "✔"; + } + } + _playerList += ", "; } } @@ -137,7 +145,10 @@ public abstract class BaseTournament implements Tournament { } if(!_droppedPlayers.isEmpty()) { - _playerList += ", " + String.join("*, ", _droppedPlayers); + if (!_playerList.isEmpty()) { + _playerList += ", "; + } + _playerList += String.join("*, ", _droppedPlayers); if(!_droppedPlayers.isEmpty()) { _playerList += "*"; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java index 80ff1b506..cfb3522af 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java @@ -48,6 +48,8 @@ public class SealedTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); + regeneratePlayerList(); + // If all registered the deck, skip the wait and start playing Set activePlayers = new HashSet<>(_players); activePlayers.removeAll(_droppedPlayers); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java index b1f670fe4..343c2ba63 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java @@ -51,6 +51,8 @@ public class SoloDraftTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); + regeneratePlayerList(); + // If all registered the deck, skip the wait and start playing Set activePlayers = new HashSet<>(_players); activePlayers.removeAll(_droppedPlayers); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java index 69fc7af0c..d8ddea439 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java @@ -53,6 +53,8 @@ public class SoloTableDraftTournament extends BaseTournament implements Tourname _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); + regeneratePlayerList(); + // If all registered the deck, skip the wait and start playing Set activePlayers = new HashSet<>(_players); activePlayers.removeAll(_droppedPlayers); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java index f618dc207..119a30879 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java @@ -59,6 +59,8 @@ public class TableDraftTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); + regeneratePlayerList(); + // If all registered the deck, skip the wait and start playing Set activePlayers = new HashSet<>(_players); activePlayers.removeAll(_droppedPlayers);