From 0217c4b4b28defc7f5d53297370956da921ba25a Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Sun, 30 May 2021 00:21:05 +0100 Subject: [PATCH] Support collectorNumber for Cards in Custom sets retrieveCollectorNumber now also considers customEditions when looking for the matching collectorNumber of a PaperCard instance. --- forge-core/src/main/java/forge/item/PaperCard.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java index 7879089856c..216fddb3852 100644 --- a/forge-core/src/main/java/forge/item/PaperCard.java +++ b/forge-core/src/main/java/forge/item/PaperCard.java @@ -306,10 +306,13 @@ public final class PaperCard implements Comparable, InventoryItemFro } private String retrieveCollectorNumber() { - CardEdition.Collection editions = StaticData.instance().getEditions(); - CardEdition edition = editions.get(this.edition); - if (edition == null) // don't bother continuing - non-existing card! - return NO_COLLECTOR_NUMBER; + StaticData data = StaticData.instance(); + CardEdition edition = data.getEditions().get(this.edition); + if (edition == null) { + edition = data.getCustomEditions().get(this.edition); + if (edition == null) // don't bother continuing - non-existing card! + return NO_COLLECTOR_NUMBER; + } int artIndexCount = 0; String collectorNumberInEdition = ""; for (CardEdition.CardInSet card : edition.getAllCardsInSet()) {