From c8790f34ad3f5e5edfedab5f689537b3aacbb79d Mon Sep 17 00:00:00 2001
From: emerald000 <emerald000@hotmail.com>
Date: Sat, 2 Jul 2016 02:12:39 -0400
Subject: [PATCH] [EMN] Fixed Emerge not caring about timing restrictions.

---
 .../java/mage/abilities/keyword/EmergeAbility.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
index 40f610c362b..15fd4dcfa70 100644
--- a/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/EmergeAbility.java
@@ -70,12 +70,14 @@ public class EmergeAbility extends SpellAbility {
 
     @Override
     public boolean canActivate(UUID playerId, Game game) {
-        Player controller = game.getPlayer(this.getControllerId());
-        if (controller != null) {
-            for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), this.getControllerId(), this.getSourceId(), game)) {
-                ManaCost costToPay = CardUtil.reduceCost(emergeCost.copy(), creature.getConvertedManaCost());
-                if (costToPay.canPay(this, this.getSourceId(), this.getControllerId(), game)) {
-                    return true;
+        if (super.canActivate(playerId, game)) {
+            Player controller = game.getPlayer(this.getControllerId());
+            if (controller != null) {
+                for (Permanent creature : game.getBattlefield().getActivePermanents(new FilterControlledCreaturePermanent(), this.getControllerId(), this.getSourceId(), game)) {
+                    ManaCost costToPay = CardUtil.reduceCost(emergeCost.copy(), creature.getConvertedManaCost());
+                    if (costToPay.canPay(this, this.getSourceId(), this.getControllerId(), game)) {
+                        return true;
+                    }
                 }
             }
         }