From d9a89c0b9995e369f472cb02ab57c0c7e086fba3 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 1 Feb 2013 17:52:33 +0000 Subject: [PATCH] - Fixed possible NPE in performTest checking "TargetsValid". --- .../java/forge/card/trigger/TriggerSpellAbilityCast.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java b/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java index 1608d261770..eb67ab7087e 100644 --- a/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java +++ b/src/main/java/forge/card/trigger/TriggerSpellAbilityCast.java @@ -97,7 +97,10 @@ public class TriggerSpellAbilityCast extends Trigger { } if (this.getMapParams().containsKey("TargetsValid")) { - final SpellAbility sa = si.getSpellAbility(); + SpellAbility sa = spellAbility; + if (si != null) { + sa = si.getSpellAbility(); + } if (sa.getTarget() == null) { if (sa.getTargetCard() == null) { if (sa.getTargetPlayer() == null) {