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

Merge branch 'fix_nre_loading_limited_deck' into 'master'

Browse Source 
Fix null reference exception when loading deck

See merge request core-developers/forge!2015
This commit is contained in:
Michael Kamensky
2019-08-12 16:46:29 +00:00
parent e483981207 3c6d45ff0c
commit 40b21710b1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
View File

@@ -88,12 +88,11 @@ public class DeckController<T extends DeckBase> {
* Load deck from file or clipboard * Load deck from file or clipboard
*/ */
public void loadDeck(Deck deck) { public void loadDeck(Deck deck) {
if (view.getCatalogManager().isInfinite()) {
if (deck.getName() == "") { if (deck.getName() == "") {
newModel(); newModel();
} }
} else {
if (!view.getCatalogManager().isInfinite()) {
CardPool catalogClone = new CardPool(view.getInitialCatalog()); CardPool catalogClone = new CardPool(view.getInitialCatalog());
deck = pickFromCatalog(deck, catalogClone); deck = pickFromCatalog(deck, catalogClone);
ItemPool<PaperCard> catalogPool = view.getCatalogManager().getPool(); ItemPool<PaperCard> catalogPool = view.getCatalogManager().getPool();