From de21b60484d2b2b7b496a27b6dafe1b665f62252 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 21 Feb 2014 19:14:44 +0100 Subject: [PATCH] * Fixed move to exile method of player. Fixes the alternat cost problem of force of will and Contagion. --- Mage.Sets/src/mage/sets/alliances/ForceOfWill.java | 7 ++----- .../src/mage/abilities/costs/common/ExileFromHandCost.java | 2 +- Mage/src/mage/players/PlayerImpl.java | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java b/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java index 73eb149eb05..acf953d4007 100644 --- a/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java +++ b/Mage.Sets/src/mage/sets/alliances/ForceOfWill.java @@ -28,17 +28,14 @@ package mage.sets.alliances; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.ObjectColor; -import mage.abilities.costs.AlternativeCostImpl; import mage.abilities.costs.AlternativeCostSourceAbility; -import mage.abilities.costs.Cost; -import mage.abilities.costs.CostsImpl; import mage.abilities.costs.common.ExileFromHandCost; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; import mage.filter.common.FilterOwnedCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; diff --git a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java index 48a3ecfd2ff..6a76d6054a0 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java @@ -70,7 +70,7 @@ public class ExileFromHandCost extends CostImpl { if (card == null) { return false; } - this.cards.add(card.copy()); + this.cards.add(card); paid |= player.moveCardToExileWithInfo(card, null, null, ability.getSourceId(), game, Zone.HAND); } } diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index 93b94c299f4..f99727093ad 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -2132,6 +2132,7 @@ public abstract class PlayerImpl> implements Player, Ser .append(" moves ").append(card.getName()).append(" ") .append(fromZone != null ? new StringBuilder("from ").append(fromZone.toString().toLowerCase(Locale.ENGLISH)).append(" "):"") .append("to exile").toString()); + result = true; } return result; }