From 8575d437ce95027cb8a6f764a97c27a391f61adb Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 24 Dec 2019 01:21:18 +0400 Subject: [PATCH] * Glacial Revelation - fixed that it couldn't put any snow cards to hand; --- Mage.Sets/src/mage/cards/f/ForceOfWill.java | 11 +++++------ Mage.Sets/src/mage/cards/g/GlacialRevelation.java | 4 ++-- Mage.Sets/src/mage/cards/x/XenagosTheReveler.java | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/f/ForceOfWill.java b/Mage.Sets/src/mage/cards/f/ForceOfWill.java index d875377dcf8..bcaee03a4f9 100644 --- a/Mage.Sets/src/mage/cards/f/ForceOfWill.java +++ b/Mage.Sets/src/mage/cards/f/ForceOfWill.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ExileFromHandCost; @@ -17,14 +15,15 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** - * * @author Plopman */ public final class ForceOfWill extends CardImpl { public ForceOfWill(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); // You may pay 1 life and exile a blue card from your hand rather than pay Force of Will's mana cost. FilterOwnedCard filter = new FilterOwnedCard("a blue card from your hand"); @@ -33,8 +32,8 @@ public final class ForceOfWill extends CardImpl { AlternativeCostSourceAbility ability = new AlternativeCostSourceAbility(new PayLifeCost(1)); ability.addCost(new ExileFromHandCost(new TargetCardInHand(filter))); - this.addAbility(ability); - + this.addAbility(ability); + // Counter target spell. this.getSpellAbility().addEffect(new CounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java index 1b18825a5c5..88213463011 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java @@ -16,7 +16,6 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; -import mage.target.common.TargetCardInHand; import java.util.UUID; @@ -73,7 +72,8 @@ class GlacialRevelationEffect extends OneShotEffect { } Cards cards = new CardsImpl(player.getLibrary().getTopCards(game, 6)); player.revealCards(source, cards, game); - TargetCard targetCard = new TargetCardInHand(0, Integer.MAX_VALUE, filter); + TargetCard targetCard = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); + targetCard.setNotTarget(true); if (player.choose(outcome, cards, targetCard, game)) { Cards toHand = new CardsImpl(targetCard.getTargets()); cards.removeAll(targetCard.getTargets()); diff --git a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java index 94e38731f20..195a738ccb0 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java @@ -123,6 +123,7 @@ class XenagosExileEffect extends OneShotEffect { filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND))); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.EXILED, filter); + target1.setNotTarget(true); if (!exiledCards.isEmpty() && target1.canChoose(source.getSourceId(), source.getControllerId(), game) && controller.choose(Outcome.PutCardInPlay, exiledCards, target1, game)) {