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 hasCounter(final CounterType type) { + public static final Predicate hasCounters() { return new Predicate() { @Override public boolean apply(final Card c) { - return c.getCounters(type) > 0; + return c.hasCounters(); + } + }; + } + + public static final Predicate hasCounter(final CounterType type) { + return hasCounter(type, 1); + } + + public static final Predicate hasCounter(final CounterType type, final int n) { + return new Predicate() { + @Override + public boolean apply(final Card c) { + return c.getCounters(type) >= n; } }; }