From 0f806988f0c1d9a5c17807a253804efee53f4c7f Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 16 Jun 2016 12:10:27 +1000 Subject: [PATCH 1/2] spjspj - Slight fixes for Wave of Vitriol (C14) --- .../src/mage/sets/commander2014/WaveOfVitriol.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java index f444c17df11..1e7580537e5 100644 --- a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java +++ b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; @@ -130,12 +131,17 @@ class WaveOfVitriolEffect extends OneShotEffect { Set playersToShuffle = new LinkedHashSet<>(); for (Map.Entry entry : sacrificedLands.entrySet()) { if (entry.getKey().chooseUse(Outcome.PutLandInPlay, "Search your library for up to " + entry.getValue() + " basic lands?", source, game)) { - Target target = new TargetCardInLibrary(0, entry.getValue(), new FilterBasicLandCard()); - entry.getKey().chooseTarget(outcome, target, source, game); - toBattlefield.addAll(target.getTargets()); - playersToShuffle.add(entry.getKey()); + + TargetCardInLibrary target = new TargetCardInLibrary(0, entry.getValue(), new FilterBasicLandCard()); + if (entry.getKey().searchLibrary(target, game)) { + if (target.getTargets().size() > 0) { + toBattlefield.addAll(target.getTargets()); + playersToShuffle.add(entry.getKey()); + } + } } } + controller.moveCards(toBattlefield.getCards(game), Zone.BATTLEFIELD, source, game, true, false, true, null); for (Player player : playersToShuffle) { player.shuffleLibrary(source, game); From 1a7edd66c74d347cdec1b1125914692feedadce5 Mon Sep 17 00:00:00 2001 From: spjspj Date: Thu, 16 Jun 2016 12:12:01 +1000 Subject: [PATCH 2/2] spjspj - Slight fixes for Wave of Vitriol (C14) --- Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java index 1e7580537e5..bcc7484a096 100644 --- a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java +++ b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java @@ -34,7 +34,6 @@ import java.util.Set; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.Cards; import mage.cards.CardsImpl; @@ -50,7 +49,6 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.Target; import mage.target.common.TargetCardInLibrary; /**