Trigger tweak

forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java

@@ -1010,4 +1010,8 @@ public class ReplacementHandler {
         });
         return !list.isEmpty();
     }
+
+    public boolean isReplacing() {
+        return !hasRun.isEmpty();
+    }
 }

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

@@ -367,8 +367,8 @@ public class TriggerHandler {
         for (final Trigger deltrig : delayedTriggersWorkingCopy) {
             if (deltrig.getHostCard().getController().equals(player)) {
                 if (isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) {
-                    runSingleTrigger(deltrig, runParams);
                     delayedTriggers.remove(deltrig);
+                    runSingleTrigger(deltrig, runParams);
                 }
             }
         }

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

@@ -34,6 +34,10 @@ public class TriggerImmediate extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
+        if (hasParam("AfterReplacement") && hostCard.getGame().getReplacementHandler().isReplacing()) {
+            return false;
+        }
+
         return true;
     }