From c43ab8fd84ac91718d7986e455aeb3ac84f5cb6e Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 11 Nov 2022 09:28:37 -0500 Subject: [PATCH] GameAction fix NPE for ScryBottom --- forge-game/src/main/java/forge/game/GameAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index fa13fa72e18..142090a8eb6 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -2343,7 +2343,7 @@ public class GameAction { // set up triggers (but not actually do them until later) final Map runParams = AbilityKey.mapFromPlayer(p); runParams.put(AbilityKey.ScryNum, numLookedAt); - runParams.put(AbilityKey.ScryBottom, toBottom.size()); + runParams.put(AbilityKey.ScryBottom, toBottom == null ? 0 : toBottom.size()); game.getTriggerHandler().runTrigger(TriggerType.Scry, runParams, false); } }