From bc1a91186f1e77e222a13e583fb6787a32d9aac8 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sun, 22 Aug 2021 21:14:21 +0200
Subject: [PATCH] Card Renderer: do not display hidden cards

---
 forge-gui-desktop/src/main/java/forge/ImageCache.java         | 2 +-
 .../src/main/java/forge/view/arcane/CardPanel.java            | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index ee0206a0de1..5fc44718e67 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -243,7 +243,7 @@ public class ImageCache {
         // a default "not available" image, however do not add it to the cache,
         // as otherwise it's problematic to update if the real image gets fetched.
         if (original == null || useArtCrop) {
-            if (ipc != null || cardView != null) {
+            if ((ipc != null || cardView != null) && !originalKey.equals(ImageKeys.getTokenKey(ImageKeys.HIDDEN_CARD))) {
                 int width = 488, height = 680;
                 BufferedImage art = original;
                 CardView card = ipc != null ? Card.getCardForUi(ipc).getView() : cardView;
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
index b0a1267e3db..50060021408 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
@@ -117,7 +117,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
     static {
 
         try {
-
             Font roboto = Font.createFont(Font.TRUETYPE_FONT, Paths.get(ForgeConstants.COMMON_FONTS_DIR, "Roboto-Bold.ttf").toFile());
 
             GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -834,7 +833,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
         } else if (counters > 3) {
             CardFaceSymbols.drawSymbol("countersMulti", g, cardXOffset - 15, yCounters);
         }
-
     }
 
     private void drawMarkersTabs(final Graphics g, List<String> markers) {
@@ -883,7 +881,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
             nameBounds.width = 43;
             drawVerticallyCenteredString(g, marker, nameBounds, smallCounterFont, smallFontMetrics);
         }
-
     }
 
     /**
@@ -903,7 +900,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
         g.setFont(font);
         g.drawString(text, x, y);
         g.setFont(oldFont);
-
     }
 
     @Override