From 33f5080ca65a61808ca2a63d6bc65c22161713cf Mon Sep 17 00:00:00 2001 From: Lyu Zong-Hong Date: Sat, 10 Jul 2021 18:43:27 +0900 Subject: [PATCH] Fix WrappedAbility again so simultaneous trigger text is shown --- .../java/forge/game/trigger/WrappedAbility.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) 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 d7ebbcc550d..f46bd78e19f 100644 --- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java +++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java @@ -25,7 +25,6 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.AlternativeCost; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityRestriction; -import forge.game.spellability.SpellAbilityView; import forge.game.spellability.TargetChoices; import forge.game.spellability.TargetRestrictions; @@ -62,7 +61,7 @@ public class WrappedAbility extends Ability { boolean mandatory = false; public WrappedAbility(final Trigger regtrig0, final SpellAbility sa0, final Player decider0) { - super(sa0.getHostCard(), ManaCost.ZERO, sa0.getView()); + super(sa0.getHostCard(), ManaCost.ZERO); setTrigger(regtrig0); sa = sa0; sa.setTrigger(regtrig0); @@ -201,16 +200,6 @@ public class WrappedAbility extends Ability { return sa.getSATargetingCard(); } - @Override - public Card getHostCard() { - return sa.getHostCard(); - } - - @Override - public SpellAbilityView getView() { - return sa.getView(); - } - // key for autoyield - if there is a trigger use its description as the wrapper now has triggering information in its description @Override public String yieldKey() { @@ -240,6 +229,7 @@ public class WrappedAbility extends Ability { @Override public String getStackDescription() { final Trigger regtrig = getTrigger(); + if (regtrig == null) return ""; final StringBuilder sb = new StringBuilder(regtrig.replaceAbilityText(regtrig.toString(true), this)); List allTargets = sa.getAllTargetChoices(); if (!allTargets.isEmpty()) {