From ec65b5d300dbf53b2083f20b21e1df186b9f7628 Mon Sep 17 00:00:00 2001 From: Hellfish Date: Thu, 22 Sep 2011 14:26:08 +0000 Subject: [PATCH] *Fixed ThisTurnEntered --- src/main/java/forge/CardUtil.java | 9 +-------- src/main/java/forge/DefaultPlayerZone.java | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index f87f9a02b5e..69db506ec77 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -664,14 +664,7 @@ public final class CardUtil { res.addAll(((DefaultPlayerZone) AllZone.getStackZone()).getCardsAddedThisTurn(from)); } - res = res.filter(new CardListFilter() { - public boolean addCard(final Card c) { - if (c.isValidCard(valid.split(","), src.getController(), src)) { - return true; - } - return false; - } - }); + res = res.getValidCards(valid, src.getController(), src); return res; } diff --git a/src/main/java/forge/DefaultPlayerZone.java b/src/main/java/forge/DefaultPlayerZone.java index 2615e4f41f7..3192f8d0541 100644 --- a/src/main/java/forge/DefaultPlayerZone.java +++ b/src/main/java/forge/DefaultPlayerZone.java @@ -320,9 +320,8 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl public final CardList getCardsAddedThisTurn(final Constant.Zone origin) { System.out.print("Request cards put into " + getZoneType() + " from " + origin + ".Amount: "); CardList ret = new CardList(); - String originName = origin == null ? null : origin.name(); for (int i = 0; i < cardsAddedThisTurn.size(); i++) { - if (cardsAddedThisTurnSource.get(i).equals(originName) || origin == null /* former: equals('Any') */) { + if (cardsAddedThisTurnSource.get(i) == origin || origin == null /* former: equals('Any') */) { ret.add(cardsAddedThisTurn.get(i)); } }