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

Fixed (probably) the player1 concedes but other player2 wins. Fixed that if player runs out of timer time or player lose of beeing idle, the match will end correctly.

Browse source
This commit is contained in:
LevelX2 2014-05-01 19:34:52 +02:00
parent 6d039e4262
commit 473c9e207b
32 changed files with 286 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -240,8 +240,8 @@ public class GameController implements GameCallback {
PriorityTimer timer = new PriorityTimer(count, delay, new Action() {
@Override
public void execute() throws MageException {
game.concede(initPlayerId);
logger.debug("Game timeout for player: " + initPlayerId + ". Conceding.");
game.timerTimeout(initPlayerId);
logger.debug(new StringBuilder("Game timeout for player: ").append(initPlayerId).append(". Conceding."));
}
});
timers.put(playerId, timer);
@ -399,7 +399,7 @@ public class GameController implements GameCallback {
.append(ConfigSettings.getInstance().getMaxSecondsIdle())
.append(" seconds ) - Auto concede.");
ChatManager.getInstance().broadcast(chatId, "", sb.toString() , MessageColor.BLACK, true, MessageType.STATUS);
concede(userId);
game.idleTimeout(getPlayerId(userId));
}
}