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

Prevent NPE

Browse Source
This commit is contained in:
Anthony Calosa
2019-09-19 23:22:59 +08:00
parent 913d108f69
commit 73f3a5ff85
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
View File

@@ -66,6 +66,8 @@ public class ComputerUtilMana {
// Does not check if mana sources can be used right now, just checks for potential chance. // 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) { public static boolean hasEnoughManaSourcesToCast(final SpellAbility sa, final Player ai) {
if(ai == null || sa == null)
return false;
sa.setActivatingPlayer(ai); sa.setActivatingPlayer(ai);
return payManaCost(sa, ai, true, 0, false); return payManaCost(sa, ai, true, 0, false);
} }

4
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -186,7 +186,9 @@ public class MatchController extends AbstractGuiGame {
final PlayerView p = gameView.getPlayerTurn(); final PlayerView p = gameView.getPlayerTurn();
final PhaseType ph = gameView.getPhase(); 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(); view.resetAllPhaseButtons();
if (lbl != null) { if (lbl != null) {