From bc9b2a0268df8308b08d72d042d7ff51032e417d Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Mon, 2 Nov 2020 08:09:56 +0100
Subject: [PATCH] Cascade: fix Maelstrom Nexus and Golos

---
 forge-game/src/main/java/forge/game/zone/MagicStack.java        | 1 +
 forge-gui/src/main/java/forge/player/PlayerControllerHuman.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index d0b4873a19e..d5c174b5e86 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -160,6 +160,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             add(sa);
         }
         // Add all waiting triggers onto the stack
+        game.getTriggerHandler().resetActiveTriggers();
         game.getTriggerHandler().runWaitingTriggers();
     }
 
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index 7fc43b09581..3469b1776ca 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -2450,6 +2450,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
 
             final PaperCard c = carddb.getUniqueByName(f.getName());
             final Card forgeCard = Card.fromPaperCard(c, p);
+            forgeCard.setTimestamp(game.getNextTimestamp());
 
             game.getAction().invoke(new Runnable() {
                 @Override