From 286533cf90c6f0b258e7f4781f4a86ab1e2c564b Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Tue, 27 Jul 2021 07:29:42 +0100 Subject: [PATCH] Aligned CardDb calls after API revision for getCardFromEditionsReleasedBefore(date). --- forge-core/src/main/java/forge/StaticData.java | 4 ++-- forge-core/src/main/java/forge/deck/DeckRecognizer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 1ce141ee159..cf301056ac5 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -326,9 +326,9 @@ public class StaticData { artPref = CardDb.CardArtPreference.LATEST_ART_CORE_EXPANSIONS_REPRINT_ONLY; else artPref = CardDb.CardArtPreference.LATEST_ART_ALL_EDITIONS; - PaperCard c = this.getCommonCards().getCardFromEditions(card.getName(), artPref, card.getArtIndex(), setReleasedBefore); + PaperCard c = this.getCommonCards().getCardFromEditionsReleasedBefore(card.getName(), artPref, card.getArtIndex(), setReleasedBefore); // NOTE: if c is null, is necessarily due to the artIndex, so remove it! - return c != null ? c : this.getCommonCards().getCardFromEditions(card.getName(), artPref, setReleasedBefore); + return c != null ? c : this.getCommonCards().getCardFromEditionsReleasedBefore(card.getName(), artPref, setReleasedBefore); } public boolean getFilteredHandsEnabled(){ diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index ac3a8b5fead..6469dd18c68 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -155,7 +155,7 @@ public class DeckRecognizer { } private PaperCard tryGetCard(String text) { - return db.getCardFromEditions(text, useLastSet, recognizeCardsPrintedBefore); + return db.getCardFromEditionsReleasedBefore(text, useLastSet, recognizeCardsPrintedBefore); } private Token recognizePossibleNameAndNumber(final String name, final int n) {