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

When current deck is Empty, CardEdition returned is not ZEN anymore but one depending on current Art Preference

Browse Source
This commit is contained in:
leriomaggio
2021-09-26 00:30:17 +01:00
parent 2e35935aca
commit 56358ecbde
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui/src/main/java/forge/deck/DeckProxy.java
View File

@@ -691,11 +691,18 @@ public class DeckProxy implements InventoryItem {
List<CardEdition> availableEditions = new ArrayList<>(); List<CardEdition> availableEditions = new ArrayList<>();
for (PaperCard c : deck.getAllCardsInASinglePool().toFlatList()) { for (PaperCard c : deck.getAllCardsInASinglePool().toFlatList()) {
availableEditions.add(FModel.getMagicDb().getEditions().get(c.getEdition())); CardEdition edition = FModel.getMagicDb().getEditions().get(c.getEdition());
if (edition == null)
continue;
availableEditions.add(edition);
} }
CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions); CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
return randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet; if (randomLandSet == null) {
CardEdition preferredArtEdition = CardEdition.Predicates.getPreferredArtEditionWithAllBasicLands();
return preferredArtEdition != null ? preferredArtEdition : FModel.getMagicDb().getEditions().get("ZEN");
}
return randomLandSet;
} }
public static final Predicate<DeckProxy> IS_WHITE = new Predicate<DeckProxy>() { public static final Predicate<DeckProxy> IS_WHITE = new Predicate<DeckProxy>() {