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

* Tenacious Dead - Fixed that it didn't came back from graveyard tapped.

Browse source
This commit is contained in:
LevelX2 2013-07-20 10:14:59 +02:00
parent 43c3f52470
commit 6c59cc4961
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2014/TenaciousDead.java
View file

@ -55,7 +55,7 @@ public class TenaciousDead extends CardImpl<TenaciousDead> {
this.toughness = new MageInt(1);
// When Tenacious Dead dies, you may pay {1}{B}. If you do, return it to the battlefield tapped under its owner's control.
Effect effect = new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(), new ManaCostsImpl("{1}{B}"));
Effect effect = new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(true), new ManaCostsImpl("{1}{B}"));
this.addAbility(new DiesTriggeredAbility(effect, false));
}

16
Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlSourceEffect.java
View file

@ -28,11 +28,11 @@
package mage.abilities.effects.common;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
/**
@ -41,13 +41,21 @@ import mage.game.Game;
*/
public class ReturnToBattlefieldUnderOwnerControlSourceEffect extends OneShotEffect<ReturnToBattlefieldUnderOwnerControlSourceEffect> {
private boolean tapped;
public ReturnToBattlefieldUnderOwnerControlSourceEffect() {
this(false);
}
public ReturnToBattlefieldUnderOwnerControlSourceEffect(boolean tapped) {
super(Outcome.Benefit);
staticText = "return that card to the battlefield under it's owner's control";
this.tapped = tapped;
staticText = new StringBuilder("return that card to the battlefield").append(tapped?" tapped":"").append(" under it's owner's control").toString();
}
public ReturnToBattlefieldUnderOwnerControlSourceEffect(final ReturnToBattlefieldUnderOwnerControlSourceEffect effect) {
super(effect);
this.tapped = effect.tapped;
}
@Override
@ -60,7 +68,7 @@ public class ReturnToBattlefieldUnderOwnerControlSourceEffect extends OneShotEff
Card card = game.getCard(source.getSourceId());
if (card != null) {
Zone currentZone = game.getState().getZone(card.getId());
if (card.putOntoBattlefield(game, currentZone, source.getSourceId(), card.getOwnerId())) {
if (card.putOntoBattlefield(game, currentZone, source.getSourceId(), card.getOwnerId(),tapped)) {
return true;
}
}