add incorrectly not staged changes

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

@@ -64,7 +64,7 @@ public class TriggerAdapt extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -85,11 +85,14 @@ public class TriggerAttackerBlocked extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Attacker, getRunParams().get("Attacker"));
+        sa.setTriggeringObjectsFrom(
-        sa.setTriggeringObject(AbilityKey.Blockers, getRunParams().get("Blockers"));
+            this,
-        sa.setTriggeringObject(AbilityKey.Defender, getRunParams().get("Defender"));
+            AbilityKey.Attacker,
-        sa.setTriggeringObject(AbilityKey.DefendingPlayer, getRunParams().get("DefendingPlayer"));
+            AbilityKey.Blockers,
-        sa.setTriggeringObject(AbilityKey.NumBlockers, getRunParams().get("NumBlockers"));
+            AbilityKey.Defender,
+            AbilityKey.DefendingPlayer,
+            AbilityKey.NumBlockers
+        );
     }
 
     @Override

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

@@ -36,7 +36,7 @@ public class TriggerBecomeMonarch extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -65,8 +65,7 @@ public class TriggerBecomeMonstrous extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.MonstrosityAmount);
-        sa.setTriggeringObject(AbilityKey.MonstrosityAmount, getRunParams().get("MonstrosityAmount"));
     }
 
     @Override

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

@@ -63,7 +63,7 @@ public class TriggerBecomeRenowned extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -89,9 +89,8 @@ public class TriggerBecomesTarget extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.SourceSA, this.getRunParams().get("SourceSA"));
+        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) getFromRunParams(AbilityKey.SourceSA)).getHostCard());
-        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
+        sa.setTriggeringObjectsFrom(this, AbilityKey.SourceSA, AbilityKey.Target);
-        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("Target"));
     }
 
     @Override

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

@@ -81,9 +81,8 @@ public class TriggerBecomesTargetOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.SourceSA, this.getRunParams().get("SourceSA"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.SourceSA, AbilityKey.Targets);
-        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard());
+        sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) getFromRunParams(AbilityKey.SourceSA)).getHostCard());
-        sa.setTriggeringObject(AbilityKey.Targets, this.getRunParams().get("Targets"));
     }
 
     @Override

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

@@ -71,7 +71,7 @@ public class TriggerChangesController extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -218,7 +218,7 @@ public class TriggerChangesZone extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -23,7 +23,7 @@ public class TriggerChangesZoneAll extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        final CardZoneTable table = (CardZoneTable) getRunParams().get("Cards");
+        final CardZoneTable table = (CardZoneTable) getFromRunParams(AbilityKey.Cards);
 
         CardCollection allCards = this.filterCards(table);
 

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

@@ -121,10 +121,7 @@ public class TriggerCounterAdded extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        if (this.getRunParams().containsKey("Card"))
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player);
-            sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
-        if (this.getRunParams().containsKey("Player"))
-            sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override

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

@@ -25,7 +25,7 @@ public class TriggerCounterAddedAll extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        final GameEntityCounterTable table = (GameEntityCounterTable) getRunParams().get("Objects");
+        final GameEntityCounterTable table = (GameEntityCounterTable) getFromRunParams(AbilityKey.Objects);
 
         Map<GameEntity, Integer> all = this.filterTable(table);
 

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

@@ -106,11 +106,8 @@ public class TriggerCounterAddedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        if (this.getRunParams().containsKey("Card"))
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player);
-            sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Amount, getFromRunParams(AbilityKey.CounterAmount));
-        if (this.getRunParams().containsKey("Player"))
-            sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
-        sa.setTriggeringObject(AbilityKey.Amount, this.getRunParams().get("CounterAmount"));
     }
 
     @Override

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

@@ -83,7 +83,7 @@ public class TriggerCounterRemoved extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -50,7 +50,7 @@ public class TriggerCycled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -119,11 +119,14 @@ public class TriggerDamageDone extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
+        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)getFromRunParams(AbilityKey.DamageSource)));
-        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget));
-        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObjectsFrom(
+            this,
+            AbilityKey.DamageAmount,
             // This parameter is here because LKI information related to combat doesn't work properly
-        sa.setTriggeringObject(AbilityKey.DefendingPlayer, this.getRunParams().get("DefendingPlayer"));
+            AbilityKey.DefendingPlayer
+        );
     }
 
     @Override

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

@@ -58,15 +58,9 @@ public class TriggerDamageDoneOnce extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        if (this.getRunParams().containsKey("DamageTarget")) {
+        sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget));
-            sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.Sources, getFromRunParams(AbilityKey.DamageSources));
-        }
+        sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount);
-        if (this.getRunParams().containsKey("DamageSources")) {
-            sa.setTriggeringObject(AbilityKey.Sources, this.getRunParams().get("DamageSources"));
-        }
-        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
-        
-
     }
 
     @Override

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

@@ -103,9 +103,9 @@ public class TriggerDamagePrevented extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)this.getRunParams().get("DamageSource")));
+        sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)getFromRunParams(AbilityKey.DamageSource)));
-        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget));
-        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount);
     }
 
     @Override

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

@@ -94,8 +94,8 @@ public class TriggerDamagePreventedOnce extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Target, this.getRunParams().get("DamageTarget"));
+        sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget));
-        sa.setTriggeringObject(AbilityKey.DamageAmount, this.getRunParams().get("DamageAmount"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount);
     }
 
     @Override

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

@@ -68,8 +68,7 @@ public class TriggerDestroyed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Causer);
-        sa.setTriggeringObject(AbilityKey.Causer, this.getRunParams().get("Causer"));
     }
 
     @Override

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

@@ -61,7 +61,7 @@ public class TriggerDevoured extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Devoured, this.getRunParams().get("Devoured"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Devoured);
     }
 
     @Override

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

@@ -86,8 +86,7 @@ public class TriggerDiscarded extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Cause);
-        sa.setTriggeringObject(AbilityKey.Cause, this.getRunParams().get("Cause"));
     }
 
     @Override

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

@@ -81,8 +81,7 @@ public class TriggerDrawn extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player);
-        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override

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

@@ -62,7 +62,7 @@ public class TriggerEvolved extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -33,8 +33,7 @@ public class TriggerExerted extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player);
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override

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

@@ -97,7 +97,7 @@ public class TriggerExiled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -72,8 +72,7 @@ public class TriggerExploited extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Exploited, this.getRunParams().get("Exploited"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Exploited, AbilityKey.Card);
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
     }
 
     @Override

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

@@ -62,7 +62,7 @@ public class TriggerExplores extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Explorer, this.getRunParams().get("Card"));
+        sa.setTriggeringObject(AbilityKey.Explorer, getFromRunParams(AbilityKey.Card));
     }
 
     @Override

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

@@ -63,7 +63,7 @@ public class TriggerFight extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Fighter, this.getRunParams().get("Fighter"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Fighter);
     }
 
     @Override

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

@@ -70,7 +70,7 @@ public class TriggerFlippedCoin extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -60,7 +60,7 @@ public class TriggerInvestigated extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     /** {@inheritDoc} */

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

@@ -52,7 +52,7 @@ public class TriggerLandPlayed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -74,8 +74,7 @@ public class TriggerLifeGained extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.LifeAmount, getRunParams().get("LifeAmount"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player);
-        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override

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

@@ -71,8 +71,7 @@ public class TriggerLifeLost extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.LifeAmount, this.getRunParams().get("LifeAmount"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player);
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
     }
 
     @Override

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

@@ -39,7 +39,7 @@ public class TriggerLosesGame extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -70,8 +70,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.PayingMana);
-        sa.setTriggeringObject(AbilityKey.PayingMana, this.getRunParams().get("PayingMana"));
     }
 
     @Override

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

@@ -70,7 +70,7 @@ public class TriggerPayEcho extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -61,8 +61,7 @@ public class TriggerPayLife extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.LifeAmount, getRunParams().get("LifeAmount"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player);
-        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
     }
 
     @Override

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

@@ -60,7 +60,7 @@ public class TriggerPhase extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -28,7 +28,7 @@ public class TriggerPhaseIn extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -36,7 +36,7 @@ public class TriggerPhaseOut extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -56,7 +56,7 @@ public class TriggerPlanarDice extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -53,7 +53,7 @@ public class TriggerPlaneswalkedFrom extends Trigger {
      */
     @Override
     public void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Cards, this.getRunParams().get("Cards"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Cards);
     }
 
     @Override

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

@@ -53,7 +53,7 @@ public class TriggerPlaneswalkedTo extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Cards, this.getRunParams().get("Cards"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Cards);
     }
 
     @Override

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

@@ -68,8 +68,7 @@ public class TriggerRegenerated extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Cause);
-        sa.setTriggeringObject(AbilityKey.Cause, this.getRunParams().get("Cause"));
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public class TriggerRevealed extends Trigger {
 
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -126,7 +126,7 @@ public class TriggerSacrificed extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -62,7 +62,7 @@ public class TriggerScry extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -74,7 +74,7 @@ public class TriggerSearchedLibrary extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -77,7 +77,7 @@ public class TriggerSetInMotion extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Scheme, this.getRunParams().get("Scheme"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Scheme);
     }
 
     @Override

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

@@ -74,7 +74,7 @@ public class TriggerShuffled extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -264,17 +264,20 @@ public class TriggerSpellAbilityCast extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        final SpellAbility castSA = (SpellAbility) getRunParams().get("CastSA");
+        final SpellAbility castSA = (SpellAbility) getFromRunParams(AbilityKey.CastSA);
         final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(castSA);
         sa.setTriggeringObject(AbilityKey.Card, castSA.getHostCard());
         sa.setTriggeringObject(AbilityKey.SpellAbility, castSA);
         sa.setTriggeringObject(AbilityKey.StackInstance, si);
         sa.setTriggeringObject(AbilityKey.SpellAbilityTargetingCards, (si != null ? si.getSpellAbility(true) : castSA).getTargets().getTargetCards());
-        sa.setTriggeringObject(AbilityKey.Player, getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(
-        sa.setTriggeringObject(AbilityKey.Activator, getRunParams().get("Activator"));
+            this,
-        sa.setTriggeringObject(AbilityKey.CurrentStormCount, getRunParams().get("CurrentStormCount"));
+            AbilityKey.Player,
-        sa.setTriggeringObject(AbilityKey.CurrentCastSpells, getRunParams().get("CurrentCastSpells"));
+            AbilityKey.Activator,
-        sa.setTriggeringObject(AbilityKey.CastSACMC, getRunParams().get("CastSACMC"));
+            AbilityKey.CurrentStormCount,
+            AbilityKey.CurrentCastSpells,
+            AbilityKey.CastSACMC
+        );
     }
 
     @Override

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

@@ -91,7 +91,7 @@ public class TriggerSpellAbilityCopy extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        final SpellAbility copySA = (SpellAbility) getRunParams().get("CopySA");
+        final SpellAbility copySA = (SpellAbility) getFromRunParams(AbilityKey.CopySA);
         final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(copySA);
         sa.setTriggeringObject(AbilityKey.Card, copySA.getHostCard());
         sa.setTriggeringObject(AbilityKey.SpellAbility, copySA);

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

@@ -56,7 +56,7 @@ public class TriggerSurveil extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     /** {@inheritDoc} */

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

@@ -78,7 +78,7 @@ public class TriggerTaps extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -59,7 +59,7 @@ public class TriggerTransformed extends Trigger {
      */
     @Override
     public void setTriggeringObjects(SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Transformer, this.getRunParams().get("Transformer"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Transformer);
     }
 
     @Override

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

@@ -21,7 +21,7 @@ public class TriggerTurnBegin extends Trigger {
 
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Player, this.getRunParams().get("Player"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Player);
     }
 
     @Override

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

@@ -61,7 +61,7 @@ public class TriggerTurnFaceUp extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -73,8 +73,7 @@ public class TriggerUnattach extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Object, getRunParams().get("Object"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Object, AbilityKey.Attach);
-        sa.setTriggeringObject(AbilityKey.Attach, getRunParams().get("Attach"));
     }
 
     @Override

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

@@ -67,7 +67,7 @@ public class TriggerUntaps extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
-        sa.setTriggeringObject(AbilityKey.Card, this.getRunParams().get("Card"));
+        sa.setTriggeringObjectsFrom(this, AbilityKey.Card);
     }
 
     @Override

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

@@ -65,8 +65,13 @@ public class TriggerVote extends Trigger {
     @Override
     public final void setTriggeringObjects(final SpellAbility sa) {
         @SuppressWarnings("unchecked")
-        final ListMultimap<Object, Player> votes = (ArrayListMultimap<Object, Player>) this.getRunParams().get("AllVotes");
+        FCollection<Player> voters = getVoters(
-        sa.setTriggeringObject(AbilityKey.OtherVoters, getVoters(this.getHostCard().getController(), votes, true, true));
+            this.getHostCard().getController(),
+            (ListMultimap<Object, Player>) getFromRunParams(AbilityKey.AllVotes),
+            true,
+            true
+        );
+        sa.setTriggeringObject(AbilityKey.OtherVoters, voters);
     }
 
     @Override