github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

[OGW] Fixed Eldrazi Displacer.

Browse source
This commit is contained in:
LevelX2 2016-01-10 08:56:06 +01:00
parent 78ccf3adb1
commit d63f6d7d27
2 changed files with 16 additions and 8 deletions
Mage.Sets/src/mage/sets/oathofthegatewatch
EldraziDisplacer.java
Mage/src/main/java/mage/abilities/effects/common
ReturnToBattlefieldUnderOwnerControlTargetEffect.java

2
Mage.Sets/src/mage/sets/oathofthegatewatch/EldraziDisplacer.java
View file

@ -70,7 +70,7 @@ public class EldraziDisplacer extends CardImpl {
Effect effect = new ExileTargetForSourceEffect();
effect.setText("Exile another target creature");
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{2}{C}"));
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect();
effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true);
effect.setText(", then return it to the battlefield tapped under its owner's control");
ability.addEffect(effect);
ability.addTarget(new TargetCreaturePermanent(filter));

22
Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -34,6 +33,7 @@ import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
/**
*
@ -41,13 +41,21 @@ import mage.game.Game;
*/
public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEffect {
private boolean tapped;
public ReturnToBattlefieldUnderOwnerControlTargetEffect() {
this(false);
}
public ReturnToBattlefieldUnderOwnerControlTargetEffect(boolean tapped) {
super(Outcome.Benefit);
staticText = "return that card to the battlefield under its owner's control";
this.tapped = tapped;
}
public ReturnToBattlefieldUnderOwnerControlTargetEffect(final ReturnToBattlefieldUnderOwnerControlTargetEffect effect) {
super(effect);
this.tapped = effect.tapped;
}
@Override
@ -57,14 +65,14 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff
@Override
public boolean apply(Game game, Ability source) {
Card card = game.getCard(targetPointer.getFirst(game, source));
if (card != null) {
Zone currentZone = game.getState().getZone(card.getId());
if (card.putOntoBattlefield(game, currentZone, source.getSourceId(), card.getOwnerId())) {
return true;
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Card card = game.getCard(targetPointer.getFirst(game, source));
if (card != null) {
controller.moveCards(card, Zone.BATTLEFIELD, source, game, tapped, false, true, null);
}
return true;
}
return false;
}
}