diff --git a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java index 8c49944ced..fe94d0dff5 100644 --- a/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java +++ b/Mage.Sets/src/mage/cards/d/DraugrNecromancer.java @@ -125,15 +125,18 @@ class DraugrNecromancerCastFromExileEffect extends AsThoughEffectImpl { @Override public boolean applies(UUID sourceId, Ability source, UUID affectedControllerId, Game game) { - if (!source.isControlledBy(affectedControllerId) - || game.getState().getZone(sourceId) != Zone.EXILED) { + Card card = game.getCard(sourceId); + if (card == null) { return false; } - Card card = game.getCard(sourceId); - return card != null - && !card.isLand() + card = card.getMainCard(); + if (!source.isControlledBy(affectedControllerId) + || game.getState().getZone(card.getId()) != Zone.EXILED) { + return false; + } + return !card.isLand() && game.getOpponents(card.getOwnerId()).contains(source.getControllerId()) - && card.getMainCard().getCounters(game).getCount(CounterType.ICE) > 0; + && card.getCounters(game).getCount(CounterType.ICE) > 0; } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java index 28b99b7e2e..3d6a51742b 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/khm/DraugrNecromancerTest.java @@ -118,7 +118,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { assertPermanentCount(playerA, pair, 1); } - @Ignore @Test public void testCastAdventureSpellFromExile() { addCard(Zone.BATTLEFIELD, playerA, necromancer); @@ -136,8 +135,8 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertExileCount(playerB, pair, 0); - assertGraveyardCount(playerB, pair, 1); + assertExileCount(playerB, pair, 1); + assertGraveyardCount(playerB, pair, 0); assertPermanentCount(playerA, "Food", 1); } @@ -162,7 +161,6 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { assertPermanentCount(playerA, pair, 1); } - @Ignore @Test public void testCastAdventureSpellFromExileWithSnow() { addCard(Zone.BATTLEFIELD, playerA, necromancer); @@ -180,8 +178,8 @@ public class DraugrNecromancerTest extends CardTestPlayerBase { execute(); assertAllCommandsUsed(); - assertExileCount(playerB, pair, 0); - assertGraveyardCount(playerB, pair, 1); + assertExileCount(playerB, pair, 1); + assertGraveyardCount(playerB, pair, 0); assertPermanentCount(playerA, "Food", 1); }