From 9f8c5b96ec67f6b2279c62ef679ade32c2f60386 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Sun, 11 Aug 2024 07:58:30 +0200 Subject: [PATCH] ~NPE fix --- forge-game/src/main/java/forge/game/GameActionUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index 5e8b3c013d4..e9d08d1cae5 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -634,7 +634,9 @@ public final class GameActionUtil { result.getPayCosts().add(cost); reset = true; } - result.setOptionalKeywordAmount(ki, v); + if (result != null) { + result.setOptionalKeywordAmount(ki, v); + } } else if (o.startsWith("Squad")) { String costStr = o.split(":")[1]; final Cost cost = new Cost(costStr, false); @@ -650,7 +652,9 @@ public final class GameActionUtil { result.getPayCosts().add(cost); reset = true; } - result.setOptionalKeywordAmount(ki, v); + if (result != null) { + result.setOptionalKeywordAmount(ki, v); + } } }