From a1d7f2c774b3860ad7130682f241dec352c38da8 Mon Sep 17 00:00:00 2001 From: elliot Date: Wed, 28 Mar 2018 21:32:25 -0400 Subject: [PATCH] Prevent crash when no validTgts in params for static ability Issue reproducable casting chandra's ignition into a board with only a hexproof creature --- .../forge/game/staticability/StaticAbilityCantTarget.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java index 7b773e928da..87ddef0f313 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java @@ -77,10 +77,14 @@ public class StaticAbilityCantTarget { return false; } - if (params.containsKey("SourceCanOnlyTarget") + if (spellAbility.getParam("ValidTgts")!=null && + (params.containsKey("SourceCanOnlyTarget") && (!spellAbility.getParam("ValidTgts").contains(params.get("SourceCanOnlyTarget")) || spellAbility.getParam("ValidTgts").contains(",")) - || spellAbility.getParam("ValidTgts").contains("non" + params.get("SourceCanOnlyTarget"))) { + || spellAbility.getParam("ValidTgts").contains("non" + params.get("SourceCanOnlyTarget") + ) + ) + ){ return false; }