github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Nether Shadow - Fixed that the intervening if clause was not checked on resolution.

Browse source
This commit is contained in:
LevelX2 2015-05-06 15:52:37 +02:00
parent 383b3f3bdb
commit d4f25e2f9e
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/sets/limitedalpha/NetherShadow.java
View file

@ -30,6 +30,7 @@ package mage.sets.limitedalpha;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
import mage.cards.Card; import mage.cards.Card;
@ -54,7 +55,7 @@ public class NetherShadow extends CardImpl {
this.expansionSetCode = "LEA"; this.expansionSetCode = "LEA";
this.subtype.add("Spirit"); this.subtype.add("Spirit");
this.color.setBlack(true);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
@ -75,12 +76,16 @@ public class NetherShadow extends CardImpl {
} }
class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{ class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
private static final FilterCard filter = new FilterCreatureCard();
public NetherShadowTriggerdAbility(){ public NetherShadowTriggerdAbility(){
super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), TargetController.YOU, true); super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), TargetController.YOU, true);
} }
public NetherShadowTriggerdAbility(final NetherShadowTriggerdAbility effect) {
super(effect);
}
@Override @Override
public boolean checkInterveningIfClause(Game game) { public boolean checkInterveningIfClause(Game game) {
Player controller = game.getPlayer(controllerId); Player controller = game.getPlayer(controllerId);
@ -94,7 +99,7 @@ class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
} }
else{ else{
Card card = game.getCard(uuid); Card card = game.getCard(uuid);
if(card != null && filter.match(card, game)){ if(card != null && card.getCardType().contains(CardType.CREATURE)){
count++; count++;
} }
} }
@ -104,9 +109,14 @@ class NetherShadowTriggerdAbility extends BeginningOfUpkeepTriggeredAbility{
return false; return false;
} }
@Override
public NetherShadowTriggerdAbility copy() {
return new NetherShadowTriggerdAbility(this);
}
@Override @Override
public String getRule() { 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.";
} }