diff --git a/src/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/forge/card/abilityFactory/AbilityFactory_Counters.java index e98aa711a7b..50fdae8fbdf 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_Counters.java +++ b/src/forge/card/abilityFactory/AbilityFactory_Counters.java @@ -139,10 +139,18 @@ public class AbilityFactory_Counters { if(amount != 1) sb.append("s"); sb.append(" on"); - ArrayList tgts = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); + ArrayList tgtCards; - for (Card c : tgts) + Target tgt = af.getAbTgt(); + if (tgt != null) + tgtCards = tgt.getTargetCards(); + else{ + tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); + } + + for (Card c : tgtCards) { sb.append(" ").append(c.getName()); + } sb.append("."); @@ -483,13 +491,14 @@ public class AbilityFactory_Counters { tgtCards = AbilityFactory.getDefinedCards(card, params.get("Defined"), sa); } - for(Card tgtCard : tgtCards) + for(Card tgtCard : tgtCards) { if(tgt == null || CardFactoryUtil.canTarget(card, tgtCard)){ if (AllZone.getZone(tgtCard).is(Constant.Zone.Battlefield)) tgtCard.addCounter(Counters.valueOf(type), counterAmount); else // adding counters to something like re-suspend cards tgtCard.addCounterFromNonEffect(Counters.valueOf(type), counterAmount); } + } if (af.hasSubAbility()){ Ability_Sub abSub = sa.getSubAbility();