From 90babc2e6847a176c0a7443e9fc5c3fbff0501ef Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 26 Aug 2023 00:08:39 -0500 Subject: [PATCH] Added "Preparing" stage for admins to set the db to when kickoff is ready. Reduced the pre-start signup for WC queues to 30 minutes to avoid issues with long timeouts. --- .../com/gempukku/lotro/tournament/DefaultTournament.java | 6 +++++- .../gempukku/lotro/tournament/ScheduledTournamentQueue.java | 2 +- .../main/java/com/gempukku/lotro/tournament/Tournament.java | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java index 2c1f92bed..505aa1299 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java @@ -307,7 +307,11 @@ public class DefaultTournament implements Tournament { if (_tournamentStage == Stage.AWAITING_KICKOFF) { } - if (_tournamentStage == Stage.PLAYING_GAMES) { + else if (_tournamentStage == Stage.PREPARING) { + _tournamentStage = Stage.PLAYING_GAMES; + _tournamentService.updateTournamentStage(_tournamentId, _tournamentStage); + } + else if (_tournamentStage == Stage.PLAYING_GAMES) { if (_currentlyPlayingPlayers.size() == 0) { if (_pairingMechanism.isFinished(_tournamentRound, _players, _droppedPlayers)) { finishTournament(tournamentCallback, collectionsManager); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/ScheduledTournamentQueue.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/ScheduledTournamentQueue.java index 8bf68e9a6..2b7ed2445 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/ScheduledTournamentQueue.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/ScheduledTournamentQueue.java @@ -15,7 +15,7 @@ import java.util.Date; public class ScheduledTournamentQueue extends AbstractTournamentQueue implements TournamentQueue { private static final Duration _signupTimeBeforeStart = Duration.ofMinutes(60); - private static final Duration _wcSignupTimeBeforeStart = Duration.ofHours(24); + private static final Duration _wcSignupTimeBeforeStart = Duration.ofHours(30); private final ZonedDateTime _startTime; private final int _minimumPlayers; private final String _startCondition; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java index f97a6e881..27d9cf952 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java @@ -14,6 +14,7 @@ public interface Tournament { DRAFT("Drafting"), DECK_BUILDING("Deck building"), AWAITING_KICKOFF("Awaiting kickoff"), + PREPARING("Preparing"), PLAYING_GAMES("Playing games"), FINISHED("Finished");