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

Merge branch 'master' into 'master'

Browse Source 
NPE prevention in getAllNonPromoCards.

See merge request core-developers/forge!4224
This commit is contained in:
Michael Kamensky
2021-03-19 17:53:20 +00:00
parent b59f92e5dd 00b5d40de7
commit b94f40c7c4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,7 +576,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
return Lists.newArrayList(Iterables.filter(this.roAllCards, new Predicate<PaperCard>() { return Lists.newArrayList(Iterables.filter(this.roAllCards, new Predicate<PaperCard>() {
@Override @Override
public boolean apply(final PaperCard paperCard) { public boolean apply(final PaperCard paperCard) {
return editions.getEditionByCodeOrThrow(paperCard.getEdition()).getType() != Type.PROMOS; CardEdition edition = null;
try {
edition = editions.getEditionByCodeOrThrow(paperCard.getEdition());
} catch (Exception ex) {
return false;
}
return edition != null && edition.getType() != Type.PROMOS;
} }
})); }));
} }