ExileAndReturnSourceEffect - update post move zone check

This commit is contained in:
jmlundeen 2025-12-04 09:33:00 -06:00
parent a73c3ce553
commit ae97f8944d

View file

@ -5,8 +5,6 @@ import mage.abilities.Mode;
import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.DoubleFacedCardHalf;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Pronoun; import mage.constants.Pronoun;
import mage.constants.PutCards; import mage.constants.PutCards;
@ -76,15 +74,7 @@ public class ExileAndReturnSourceEffect extends OneShotEffect {
returnUnderYourControl ? controller : game.getPlayer(permanent.getOwnerId()), returnUnderYourControl ? controller : game.getPlayer(permanent.getOwnerId()),
permanent.getMainCard(), source, game, "card" permanent.getMainCard(), source, game, "card"
); );
Permanent newPermanent = game.getPermanent(permanent.getId()); if (additionalEffect == null || !game.getState().getZone(permanent.getMainCard().getId()).equals(Zone.BATTLEFIELD)) {
if (newPermanent == null) {
// check if permanent returned with a new face (e.g., transform)
Card card = game.getCard(permanent.getId());
if (card instanceof DoubleFacedCardHalf) {
newPermanent = game.getPermanent(((DoubleFacedCardHalf) card).getOtherSide().getId());
}
}
if (additionalEffect == null || newPermanent == null) {
return true; return true;
} }
if (additionalEffect instanceof ContinuousEffect) { if (additionalEffect instanceof ContinuousEffect) {