From b436950ac3d4d4486bb315ad7d4fde580bfd5c19 Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 24 Aug 2011 23:44:45 +0000 Subject: [PATCH] Fix for CostExile not grabbing Valid Cards before being used with XChoice --- src/main/java/forge/card/cost/CostExile.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 52b67e6d3a0..20df95ed669 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -90,7 +90,9 @@ public class CostExile extends CostPartWithList { public boolean payHuman(SpellAbility ability, Card source, Cost_Payment payment) { String amount = getAmount(); Integer c = convertAmount(); - CardList list = AllZoneUtil.getCardsInZone(getFrom(), ability.getActivatingPlayer()); + Player activator = ability.getActivatingPlayer(); + CardList list = AllZoneUtil.getCardsInZone(getFrom(), activator); + list = list.getValidCards(type.split(";"), activator, source); if (c == null){ String sVar = source.getSVar(amount); // Generalize this