From f9571398b560efebb0e9b3ff5d85f343dfccf8db Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Mon, 15 Mar 2021 09:51:49 -0400
Subject: [PATCH] [ELD] added possible fix for Once Upon a Time intermittently
 failing (#6954)

---
 Mage.Sets/src/mage/cards/o/OnceUponATime.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/o/OnceUponATime.java b/Mage.Sets/src/mage/cards/o/OnceUponATime.java
index 39be09ca8c6..52ef52fb3b8 100644
--- a/Mage.Sets/src/mage/cards/o/OnceUponATime.java
+++ b/Mage.Sets/src/mage/cards/o/OnceUponATime.java
@@ -84,13 +84,18 @@ class OnceUponATimeWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (GameEvent.EventType.SPELL_CAST == event.getType()) {
-            castSpells.add(event.getPlayerId());
+        switch (event.getType()) {
+            case SPELL_CAST:
+                castSpells.add(event.getPlayerId());
+                return;
+            case BEGINNING_PHASE_PRE:
+                if (game.getTurnNum() == 1) {
+                    castSpells.clear();
+                }
         }
     }
 
-    public boolean getSpellsCastThisGame(UUID playerId) {
+    boolean getSpellsCastThisGame(UUID playerId) {
         return !castSpells.contains(playerId);
     }
-    
 }