From f305d0418a7224eab742505d460dfe18206db867 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Thu, 5 Jan 2023 00:30:05 -0600
Subject: [PATCH] Attempting to get the errata to work with sealed leagues

---
 .../src/main/java/com/gempukku/lotro/game/LotroFormat.java | 2 +-
 .../gempukku/lotro/game/formats/DefaultLotroFormat.java    | 4 ++--
 .../src/main/java/com/gempukku/lotro/hall/HallServer.java  | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
index 438608949..f90c32ec7 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
@@ -53,7 +53,7 @@ public interface LotroFormat {
 
     public String applyErrata(String bpID);
 
-    public String findBaseCard(String bpID);
+    public List<String> findBaseCards(String bpID);
 
     public SitesBlock getSiteBlock();
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
index ec02a8e3e..814cafc5d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
@@ -485,8 +485,8 @@ public class DefaultLotroFormat implements LotroFormat {
     }
 
     @Override
-    public String findBaseCard(String bpID) {
-        return _library.getBaseBlueprintId(bpID);
+    public List<String> findBaseCards(String bpID) {
+        return _errataCardMap.values().stream().filter(x-> x.equals(bpID)).toList();
     }
 
     private String validateDeckStructure(LotroDeck deck) {
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
index 8369e9d20..02192a21e 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
@@ -689,10 +689,13 @@ public class HallServer extends AbstractServer {
             Map<String, Integer> deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck);
 
             for (Map.Entry<String, Integer> cardCount : deckCardCounts.entrySet()) {
-                final int collectionCount = collection.getItemCount(cardCount.getKey()) +
-                        collection.getItemCount(format.findBaseCard(cardCount.getKey())) +
+                int collectionCount = collection.getItemCount(cardCount.getKey()) +
                         collection.getItemCount(format.applyErrata(cardCount.getKey()));
 
+                for(String id : format.findBaseCards(cardCount.getKey())) {
+                    collectionCount += collection.getItemCount(id);
+                }
+
                 if (collectionCount < cardCount.getValue()) {
                     String cardName = null;
                     try {