diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java index 7b773e928da..87ddef0f313 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java @@ -77,10 +77,14 @@ public class StaticAbilityCantTarget { return false; } - if (params.containsKey("SourceCanOnlyTarget") + if (spellAbility.getParam("ValidTgts")!=null && + (params.containsKey("SourceCanOnlyTarget") && (!spellAbility.getParam("ValidTgts").contains(params.get("SourceCanOnlyTarget")) || spellAbility.getParam("ValidTgts").contains(",")) - || spellAbility.getParam("ValidTgts").contains("non" + params.get("SourceCanOnlyTarget"))) { + || spellAbility.getParam("ValidTgts").contains("non" + params.get("SourceCanOnlyTarget") + ) + ) + ){ return false; }