From e92e205a5c8b2309782d78de3584e8c8dbe1458f Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 26 Sep 2015 04:20:13 +0000 Subject: [PATCH] - Reverting r30101 (breaks Echo). --- .../main/java/forge/game/card/CardUtil.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 71ae0daca92..bcd8d8e7f2e 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -155,7 +155,7 @@ public final class CardUtil { * @return a CardCollection that matches the given criteria */ public static CardCollection getThisTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src) { - return getThisTurnEntered(to, from, valid, src, true); + return getThisTurnEntered(to, from, valid, src, false); } /** @@ -193,29 +193,15 @@ public final class CardUtil { * @return a CardCollection that matches the given criteria */ public static CardCollection getLastTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src) { - return getLastTurnEntered(to, from, valid, src, true); - } - - /** - * getLastTurnEntered. - * - * @param to zone going to - * @param from zone coming from - * @param valid a isValid expression - * @param src a Card object - * @param checkLatestState a boolean, true if the latest state of the card as it left the original zone needs to be checked - * @return a CardCollection that matches the given criteria - */ - public static CardCollection getLastTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src, final boolean checkLatestState) { CardCollection res = new CardCollection(); final Game game = src.getGame(); if (to != ZoneType.Stack) { for (Player p : game.getPlayers()) { - res.addAll(p.getZone(to).getCardsAddedLastTurn(from, checkLatestState)); + res.addAll(p.getZone(to).getCardsAddedLastTurn(from)); } } else { - res.addAll(game.getStackZone().getCardsAddedLastTurn(from, checkLatestState)); + res.addAll(game.getStackZone().getCardsAddedLastTurn(from)); } res = CardLists.getValidCards(res, valid, src.getController(), src); return res;