From 97738afb9e6b85711c94d8e26db1ba2768531a70 Mon Sep 17 00:00:00 2001
From: jmlundeen <jmlundee@yahoo.com>
Date: Fri, 28 Nov 2025 10:27:51 -0600
Subject: [PATCH] revert card scanner changes

---
 .../src/main/java/mage/cards/RateCard.java    |  2 +-
 .../java/mage/verify/VerifyCardDataTest.java  |  2 +-
 .../mage/cards/repository/CardScanner.java    | 20 ++++++-------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Mage.Common/src/main/java/mage/cards/RateCard.java b/Mage.Common/src/main/java/mage/cards/RateCard.java
index 8b3dbd9b6d4..b9c21e6a06e 100644
--- a/Mage.Common/src/main/java/mage/cards/RateCard.java
+++ b/Mage.Common/src/main/java/mage/cards/RateCard.java
@@ -61,7 +61,7 @@ public final class RateCard {
     public static void bootstrapCardsAndRatings() {
         // preload cards and ratings
         log.info("Loading cards and rating...");
-        List<Card> cards = CardScanner.getAllCards(false, true, true);
+        List<Card> cards = CardScanner.getAllCards(false);
         for (Card card : cards) {
             RateCard.rateCard(card, null);
         }
diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
index 8e2f7b0e142..1e13aa32809 100644
--- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
+++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
@@ -329,7 +329,7 @@ public class VerifyCardDataTest {
         checkWrongAbilitiesTextStart();
 
         int cardIndex = 0;
-        List<Card> allCards = CardScanner.getAllCards(true, true, false);
+        List<Card> allCards = CardScanner.getAllCards();
         for (Card card : allCards) {
             cardIndex++;
             if (card instanceof CardWithHalves) {
diff --git a/Mage/src/main/java/mage/cards/repository/CardScanner.java b/Mage/src/main/java/mage/cards/repository/CardScanner.java
index 57e748bc530..8f3d429b850 100644
--- a/Mage/src/main/java/mage/cards/repository/CardScanner.java
+++ b/Mage/src/main/java/mage/cards/repository/CardScanner.java
@@ -3,7 +3,10 @@ package mage.cards.repository;
 import mage.cards.*;
 import org.apache.log4j.Logger;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @author North
@@ -80,28 +83,17 @@ public final class CardScanner {
     }
 
     public static List<Card> getAllCards() {
-        return getAllCards(true, true, true);
+        return getAllCards(true);
     }
 
-    public static List<Card> getAllCards(boolean ignoreCustomSets, boolean uniqueByName, boolean uniqueBySet) {
-        Set<String> uniqueCardNames = new HashSet<>();
+    public static List<Card> getAllCards(boolean ignoreCustomSets) {
         Collection<ExpansionSet> sets = Sets.getInstance().values();
         List<Card> cards = new ArrayList<>();
         for (ExpansionSet set : sets) {
             if (ignoreCustomSets && set.getSetType().isCustomSet()) {
                 continue;
             }
-            if (uniqueBySet) {
-                uniqueCardNames.clear();
-            }
             for (ExpansionSet.SetCardInfo setInfo : set.getSetCardInfo()) {
-                if (uniqueByName) {
-                    String cardName = setInfo.getName();
-                    if (uniqueCardNames.contains(cardName)) {
-                        continue;
-                    }
-                    uniqueCardNames.add(cardName);
-                }
                 cards.add(CardImpl.createCard(setInfo.getCardClass(), new CardSetInfo(setInfo.getName(), set.getCode(),
                         setInfo.getCardNumber(), setInfo.getRarity(), setInfo.getGraphicInfo())));
             }