From 1e7d900ba0c20a4dccd81330cdf48af72080151c Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sat, 26 Nov 2016 10:26:10 +0000
Subject: [PATCH] CardLists.filter now uses Predicates.and

---
 .../src/main/java/forge/game/card/CardLists.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java
index 44618ed8182..a2248a37e86 100644
--- a/forge-game/src/main/java/forge/game/card/CardLists.java
+++ b/forge-game/src/main/java/forge/game/card/CardLists.java
@@ -256,7 +256,11 @@ public class CardLists {
     }
 
     public static CardCollection filter(Iterable<Card> cardList, Predicate<Card> f1, Predicate<Card> f2) {
-        return new CardCollection(Iterables.filter(Iterables.filter(cardList, f1), f2));
+        return new CardCollection(Iterables.filter(cardList, Predicates.and(f1, f2)));
+    }
+
+    public static CardCollection filter(Iterable<Card> cardList, Iterable<Predicate<Card>> filt) {
+        return new CardCollection(Iterables.filter(cardList, Predicates.and(filt)));
     }
 
     /**
@@ -275,7 +279,11 @@ public class CardLists {
     }
 
     public static List<Card> filterAsList(Iterable<Card> cardList, Predicate<Card> f1, Predicate<Card> f2) {
-        return Lists.newArrayList((Iterables.filter(Iterables.filter(cardList, f1), f2)));
+        return Lists.newArrayList(Iterables.filter(cardList, Predicates.and(f1, f2)));
+    }
+
+    public static List<Card> filterAsList(Iterable<Card> cardList, Iterable<Predicate<Card>> filt) {
+        return Lists.newArrayList(Iterables.filter(cardList, Predicates.and(filt)));
     }
 
     public static int count(Iterable<Card> cardList, Predicate<Card> filt) {