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

Merge branch 'patch-2' into 'master'

Browse Source 
Prevent NPE casting adventure card as spell

See merge request core-developers/forge!2211
This commit is contained in:
swordshine
2019-10-04 03:35:07 +00:00
parent 3c2eac78d6 c9c27faf8f
commit 0dbc90817a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -158,7 +158,8 @@ public class EffectEffect extends SpellAbilityEffect {
if (effectStaticAbilities != null) { if (effectStaticAbilities != null) {
for (final String s : effectStaticAbilities) { for (final String s : effectStaticAbilities) {
final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s)); final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s));
addedStaticAbility.setIntrinsic(true); if (addedStaticAbility != null) //prevent npe casting adventure card spell
addedStaticAbility.setIntrinsic(true);
} }
} }