From 7ef07fa6815829b0a1ceedf3612a02c86aff49b3 Mon Sep 17 00:00:00 2001
From: Michael Kamensky <stavdev@mail.ru>
Date: Tue, 16 Feb 2021 09:46:17 +0300
Subject: [PATCH] - Resolve several issues in the Game State support for
 Mutate/merged cards.

---
 forge-ai/src/main/java/forge/ai/GameState.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index 78357bdb44b..9439e45f8d9 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -262,7 +262,12 @@ public abstract class GameState {
             if (c.getPaperCard() == null) {
                 return;
             }
-            newText.append(c.getPaperCard().getName());
+            if (c.getMergedCards().isEmpty()) {
+                newText.append(c.getPaperCard().getName());
+            } else {
+                // we have to go by the current top card name here
+                newText.append(c.getTopMergedCard().getPaperCard().getName());
+            }
         }
         if (c.isCommander()) {
             newText.append("|IsCommander");
@@ -369,10 +374,10 @@ public abstract class GameState {
             if (!c.getMergedCards().isEmpty()) {
                 List<String> mergedCardNames = new ArrayList<>();
                 for (Card merged : c.getMergedCards()) {
-                    if (merged.getId() == c.getId()) {
+                    if (c.getTopMergedCard() == merged) {
                         continue;
                     }
-                    mergedCardNames.add(merged.getName());
+                    mergedCardNames.add(merged.getPaperCard().getName().replace(",", "^"));
                 }
                 newText.append("|MergedCards:").append(TextUtil.join(mergedCardNames, ","));
             }
@@ -1131,7 +1136,7 @@ public abstract class GameState {
             Card mergedTo = entry.getKey();
             for(String mergedCardName : entry.getValue()) {
                 Card c;
-                PaperCard pc = StaticData.instance().getCommonCards().getCard(mergedCardName); // FIXME: is set relevant here?
+                PaperCard pc = StaticData.instance().getCommonCards().getCard(mergedCardName. replace("^", ","));
                 if (pc == null) {
                     System.err.println("ERROR: Tried to create a non-existent card named " + mergedCardName + " (as a merged card) when loading game state!");
                     continue;