From 1529ffe63077185f6b53b727188ce46b007b9023 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sat, 28 Aug 2021 07:38:32 +0200
Subject: [PATCH] Fix ImageKeys again

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCost.java | 3 +++
 forge-core/src/main/java/forge/ImageKeys.java         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
index 4a8744f0e76..c3e2823877e 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
@@ -236,6 +236,9 @@ public class ComputerUtilCost {
         if (cost == null) {
             return true;
         }
+        if (!ai.isAI()) {
+            return false;
+        }
         for (final CostPart part : cost.getCostParts()) {
             if (part instanceof CostSacrifice) {
                 CardCollection list = new CardCollection();
diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index cb79e5b4077..e825c09750a 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -236,7 +236,7 @@ public final class ImageKeys {
                 cachedContent.put(setFolder, setFolderContent);
             }
         }
-        String[] keyParts = StringUtils.split(pc.getImageKeyFromSet(), "//");
+        String[] keyParts = StringUtils.split(pc.getCardImageKey(), "//");
         if (keyParts.length != 2)
             return false;
         HashSet<String> content = cachedContent.getOrDefault(keyParts[0], null);