From 313755fc2f8468ef9dc54b1ec0c319589277097c Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Mon, 14 Feb 2022 09:57:02 +0100 Subject: [PATCH] Fix NPE with Realmwalker --- forge-game/src/main/java/forge/game/ability/AbilityUtils.java | 2 +- forge-gui/src/main/java/forge/player/PlayerControllerHuman.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 4426492e8c5..242df235f0c 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -1853,7 +1853,7 @@ public class AbilityUtils { // Count$TriggeredManaSpent if (sq[0].equals("TriggeredManaSpent")) { final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility); - return root.getTotalManaSpent(); + return root == null ? 0 : root.getTotalManaSpent(); } // Count$Adamant... diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 1a7b26f5b8f..b829ed6a052 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1278,7 +1278,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont // TODO JAVA 8 use getOrDefault for (Card c : player.getAllCards()) { - // Changeling are all creature types, they are not interesting for // counting creature types if (c.hasStartOfKeyword(Keyword.CHANGELING.toString())) {