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

Prevented crash when opening the card shop for quests with no boosters in its unlocked sets.

Browse Source
This commit is contained in:
Krazy
2015-06-06 15:58:17 +00:00
parent 10aba6c875
commit fd2b7639c3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui/src/main/java/forge/quest/QuestUtilCards.java
View File

@@ -79,10 +79,10 @@ public final class QuestUtilCards {
*/ */
public static ItemPool<PaperCard> generateBasicLands(final int nBasic, final int nSnow, final GameFormatQuest usedFormat) { public static ItemPool<PaperCard> generateBasicLands(final int nBasic, final int nSnow, final GameFormatQuest usedFormat) {
final ICardDatabase db = FModel.getMagicDb().getCommonCards(); final ICardDatabase db = FModel.getMagicDb().getCommonCards();
final ItemPool<PaperCard> pool = new ItemPool<PaperCard>(PaperCard.class); final ItemPool<PaperCard> pool = new ItemPool<>(PaperCard.class);
List<String> landCodes = new ArrayList<String>(); List<String> landCodes = new ArrayList<>();
List<String> snowLandCodes = new ArrayList<String>(); List<String> snowLandCodes = new ArrayList<>();
if (usedFormat != null) { if (usedFormat != null) {
List<String> availableEditions = usedFormat.getAllowedSetCodes(); List<String> availableEditions = usedFormat.getAllowedSetCodes();
@@ -391,7 +391,7 @@ public final class QuestUtilCards {
/** /**
* Lose card. * Lose card.
* @param cards * @param cards The cards to lose
*/ */
public void loseCards(final List<PaperCard> cards) { public void loseCards(final List<PaperCard> cards) {
for(PaperCard pc: cards) for(PaperCard pc: cards)
@@ -533,6 +533,9 @@ public final class QuestUtilCards {
filter = Predicates.and(CardEdition.Predicates.CAN_MAKE_BOOSTER, isLegalInQuestFormat(qc.getFormat())); filter = Predicates.and(CardEdition.Predicates.CAN_MAKE_BOOSTER, isLegalInQuestFormat(qc.getFormat()));
} }
Iterable<CardEdition> rightEditions = Iterables.filter(FModel.getMagicDb().getEditions(), filter); Iterable<CardEdition> rightEditions = Iterables.filter(FModel.getMagicDb().getEditions(), filter);
if (!rightEditions.iterator().hasNext()) {
continue;
}
this.qa.getShopList().add(BoosterPack.FN_FROM_SET.apply(Aggregates.random(rightEditions))); this.qa.getShopList().add(BoosterPack.FN_FROM_SET.apply(Aggregates.random(rightEditions)));
} }
} }
@@ -610,7 +613,7 @@ public final class QuestUtilCards {
* the count * the count
*/ */
private void generatePreconsInShop(final int count) { private void generatePreconsInShop(final int count) {
final List<PreconDeck> meetRequirements = new ArrayList<PreconDeck>(); final List<PreconDeck> meetRequirements = new ArrayList<>();
for (final PreconDeck deck : QuestController.getPrecons()) { for (final PreconDeck deck : QuestController.getPrecons()) {
if (QuestController.getPreconDeals(deck).meetsRequiremnts(this.qc.getAchievements()) if (QuestController.getPreconDeals(deck).meetsRequiremnts(this.qc.getAchievements())
&& (null == qc.getFormat() || qc.getFormat().isSetLegal(deck.getEdition()))) { && (null == qc.getFormat() || qc.getFormat().isSetLegal(deck.getEdition()))) {