diff --git a/src/main/java/forge/card/ability/SaTargetRountines.java b/src/main/java/forge/card/ability/SaTargetRountines.java index 029944f90bf..637ea8ad0e1 100644 --- a/src/main/java/forge/card/ability/SaTargetRountines.java +++ b/src/main/java/forge/card/ability/SaTargetRountines.java @@ -21,7 +21,8 @@ public class SaTargetRountines { protected List getDefinedCardsOrTargeted(SpellAbility sa, String definedParam) { return getCards(true, definedParam, sa); } private List getCards(boolean definedFirst, String definedParam, SpellAbility sa) { - boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam)); + boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam)) + && sa.getTargets() != null && sa.getTargets().isTargetingAnyCard(); return useTargets ? Lists.newArrayList(sa.getTargets().getTargetCards()) : AbilityUtils.getDefinedCards(sa.getSourceCard(), sa.getParam(definedParam), sa); }