From 3be44a1feba159232fbb944b4d136fbd6536757b Mon Sep 17 00:00:00 2001 From: Alex Vasile <48962821+Alex-Vasile@users.noreply.github.com> Date: Mon, 27 Jun 2022 12:08:28 -0400 Subject: [PATCH] [SNC] Fixed Extraction Specialist effect. Closes #8891. --- Mage.Sets/src/mage/cards/e/ExtractionSpecialist.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/ExtractionSpecialist.java b/Mage.Sets/src/mage/cards/e/ExtractionSpecialist.java index d7fba3e56eb..9a77fe5e04f 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractionSpecialist.java +++ b/Mage.Sets/src/mage/cards/e/ExtractionSpecialist.java @@ -44,7 +44,8 @@ public final class ExtractionSpecialist extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); - // When Extraction Specialist enters the battlefield, return target creature card with mana value 2 or less from your graveyard to the battlefield. That creature can't attack or block for as long as you control Extraction Specialist. + // When Extraction Specialist enters the battlefield, return target creature card with mana value 2 or less from your graveyard to the battlefield. + // That creature can't attack or block for as long as you control Extraction Specialist. Ability ability = new EntersBattlefieldTriggeredAbility(new ExtractionSpecialistEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); @@ -86,7 +87,7 @@ class ExtractionSpecialistEffect extends OneShotEffect { } player.moveCards(card, Zone.BATTLEFIELD, source, game); Permanent permanent = game.getPermanent(card.getId()); - if (permanent == null + if (permanent != null && source.getSourcePermanentIfItStillExists(game) != null && source.isControlledBy(game.getControllerId(source.getSourceId()))) { game.addEffect(new CantAttackBlockTargetEffect(Duration.WhileControlled)