external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make yield string methods robust to effects that don't have a host card

Browse Source
This commit is contained in:
pfps
2017-01-07 20:17:17 +00:00
parent 17b2b4a810
commit beaffe830b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -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() { public String yieldKey() {
if ( getHostCard() != null ) {
return getHostCard().toString() + ": " + toUnsuppressedString(); return getHostCard().toString() + ": " + toUnsuppressedString();
} else {
return toUnsuppressedString();
}
} }
public String getStackDescription() { public String getStackDescription() {

4
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -193,7 +193,11 @@ public class WrappedAbility extends Ability {
@Override @Override
public String yieldKey() { public String yieldKey() {
if ( getTrigger() != null ) { if ( getTrigger() != null ) {
if ( getHostCard() != null ) {
return getHostCard().toString() + ": " + getTrigger().toString(); return getHostCard().toString() + ": " + getTrigger().toString();
} else {
return getTrigger().toString();
}
} else { } else {
return super.yieldKey(); return super.yieldKey();
} }