ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temp fix - draft games start when all players submit a deck

Browse Source
This commit is contained in:
jakub.salavec
2025-04-15 10:38:51 +02:00
parent 88fe7cdd95
commit 35a514da81
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java
View File

@@ -48,16 +48,17 @@ public class SealedTournament extends BaseTournament implements Tournament {
_tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck);
_playerDecks.put(player, deck); _playerDecks.put(player, deck);
// If 1v1 and both registered the deck, skip the wait and start playing // If all registered the deck, skip the wait and start playing
var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); Set<String> activePlayers = new HashSet<>(_players);
activePlayers.removeAll(_droppedPlayers);
boolean everyoneSubmitted = true; boolean everyoneSubmitted = true;
for(var playerName : players) { for(var playerName : activePlayers) {
var registeredDeck = getPlayerDeck(playerName); var registeredDeck = getPlayerDeck(playerName);
if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) {
everyoneSubmitted = false; everyoneSubmitted = false;
} }
} }
if (players.size() == 2 && everyoneSubmitted) { if (everyoneSubmitted) {
_tournamentInfo.Stage = _sealedInfo.PostRegistrationStage(); _tournamentInfo.Stage = _sealedInfo.PostRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
} }

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java
View File

@@ -51,16 +51,17 @@ public class SoloDraftTournament extends BaseTournament implements Tournament {
_tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck);
_playerDecks.put(player, deck); _playerDecks.put(player, deck);
// If 1v1 and both registered the deck, skip the wait and start playing // If all registered the deck, skip the wait and start playing
var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); Set<String> activePlayers = new HashSet<>(_players);
activePlayers.removeAll(_droppedPlayers);
boolean everyoneSubmitted = true; boolean everyoneSubmitted = true;
for(var playerName : players) { for(var playerName : activePlayers) {
var registeredDeck = getPlayerDeck(playerName); var registeredDeck = getPlayerDeck(playerName);
if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) {
everyoneSubmitted = false; everyoneSubmitted = false;
} }
} }
if (players.size() == 2 && everyoneSubmitted) { if (everyoneSubmitted) {
_tournamentInfo.Stage = _soloDraftInfo.PostRegistrationStage(); _tournamentInfo.Stage = _soloDraftInfo.PostRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
} }

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java
View File

@@ -53,16 +53,17 @@ public class SoloTableDraftTournament extends BaseTournament implements Tourname
_tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck);
_playerDecks.put(player, deck); _playerDecks.put(player, deck);
// If 1v1 and both registered the deck, skip the wait and start playing // If all registered the deck, skip the wait and start playing
var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); Set<String> activePlayers = new HashSet<>(_players);
activePlayers.removeAll(_droppedPlayers);
boolean everyoneSubmitted = true; boolean everyoneSubmitted = true;
for(var playerName : players) { for(var playerName : activePlayers) {
var registeredDeck = getPlayerDeck(playerName); var registeredDeck = getPlayerDeck(playerName);
if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) {
everyoneSubmitted = false; everyoneSubmitted = false;
} }
} }
if (players.size() == 2 && everyoneSubmitted) { if (everyoneSubmitted) {
_tournamentInfo.Stage = soloTableDraftInfo.postRegistrationStage(); _tournamentInfo.Stage = soloTableDraftInfo.postRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
} }

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java
View File

@@ -59,16 +59,17 @@ public class TableDraftTournament extends BaseTournament implements Tournament {
_tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck); _tournamentService.updateRecordedPlayerDeck(_tournamentId, player, deck);
_playerDecks.put(player, deck); _playerDecks.put(player, deck);
// If 1v1 and both registered the deck, skip the wait and start playing // If all registered the deck, skip the wait and start playing
var players = _tournamentService.retrieveTournamentPlayers(_tournamentId); Set<String> activePlayers = new HashSet<>(_players);
activePlayers.removeAll(_droppedPlayers);
boolean everyoneSubmitted = true; boolean everyoneSubmitted = true;
for(var playerName : players) { for(var playerName : activePlayers) {
var registeredDeck = getPlayerDeck(playerName); var registeredDeck = getPlayerDeck(playerName);
if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) { if(registeredDeck == null || StringUtils.isEmpty(registeredDeck.getDeckName())) {
everyoneSubmitted = false; everyoneSubmitted = false;
} }
} }
if (players.size() == 2 && everyoneSubmitted) { if (everyoneSubmitted) {
_tournamentInfo.Stage = tableDraftInfo.postRegistrationStage(); _tournamentInfo.Stage = tableDraftInfo.postRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
} }