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

- Only add existing booster templates to the template map to avoid situations where the game would try to generate a non-existing booster pack and crash (e.g. unlocking a Starter 2000 set in quest mode).

Browse Source 
- Only show the "You receive the following bonus cards" window if there are bonus cards available from the booster template.
This commit is contained in:
Agetian
2017-07-13 04:12:53 +00:00
parent 9e65053285
commit 6fdea6572c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -431,7 +431,9 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
public Map<String, SealedProduct.Template> readAll() { public Map<String, SealedProduct.Template> readAll() {
Map<String, SealedProduct.Template> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); Map<String, SealedProduct.Template> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for(CardEdition ce : Collection.this) { for(CardEdition ce : Collection.this) {
map.put(ce.getCode(), ce.getBoosterTemplate()); if (ce.hasBoosterTemplate()) {
map.put(ce.getCode(), ce.getBoosterTemplate());
}
} }
return map; return map;
} }

7
forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
View File

@@ -217,8 +217,11 @@ public class QuestUtilUnlockSets {
cardsWon.addAll(booster.get()); cardsWon.addAll(booster.get());
} }
qData.getCards().addAllCards(cardsWon); if (!cardsWon.isEmpty()) {
GuiBase.getInterface().showCardList(unlockedSet.getName(), "You get the following bonus cards:", cardsWon); qData.getCards().addAllCards(cardsWon);
GuiBase.getInterface().showCardList(unlockedSet.getName(), "You get the following bonus cards:", cardsWon);
}
qData.save(); qData.save();
} }
} }