From 009d16a1c13334357c066f41eebb0032299cce67 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 23 Nov 2012 19:42:23 +0000 Subject: [PATCH] - Fixed MustBlockCards not being checked for still attacking. --- src/main/java/forge/game/phase/CombatUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index fdc0dda9c47..8d34c0c8d15 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -530,7 +530,8 @@ public class CombatUtil { if (blocker.getMustBlockCards() != null) { for (final Card attacker : blocker.getMustBlockCards()) { - if (CombatUtil.canBeBlocked(attacker, combat) && CombatUtil.canBlock(attacker, blocker)) { + if (CombatUtil.canBeBlocked(attacker, combat) && CombatUtil.canBlock(attacker, blocker) + && combat.isAttacking(attacker)) { boolean canBe = true; if (attacker.hasKeyword("CARDNAME can't be blocked except by two or more creatures.")) { final List blockers = combat.getDefenderPlayerByAttacker(attacker).getCreaturesInPlay();