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

Merge branch 'master' into 'master'

Browse Source 
fix db loading

See merge request core-developers/forge!4087
This commit is contained in:
Anthony Calosa
2021-03-03 15:08:02 +00:00
parent 56bf121c90 6a2549efd8
commit fc73d93576
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -175,19 +175,21 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
for (CardEdition e : editions.getOrderedEditions()) { for (CardEdition e : editions.getOrderedEditions()) {
boolean coreOrExpSet = e.getType() == CardEdition.Type.CORE || e.getType() == CardEdition.Type.EXPANSION; boolean coreOrExpSet = e.getType() == CardEdition.Type.CORE || e.getType() == CardEdition.Type.EXPANSION;
boolean isCoreExpSet = coreOrExpSet || e.getType() == CardEdition.Type.REPRINT; boolean isCoreExpSet = coreOrExpSet || e.getType() == CardEdition.Type.REPRINT;
//todo sets with nonlegal cards should have tags in them so we don't need to specify the code here
boolean skip = !loadNonLegalCards && (e.getCode().equals("CMB1") ||e.getCode().equals("UGL")
||e.getCode().equals("UNH")||e.getCode().equals("UND")||e.getCode().equals("UST"));
if (logMissingPerEdition && isCoreExpSet) { if (logMissingPerEdition && isCoreExpSet) {
System.out.print(e.getName() + " (" + e.getAllCardsInSet().size() + " cards)"); System.out.print(e.getName() + " (" + e.getAllCardsInSet().size() + " cards)");
} }
if (coreOrExpSet && e.getDate().after(today) && upcomingSet == null) { if (coreOrExpSet && e.getDate().after(today) && upcomingSet == null) {
upcomingSet = e; if (skip)
upcomingSet = e;
} }
for (CardEdition.CardInSet cis : e.getAllCardsInSet()) { for (CardEdition.CardInSet cis : e.getAllCardsInSet()) {
CardRules cr = rulesByName.get(cis.name); CardRules cr = rulesByName.get(cis.name);
if (cr != null && !cr.getType().isBasicLand() && !loadNonLegalCards if (cr != null && !cr.getType().isBasicLand() && skip)
&& (e.getCode().equals("CMB1") ||e.getCode().equals("UGL") continue;
||e.getCode().equals("UNH")||e.getCode().equals("UND")||e.getCode().equals("UST")))
continue; //todo sets with nonlegal cards should have tags in them so we don't need to specify the code here
if (cr != null) { if (cr != null) {
addSetCard(e, cis, cr); addSetCard(e, cis, cr);