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

Merge branch 'fixTriggerCardState' into 'master'

Browse Source 
TriggerHandler: fix setting CardState for Trigger

See merge request core-developers/forge!4555
This commit is contained in:
Michael Kamensky
2021-04-20 07:17:09 +00:00
parent ec52a07fe9 15eb3a421d
commit 7465031d44
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3206,7 +3206,7 @@ public class CardFactoryUtil {
trigStr.append(" | Secondary$ True"); trigStr.append(" | Secondary$ True");
} }
trigStr.append("| TriggerDescription$ ").append(desc).append(" — ").append(sa.getDescription()); trigStr.append("| TriggerDescription$ ").append(desc).append(" — ").append(sa.getDescription());
final Trigger t = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic); final Trigger t = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic);
t.setOverridingAbility(sa); t.setOverridingAbility(sa);
inst.addTrigger(t); inst.addTrigger(t);
} }

2
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -121,7 +121,7 @@ public class TriggerHandler {
} }
public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic) { public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic) {
return parseTrigger(trigParse, host, intrinsic, host); return parseTrigger(trigParse, host, intrinsic, host.getCurrentState());
} }
public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic, final IHasSVars sVarHolder) { public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic, final IHasSVars sVarHolder) {