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

~NPE fix

Browse Source
This commit is contained in:
Hans Mackowiak
2024-08-11 07:58:30 +02:00
parent e60194c265
commit 9f8c5b96ec
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -634,7 +634,9 @@ public final class GameActionUtil {
result.getPayCosts().add(cost); result.getPayCosts().add(cost);
reset = true; reset = true;
} }
result.setOptionalKeywordAmount(ki, v); if (result != null) {
result.setOptionalKeywordAmount(ki, v);
}
} else if (o.startsWith("Squad")) { } else if (o.startsWith("Squad")) {
String costStr = o.split(":")[1]; String costStr = o.split(":")[1];
final Cost cost = new Cost(costStr, false); final Cost cost = new Cost(costStr, false);
@@ -650,7 +652,9 @@ public final class GameActionUtil {
result.getPayCosts().add(cost); result.getPayCosts().add(cost);
reset = true; reset = true;
} }
result.setOptionalKeywordAmount(ki, v); if (result != null) {
result.setOptionalKeywordAmount(ki, v);
}
} }
} }