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

Merge branch '1380-selective-adaptation-triggers-excessive-memory-usage' into 'master'

Browse Source 
Resolve "'Selective Adaptation' triggers excessive memory usage"

Closes #1380

See merge request core-developers/forge!2762
This commit is contained in:
Michael Kamensky
2020-04-26 15:54:16 +00:00
parent c4963821e5 8d1c02012e
commit 552a7130a5
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,20 +247,7 @@ public final class AbilityFactory {
if (mapParams.containsKey("SubAbility")) { if (mapParams.containsKey("SubAbility")) {
final String name = mapParams.get("SubAbility"); final String name = mapParams.get("SubAbility");
SpellAbility p = parent; spellAbility.setSubAbility(getSubAbility(state, name, spellAbility));
AbilitySub sub = null;
while (p != null) {
sub = p.getAdditionalAbility(name);
if (sub != null) {
break;
}
p = p.getParent();
}
if (sub == null) {
sub = getSubAbility(state, name, spellAbility);
}
spellAbility.setSubAbility(sub);
spellAbility.setAdditionalAbility(name, sub);
} }
for (final String key : additionalAbilityKeys) { for (final String key : additionalAbilityKeys) {