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

Fix WrappedAbility again so simultaneous trigger text is shown

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-07-10 18:43:27 +09:00
parent d5149293da
commit 33f5080ca6
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ import forge.game.spellability.AbilitySub;
import forge.game.spellability.AlternativeCost; import forge.game.spellability.AlternativeCost;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityRestriction; import forge.game.spellability.SpellAbilityRestriction;
import forge.game.spellability.SpellAbilityView;
import forge.game.spellability.TargetChoices; import forge.game.spellability.TargetChoices;
import forge.game.spellability.TargetRestrictions; import forge.game.spellability.TargetRestrictions;
@@ -62,7 +61,7 @@ public class WrappedAbility extends Ability {
boolean mandatory = false; boolean mandatory = false;
public WrappedAbility(final Trigger regtrig0, final SpellAbility sa0, final Player decider0) { 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); setTrigger(regtrig0);
sa = sa0; sa = sa0;
sa.setTrigger(regtrig0); sa.setTrigger(regtrig0);
@@ -201,16 +200,6 @@ public class WrappedAbility extends Ability {
return sa.getSATargetingCard(); 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 // key for autoyield - if there is a trigger use its description as the wrapper now has triggering information in its description
@Override @Override
public String yieldKey() { public String yieldKey() {
@@ -240,6 +229,7 @@ public class WrappedAbility extends Ability {
@Override @Override
public String getStackDescription() { public String getStackDescription() {
final Trigger regtrig = getTrigger(); final Trigger regtrig = getTrigger();
if (regtrig == null) return "";
final StringBuilder sb = new StringBuilder(regtrig.replaceAbilityText(regtrig.toString(true), this)); final StringBuilder sb = new StringBuilder(regtrig.replaceAbilityText(regtrig.toString(true), this));
List<TargetChoices> allTargets = sa.getAllTargetChoices(); List<TargetChoices> allTargets = sa.getAllTargetChoices();
if (!allTargets.isEmpty()) { if (!allTargets.isEmpty()) {