external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aligned CardDb calls after API revision for getCardFromEditionsReleasedBefore(date).

Browse Source
This commit is contained in:
leriomaggio
2021-07-27 07:29:42 +01:00
parent e2aa8874b6
commit 286533cf90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/StaticData.java
View File

@@ -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(){

2
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -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) {