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

* Fixed and extended extra turn test.

Browse source
This commit is contained in:
LevelX2 2016-11-26 13:46:10 +01:00
parent db831202da
commit 8bf299e342
4 changed files with 145 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -759,14 +759,18 @@ public abstract class GameImpl implements Game, Serializable {
Player playerByOrder = getPlayer(playerList.get());
state.setPlayerByOrderId(playerByOrder.getId());
while (!isPaused() && !gameOver(null)) {
playExtraTurns();
if (!playExtraTurns()) {
break;
}
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, playerByOrder.getId());
if (!replaceEvent(event)) {
if (!playTurn(playerByOrder)) {
break;
}
}
playExtraTurns();
if (!playExtraTurns()) {
break;
}
playerByOrder = playerList.getNext(this);
state.setPlayerByOrderId(playerByOrder.getId());
}
@ -792,7 +796,7 @@ public abstract class GameImpl implements Game, Serializable {
}
}
private void playExtraTurns() {
private boolean playExtraTurns() {
//20091005 - 500.7
TurnMod extraTurn = getNextExtraTurn();
while (extraTurn != null) {
@ -805,14 +809,16 @@ public abstract class GameImpl implements Game, Serializable {
if (!this.isSimulation()) {
informPlayers(extraPlayer.getLogName() + " takes an extra turn");
}
playTurn(extraPlayer);
if (!playTurn(extraPlayer)) {
return false;
}
}
}
extraTurn = getNextExtraTurn();
}
state.setTurnId(null);
state.setExtraTurn(false);
return true;
}
private TurnMod getNextExtraTurn() {
@ -2275,7 +2281,7 @@ public abstract class GameImpl implements Game, Serializable {
*
* @param playerId
*/
protected void leave(UUID playerId) {
protected void leave(UUID playerId) { // needs to be executed from the game thread, not from the concede thread of conceding player!
Player player = getPlayer(playerId);
if (player == null || player.hasLeft()) {