From dbab21059d8e8176e96b47e2ee4d8faa6fdf5d7b Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sun, 11 Dec 2016 08:23:43 +0000 Subject: [PATCH] AbilityFactory: fixed additionalAbilities for AbilitySub without parent (might happen for Trigger) --- forge-game/src/main/java/forge/game/ability/AbilityFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index ead60cb1918..f8f555dbdf0 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -240,7 +240,7 @@ public final class AbilityFactory { } } - if (type != AbilityRecordType.SubAbility) { + if (type != AbilityRecordType.SubAbility || parent == null) { for (final String key : additionalAbilityKeys) { if (mapParams.containsKey(key) && spellAbility.getAdditonalAbility(key) == null) { spellAbility.setAdditionalAbility(key, getSubAbility(hostCard, mapParams.get(key), spellAbility));