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

Game hall tables ordering.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-27 17:31:40 +00:00
parent 41c28c8696
commit 2167a4f85f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,16 +169,32 @@ public class HallServer extends AbstractServer {
_lastVisitedPlayers.put(player, System.currentTimeMillis()); _lastVisitedPlayers.put(player, System.currentTimeMillis());
visitor.playerIsWaiting(isPlayerWaiting(player.getName())); visitor.playerIsWaiting(isPlayerWaiting(player.getName()));
// First waiting
for (Map.Entry<String, AwaitingTable> tableInformation : _awaitingTables.entrySet()) { for (Map.Entry<String, AwaitingTable> tableInformation : _awaitingTables.entrySet()) {
final AwaitingTable table = tableInformation.getValue(); final AwaitingTable table = tableInformation.getValue();
visitor.visitTable(tableInformation.getKey(), null, "Waiting", table.getLotroFormat().getName(), getTournamentName(table), table.getPlayerNames(), null); visitor.visitTable(tableInformation.getKey(), null, "Waiting", table.getLotroFormat().getName(), getTournamentName(table), table.getPlayerNames(), null);
} }
// Then non-finished
Map<String, String> nonPlayingTables = new HashMap<String, String>();
for (Map.Entry<String, String> runningGame : _runningTables.entrySet()) { for (Map.Entry<String, String> runningGame : _runningTables.entrySet()) {
LotroGameMediator lotroGameMediator = _lotroServer.getGameById(runningGame.getValue()); LotroGameMediator lotroGameMediator = _lotroServer.getGameById(runningGame.getValue());
if (lotroGameMediator != null) {
String gameStatus = lotroGameMediator.getGameStatus();
if (gameStatus.equals("Finished"))
visitor.visitTable(runningGame.getKey(), runningGame.getValue(), gameStatus, _runningTableFormatNames.get(runningGame.getKey()), _runningTableTournamentNames.get(runningGame.getKey()), lotroGameMediator.getPlayersPlaying(), lotroGameMediator.getWinner());
else
nonPlayingTables.put(runningGame.getKey(), runningGame.getValue());
}
}
// Then rest
for (Map.Entry<String, String> nonPlayingGame : nonPlayingTables.entrySet()) {
LotroGameMediator lotroGameMediator = _lotroServer.getGameById(nonPlayingGame.getValue());
if (lotroGameMediator != null) if (lotroGameMediator != null)
visitor.visitTable(runningGame.getKey(), runningGame.getValue(), lotroGameMediator.getGameStatus(), _runningTableFormatNames.get(runningGame.getKey()), _runningTableTournamentNames.get(runningGame.getKey()), lotroGameMediator.getPlayersPlaying(), lotroGameMediator.getWinner()); visitor.visitTable(nonPlayingGame.getKey(), nonPlayingGame.getValue(), lotroGameMediator.getGameStatus(), _runningTableFormatNames.get(nonPlayingGame.getKey()), _runningTableTournamentNames.get(nonPlayingGame.getKey()), lotroGameMediator.getPlayersPlaying(), lotroGameMediator.getWinner());
} }
String playerTable = getNonFinishedPlayerTable(player.getName()); String playerTable = getNonFinishedPlayerTable(player.getName());