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

Fixed a bug that lets a player that has reconnected to a game and the game still last for the timeout duration the player loses wrongly because of timeout (fixes #547).

Browse source
This commit is contained in:
LevelX2 2014-08-27 22:24:42 +02:00
parent db632742e9
commit bdde1bd45f
1 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -268,13 +268,31 @@ public class GameController implements GameCallback {
public void join(UUID userId) { public void join(UUID userId) {
UUID playerId = userPlayerMap.get(userId); UUID playerId = userPlayerMap.get(userId);
GameSession gameSession = new GameSession(game, userId, playerId, useTimeout);
gameSessions.put(playerId, gameSession);
User user = UserManager.getInstance().getUser(userId); User user = UserManager.getInstance().getUser(userId);
gameSession.setUserData(user.getUserData()); if (userId == null || playerId == null) {
logger.fatal("Join game failed!");
logger.fatal("- gameId: " + game.getId());
logger.fatal("- userId: " + userId);
return;
}
Player player = game.getPlayer(playerId);
if (player == null) {
logger.fatal("Player not found - playerId: " +playerId);
return;
}
GameSession gameSession = gameSessions.get(playerId);
String joinType;
if (gameSession == null) {
gameSession = new GameSession(game, userId, playerId, useTimeout);
gameSessions.put(playerId, gameSession);
gameSession.setUserData(user.getUserData());
joinType = "joined";
} else {
joinType = "rejoined";
}
user.addGame(playerId, gameSession); user.addGame(playerId, gameSession);
logger.debug(new StringBuilder("Player ").append(playerId).append(" has joined game ").append(game.getId()).toString()); logger.debug("Player " + playerId + " has " + joinType + " gameId: " + game.getId());
ChatManager.getInstance().broadcast(chatId, "", new StringBuilder(game.getPlayer(playerId).getName()).append(" has joined the game").toString(), MessageColor.ORANGE, true, MessageType.GAME); ChatManager.getInstance().broadcast(chatId, "", game.getPlayer(playerId).getName() + " has " + joinType + " the game", MessageColor.ORANGE, true, MessageType.GAME);
checkStart(); checkStart();
} }
@ -417,11 +435,10 @@ public class GameController implements GameCallback {
public void timeout(UUID userId) { public void timeout(UUID userId) {
if (userPlayerMap.containsKey(userId)) { if (userPlayerMap.containsKey(userId)) {
StringBuilder sb = new StringBuilder(game.getPlayer(userPlayerMap.get(userId)).getName()) String sb = game.getPlayer(userPlayerMap.get(userId)).getName() +
.append(" has timed out (player had priority and was not active for ") " has timed out (player had priority and was not active for " +
.append(ConfigSettings.getInstance().getMaxSecondsIdle()) ConfigSettings.getInstance().getMaxSecondsIdle() + " seconds ) - Auto concede.";
.append(" seconds ) - Auto concede."); ChatManager.getInstance().broadcast(chatId, "", sb, MessageColor.BLACK, true, MessageType.STATUS);
ChatManager.getInstance().broadcast(chatId, "", sb.toString() , MessageColor.BLACK, true, MessageType.STATUS);
game.idleTimeout(getPlayerId(userId)); game.idleTimeout(getPlayerId(userId));
} }
} }