From 08acbc369c6bfa00be10292d632841f18cc70b3c Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 27 Oct 2011 03:18:05 +0000 Subject: [PATCH] Filter out tapped cards in CostTapType --- src/main/java/forge/card/cost/CostTapType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/card/cost/CostTapType.java b/src/main/java/forge/card/cost/CostTapType.java index 1cfdc545138..3c613d03ba4 100644 --- a/src/main/java/forge/card/cost/CostTapType.java +++ b/src/main/java/forge/card/cost/CostTapType.java @@ -134,8 +134,9 @@ public class CostTapType extends CostPartWithList { */ @Override public final boolean payHuman(final SpellAbility ability, final Card source, final Cost_Payment payment) { - CardList typeList = source.getController().getCardsIn(Zone.Battlefield); + CardList typeList = ability.getActivatingPlayer().getCardsIn(Zone.Battlefield); typeList = typeList.getValidCards(getType().split(";"), ability.getActivatingPlayer(), ability.getSourceCard()); + typeList = typeList.filter(CardListFilter.untapped); String amount = getAmount(); Integer c = convertAmount(); if (c == null) {