From e9d46db77240036ca2aa23f994a04ceca37a9009 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 28 Jan 2017 12:10:38 +0100 Subject: [PATCH] * Scrapheap Scrounger - Fixed that the exile cost was not mandatory. --- Mage.Sets/src/mage/cards/s/ScrapheapScrounger.java | 3 ++- .../mage/abilities/costs/common/ExileFromGraveCost.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/ScrapheapScrounger.java b/Mage.Sets/src/mage/cards/s/ScrapheapScrounger.java index 2702edeb1e0..c61a13a86cd 100644 --- a/Mage.Sets/src/mage/cards/s/ScrapheapScrounger.java +++ b/Mage.Sets/src/mage/cards/s/ScrapheapScrounger.java @@ -51,12 +51,13 @@ import mage.target.common.TargetCardInYourGraveyard; public class ScrapheapScrounger extends CardImpl { private static final FilterCard filter = new FilterCreatureCard("another creature card"); + static { filter.add(new AnotherCardPredicate()); } public ScrapheapScrounger(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}"); this.subtype.add("Construct"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java index 6e267bcc56f..22ca4906efc 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java @@ -95,11 +95,11 @@ public class ExileFromGraveCost extends CostImpl { } exiledCards.add(card); } + Cards cardsToExile = new CardsImpl(); + cardsToExile.addAll(exiledCards); + controller.moveCards(cardsToExile, Zone.EXILED, ability, game); + paid = true; } - Cards cardsToExile = new CardsImpl(); - cardsToExile.addAll(exiledCards); - controller.moveCards(cardsToExile, Zone.EXILED, ability, game); - paid = true; } return paid;