From a2f11fb8291c129e3ac1522c70d89e5aeb7ea3af Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Sat, 9 Dec 2017 15:47:13 +0000
Subject: [PATCH] RE: do CARDNAME after text changing effects

---
 .../java/forge/game/replacement/ReplacementEffect.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
index d14f5e8855b..1e2e97fd6c2 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -193,12 +193,12 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
      */
     @Override
     public String toString() {
-        if (this.getMapParams().containsKey("Description") && !this.isSuppressed()) {
-            String desc = this.getMapParams().get("Description");
+        if (hasParam("Description") && !this.isSuppressed()) {
+            String desc = AbilityUtils.applyDescriptionTextChangeEffects(getParam("Description"), this);
             if (desc.contains("CARDNAME")) {
-                desc = TextUtil.fastReplace(this.getMapParams().get("Description"), "CARDNAME", getHostCard().toString());
+                desc = TextUtil.fastReplace(desc, "CARDNAME", getHostCard().toString());
             }
-            return AbilityUtils.applyDescriptionTextChangeEffects(desc, this);
+            return desc;
         } else {
             return "";
         }