From e5f53febf85fe16a92340800612c98e857415c2a Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 8 Aug 2021 14:42:43 +0200 Subject: [PATCH] Fix onlyOneBlockerPerOpponent --- forge-game/src/main/java/forge/game/combat/CombatUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index 61ca06ad748..c25d7ca22f5 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -425,7 +425,9 @@ public class CombatUtil { return false; } - final int blockersFromOnePlayer = CardLists.filter(combat.getAllBlockers(), CardPredicates.isController(blocker.getController())).size(); + CardCollection allOtherBlockers = combat.getAllBlockers(); + allOtherBlockers.remove(blocker); + final int blockersFromOnePlayer = CardLists.filter(allOtherBlockers, CardPredicates.isController(blocker.getController())).size(); if (blockersFromOnePlayer > 0 && game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.onlyOneBlockerPerOpponent)) { return false; }