From 2dfe647318be54bc0a6b5eafd7df90e6edee8eb4 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 27 Jan 2012 18:03:01 +0000 Subject: [PATCH] - CheckStyle. --- src/main/java/forge/CombatUtil.java | 7 ++++--- src/main/java/forge/ComputerUtilBlock.java | 2 +- .../card/abilityfactory/AbilityFactoryChangeZone.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index 4c0159bff28..de53fa28aa9 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -456,9 +456,10 @@ public class CombatUtil { CardList attackersWithLure = new CardList(); for (Card attacker : attackers) { if (attacker.hasStartOfKeyword("All creatures able to block CARDNAME do so.") - || (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.") - && combat.getBlockers(attacker).isEmpty())) - attackersWithLure.add(attacker); + || (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.") + && combat.getBlockers(attacker).isEmpty())) { + attackersWithLure.add(attacker); + } } for (final Card attacker : attackersWithLure) { diff --git a/src/main/java/forge/ComputerUtilBlock.java b/src/main/java/forge/ComputerUtilBlock.java index 4cd04cde91e..49f62e375bf 100644 --- a/src/main/java/forge/ComputerUtilBlock.java +++ b/src/main/java/forge/ComputerUtilBlock.java @@ -897,7 +897,7 @@ public class ComputerUtilBlock { blockers = ComputerUtilBlock.getPossibleBlockers(attacker, chumpBlockers, combat); for (final Card blocker : blockers) { if (CombatUtil.canBlock(attacker, blocker, combat) && ComputerUtilBlock.getBlockersLeft().contains(blocker) - && (CombatUtil.mustBlockAnAttacker(blocker, combat) + && (CombatUtil.mustBlockAnAttacker(blocker, combat) || blocker.hasKeyword("CARDNAME blocks each turn if able."))) { combat.addBlocker(attacker, blocker); ComputerUtilBlock.getBlockersLeft().removeAll(blocker); diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index 4e7bb8e71f2..bd24085553f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java @@ -858,7 +858,7 @@ public final class AbilityFactoryChangeZone { if (params.containsKey("GainControl")) { c.addController(af.getHostCard()); } - + if (params.containsKey("AttachedTo")) { ArrayList list = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("AttachedTo"), sa); if (!list.isEmpty()) { @@ -1047,7 +1047,7 @@ public final class AbilityFactoryChangeZone { c.enchantEntity(attachedTo); } } - + if (params.containsKey("Attacking")) { AllZone.getCombat().addAttacker(c); }