From 106d9ca7aca94e9710fe550399f1e34f49309a83 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:49:08 +0000 Subject: [PATCH] prevent possible NullPointerException in SpellAbility.setTargetCard() --- src/forge/SpellAbility.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/forge/SpellAbility.java b/src/forge/SpellAbility.java index ae69fe181b8..b5b4e4110a1 100644 --- a/src/forge/SpellAbility.java +++ b/src/forge/SpellAbility.java @@ -300,14 +300,18 @@ public abstract class SpellAbility { } public void setTargetCard(Card card) { - targetPlayer = null;//reset setTargetPlayer() - - targetCard = card; - String desc = ""; - if(!card.isFaceDown()) desc = getSourceCard().getName() + " - targeting " + card; - else desc = getSourceCard().getName() + " - targeting Morph(" + card.getUniqueNumber() + ")"; - setStackDescription(desc); - + targetPlayer = null;//reset setTargetPlayer() + + targetCard = card; + String desc = ""; + if(null != card) { + if(!card.isFaceDown()) desc = getSourceCard().getName() + " - targeting " + card; + else desc = getSourceCard().getName() + " - targeting Morph(" + card.getUniqueNumber() + ")"; + setStackDescription(desc); + } + else { + System.out.println(getSourceCard()+" - SpellAbility.setTargetCard() called with null for target card."); + } //System.out.println(card + " has become target of a spell or ability (" +this.getSourceCard() + ")"); }