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

AbilityFactory: fixed additionalAbilities for AbilitySub without parent (might happen for Trigger)

Browse Source
This commit is contained in:
Hanmac
2016-12-11 08:23:43 +00:00
parent cb337f39aa
commit dbab21059d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityFactory.java
View File

@@ -240,7 +240,7 @@ public final class AbilityFactory {
} }
} }
if (type != AbilityRecordType.SubAbility) { if (type != AbilityRecordType.SubAbility || parent == null) {
for (final String key : additionalAbilityKeys) { for (final String key : additionalAbilityKeys) {
if (mapParams.containsKey(key) && spellAbility.getAdditonalAbility(key) == null) { if (mapParams.containsKey(key) && spellAbility.getAdditonalAbility(key) == null) {
spellAbility.setAdditionalAbility(key, getSubAbility(hostCard, mapParams.get(key), spellAbility)); spellAbility.setAdditionalAbility(key, getSubAbility(hostCard, mapParams.get(key), spellAbility));