From 73f3a5ff852a165c9ca66988e824d2e456c17b63 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 19 Sep 2019 23:22:59 +0800 Subject: [PATCH] Prevent NPE --- forge-ai/src/main/java/forge/ai/ComputerUtilMana.java | 2 ++ forge-gui-mobile/src/forge/screens/match/MatchController.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java index 1a1b9fc6df5..e12c8457b80 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java @@ -66,6 +66,8 @@ public class ComputerUtilMana { // Does not check if mana sources can be used right now, just checks for potential chance. public static boolean hasEnoughManaSourcesToCast(final SpellAbility sa, final Player ai) { + if(ai == null || sa == null) + return false; sa.setActivatingPlayer(ai); return payManaCost(sa, ai, true, 0, false); } diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 8e3727a03e4..b1bf46bcfaa 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -186,7 +186,9 @@ public class MatchController extends AbstractGuiGame { final PlayerView p = gameView.getPlayerTurn(); final PhaseType ph = gameView.getPhase(); - final PhaseLabel lbl = view.getPlayerPanel(p).getPhaseIndicator().getLabel(ph); + PhaseLabel lbl = null; + if(p != null && ph != null) + lbl = view.getPlayerPanel(p).getPhaseIndicator().getLabel(ph); view.resetAllPhaseButtons(); if (lbl != null) {