From 0e87313e1ac17eef98f99c8f891bc2c48a303aba Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 23 Jun 2013 02:53:55 +0200
Subject: [PATCH] CounterPredicates works now with card counters. Handle Exile
 to Exile movement.

---
 Mage/src/mage/cards/CardImpl.java                           | 3 +++
 .../mage/filter/predicate/permanent/CounterPredicate.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java
index 4e0879a3460..6f788edbb9b 100644
--- a/Mage/src/mage/cards/CardImpl.java
+++ b/Mage/src/mage/cards/CardImpl.java
@@ -402,6 +402,9 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
                     case LIBRARY:
                         game.getPlayer(ownerId).removeFromLibrary(this, game);
                         break;
+                    case EXILED:
+                        game.getExile().removeCard(this, game);
+                        break;
                     default:
                         logger.warn("moveToExile, not fully implemented: from="+fromZone);
                 }
diff --git a/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
index 1096383d4d2..4c8852246fa 100644
--- a/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
+++ b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
@@ -27,16 +27,16 @@
  */
 package mage.filter.predicate.permanent;
 
+import mage.cards.Card;
 import mage.counters.CounterType;
 import mage.filter.predicate.Predicate;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
 
 /**
  *
  * @author jeff
  */
-public class CounterPredicate implements Predicate<Permanent> {
+public class CounterPredicate implements Predicate<Card> {
 
     private final CounterType counter;
 
@@ -45,7 +45,7 @@ public class CounterPredicate implements Predicate<Permanent> {
     }
 
     @Override
-    public boolean apply(Permanent input, Game game) {
+    public boolean apply(Card input, Game game) {
         return input.getCounters().containsKey(counter);
     }