From ca9542d3deae9323f9bb5e429b4f430c62eaecac Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 29 Feb 2020 23:27:11 +0400 Subject: [PATCH] * Game: fixed that declare blocker step skips all the time on disabled "STOP skip on any/zero blockers" preferences (#6308); --- .../src/mage/player/human/HumanPlayer.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index b62299993c0..bc08e0aa8d0 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -1633,7 +1633,15 @@ public class HumanPlayer extends PlayerImpl { int possibleBlockersCount = game.getBattlefield().count(filter, null, playerId, game); boolean canStopOnAny = possibleBlockersCount != 0 && getControllingPlayersUserData(game).getUserSkipPrioritySteps().isStopOnDeclareBlockersWithAnyPermanents(); 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; }