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

Moved the creation of games and broadcasting outside of tournament lock to prevent theoretical deadlocks. These actions are now made through a list of actions returned from tournament advance method.

Browse Source
This commit is contained in:
MarcinSc
2024-08-28 12:07:04 +07:00
parent ecf5e097fd
commit ea31ff2bae
3 changed files with 3 additions and 4 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/draft/DefaultDraft.java
View File

@@ -56,7 +56,7 @@ public class DefaultDraft implements Draft {
} }
@Override @Override
public void advanceDraft(TournamentCallback draftCallback) { public void advanceDraft() {
if (haveAllPlayersPicked()) { if (haveAllPlayersPicked()) {
if (haveAllCardsBeenChosen()) { if (haveAllCardsBeenChosen()) {
if (haveMorePacks()) { if (haveMorePacks()) {

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft/Draft.java
View File

@@ -6,7 +6,7 @@ import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.tournament.TournamentCallback; import com.gempukku.lotro.tournament.TournamentCallback;
public interface Draft { public interface Draft {
public void advanceDraft(TournamentCallback draftCallback); public void advanceDraft();
public void playerChosenCard(String playerName, String cardId); public void playerChosenCard(String playerName, String cardId);

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java
View File

@@ -297,8 +297,7 @@ public class DefaultTournament implements Tournament {
List<TournamentProcessAction> result = new LinkedList<>(); List<TournamentProcessAction> result = new LinkedList<>();
if (_nextTask == null) { if (_nextTask == null) {
if (_tournamentStage == Stage.DRAFT) { if (_tournamentStage == Stage.DRAFT) {
// Temporary - don't want to involve draft in this _draft.advanceDraft();
_draft.advanceDraft(null);
if (_draft.isFinished()) { if (_draft.isFinished()) {
result.add(new BroadcastAction("Drafting in tournament " + _tournamentName + " is finished, starting deck building")); result.add(new BroadcastAction("Drafting in tournament " + _tournamentName + " is finished, starting deck building"));
_tournamentStage = Stage.DECK_BUILDING; _tournamentStage = Stage.DECK_BUILDING;