From beaffe830ba14227e858df453531df3fff5dee55 Mon Sep 17 00:00:00 2001 From: pfps Date: Sat, 7 Jan 2017 20:17:17 +0000 Subject: [PATCH] Make yield string methods robust to effects that don't have a host card --- .../main/java/forge/game/spellability/SpellAbility.java | 8 ++++++-- .../src/main/java/forge/game/trigger/WrappedAbility.java | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index ce01258bafd..bd79c09196e 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -581,9 +581,13 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit } } - // key for autoyield - the card description (including number) plus the effect description + // key for autoyield - the card description (including number) (if there is a card) plus the effect description public String yieldKey() { - return getHostCard().toString() + ": " + toUnsuppressedString(); + if ( getHostCard() != null ) { + return getHostCard().toString() + ": " + toUnsuppressedString(); + } else { + return toUnsuppressedString(); + } } public String getStackDescription() { diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java index a8f6cdedfeb..e187bf93989 100644 --- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java +++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java @@ -193,7 +193,11 @@ public class WrappedAbility extends Ability { @Override public String yieldKey() { if ( getTrigger() != null ) { - return getHostCard().toString() + ": " + getTrigger().toString(); + if ( getHostCard() != null ) { + return getHostCard().toString() + ": " + getTrigger().toString(); + } else { + return getTrigger().toString(); + } } else { return super.yieldKey(); }