From 6132594038524ee44ea931d3d0df5ec9b493e04f Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 25 Aug 2011 00:15:57 +0000 Subject: [PATCH] Small fix for ExileFromHand Input --- src/main/java/forge/card/cost/CostExile.java | 2 +- src/main/java/forge/card/cost/Cost_Input.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 20df95ed669..340629ec475 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -15,7 +15,7 @@ public class CostExile extends CostPartWithList { //Exile //ExileFromHand //ExileFromGraveyard - //ExileFromLibrary + //ExileFromTop (of library) private String from = Constant.Zone.Battlefield; diff --git a/src/main/java/forge/card/cost/Cost_Input.java b/src/main/java/forge/card/cost/Cost_Input.java index 86bc901d0e2..91a3b011e20 100644 --- a/src/main/java/forge/card/cost/Cost_Input.java +++ b/src/main/java/forge/card/cost/Cost_Input.java @@ -469,8 +469,11 @@ public class Cost_Input { if (nLeft > 1) { msg.append("s"); } - - typeList = AllZoneUtil.getPlayerCardsInPlay(sa.getSourceCard().getController()); + + if (part.getFrom().equals(Constant.Zone.Hand)){ + msg.append(" from your Hand"); + } + typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer()); typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); AllZone.getDisplay().showMessage(msg.toString()); ButtonUtil.enableOnlyCancel(); @@ -515,10 +518,11 @@ public class Cost_Input { public static Input exileFrom(final SpellAbility sa, final CostExile part, final String type, final Cost_Payment payment, final int nNeeded) { Input target = new Input() { private static final long serialVersionUID = 734256837615635021L; + CardList typeList; @Override public void showMessage() { - CardList typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer()); + typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer()); typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); for (int i = 0; i < nNeeded; i++) {