From 4c6b59e7ec0424edc087021e8f1f2ac4b65bb03f Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Mon, 1 Oct 2018 21:45:22 -0600 Subject: [PATCH] avoid NPE when right clicking during draft Signed-off-by: Jamin W. Collins --- .../forge/screens/deckeditor/controllers/ACEditorBase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 f9287da68da..8c35c67ec10 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 @@ -257,7 +257,11 @@ public abstract class ACEditorBase getDeckController(); protected Deck getHumanDeck() { - return getDeckController().getModel().getHumanDeck(); + try { + return getDeckController().getModel().getHumanDeck(); + } catch (NullPointerException ex) { + return null; + } } /**