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

Introducing TournamentVisitor into HallServer.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-08-23 14:03:51 +00:00
parent b9d588c389
commit 7adc456684
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class HallServer extends AbstractServer {
private Map<Player, Long> _lastVisitedPlayers = new HashMap<Player, Long>();
private List<Tournament> _runningTournaments = new ArrayList<Tournament>();
private Map<String, Tournament> _runningTournaments = new LinkedHashMap<String, Tournament>();
private Map<String, TournamentQueue> _tournamentQueues = new HashMap<String, TournamentQueue>();
private final ChatRoomMediator _hallChat;
@@ -73,7 +73,8 @@ public class HallServer extends AbstractServer {
@Override
protected void doAfterStartup() {
_runningTournaments.addAll(_tournamentService.getLiveTournaments());
for (Tournament tournament : _tournamentService.getLiveTournaments())
_runningTournaments.put(tournament.getTournamentId(), tournament);
}
public void setShutdown(boolean shutdown) {
@@ -248,6 +249,19 @@ public class HallServer extends AbstractServer {
}
}
public boolean processTournament(String tournamentId, Player player, TournamentVisitor tournamentVisitor) {
_hallDataAccessLock.readLock().lock();
try {
Tournament tournament = _runningTournaments.get(tournamentId);
if (tournament == null)
return false;
return true;
} finally {
_hallDataAccessLock.readLock().unlock();
}
}
public void processHall(Player player, HallInfoVisitor visitor) {
_hallDataAccessLock.readLock().lock();
try {
@@ -450,7 +464,7 @@ public class HallServer extends AbstractServer {
return true;
}
for (Tournament runningTournament : _runningTournaments) {
for (Tournament runningTournament : _runningTournaments.values()) {
if (runningTournament.isPlayerInCompetition(playerId))
return true;
}
@@ -492,11 +506,11 @@ public class HallServer extends AbstractServer {
_tournamentQueues.remove(tournamentQueueKey);
}
for (Tournament runningTournament : new ArrayList<Tournament>(_runningTournaments)) {
for (Tournament runningTournament : new ArrayList<Tournament>(_runningTournaments.values())) {
runningTournament.advanceTournament(new HallTournamentCallback(runningTournament));
if (runningTournament.isFinished()) {
_tournamentService.markTournamentFinished(runningTournament.getTournamentId());
_runningTournaments.remove(runningTournament);
_runningTournaments.remove(runningTournament.getTournamentId());
}
}
@@ -510,7 +524,7 @@ public class HallServer extends AbstractServer {
public void createTournament(Tournament tournament) {
_hallDataAccessLock.writeLock().lock();
try {
_runningTournaments.add(tournament);
_runningTournaments.put(tournament.getTournamentId(), tournament);
} finally {
_hallDataAccessLock.writeLock().unlock();
}
@@ -520,7 +534,7 @@ public class HallServer extends AbstractServer {
private class HallTournamentQueueCallback implements TournamentQueueCallback {
@Override
public void createTournament(Tournament tournament) {
_runningTournaments.add(tournament);
_runningTournaments.put(tournament.getTournamentId(), tournament);
}
@Override

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TournamentVisitor.java Normal file
View File

@@ -0,0 +1,4 @@
package com.gempukku.lotro.hall;
public class TournamentVisitor {
}