From 5505cbd2f870c2bc095718f5e6ae9629748e37c9 Mon Sep 17 00:00:00 2001 From: Myrd Date: Thu, 31 Dec 2015 20:05:21 +0000 Subject: [PATCH] Add the Okk blocking restrictions to CombatUtil.validateBlocks() too. --- .../src/main/java/forge/game/combat/CombatUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 dd6db8106a8..bb242839213 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -690,17 +690,19 @@ public class CombatUtil { } } } + } - // Creatures that aren't allowed to block unless certain restrictions are met. - if (blocker.hasKeyword("CARDNAME can't attack or block alone.") && defendersArmy.size() < 2) { + // Creatures that aren't allowed to block unless certain restrictions are met. + for (final Card blocker : blockers) { + if (blocker.hasKeyword("CARDNAME can't attack or block alone.") && blockers.size() < 2) { return String.format("%s can't block alone.", blocker); - } else if (blocker.hasKeyword("CARDNAME can't block unless at least two other creatures block.") && defendersArmy.size() < 3) { + } else if (blocker.hasKeyword("CARDNAME can't block unless at least two other creatures block.") && blockers.size() < 3) { return String.format("%s can't block unless at least two other creatures block.", blocker); } else if (blocker.hasKeyword("CARDNAME can't block unless a creature with greater power also blocks.")) { boolean found = false; int power = blocker.getNetPower(); // Note: This is O(n^2), but there shouldn't generally be many creatures with the above keyword. - for (Card blocker2 : defendersArmy) { + for (Card blocker2 : blockers) { if (blocker2.getNetPower() > power) { found = true; break;