diff --git a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java index 04a6129f225..946b574a2ae 100644 --- a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java +++ b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java @@ -57,22 +57,21 @@ public class NivmagusElemental extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.or( - new CardTypePredicate(CardType.INSTANT), - new CardTypePredicate(CardType.SORCERY))); + new CardTypePredicate(CardType.INSTANT), + new CardTypePredicate(CardType.SORCERY))); } public NivmagusElemental(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U/R}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U/R}"); this.subtype.add(SubType.ELEMENTAL); - this.power = new MageInt(1); this.toughness = new MageInt(2); // Exile an instant or sorcery spell you control: Put two +1/+1 counters on Nivmagus Elemental. (That spell won't resolve.) - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)),new ExileFromStackCost(new TargetSpell(filter))); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), new ExileFromStackCost(new TargetSpell(filter))); this.addAbility(ability); - + } public NivmagusElemental(final NivmagusElemental card) { diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java index 28576b5eed0..5f692b1a264 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromStackCost.java @@ -61,10 +61,15 @@ public class ExileFromStackCost extends CostImpl { if (spellToExile == null) { return false; } - spellToExile.moveToExile(null, "", ability.getSourceId(), game); + String spellName = spellToExile.getName(); + if (spellToExile.isCopy()) { + game.getStack().remove(spellToExile); + } else { + spellToExile.moveToExile(null, "", ability.getSourceId(), game); + } paid = true; if (!game.isSimulation()) { - game.informPlayers(player.getLogName() + " exiles " + spellToExile.getName() + " (as costs)"); + game.informPlayers(player.getLogName() + " exiles " + spellName + " (as costs)"); } } }