From dc0d5a4bc8f4c256258ef7ed2e5eb0e80d266c97 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 14 Mar 2014 14:43:54 +0100
Subject: [PATCH] Reversed some formatting changed that led to casting errors.

---
 Mage/src/mage/filter/Filter.java                            | 1 -
 Mage/src/mage/filter/FilterCard.java                        | 4 ++--
 Mage/src/mage/filter/FilterImpl.java                        | 3 +--
 Mage/src/mage/filter/FilterObject.java                      | 2 +-
 Mage/src/mage/filter/FilterPlayer.java                      | 2 +-
 Mage/src/mage/filter/predicate/ObjectPlayer.java            | 1 -
 Mage/src/mage/filter/predicate/other/CardTextPredicate.java | 2 --
 7 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Mage/src/mage/filter/Filter.java b/Mage/src/mage/filter/Filter.java
index 829c5a835b0..dc155eef6c6 100644
--- a/Mage/src/mage/filter/Filter.java
+++ b/Mage/src/mage/filter/Filter.java
@@ -29,7 +29,6 @@
 package mage.filter;
 
 import java.io.Serializable;
-import mage.MageObject;
 import mage.filter.predicate.Predicate;
 import mage.game.Game;
 
diff --git a/Mage/src/mage/filter/FilterCard.java b/Mage/src/mage/filter/FilterCard.java
index 131ca6e4910..24ff39788c4 100644
--- a/Mage/src/mage/filter/FilterCard.java
+++ b/Mage/src/mage/filter/FilterCard.java
@@ -88,7 +88,7 @@ public class FilterCard extends FilterObject<Card> {
             return false;
         }
         
-        return Predicates.and(extraPredicates).apply(new ObjectPlayer<>(card, playerId), game);
+        return Predicates.and(extraPredicates).apply(new ObjectPlayer(card, playerId), game);
     }
 
     public boolean match(Card card, UUID sourceId, UUID playerId, Game game) {
@@ -96,7 +96,7 @@ public class FilterCard extends FilterObject<Card> {
             return false;
         }
 
-        return Predicates.and(extraPredicates).apply(new ObjectSourcePlayer<>(card, sourceId, playerId), game);
+        return Predicates.and(extraPredicates).apply(new ObjectSourcePlayer(card, sourceId, playerId), game);
     }
 
     public void add(ObjectPlayerPredicate predicate) {
diff --git a/Mage/src/mage/filter/FilterImpl.java b/Mage/src/mage/filter/FilterImpl.java
index 4acf76dd43f..ecb3f9ee923 100644
--- a/Mage/src/mage/filter/FilterImpl.java
+++ b/Mage/src/mage/filter/FilterImpl.java
@@ -30,7 +30,6 @@ package mage.filter;
 
 import java.util.ArrayList;
 import java.util.List;
-import mage.MageObject;
 import mage.filter.predicate.Predicate;
 import mage.filter.predicate.Predicates;
 import mage.game.Game;
@@ -53,7 +52,7 @@ public abstract class FilterImpl<E> implements Filter<E> {
         this.message = name;
     }
 
-    public FilterImpl(FilterImpl<E> filter) {
+    public FilterImpl(FilterImpl filter) {
         this.message = filter.message;
         this.predicates = new ArrayList<>(filter.predicates);
     }
diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java
index 9d2034279ae..29402389df3 100644
--- a/Mage/src/mage/filter/FilterObject.java
+++ b/Mage/src/mage/filter/FilterObject.java
@@ -46,7 +46,7 @@ public class FilterObject<E extends MageObject> extends FilterImpl<E> {
         super(name);
     }
 
-    public FilterObject(FilterObject<E> filter) {
+    public FilterObject(FilterObject filter) {
         super(filter);
     }
 }
diff --git a/Mage/src/mage/filter/FilterPlayer.java b/Mage/src/mage/filter/FilterPlayer.java
index d6bf96ec0a0..8eecfdb8e17 100644
--- a/Mage/src/mage/filter/FilterPlayer.java
+++ b/Mage/src/mage/filter/FilterPlayer.java
@@ -60,7 +60,7 @@ public class FilterPlayer extends FilterImpl<Player> {
         this.extraPredicates = new ArrayList<>(filter.extraPredicates);
     }
 
-    public void add(ObjectPlayerPredicate<ObjectPlayer<Player>> predicate) {
+    public void add(ObjectPlayerPredicate predicate) {
         extraPredicates.add(predicate);
     }
 
diff --git a/Mage/src/mage/filter/predicate/ObjectPlayer.java b/Mage/src/mage/filter/predicate/ObjectPlayer.java
index c032c294b47..d7c84e78f51 100644
--- a/Mage/src/mage/filter/predicate/ObjectPlayer.java
+++ b/Mage/src/mage/filter/predicate/ObjectPlayer.java
@@ -28,7 +28,6 @@
 package mage.filter.predicate;
 
 import java.util.UUID;
-import mage.MageObject;
 
 /**
  *
diff --git a/Mage/src/mage/filter/predicate/other/CardTextPredicate.java b/Mage/src/mage/filter/predicate/other/CardTextPredicate.java
index 547fab02ef6..f36cfacac90 100644
--- a/Mage/src/mage/filter/predicate/other/CardTextPredicate.java
+++ b/Mage/src/mage/filter/predicate/other/CardTextPredicate.java
@@ -28,8 +28,6 @@
 package mage.filter.predicate.other;
 
 import mage.cards.Card;
-import mage.filter.predicate.ObjectPlayer;
-import mage.filter.predicate.ObjectPlayerPredicate;
 import mage.filter.predicate.Predicate;
 import mage.game.Game;