Merge branch 'fixTriggerNullAi' into 'master'

WrappedAbility: fix trigger not set for confirmTrigger

See merge request core-developers/forge!2716

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -1591,6 +1591,10 @@ public class AbilityUtils {
 
                     if (root.isTrigger()) {
                         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,
                         // 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.

forge-game/src/main/java/forge/game/trigger/WrappedAbility.java

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