From d918cade677df84b2a1fed0e54ed0d5ed710a7f2 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 21 Apr 2021 21:07:47 +0200
Subject: [PATCH] Hold triggers until all cards are processed

---
 forge-game/src/main/java/forge/game/GameAction.java             | 1 -
 forge-game/src/main/java/forge/game/trigger/TriggerHandler.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index e7d55ec0962..89ec43318e4 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -943,7 +943,6 @@ public class GameAction {
             runParams.put(AbilityKey.CardLKI, lki);
             runParams.put(AbilityKey.Origin, c.getZone().getZoneType().name());
             game.getTriggerHandler().runTrigger(TriggerType.ChangesZone, runParams, false);
-            game.getTriggerHandler().runWaitingTriggers();
         }
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 93c36cd3a7c..3628d261a12 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -640,5 +640,7 @@ public class TriggerHandler {
                 delayedTriggers.remove(t);
             }
         }
+        // run all ChangesZone
+        runWaitingTriggers();
     }
 }