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

Fix return to battlefield effect losing target if it has changed zones

Browse source 
for a fixed target pointer.
This commit is contained in:
Nathaniel Brandes 2015-05-04 01:08:41 -07:00
parent c5c51cacf0
commit ddc2128f78
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/mage/abilities/effects/common/ReturnToBattlefieldUnderYourControlTargetEffect.java
View file

@ -29,6 +29,7 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.abilities.Ability;
@ -37,6 +38,7 @@ import mage.cards.Card;
import mage.game.ExileZone;
import mage.game.Game;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
@ -84,9 +86,14 @@ public class ReturnToBattlefieldUnderYourControlTargetEffect extends OneShotEffe
card = exileZone.get(getTargetPointer().getFirst(game, source), game);
}
}
} else {
if(targetPointer instanceof FixedTarget) {
card = game.getCard(((FixedTarget) targetPointer).getTarget());
} else {
card = game.getCard(targetPointer.getFirst(game, source));
}
}
if (card != null) {
Zone currentZone = game.getState().getZone(card.getId());
controller.putOntoBattlefieldWithInfo(card, game, currentZone, source.getSourceId());