From e2f39b289badde10606a994a4bad84c1b1cf3789 Mon Sep 17 00:00:00 2001
From: Mark Langen <stravant@gmail.com>
Date: Sun, 16 Apr 2017 23:22:50 -0600
Subject: [PATCH] Fix cards in set using UntapAllControllerEffect with
 AnotherPredicate

---
 Mage.Sets/src/mage/cards/a/AhnCropChampion.java | 7 +------
 Mage.Sets/src/mage/cards/c/CombatCelebrant.java | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AhnCropChampion.java b/Mage.Sets/src/mage/cards/a/AhnCropChampion.java
index 485c4bc2cc8..2004cbf2fa1 100644
--- a/Mage.Sets/src/mage/cards/a/AhnCropChampion.java
+++ b/Mage.Sets/src/mage/cards/a/AhnCropChampion.java
@@ -43,11 +43,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  * @author stravant
  */
 public class AhnCropChampion extends CardImpl {
-    private final static FilterControlledCreaturePermanent otherCreaturesFilter = new FilterControlledCreaturePermanent("other creatures you control");
-    static {
-        otherCreaturesFilter.add(new AnotherPredicate());
-    }
-
     public AhnCropChampion(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}");
         
@@ -57,7 +52,7 @@ public class AhnCropChampion extends CardImpl {
         this.toughness = new MageInt(4);
 
         // You may exert Ahn-Crop Champion as it attacks. When you do, untap all other creatures you control.
-        addAbility(new ExertAbility(new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(otherCreaturesFilter))));
+        addAbility(new ExertAbility(new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(new FilterControlledCreaturePermanent("creatures you control"), null, false))));
     }
 
     public AhnCropChampion(final AhnCropChampion card) {
diff --git a/Mage.Sets/src/mage/cards/c/CombatCelebrant.java b/Mage.Sets/src/mage/cards/c/CombatCelebrant.java
index 8fe14ab982a..ddb5d96efeb 100644
--- a/Mage.Sets/src/mage/cards/c/CombatCelebrant.java
+++ b/Mage.Sets/src/mage/cards/c/CombatCelebrant.java
@@ -45,12 +45,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class CombatCelebrant extends CardImpl {
 
-    private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creatures you control");
-
-    static {
-        filter.add(new AnotherPredicate());
-    }
-
     public CombatCelebrant(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
 
@@ -60,7 +54,7 @@ public class CombatCelebrant extends CardImpl {
         this.toughness = new MageInt(1);
 
         // If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase.
-        BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(filter));
+        BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(), null, false));
         ability.addEffect(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase"));
         this.addAbility(new ExertAbility(ability, true));
     }