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 'fixTriggerNullAi' into 'master'

Browse Source 
WrappedAbility: fix trigger not set for confirmTrigger

See merge request core-developers/forge!2716
This commit is contained in:
Michael Kamensky
2020-04-15 08:13:16 +00:00
parent d52d850c85 759703bf56
commit ca6873d893
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1591,6 +1591,10 @@ public class AbilityUtils {
if (root.isTrigger()) { if (root.isTrigger()) {
Trigger t = root.getTrigger(); Trigger t = root.getTrigger();
if (t == null) {
return 0;
}
// 107.3k If an object’s enters-the-battlefield triggered ability or replacement effect refers to X, // 107.3k If an object’s enters-the-battlefield triggered ability or replacement effect refers to X,
// and the spell that became that object as it resolved had a value of X chosen for any of its costs, // and the spell that became that object as it resolved had a value of X chosen for any of its costs,
// the value of X for that ability is the same as the value of X for that spell, although the value of X for that permanent is 0. // the value of X for that ability is the same as the value of X for that spell, although the value of X for that permanent is 0.

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

@@ -473,13 +473,13 @@ public class WrappedAbility extends Ability {
TriggerHandler th = game.getTriggerHandler(); TriggerHandler th = game.getTriggerHandler();
// set Trigger
sa.setTrigger(regtrig);
if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) { if (decider != null && !decider.getController().confirmTrigger(this, triggerParams, this.isMandatory())) {
return; return;
} }
// set Trigger
sa.setTrigger(regtrig);
if (!triggerParams.containsKey("NoTimestampCheck")) { if (!triggerParams.containsKey("NoTimestampCheck")) {
timestampCheck(); timestampCheck();
} }