diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java index f7456c3b0e..ee3ed95b08 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/AmplifyTest.java @@ -112,7 +112,6 @@ public class AmplifyTest extends CardTestPlayerBase { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Through the Breach"); - setChoice(playerA, true); // Put a creature into play with Through the Breach? setChoice(playerA, "Kilnmouth Dragon"); //setChoice(playerA, true); // no reveal request cause no cards to show //addTarget(playerA, "Kilnmouth Dragon"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java index b107cfd4e8..ef60a95ff5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/modaldoublefaces/ModalDoubleFacesCardsTest.java @@ -992,7 +992,6 @@ public class ModalDoubleFacesCardsTest extends CardTestPlayerBase { // move activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{R}:"); - setChoice(playerA, true); // yes, activate setChoice(playerA, "Akoum Warrior"); waitStackResolved(1, PhaseStep.PRECOMBAT_MAIN); checkPermanentCount("after move", 1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akoum Warrior", 1); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutCardIntoPlayWithHasteAndSacrificeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutCardIntoPlayWithHasteAndSacrificeEffect.java index fd5fd3b26a..a07b7e2394 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PutCardIntoPlayWithHasteAndSacrificeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PutCardIntoPlayWithHasteAndSacrificeEffect.java @@ -15,6 +15,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; /** @@ -62,13 +63,16 @@ public class PutCardIntoPlayWithHasteAndSacrificeEffect extends OneShotEffect { return false; } player.moveCards(card, Zone.BATTLEFIELD, source, game); - Permanent permanent = game.getPermanent(card.getId()); + Permanent permanent = game.getPermanent(CardUtil.getDefaultCardSideForBattlefield(game, card).getId()); if (permanent == null) { return false; } - game.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), duration), source); + game.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), duration) + .setTargetPointer(new FixedTarget(permanent, game)), source); game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility( - new SacrificeTargetEffect("sacrifice it"), TargetController.ANY + new SacrificeTargetEffect("sacrifice it") + .setTargetPointer(new FixedTarget(permanent, game)), + TargetController.ANY ), source); return true; }