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

Notify of changes to tournament.

Browse Source
This commit is contained in:
marcins78@gmail.com
2013-01-18 19:11:22 +00:00
parent 46ea4979e8
commit b1eba473f1
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -689,11 +689,11 @@ public class HallServer extends AbstractServer {
for (Map.Entry<String, Tournament> tournamentEntry : new HashMap<String, Tournament>(_runningTournaments).entrySet()) {
Tournament runningTournament = tournamentEntry.getValue();
runningTournament.advanceTournament(new HallTournamentCallback(runningTournament), _collectionsManager);
if (runningTournament.getTournamentStage() == Tournament.Stage.FINISHED) {
boolean changed = runningTournament.advanceTournament(new HallTournamentCallback(runningTournament), _collectionsManager);
if (runningTournament.getTournamentStage() == Tournament.Stage.FINISHED)
_runningTournaments.remove(tournamentEntry.getKey());
if (changed)
hallChanged();
}
}
if (_tickCounter == 60) {

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

@@ -226,9 +226,10 @@ public class DefaultTournament implements Tournament {
}
@Override
public void advanceTournament(TournamentCallback tournamentCallback, CollectionsManager collectionsManager) {
public boolean advanceTournament(TournamentCallback tournamentCallback, CollectionsManager collectionsManager) {
_lock.writeLock().lock();
try {
boolean result = false;
if (_nextTask == null) {
if (_tournamentStage == Stage.DRAFT) {
_draft.advanceDraft(tournamentCallback);
@@ -238,6 +239,7 @@ public class DefaultTournament implements Tournament {
_tournamentService.updateTournamentStage(_tournamentId, _tournamentStage);
_deckBuildStartTime = System.currentTimeMillis();
_draft = null;
result = true;
}
}
if (_tournamentStage == Stage.DECK_BUILDING) {
@@ -245,6 +247,7 @@ public class DefaultTournament implements Tournament {
|| _playerDecks.size() == _players.size()) {
_tournamentStage = Stage.PLAYING_GAMES;
_tournamentService.updateTournamentStage(_tournamentId, _tournamentStage);
result = true;
}
}
if (_tournamentStage == Stage.PLAYING_GAMES) {
@@ -255,6 +258,7 @@ public class DefaultTournament implements Tournament {
tournamentCallback.broadcastMessage("Tournament " + _tournamentName + " will start round "+(_tournamentRound+1)+" in 2 minutes");
_nextTask = new PairPlayers();
}
result = true;
}
}
}
@@ -262,7 +266,9 @@ public class DefaultTournament implements Tournament {
TournamentTask task = _nextTask;
_nextTask = null;
task.executeTask(tournamentCallback, collectionsManager);
result = true;
}
return result;
} finally {
_lock.writeLock().unlock();
}

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java
View File

@@ -33,7 +33,7 @@ public interface Tournament {
public int getCurrentRound();
public int getPlayersInCompetitionCount();
public void advanceTournament(TournamentCallback tournamentCallback, CollectionsManager collectionsManager);
public boolean advanceTournament(TournamentCallback tournamentCallback, CollectionsManager collectionsManager);
public void reportGameFinished(String winner, String loser);