From 78b6c3610deb33d3903986f72b9395b3bbd6701c Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Wed, 11 Jan 2017 18:55:17 +0000
Subject: [PATCH] - A more graceful solution for cases when a deck ends up
 being null for any reason in ACEditorBase.

---
 .../screens/deckeditor/controllers/ACEditorBase.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
index 4ac3fcc391a..d012b0f4fae 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
@@ -209,14 +209,12 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
             }
         }
 
-        if (deck == null) {
-            System.err.println("Warning: ACEditorBase#getAllowedAdditions could not properly process the deck in controller.getModel(), returning empty item pool.");
-            return additions; // returning empty additions
+        Iterable<Entry<String,Integer>> cardsByName = null;
+        if (deck != null) {
+            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) {
 
             final TItem item = itemEntry.getKey();
@@ -224,7 +222,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
             int qty = itemEntry.getValue();
 
             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())) {
                 max = Integer.MAX_VALUE;
             }