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

Fixed duplicate callout messages when changing stages in sealed tournaments. Fixed sealed tournaments not being made aware of deck registrations

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-09-19 08:15:19 -05:00
parent eac9904a5c
commit 62a4567bf5
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -533,7 +533,7 @@ public class HallServer extends AbstractServer {
stage == Tournament.Stage.PAUSED || stage == Tournament.Stage.AWAITING_KICKOFF) { stage == Tournament.Stage.PAUSED || stage == Tournament.Stage.AWAITING_KICKOFF) {
LotroDeck lotroDeck = validateUserAndDeck(_formatLibrary.getFormat(tournament.getFormatCode()), player, deckName, tournament.getCollectionType()); LotroDeck lotroDeck = validateUserAndDeck(_formatLibrary.getFormat(tournament.getFormatCode()), player, deckName, tournament.getCollectionType());
_tournamentService.updateRecordedPlayerDeck(tournamentId, player.getName(), lotroDeck); tournament.playerSubmittedDeck(player.getName(), lotroDeck);
} }
result = "Registered deck '" + deckName + "' with tournament <b>" + tournament.getTournamentName() + "</b> successfully." result = "Registered deck '" + deckName + "' with tournament <b>" + tournament.getTournamentName() + "</b> successfully."
+ "<br/><br/>If you make an update to your deck, you will need to register it here again for any changes to take effect."; + "<br/><br/>If you make an update to your deck, you will need to register it here again for any changes to take effect.";

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

@@ -163,9 +163,6 @@ public class SealedTournament extends BaseTournament implements Tournament {
else if (DateUtils.Now().isAfter(_sealedInfo.DeckbuildingDeadline) && _playerDecks.values().stream().noneMatch(x -> StringUtils.isEmpty(x.getDeckName()))) { else if (DateUtils.Now().isAfter(_sealedInfo.DeckbuildingDeadline) && _playerDecks.values().stream().noneMatch(x -> StringUtils.isEmpty(x.getDeckName()))) {
_tournamentInfo.Stage = _sealedInfo.PostRegistrationStage(); _tournamentInfo.Stage = _sealedInfo.PostRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
result.add(new BroadcastAction("Deck building in tournament <b>" + getTournamentName()
+ "</b> has finished and all players have turned in their decks. Stand by for the start of the tournament."));
} }
} }
@@ -175,8 +172,6 @@ public class SealedTournament extends BaseTournament implements Tournament {
_tournamentInfo.Stage = _sealedInfo.PostRegistrationStage(); _tournamentInfo.Stage = _sealedInfo.PostRegistrationStage();
_tournamentService.recordTournamentStage(_tournamentId, getTournamentStage()); _tournamentService.recordTournamentStage(_tournamentId, getTournamentStage());
result.add(new BroadcastAction("Deck registration for tournament <b>" + getTournamentName()
+ "</b> has closed. Stand by for the start of the tournament."));
} }
} }
@@ -191,8 +186,6 @@ public class SealedTournament extends BaseTournament implements Tournament {
result.add(finishTournament(collectionsManager)); result.add(finishTournament(collectionsManager));
} else { } else {
if(getCurrentRound() == 0) { if(getCurrentRound() == 0) {
result.add(new BroadcastAction("Deck registration for tournament <b>" + getTournamentName()
+ "</b> has closed. Stand by for the start of the tournament."));
result.add(new BroadcastAction("Deck registration for tournament <b>" + getTournamentName() result.add(new BroadcastAction("Deck registration for tournament <b>" + getTournamentName()
+ "</b> has closed. Round " + "</b> has closed. Round "
+ (getCurrentRound() + 1) + " will begin in " + DateUtils.HumanDuration(PairingDelayTime) + (getCurrentRound() + 1) + " will begin in " + DateUtils.HumanDuration(PairingDelayTime)