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

* Until end of your turn - fixed that effects discarded too early in multiplayer games (#5759, #5676);

Browse source 
Tests: added dozen tests for end of turn effects and related cards.
This commit is contained in:
Oleg Agafonov 2019-04-28 11:27:08 +04:00
parent 4288e45c23
commit 534037e095
22 changed files with 758 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/game/turn/Turn.java
View file

@ -1,11 +1,5 @@
package mage.game.turn;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
import mage.abilities.Ability;
import mage.constants.PhaseStep;
import mage.constants.TurnPhase;
@ -18,8 +12,13 @@ import mage.game.stack.StackObject;
import mage.players.Player;
import mage.util.ThreadLocalStringBuilder;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class Turn implements Serializable {
@ -93,7 +92,6 @@ public class Turn implements Serializable {
}
/**
*
* @param game
* @param activePlayer
* @return true if turn is skipped
@ -105,6 +103,7 @@ public class Turn implements Serializable {
return false;
}
if (game.getState().getTurnMods().skipTurn(activePlayer.getId())) {
game.informPlayers(activePlayer.getLogName() + " skips their turn.");
return true;
@ -239,6 +238,7 @@ public class Turn implements Serializable {
this.play(game, activePlayerId);
}
}*/
/**
* Used for some spells with end turn effect (e.g. Time Stop).
*