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

* Match handling - some changes to solve/workaround the draw games that cause matches not to end. Changed disconnect handling to not block the client (needs tests if works correctly).

Browse source
This commit is contained in:
LevelX2 2014-09-18 17:14:33 +02:00
parent 8567c1cd38
commit 3c12b23928
9 changed files with 100 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -521,12 +521,15 @@ public class TableController {
if (user != null) {
if (!user.isConnected()) {
// if the user is not connected but exits, the user is currently disconnected. So it's neccessary
// to join the user to the game here, so he can join the game, if he reconnects in time.
// to join the user to the game here (instead the client does it) , so he can join the game, if he reconnects in time.
// remove an existing constructing for the player if it exists
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();
} else {
@ -543,6 +546,9 @@ public class TableController {
matchPlayer.setQuit(true);
}
}
} else {
// Match player has already quit
throw new MageException("Can't start game - user already quit userId " + entry.getKey());
}
}
// Append AI opponents to the log file