From f5e5ddbbb981fcd0fd859830bbf487f777c7ed2d Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Thu, 21 May 2020 10:36:03 +0000
Subject: [PATCH] MagicStack: call resetCardsAddedThisTurn on onNextTurn

---
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 5 -----
 forge-game/src/main/java/forge/game/player/Player.java      | 3 +++
 forge-game/src/main/java/forge/game/zone/MagicStack.java    | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 7e6d63f464f..1e2ca2085d5 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -798,11 +798,6 @@ public class PhaseHandler implements java.io.Serializable {
         // reset mustAttackEntity
         playerTurn.setMustAttackEntity(null);
 
-        for (final Player p1 : game.getPlayers()) {
-            for (final ZoneType z : Player.ALL_ZONES) {
-                p1.getZone(z).resetCardsAddedThisTurn();
-            }
-        }
         for (Player p : game.getPlayers()) {
             p.clearNextTurn();
         }
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 02ae7c6384d..36bcb6d24ee 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -3196,6 +3196,9 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public final void clearNextTurn() {
+        for (final PlayerZone pz : zones.values()) {
+            pz.resetCardsAddedThisTurn();
+        }
         resetProwl();
         setSpellsCastLastTurn(getSpellsCastThisTurn());
         resetSpellsCastThisTurn();
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 283bab09768..ee805d953e5 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -785,6 +785,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
     }
 
     public final void onNextTurn() {
+        game.getStackZone().resetCardsAddedThisTurn();
         if (thisTurnCast.isEmpty()) {
             lastTurnCast = Lists.newArrayList();
             return;