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

Merge branch 'clonecrash' into 'master'

Browse Source 
CloneStates: fix crash when adding trigger with subs

See merge request core-developers/forge!4027
This commit is contained in:
Hans Mackowiak
2021-02-26 20:00:46 +00:00
parent 96723983c9 676a0b9b43
commit e02805e49d
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -670,18 +670,6 @@ public class CardFactory {
state.setBaseLoyalty(String.valueOf(sa.getParam("SetLoyalty"))); state.setBaseLoyalty(String.valueOf(sa.getParam("SetLoyalty")));
} }
// triggers to add to clone
if (sa.hasParam("AddTriggers")) {
for (final String s : sa.getParam("AddTriggers").split(",")) {
if (origSVars.containsKey(s)) {
final String actualTrigger = origSVars.get(s);
final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, out, true);
state.addTrigger(parsedTrigger);
}
}
}
// SVars to add to clone // SVars to add to clone
if (sa.hasParam("AddSVars") || sa.hasParam("GainTextSVars")) { if (sa.hasParam("AddSVars") || sa.hasParam("GainTextSVars")) {
final String str = sa.getParamOrDefault("GainTextSVars", sa.getParam("AddSVars")); final String str = sa.getParamOrDefault("GainTextSVars", sa.getParam("AddSVars"));
@@ -693,6 +681,17 @@ public class CardFactory {
} }
} }
// triggers to add to clone
if (sa.hasParam("AddTriggers")) {
for (final String s : sa.getParam("AddTriggers").split(",")) {
if (origSVars.containsKey(s)) {
final String actualTrigger = origSVars.get(s);
final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, out, true, state);
state.addTrigger(parsedTrigger);
}
}
}
// abilities to add to clone // abilities to add to clone
if (sa.hasParam("AddAbilities") || sa.hasParam("GainTextAbilities")) { if (sa.hasParam("AddAbilities") || sa.hasParam("GainTextAbilities")) {
final String str = sa.getParamOrDefault("GainTextAbilities", sa.getParam("AddAbilities")); final String str = sa.getParamOrDefault("GainTextAbilities", sa.getParam("AddAbilities"));