From 8adab86adbe4f2b15618a34458f05ca79f1d7020 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 10 Jan 2013 19:56:45 +0000 Subject: [PATCH] Removing abuse of "canSpot". --- .../main/java/com/gempukku/lotro/cards/AbstractFollower.java | 2 +- .../main/java/com/gempukku/lotro/cards/PlayConditions.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java index d364edb61..222ca92ee 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java @@ -73,7 +73,7 @@ public abstract class AbstractFollower extends AbstractPermanent { public final List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER) && canPayAidCost(game, self) - && PlayConditions.canSpot(game, getFollowerTarget(game, self))) { + && PlayConditions.isActive(game, getFollowerTarget(game, self))) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( getAidCost(game, action, self)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 619902cd8..d959da639 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -184,6 +184,10 @@ public class PlayConditions { return canSpot(game, 1, filters); } + public static boolean isActive(LotroGame game, Filterable... filters) { + return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), filters)>0; + } + public static boolean canSpot(LotroGame game, int count, Filterable... filters) { return Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), count, filters); }