From 06ad8e65abf3a6d2a826ef10daf11e3a32b187c8 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Mon, 18 Sep 2017 20:16:24 -0400
Subject: [PATCH] Reverted Atarka, Worldrender to before text change
 implementation

---
 .../src/mage/cards/a/AtarkaWorldRender.java   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java
index b9348f249a..7cc32c280d 100644
--- a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java
+++ b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java
@@ -35,14 +35,11 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.TrampleAbility;
-import mage.abilities.text.TextPartSubType;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.common.FilterControlledCreaturePermanent;
-import mage.filter.predicate.Predicates;
-import mage.filter.predicate.mageobject.TextPartSubtypePredicate;
-import mage.filter.predicate.permanent.TappedPredicate;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
@@ -68,11 +65,7 @@ public class AtarkaWorldRender extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Whenever a Dragon you control attacks, it gains double strike until end of turn.
-        TextPartSubType textPart1 = (TextPartSubType) addTextPart(new TextPartSubType(SubType.DRAGON));
-        FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Dragon you control");
-        filter.add(new TextPartSubtypePredicate(textPart1));
-        filter.add(Predicates.not(new TappedPredicate()));
-        this.addAbility(new AtarkaWorldRenderEffect(filter));
+        this.addAbility(new AtarkaWorldRenderEffect());
 
     }
 
@@ -88,16 +81,18 @@ public class AtarkaWorldRender extends CardImpl {
 
 class AtarkaWorldRenderEffect extends TriggeredAbilityImpl {
 
-    FilterControlledCreaturePermanent filter;
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("dragon you control");
 
-    public AtarkaWorldRenderEffect(FilterControlledCreaturePermanent filter) {
+    static {
+        filter.add(new SubtypePredicate(SubType.DRAGON));
+    }
+
+    public AtarkaWorldRenderEffect() {
         super(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn));
-        this.filter = filter;
     }
 
     public AtarkaWorldRenderEffect(final AtarkaWorldRenderEffect ability) {
         super(ability);
-        this.filter = ability.filter.copy();
     }
 
     @Override