From c9a64b8e96d551376f5e6ca1eb259e8c073102e6 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Tue, 5 Dec 2017 04:59:58 +0000
Subject: [PATCH] - Attempting to fix a bug with the replacement handler not
 converting CARDNAME.

---
 .../forge/game/replacement/ReplacementEffect.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 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 e44e18a6595..38a354483c7 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -25,6 +25,7 @@ import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
+import forge.util.TextUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -48,7 +49,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
     public final boolean hasRun() {
         return this.hasRun;
     }
-
+
     /**
      * Instantiates a new replacement effect.
      * 
@@ -62,8 +63,14 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
         originalMapParams.putAll(map);
         mapParams.putAll(map);
         this.setHostCard(host);
+
+        if (host != null && mapParams.get("Description").contains("CARDNAME")) {
+            String desc = TextUtil.fastReplace(mapParams.get("Description"), "CARDNAME", host.toString());
+            originalMapParams.put("Description", desc);
+            mapParams.put("Description", desc);
+        }
     }
-
+
     /**
      * Sets the checks for run.
      * 
@@ -191,6 +198,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
      */
     @Override
     public String toString() {
+        String desc = this.getMapParams().get("Description");
         if (this.getMapParams().containsKey("Description") && !this.isSuppressed()) {
             return AbilityUtils.applyDescriptionTextChangeEffects(this.getMapParams().get("Description"), this);
         } else {