From ff18cb74c876be70b1de0af908c95f515a1ea241 Mon Sep 17 00:00:00 2001
From: Myrd <myrd@cardforge.org>
Date: Sun, 8 Feb 2015 17:43:09 +0000
Subject: [PATCH] Fix dumping and restoring game state with morphed creatures.

---
 forge-ai/src/main/java/forge/ai/GameState.java     | 3 ++-
 forge-game/src/main/java/forge/game/card/Card.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index 71a5621a723..92f819cc853 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -98,7 +98,7 @@ public abstract class GameState {
         if (c.isToken()) {
             newText.append("t:" + new CardFactory.TokenInfo(c).toString());
         } else {
-            newText.append(c.getName());
+            newText.append(c.getPaperCard().getName());
         }
         if (zoneType == ZoneType.Battlefield) {
             if (c.isTapped()) {
@@ -258,6 +258,7 @@ public abstract class GameState {
                 // by doubling season, etc).
                 c = CardFactory.makeToken(CardFactory.TokenInfo.fromString(tokenStr), player).get(0);
             } else {
+                System.out.println(cardinfo[0]);
                 c = Card.fromPaperCard(getPaperCard(cardinfo[0]), player);
             }
             c.setSickness(false);
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 effb796dd8b..e0fbe7f9cad 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -5662,7 +5662,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
 
     public final String getMostRecentSet() {
-        return StaticData.instance().getCommonCards().getCard(getName()).getEdition();
+        return StaticData.instance().getCommonCards().getCard(getPaperCard().getName()).getEdition();
     }
 
     public final String getImageKey() {