From 58cfbf4c0d1f1421b76ace35f0711df14ab7893b Mon Sep 17 00:00:00 2001
From: leriomaggio <valeriomaggio@gmail.com>
Date: Wed, 9 Jun 2021 17:33:37 +0100
Subject: [PATCH] Updated API call to CardDB with PreferredCardArt

Note: the `convertByXitaxMethod` will be soon discontinued thanks to the new upcoming option and API.
Same will apply to those methods in StaticData
---
 forge-core/src/main/java/forge/deck/Deck.java | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index 24eccbae1b2..56810dccd85 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -17,25 +17,16 @@
  */
 package forge.deck;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-
 import forge.StaticData;
 import forge.card.CardDb;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 /**
  * <p>
  * Deck class.
@@ -261,7 +252,7 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
 
     private void convertByXitaxMethod() {
         Date dateWithAllCards = StaticData.instance().getEditions().getEarliestDateWithAllCards(getAllCardsInASinglePool());
-        String artOption = StaticData.instance().getPrefferedArtOption();
+        String artOption = StaticData.instance().getPreferredCardArt();
 
         for(Entry<DeckSection, CardPool> p : parts.entrySet()) {
             if( p.getKey() == DeckSection.Planes || p.getKey() == DeckSection.Schemes || p.getKey() == DeckSection.Avatar)
@@ -285,6 +276,9 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
                         replacementCard = StaticData.instance().getCardByEditionDate(card, dateWithAllCards);
                 }
 
+                // Note @leriomaggio: The following logic is very obscure to me
+                // Why looking for a replacement Card and then not using adding it to the pool?
+                // Also, what does "having the same art index" say about the two cards?
                 if (replacementCard.getArtIndex() == card.getArtIndex()) {
                     if (card.hasImage())
                         newPool.add(card, count);