From 2aea44da2c12b2ea99aeea6139b0d12354fa6fda Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Thu, 29 Feb 2024 07:10:51 +0400
Subject: [PATCH] gui: fixed token render in mtgo mode (part of #11873)

---
 .../java/org/mage/card/arcane/CardRenderer.java     |  2 +-
 .../org/mage/card/arcane/ModernCardRenderer.java    | 13 +++++--------
 .../mage/card/arcane/ModernSplitCardRenderer.java   |  5 ++---
 .../cards/cost/sacrifice/SacrificeLandTest.java     |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java
index 4c4a2b3f7f2..05ac037eeda 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java
@@ -237,7 +237,7 @@ public abstract class CardRenderer {
     // Template methods that are possible to override, but unlikely to be
     // overridden.
     // Draw the card back
-    protected void drawCardBack(Graphics2D g) {
+    protected void drawCardBackTexture(Graphics2D g) {
         g.setPaint(BG_TEXTURE_CARDBACK);
         g.fillRect(borderWidth, borderWidth,
                 cardWidth - 2 * borderWidth, cardHeight - 2 * borderWidth);
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
index a1e92004748..eb2643061dc 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
@@ -8,7 +8,6 @@ import mage.client.dialog.PreferencesDialog;
 import mage.constants.CardType;
 import mage.constants.MageObjectType;
 import mage.constants.SubType;
-import mage.util.CardUtil;
 import mage.util.SubTypes;
 import mage.view.CardView;
 import mage.view.PermanentView;
@@ -264,11 +263,9 @@ public class ModernCardRenderer extends CardRenderer {
     @Override
     protected void drawBackground(Graphics2D g) {
         // Draw background, in 3 parts
-
-        if (false && cardView.isFaceDown()) {
-            // TODO: delete un-used code?!
-            // Just draw a brown rectangle
-            drawCardBack(g);
+        if (cardView.isFaceDown()) {
+            // just draw a brown rectangle
+            drawCardBackTexture(g);
         } else {
             if (cardView.getFrameStyle() == FrameStyle.UST_FULL_ART_BASIC) {
                 return;
@@ -278,7 +275,7 @@ public class ModernCardRenderer extends CardRenderer {
             if (cardView.getExpansionSetCode().equals("EXP")) {
                 isExped = true;
             }
-            BufferedImage bg = getBackgroundImage(cardView.getColor(), cardView.getCardTypes(), cardView.getSubTypes(), isExped);
+            BufferedImage bg = getBackgroundTexture(cardView.getColor(), cardView.getCardTypes(), cardView.getSubTypes(), isExped);
             if (bg == null) {
                 return;
             }
@@ -1542,7 +1539,7 @@ public class ModernCardRenderer extends CardRenderer {
 
     // Determine which background image to use from a set of colors
     // and the current card.
-    protected static BufferedImage getBackgroundImage(ObjectColor colors, Collection<CardType> types, SubTypes subTypes, boolean isExped) {
+    protected static BufferedImage getBackgroundTexture(ObjectColor colors, Collection<CardType> types, SubTypes subTypes, boolean isExped) {
         if (subTypes.contains(SubType.VEHICLE)) {
             return BG_IMG_VEHICLE;
         } else if (types.contains(CardType.LAND)) {
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java
index 6b36ebe5015..824589c64a9 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernSplitCardRenderer.java
@@ -157,9 +157,8 @@ public class ModernSplitCardRenderer extends ModernCardRenderer {
 
     @Override
     protected void drawBackground(Graphics2D g) {
-        if (false && cardView.isFaceDown()) {
-            // TODO: delete un-used code?!
-            drawCardBack(g);
+        if (cardView.isFaceDown()) {
+            drawCardBackTexture(g);
         } if (isAdventure()) {
             super.drawBackground(g);
         } else {
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/SacrificeLandTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/SacrificeLandTest.java
index f34aea16e79..b895bf7b1f0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/SacrificeLandTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/sacrifice/SacrificeLandTest.java
@@ -23,7 +23,7 @@ public class SacrificeLandTest extends CardTestPlayerBase {
      */
     @Test
     public void testRollback() {
-        // If Soldevi Excavations entered the battlefield, sacrifice an untapped Island instead.
+        // If Soldevi Excavations would enter the battlefield, sacrifice an untapped Island instead.
         // If you do, put Soldevi Excavations onto the battlefield. If you don't, put it into its owner's graveyard.
         String soldeviExcavations = "Soldevi Excavations";