From 5d35ee675dd023f52f28153a3a4279d53df289fa Mon Sep 17 00:00:00 2001 From: Patrick Hulin Date: Sat, 14 Dec 2019 23:31:39 -0500 Subject: [PATCH] Fix Mysterious Pathlighter. --- .../mage/cards/m/MysteriousPathlighter.java | 4 +++- .../cost/adventure/AdventureCardsTest.java | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/m/MysteriousPathlighter.java b/Mage.Sets/src/mage/cards/m/MysteriousPathlighter.java index 49cfff12c03..a9a8333706e 100644 --- a/Mage.Sets/src/mage/cards/m/MysteriousPathlighter.java +++ b/Mage.Sets/src/mage/cards/m/MysteriousPathlighter.java @@ -17,6 +17,7 @@ import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import mage.game.permanent.PermanentCard; import java.util.UUID; @@ -69,7 +70,8 @@ class MysteriousPathlighterEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget(); - return permanent instanceof AdventureCard + return permanent instanceof PermanentCard + && ((PermanentCard) permanent).getCard() instanceof AdventureCard && permanent.isControlledBy(source.getControllerId()) && permanent.isCreature(); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java index ac2e2d6fe62..c2469d56284 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/adventure/AdventureCardsTest.java @@ -151,6 +151,27 @@ public class AdventureCardsTest extends CardTestPlayerBase { assertGraveyardCount(playerA, 0); } + @Test + public void testCastCuriousPairWithMysteriousPathlighter() { + setStrictChooseMode(true); + + addCard(Zone.BATTLEFIELD, playerA, "Forest", 2); + addCard(Zone.BATTLEFIELD, playerA, "Mysterious Pathlighter"); + addCard(Zone.HAND, playerA, "Curious Pair"); + + castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Curious Pair"); + setStopAt(1, PhaseStep.BEGIN_COMBAT); + execute(); + + assertAllCommandsUsed(); + assertHandCount(playerA, 0); + assertPermanentCount(playerA, "Food", 0); + assertPermanentCount(playerA, "Curious Pair", 1); + assertPowerToughness(playerA, "Curious Pair", 2, 4); + assertExileCount(playerA, "Curious Pair", 0); + assertGraveyardCount(playerA, 0); + } + @Test public void testCastMemoryTheft() { /*