github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Game: fixed that declare blocker step skips all the time on disabled "STOP skip on any/zero blockers" preferences (#6308);

Browse source
This commit is contained in:
Oleg Agafonov 2020-02-29 23:27:11 +04:00
parent 6769b1d536
commit ca9542d3de
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1633,7 +1633,15 @@ public class HumanPlayer extends PlayerImpl {
int possibleBlockersCount = game.getBattlefield().count(filter, null, playerId, game); int possibleBlockersCount = game.getBattlefield().count(filter, null, playerId, game);
boolean canStopOnAny = possibleBlockersCount != 0 && getControllingPlayersUserData(game).getUserSkipPrioritySteps().isStopOnDeclareBlockersWithAnyPermanents(); boolean canStopOnAny = possibleBlockersCount != 0 && getControllingPlayersUserData(game).getUserSkipPrioritySteps().isStopOnDeclareBlockersWithAnyPermanents();
boolean canStopOnZero = possibleBlockersCount == 0 && getControllingPlayersUserData(game).getUserSkipPrioritySteps().isStopOnDeclareBlockersWithZeroPermanents(); boolean canStopOnZero = possibleBlockersCount == 0 && getControllingPlayersUserData(game).getUserSkipPrioritySteps().isStopOnDeclareBlockersWithZeroPermanents();
if (!canStopOnAny && !canStopOnZero) {
// skip declare blocker step
// as opposed to declare attacker - it can be skipped by ANY skip button TODO: make same for declare attackers and rework skip buttons (normal and forced)
boolean skipButtonActivated = passedAllTurns
|| passedUntilEndStepBeforeMyTurn
|| passedTurn
|| passedUntilEndOfTurn
|| passedUntilNextMain;
if (skipButtonActivated && !canStopOnAny && !canStopOnZero) {
return; return;
} }