From c9c27faf8fd6eeac9f8bab05a93318eea4a95abd Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 3 Oct 2019 05:45:44 +0000 Subject: [PATCH] Prevent NPE casting adventure card as spell --- .../src/main/java/forge/game/ability/effects/EffectEffect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 52fce48cc08..b60f3abea6a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -158,7 +158,8 @@ public class EffectEffect extends SpellAbilityEffect { if (effectStaticAbilities != null) { for (final String s : effectStaticAbilities) { final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s)); - addedStaticAbility.setIntrinsic(true); + if (addedStaticAbility != null) //prevent npe casting adventure card spell + addedStaticAbility.setIntrinsic(true); } }