From 319cd97d8335f2dab8710447faf2d32cae8ca87a Mon Sep 17 00:00:00 2001
From: Myrd <myrd@cardforge.org>
Date: Mon, 1 Dec 2014 06:09:54 +0000
Subject: [PATCH] Fix game log revealing opponent's morphed creatures in
 messages.

---
 .../java/forge/game/ability/effects/DestroyEffect.java |  7 +------
 .../forge/game/ability/effects/SetStateEffect.java     |  7 +------
 forge-game/src/main/java/forge/game/card/Card.java     |  9 ++++++---
 .../java/forge/game/spellability/SpellAbility.java     | 10 +---------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
index 655466e7b17..6887b524054 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
@@ -27,12 +27,7 @@ public class DestroyEffect extends SpellAbilityEffect {
 
         final Iterator<Card> it = tgtCards.iterator();
         while (it.hasNext()) {
-            final Card tgtC = it.next();
-            if (tgtC.isFaceDown()) {
-                sb.append("Morph ").append("(").append(tgtC.getId()).append(")");
-            } else {
-                sb.append(tgtC);
-            }
+            sb.append(it.next());
 
             if (it.hasNext()) {
                 sb.append(", ");
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
index 8990058b24a..189b1b69dbc 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
@@ -26,12 +26,7 @@ public class SetStateEffect extends SpellAbilityEffect {
 
         final Iterator<Card> it = tgtCards.iterator();
         while (it.hasNext()) {
-            final Card tgtC = it.next();
-            if (tgtC.isFaceDown()) {
-                sb.append("Morph ").append("(").append(tgtC.getId()).append(")");
-            } else {
-                sb.append(tgtC);
-            }
+            sb.append(it.next());
 
             if (it.hasNext()) {
                 sb.append(", ");
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index c3c9063cfbd..27e2ebdc064 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -3120,9 +3120,12 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
     /** {@inheritDoc} */
     @Override
     public final String toString() {
-        String name = getName();
-        if (StringUtils.isEmpty(name) && paperCard != null) {
-            name = paperCard.getName(); //make it possible to see likely card name before it's set
+        String name = "Morph";
+        if (!isFaceDown()) {
+            name = getName();
+            if (StringUtils.isEmpty(name) && paperCard != null) {
+                name = paperCard.getName(); //make it possible to see likely card name before it's set
+            }
         }
         return name + " (" + id + ")";
     }
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
index 5eabd965569..96e2bf4e45f 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -935,15 +935,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
 
         resetTargets();
         targetChosen.add(card);
-
-        final String desc;
-        if (!card.isFaceDown()) {
-            desc = getHostCard().getName() + " - targeting " + card;
-        }
-        else {
-            desc = getHostCard().getName() + " - targeting Morph(" + card.getId() + ")";
-        }
-        setStackDescription(desc);
+        setStackDescription(getHostCard().getName() + " - targeting " + card);
     }
 
     /**