From d20af6a812288bd90c0043c7f07f30793ca4f7f2 Mon Sep 17 00:00:00 2001 From: ArsenalNut Date: Fri, 10 Feb 2012 06:13:44 +0000 Subject: [PATCH] added null pointer checks to getDefinedCards and getDefinedPlayers --- .../forge/card/abilityfactory/AbilityFactory.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index 3f4804ce9dd..ac6df904e8f 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -1731,7 +1731,11 @@ public class AbilityFactory { else if (defined.equals("Targeted")) { final SpellAbility parent = AbilityFactory.findParentsTargetedCard(sa); - cards.addAll(parent.getTarget().getTargetCards()); + if (parent != null) { + if (parent.getTarget() != null) { + cards.addAll(parent.getTarget().getTargetCards()); + } + } } else if (defined.startsWith("Triggered") && (sa != null)) { final SpellAbility root = sa.getRootSpellAbility(); final Object crd = root.getTriggeringObject(defined.substring(9)); @@ -1844,7 +1848,11 @@ public class AbilityFactory { if (defined.equals("Targeted")) { final SpellAbility parent = AbilityFactory.findParentsTargetedPlayer(sa); - players.addAll(parent.getTarget().getTargetPlayers()); + if (parent != null) { + if (parent.getTarget() != null) { + players.addAll(parent.getTarget().getTargetPlayers()); + } + } /* * Target tgt = sa.getTarget(); SpellAbility parent = sa; *