* Fixed and extended extra turn test.

Mage.Tests/src/test/java/org/mage/test/turnmod/ExtraTurnsTest.java

@@ -44,7 +44,7 @@ public class ExtraTurnsTest extends CardTestPlayerBase {
      * opponent's turn
      */
     @Test
-    public void testEmrakulCastOnOpponentsTurn() {
+    public void testEmrakulCastOnOpponentsTurnCheckTurn3() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 12);
         addCard(Zone.GRAVEYARD, playerA, "Island", 1);
         // Emrakul, the Promised End costs {1} less to cast for each card type among cards in your graveyard.
@@ -59,12 +59,68 @@ public class ExtraTurnsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Teferi, Mage of Zhalfir", 1);
 
         castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Emrakul, the Promised End");
-
+        // Turn 4 is the next turn of opponent (player B)  that player A controls
-        setStopAt(3, PhaseStep.UPKEEP);
+        // So Turn 5 is the extra turn for player B after Turn 4
+        setStopAt(3, PhaseStep.DRAW);
         execute();
 
         assertPermanentCount(playerA, "Emrakul, the Promised End", 1);
+        Assert.assertTrue("Turn 3 is no extra turn ", !currentGame.getState().isExtraTurn());
+        Assert.assertTrue("For turn " + currentGame.getTurnNum() + ", playerA has to be the active player but active player is: "
+                + currentGame.getPlayer(currentGame.getActivePlayerId()).getName(), currentGame.getActivePlayerId().equals(playerA.getId()));
+    }
 
-        Assert.assertTrue("For extra turn, playerB has to be the active player ", currentGame.getActivePlayerId().equals(playerB.getId()));
+    @Test
+    public void testEmrakulCastOnOpponentsTurnCheckTurn4() {
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 12);
+        addCard(Zone.GRAVEYARD, playerA, "Island", 1);
+        // Emrakul, the Promised End costs {1} less to cast for each card type among cards in your graveyard.
+        // When you cast Emrakul, you gain control of target opponent during that player's next turn. After that turn, that player takes an extra turn.
+        // Flying
+        // Trample
+        // Protection from instants
+        addCard(Zone.HAND, playerA, "Emrakul, the Promised End", 1); // {13}
+        // Flash (You may cast this spell any time you could cast an instant.)
+        // Creature cards you own that aren't on the battlefield have flash.
+        // Each opponent can cast spells only any time he or she could cast a sorcery.
+        addCard(Zone.BATTLEFIELD, playerA, "Teferi, Mage of Zhalfir", 1);
+
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Emrakul, the Promised End");
+        // Turn 4 is the next turn of opponent (player B)  that player A controls
+        // So Turn 5 is the extra turn for player B after Turn 4
+        setStopAt(4, PhaseStep.DRAW);
+        execute();
+
+        assertPermanentCount(playerA, "Emrakul, the Promised End", 1);
+        Assert.assertTrue("Turn 4 is a controlled turn ", !playerB.isGameUnderControl());
+        Assert.assertTrue("For turn " + currentGame.getTurnNum() + ", playerB has to be the active player but active player is: "
+                + currentGame.getPlayer(currentGame.getActivePlayerId()).getName(), currentGame.getActivePlayerId().equals(playerB.getId()));
+    }
+
+    @Test
+    public void testEmrakulCastOnOpponentsTurnCheckTurn5() {
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 12);
+        addCard(Zone.GRAVEYARD, playerA, "Island", 1);
+        // Emrakul, the Promised End costs {1} less to cast for each card type among cards in your graveyard.
+        // When you cast Emrakul, you gain control of target opponent during that player's next turn. After that turn, that player takes an extra turn.
+        // Flying
+        // Trample
+        // Protection from instants
+        addCard(Zone.HAND, playerA, "Emrakul, the Promised End", 1); // {13}
+        // Flash (You may cast this spell any time you could cast an instant.)
+        // Creature cards you own that aren't on the battlefield have flash.
+        // Each opponent can cast spells only any time he or she could cast a sorcery.
+        addCard(Zone.BATTLEFIELD, playerA, "Teferi, Mage of Zhalfir", 1);
+
+        castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Emrakul, the Promised End");
+        // Turn 4 is the next turn of opponent (player B)  that player A controls
+        // So Turn 5 is the extra turn for player B after Turn 4
+        setStopOnTurn(5);
+        execute();
+
+        assertPermanentCount(playerA, "Emrakul, the Promised End", 1);
+        Assert.assertTrue("Turn 5 is an extra turn ", currentGame.getState().isExtraTurn());
+        Assert.assertTrue("For turn " + currentGame.getTurnNum() + ", playerB has to be the active player but active player is: "
+                + currentGame.getPlayer(currentGame.getActivePlayerId()).getName(), currentGame.getActivePlayerId().equals(playerB.getId()));
     }
 }

Mage/src/main/java/mage/game/GameImpl.java

@@ -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()) {

Mage/src/main/java/mage/game/turn/Phase.java

@@ -133,12 +133,12 @@ public abstract class Phase implements Serializable {
     }
 
     private boolean checkStopOnStepOption(Game game) {
-        if (game.getOptions().stopOnTurn != null && game.getOptions().stopAtStep == getStep().getType()) {
+        if (game.getOptions().stopOnTurn != null
-            if (game.getOptions().stopOnTurn <= game.getState().getTurnNum()) {
+                && game.getOptions().stopOnTurn <= game.getState().getTurnNum()
+                && game.getOptions().stopAtStep == getStep().getType()) {
             game.pause();
             return true;
         }
-        }
         return false;
     }
 

Mage/src/main/java/mage/game/turn/Turn.java

@@ -337,7 +337,8 @@ public class Turn implements Serializable {
     }
 
     private void logStartOfTurn(Game game, Player player) {
-        StringBuilder sb = new StringBuilder("Turn ").append(game.getState().getTurnNum()).append(" ");
+        StringBuilder sb = new StringBuilder(game.getState().isExtraTurn() ? "Extra turn" : "Turn ");
+        sb.append(game.getState().getTurnNum()).append(" ");
         sb.append(player.getLogName());
         sb.append(" (");
         int delimiter = game.getPlayers().size() - 1;