From f341d2cdb17f5ef9a2a6772b5841f2af11916662 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sat, 26 Nov 2016 10:20:28 +0000
Subject: [PATCH] CardPredicates: add more Predicates for Counters

---
 .../java/forge/game/card/CardPredicates.java    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java
index f204c1600ab..8ab71e90117 100644
--- a/forge-game/src/main/java/forge/game/card/CardPredicates.java
+++ b/forge-game/src/main/java/forge/game/card/CardPredicates.java
@@ -245,11 +245,24 @@ public final class CardPredicates {
         };
     }
 
-    public static final Predicate<Card> hasCounter(final CounterType type) {
+    public static final Predicate<Card> hasCounters() {
         return new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                return c.getCounters(type) > 0;
+                return c.hasCounters();
+            }
+        };
+    }
+
+    public static final Predicate<Card> hasCounter(final CounterType type) {
+        return hasCounter(type, 1);
+    }
+
+    public static final Predicate<Card> hasCounter(final CounterType type, final int n) {
+        return new Predicate<Card>() {
+            @Override
+            public boolean apply(final Card c) {
+                return c.getCounters(type) >= n;
             }
         };
     }