From ffa57af60fb1b8bc6ea667adbec5bdd2490889e4 Mon Sep 17 00:00:00 2001 From: moomarc Date: Tue, 10 Jul 2012 12:51:03 +0000 Subject: [PATCH] Checkstyle --- .../card/abilityfactory/AbilityFactoryChangeZone.java | 8 ++++---- .../forge/card/abilityfactory/AbilityFactoryClone.java | 2 +- .../forge/card/abilityfactory/AbilityFactoryCounters.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java index 393f81a39bc..71e98e8ed3b 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java @@ -479,7 +479,7 @@ public final class AbilityFactoryChangeZone { return false; } } - + // don't play if the conditions aren't met, unless it would trigger a beneficial sub-condition if (!AbilityFactory.checkConditional(sa)) { final AbilitySub abSub = sa.getSubAbility(); @@ -1372,7 +1372,7 @@ public final class AbilityFactoryChangeZone { return true; } - + /** * Some logic for picking a creature card from a list. * @param list @@ -1643,7 +1643,7 @@ public final class AbilityFactoryChangeZone { // counters TODO check good and // bad counters // checks only if there is a dangerous ETB effect - return SpellPermanent.checkETBEffects(c, null, null); + return SpellPermanent.checkETBEffects(c, null, null); } }); if (!aiPermanents.isEmpty()) { @@ -1777,7 +1777,7 @@ public final class AbilityFactoryChangeZone { return true; } - + /** *

* changeKnownUnpreferredTarget. diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java index 38da426e4c8..9bf71c080da 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java @@ -204,7 +204,7 @@ public final class AbilityFactoryClone { // TODO update this method private static String cloneStackDescription(final AbilityFactory af, final SpellAbility sa) { final HashMap params = af.getMapParams(); - + final StringBuilder sb = new StringBuilder(); if (sa instanceof AbilitySub) { diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 63eb4c3b9b8..30eb604f61f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -421,7 +421,7 @@ public class AbilityFactoryCounters { } // Don't use non P1P1/M1M1 counters before main 2 if possible - if (Singletons.getModel().getGameState().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2) + if (Singletons.getModel().getGameState().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2) && !params.containsKey("ActivationPhases") && !(type.equals("P1P1") || type.equals("M1M1"))) { return false;