External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed that after using the roll back function the wrong player can be used as next player (fixes #1032).

Browse source
This commit is contained in:
LevelX2 2015-07-16 15:45:47 +02:00
parent 96036ce97b
commit be9ed165f5
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/mage/game/GameImpl.java
View file

@ -204,6 +204,7 @@ public abstract class GameImpl implements Game, Serializable {
private int priorityTime;
private final int startLife;
protected PlayerList playerList;
public GameImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans, int startLife) {
this.id = UUID.randomUUID();
@ -613,6 +614,7 @@ public abstract class GameImpl implements Game, Serializable {
GameState restore = gameStates.rollback(stateNum);
if (restore != null) {
state.restore(restore);
playerList.setCurrent(state.getActivePlayerId());
}
}
}
@ -667,8 +669,8 @@ public abstract class GameImpl implements Game, Serializable {
@Override
public void resume() {
PlayerList players = state.getPlayerList(state.getActivePlayerId());
Player player = getPlayer(players.get());
playerList = state.getPlayerList(state.getActivePlayerId());
Player player = getPlayer(playerList.get());
boolean wasPaused = state.isPaused();
state.resume();
if (!gameOver(null)) {
@ -679,7 +681,7 @@ public abstract class GameImpl implements Game, Serializable {
state.getTurn().resumePlay(this, wasPaused);
if (!isPaused() && !gameOver(null)) {
endOfTurn();
player = players.getNext(this);
player = playerList.getNext(this);
state.setTurnNum(state.getTurnNum() + 1);
}
}
@ -688,8 +690,8 @@ public abstract class GameImpl implements Game, Serializable {
protected void play(UUID nextPlayerId) {
if (!isPaused() && !gameOver(null)) {
PlayerList players = state.getPlayerList(nextPlayerId);
Player playerByOrder = getPlayer(players.get());
playerList = state.getPlayerList(nextPlayerId);
Player playerByOrder = getPlayer(playerList.get());
while (!isPaused() && !gameOver(null)) {
playExtraTurns();
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, playerByOrder.getId());
@ -700,7 +702,7 @@ public abstract class GameImpl implements Game, Serializable {
state.setTurnNum(state.getTurnNum() + 1);
}
playExtraTurns();
playerByOrder = players.getNext(this);
playerByOrder = playerList.getNext(this);
}
}
if (gameOver(null) && !isSimulation()) {
@ -2653,6 +2655,7 @@ public abstract class GameImpl implements Game, Serializable {
}
}
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;

1
Mage/src/mage/game/GameState.java
View file

@ -198,6 +198,7 @@ public class GameState implements Serializable, Copyable<GameState> {
public void restore(GameState state) {
this.activePlayerId = state.activePlayerId;
this.playerList.setCurrent(state.activePlayerId);
this.priorityPlayerId = state.priorityPlayerId;
this.stack = state.stack;
this.command = state.command;