From 35a514da81b417bcdfa79ad07c11b88ebf76fc4e Mon Sep 17 00:00:00 2001 From: "jakub.salavec" Date: Tue, 15 Apr 2025 10:38:51 +0200 Subject: [PATCH] Temp fix - draft games start when all players submit a deck --- .../com/gempukku/lotro/tournament/SealedTournament.java | 9 +++++---- .../gempukku/lotro/tournament/SoloDraftTournament.java | 9 +++++---- .../lotro/tournament/SoloTableDraftTournament.java | 9 +++++---- .../gempukku/lotro/tournament/TableDraftTournament.java | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) 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 8f318ef20..80ff1b506 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,16 +48,17 @@ public class SealedTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); - // If 1v1 and both registered the deck, skip the wait and start playing - var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); + // If all registered the deck, skip the wait and start playing + Set activePlayers = new HashSet<>(_players); + activePlayers.removeAll(_droppedPlayers); boolean everyoneSubmitted = true; - for(var playerName : players) { + for(var playerName : activePlayers) { var registeredDeck = getPlayerDeck(playerName); if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { everyoneSubmitted = false; } } - if (players.size() == 2 && everyoneSubmitted) { + if (everyoneSubmitted) { _tournamentInfo.Stage = _sealedInfo.PostRegistrationStage(); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); } 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 f4b567aef..b1f670fe4 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,16 +51,17 @@ public class SoloDraftTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); - // If 1v1 and both registered the deck, skip the wait and start playing - var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); + // If all registered the deck, skip the wait and start playing + Set activePlayers = new HashSet<>(_players); + activePlayers.removeAll(_droppedPlayers); boolean everyoneSubmitted = true; - for(var playerName : players) { + for(var playerName : activePlayers) { var registeredDeck = getPlayerDeck(playerName); if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { everyoneSubmitted = false; } } - if (players.size() == 2 && everyoneSubmitted) { + if (everyoneSubmitted) { _tournamentInfo.Stage = _soloDraftInfo.PostRegistrationStage(); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); } 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 bc1498fbd..69fc7af0c 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,16 +53,17 @@ public class SoloTableDraftTournament extends BaseTournament implements Tourname _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); - // If 1v1 and both registered the deck, skip the wait and start playing - var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); + // If all registered the deck, skip the wait and start playing + Set activePlayers = new HashSet<>(_players); + activePlayers.removeAll(_droppedPlayers); boolean everyoneSubmitted = true; - for(var playerName : players) { + for(var playerName : activePlayers) { var registeredDeck = getPlayerDeck(playerName); if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { everyoneSubmitted = false; } } - if (players.size() == 2 && everyoneSubmitted) { + if (everyoneSubmitted) { _tournamentInfo.Stage = soloTableDraftInfo.postRegistrationStage(); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); } 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 d90935837..f618dc207 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,16 +59,17 @@ public class TableDraftTournament extends BaseTournament implements Tournament { _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _playerDecks.put(player, deck); - // If 1v1 and both registered the deck, skip the wait and start playing - var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); + // If all registered the deck, skip the wait and start playing + Set activePlayers = new HashSet<>(_players); + activePlayers.removeAll(_droppedPlayers); boolean everyoneSubmitted = true; - for(var playerName : players) { + for(var playerName : activePlayers) { var registeredDeck = getPlayerDeck(playerName); if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { everyoneSubmitted = false; } } - if (players.size() == 2 && everyoneSubmitted) { + if (everyoneSubmitted) { _tournamentInfo.Stage = tableDraftInfo.postRegistrationStage(); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); }