From 4adc55eb80978a8a5ffe71861c7f810bf559d436 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 22 Feb 2015 11:16:39 +0100
Subject: [PATCH] * Miracle - Fixed that miracle was also checked for inital
 card draw.

---
 Mage/src/mage/abilities/keyword/MiracleAbility.java | 1 -
 Mage/src/mage/watchers/common/MiracleWatcher.java   | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Mage/src/mage/abilities/keyword/MiracleAbility.java b/Mage/src/mage/abilities/keyword/MiracleAbility.java
index fc29afada4..1b601d5b54 100644
--- a/Mage/src/mage/abilities/keyword/MiracleAbility.java
+++ b/Mage/src/mage/abilities/keyword/MiracleAbility.java
@@ -38,7 +38,6 @@ import mage.constants.Outcome;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.GameEvent.EventType;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 import mage.watchers.common.MiracleWatcher;
diff --git a/Mage/src/mage/watchers/common/MiracleWatcher.java b/Mage/src/mage/watchers/common/MiracleWatcher.java
index d844aef8ee..7c18404994 100644
--- a/Mage/src/mage/watchers/common/MiracleWatcher.java
+++ b/Mage/src/mage/watchers/common/MiracleWatcher.java
@@ -69,8 +69,10 @@ public class MiracleWatcher extends Watcher {
     public void watch(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.UNTAP_STEP_PRE) {
             reset();
+            return;
         }
-        if (event.getType() == GameEvent.EventType.DREW_CARD) {
+        // inital card draws do not trigger miracle so check that phase != null
+        if (game.getPhase() != null && event.getType() == GameEvent.EventType.DREW_CARD) {
             UUID playerId = event.getPlayerId();
             if (playerId != null) {
                 Integer amount = amountOfCardsDrawnThisTurn.get(playerId);