From a4bd13d0502970ab8dad004c09a871ddb192d884 Mon Sep 17 00:00:00 2001
From: Myrd <alexei.svitkine@gmail.com>
Date: Fri, 20 Dec 2019 17:56:37 +0000
Subject: [PATCH] Fix dumping state with cards with non-matching
 owner/controllers.

---
 forge-ai/src/main/java/forge/ai/GameState.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index 3d0c81eda1c..2156d3f8910 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -242,7 +242,7 @@ public abstract class GameState {
                 if (card instanceof DetachedCardEffect) {
                     continue;
                 }
-                addCard(zone, card.getOwner() == ai ? aiCardTexts : humanCardTexts, card);
+                addCard(zone, card.getController() == ai ? aiCardTexts : humanCardTexts, card);
             }
         }
     }
@@ -269,6 +269,10 @@ public abstract class GameState {
         }
 
         if (zoneType == ZoneType.Battlefield) {
+            if (c.getOwner() != c.getController()) {
+                // TODO: Handle more than 2-player games.
+                newText.append("|Owner:" + (c.getOwner().isAI() ?  "AI" : "Human"));
+            }
             if (c.isTapped()) {
                 newText.append("|Tapped");
             }