* Fixed a bug of the rollback turns feature locking sometimes the UI.

This commit is contained in:
LevelX2 2015-07-16 16:54:32 +02:00
parent be9ed165f5
commit 0db7c5cff4
2 changed files with 74 additions and 5 deletions

View file

@ -2649,16 +2649,16 @@ public abstract class GameImpl implements Game, Serializable {
GameState restore = gameStatesRollBack.get(turnToGoTo);
if (restore != null) {
informPlayers(GameLog.getPlayerRequestColoredText("Player request: Rolling back to start of turn " + restore.getTurnNum()));
for (Player playerObject : getPlayers().values()) {
if (playerObject.isHuman() && playerObject.isInGame()) {
playerObject.abort();
}
}
state.restoreForRollBack(restore);
playerList.setCurrent(state.getActivePlayerId());
// because restore uses the objects without copy each copy the state again
gameStatesRollBack.put(getTurnNum(), state.copy());
executingRollback = true;
for (Player playerObject : getPlayers().values()) {
if (playerObject.isHuman() && playerObject.isInGame()) {
playerObject.abort();
}
}
fireUpdatePlayersEvent();
}
}