External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Added handling to show all tournament games in tournament view.

Browse source
This commit is contained in:
LevelX2 2014-10-02 01:15:21 +02:00
parent 8ac8d36c03
commit 845d3a7951
13 changed files with 218 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -741,7 +741,7 @@ public class TableController {
}
}
// free resources no longer needed
match.cleanUpOnMatchEnd(ConfigSettings.getInstance().isSaveGameActivated());
match.cleanUpOnMatchEnd(ConfigSettings.getInstance().isSaveGameActivated(), table.isTournament());
}
}

5
Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
View file

@ -42,6 +42,7 @@ import mage.game.events.Listener;
import mage.game.events.PlayerQueryEvent;
import mage.game.events.TableEvent;
import static mage.game.events.TableEvent.EventType.CONSTRUCT;
import mage.game.match.Match;
import mage.game.match.MatchOptions;
import mage.game.tournament.Tournament;
import mage.game.tournament.TournamentPairing;
@ -241,7 +242,9 @@ public class TournamentController {
tableManager.addPlayer(getPlayerUserId(player2.getPlayer().getId()), table.getId(), player2.getPlayer(), player2.getPlayerType(), player2.getDeck());
table.setState(TableState.STARTING);
tableManager.startTournamentSubMatch(null, table.getId());
pair.setMatch(tableManager.getMatch(table.getId()));
Match match = tableManager.getMatch(table.getId());
match.setTableId(tableId);
pair.setMatch(match);
pair.setTableId(table.getId());
player1.setState(TournamentPlayerState.DUELING);
player2.setState(TournamentPlayerState.DUELING);

6
Mage.Server/src/main/java/mage/server/tournament/TournamentManager.java
View file

@ -89,7 +89,11 @@ public class TournamentManager {
}
public TournamentView getTournamentView(UUID tournamentId) {
return controllers.get(tournamentId).getTournamentView();
TournamentController tournamentController = controllers.get(tournamentId);
if (tournamentController != null) {
return tournamentController.getTournamentView();
}
return null;
}
public UUID getChatId(UUID tournamentId) {