External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 20:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

spjspj - Add the 'Skip to End Step of Previous Player' button to the GamePanel and associated changes

Browse source
This commit is contained in:
spjspj 2016-03-27 00:07:23 +11:00
parent fa5dd387b4
commit 3dfe9de05f
13 changed files with 143 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -91,6 +91,7 @@ import mage.game.permanent.Permanent;
import mage.game.tournament.Tournament;
import mage.players.Player;
import mage.players.PlayerImpl;
import mage.players.PlayerList;
import mage.target.Target;
import mage.target.TargetAmount;
import mage.target.TargetCard;
@ -589,6 +590,21 @@ public class HumanPlayer extends PlayerImpl {
return false;
}
}
if (passedUntilEndStepBeforeMyTurn) {
if (!game.getTurn().getStepType().equals(PhaseStep.END_TURN)) {
if (passWithManaPoolCheck(game)) {
return false;
}
} else {
PlayerList playerList = game.getState().getPlayerList(playerId);
if (!playerList.getPrevious().equals(game.getActivePlayerId())) {
if (passWithManaPoolCheck(game)) {
return false;
}
}
}
}
if (game.getStack().isEmpty()) {
passedUntilStackResolved = false;
boolean dontCheckPassStep = false;
@ -878,7 +894,7 @@ public class HumanPlayer extends PlayerImpl {
FilterCreatureForCombat filter = filterCreatureForCombat.copy();
filter.add(new ControllerIdPredicate(attackingPlayerId));
while (!abort) {
if (passedAllTurns
if (passedAllTurns || passedUntilEndStepBeforeMyTurn
|| (!getUserData().getUserSkipPrioritySteps().isStopOnDeclareAttackersDuringSkipAction() && (passedTurn || passedUntilEndOfTurn || passedUntilNextMain))) {
return;
}