From d4f25e2f9ea5857665de62ba794cf123bd108434 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 6 May 2015 15:52:37 +0200
Subject: [PATCH] * Nether Shadow - Fixed that the intervening if clause was
 not checked on resolution.

---
 .../mage/sets/limitedalpha/NetherShadow.java   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NetherShadow.java b/Mage.Sets/src/mage/sets/limitedalpha/NetherShadow.java
index c595027dfc..35ecf276b6 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/NetherShadow.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/NetherShadow.java
@@ -30,6 +30,7 @@ package mage.sets.limitedalpha;
 import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.effects.common.DoIfCostPaid;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.Card;
@@ -54,7 +55,7 @@ public class NetherShadow extends CardImpl {
         this.expansionSetCode = "LEA";
         this.subtype.add("Spirit");
 
-        this.color.setBlack(true);
+
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
@@ -75,12 +76,16 @@ public class NetherShadow extends CardImpl {
 }
 
 class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
-    private static final FilterCard filter = new FilterCreatureCard();
+  
     
     public NetherShadowTriggerdAbility(){
         super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), TargetController.YOU, true);
     }
 
+    public NetherShadowTriggerdAbility(final NetherShadowTriggerdAbility effect) {
+        super(effect);
+    }    
+    
     @Override
     public boolean checkInterveningIfClause(Game game) {
         Player controller = game.getPlayer(controllerId);
@@ -94,7 +99,7 @@ class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
                 }
                 else{
                     Card card = game.getCard(uuid);
-                    if(card != null && filter.match(card, game)){
+                    if(card != null && card.getCardType().contains(CardType.CREATURE)){
                         count++;
                     }
                 }
@@ -104,9 +109,14 @@ class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
         return false;
     }
 
+    @Override
+    public NetherShadowTriggerdAbility copy() {
+        return new NetherShadowTriggerdAbility(this);
+    }
+
     @Override
     public String getRule() {
-        return "At the beginning of your upkeep, if {source} is in your graveyard with three or more creature cards above it, you may put {source} onto the battlefield";
+        return "At the beginning of your upkeep, if {source} is in your graveyard with three or more creature cards above it, you may put {source} onto the battlefield.";
     }