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

Merge branch 'NPEfix' into 'master'

Browse Source 
Fix NPE with Realmwalker

See merge request core-developers/forge!6228
This commit is contained in:
Michael Kamensky
2022-02-14 09:42:02 +00:00
parent 866037f5cb 313755fc2f
commit 90bcadd048
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1853,7 +1853,7 @@ public class AbilityUtils {
// Count$TriggeredManaSpent // Count$TriggeredManaSpent
if (sq[0].equals("TriggeredManaSpent")) { if (sq[0].equals("TriggeredManaSpent")) {
final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility); final SpellAbility root = (SpellAbility) sa.getRootAbility().getTriggeringObject(AbilityKey.SpellAbility);
return root.getTotalManaSpent(); return root == null ? 0 : root.getTotalManaSpent();
} }
// Count$Adamant.<Color>.<True>.<False> // Count$Adamant.<Color>.<True>.<False>

1
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1278,7 +1278,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
// TODO JAVA 8 use getOrDefault // TODO JAVA 8 use getOrDefault
for (Card c : player.getAllCards()) { for (Card c : player.getAllCards()) {
// Changeling are all creature types, they are not interesting for // Changeling are all creature types, they are not interesting for
// counting creature types // counting creature types
if (c.hasStartOfKeyword(Keyword.CHANGELING.toString())) { if (c.hasStartOfKeyword(Keyword.CHANGELING.toString())) {