Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Changes to user / tournament / match handling.

Browse source
This commit is contained in:
LevelX2 2014-09-18 23:50:34 +02:00
parent ffa959d536
commit eeb22c05ee
11 changed files with 55 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -402,7 +402,7 @@ public class TableController {
if (table.isTournament()) {
tournament.removePlayer(playerId);
} else {
match.leave(playerId);
match.quitMatch(playerId);
}
User user = UserManager.getInstance().getUser(userId);
if (user != null) {
@ -434,7 +434,7 @@ public class TableController {
matchPlayer.submitDeck(matchPlayer.getDeck());
}
}
match.leave(playerId);
match.quitMatch(playerId);
}
}
}
@ -526,9 +526,8 @@ public class TableController {
user.removeConstructing(match.getPlayer(entry.getValue()).getPlayer().getId());
GameManager.getInstance().joinGame(match.getGame().getId(), user.getId());
logger.debug("Joined currently not connected user " + user.getName() + " matchId: " + match.getId());
} else {
user.gameStarted(match.getGame().getId(), entry.getValue());
}
}
user.gameStarted(match.getGame().getId(), entry.getValue());
if (creator == null) {
creator = user.getName();
@ -663,17 +662,18 @@ public class TableController {
*/
public boolean endGameAndStartNextGame() {
// get player that chooses who goes first
if (match.getGame() == null) {
Game game = match.getGame();
if (game == null) {
return true;
}
UUID choosingPlayerId = match.getChooser();
match.endGame();
if (ConfigSettings.getInstance().isSaveGameActivated() && !match.getGame().isSimulation()) {
if (GameManager.getInstance().saveGame(match.getGame().getId())) {
if (ConfigSettings.getInstance().isSaveGameActivated() && !game.isSimulation()) {
if (GameManager.getInstance().saveGame(game.getId())) {
match.setReplayAvailable(true);
}
}
GameManager.getInstance().removeGame(match.getGame().getId());
GameManager.getInstance().removeGame(game.getId());
try {
if (!match.hasEnded()) {
table.sideboard();