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

- A more graceful solution for cases when a deck ends up being null for any reason in ACEditorBase.

Browse Source
This commit is contained in:
Agetian
2017-01-11 18:55:17 +00:00
parent 01e402f292
commit 78b6c3610d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -209,14 +209,12 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
} }
if (deck == null) { Iterable<Entry<String,Integer>> cardsByName = null;
System.err.println("Warning: ACEditorBase#getAllowedAdditions could not properly process the deck in controller.getModel(), returning empty item pool."); if (deck != null) {
return additions; // returning empty additions final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander));
cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME);
} }
final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander));
Iterable<Entry<String,Integer>> cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME);
for (final Entry<TItem, Integer> itemEntry : itemsToAdd) { for (final Entry<TItem, Integer> itemEntry : itemsToAdd) {
final TItem item = itemEntry.getKey(); final TItem item = itemEntry.getKey();
@@ -224,7 +222,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
int qty = itemEntry.getValue(); int qty = itemEntry.getValue();
int max; int max;
if (card == null || card.getRules().getType().isBasic() || if (deck == null || card == null || card.getRules().getType().isBasic() ||
limit == CardLimit.None || limitExceptions.contains(card.getName())) { limit == CardLimit.None || limitExceptions.contains(card.getName())) {
max = Integer.MAX_VALUE; max = Integer.MAX_VALUE;
} }