Merge branch 'spellCopyPaidFix' into 'master'

SpellAbility: copy PaidHash when copy spell ability

See merge request core-developers/forge!2800
This commit is contained in:
Michael Kamensky
2020-05-10 15:32:08 +00:00

View File

@@ -884,7 +884,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
clone.id = lki ? id : nextId(); clone.id = lki ? id : nextId();
clone.view = new SpellAbilityView(clone); clone.view = new SpellAbilityView(clone);
// dont use setHostCard to not trigger the not copied parts yet // don't use setHostCard to not trigger the not copied parts yet
copyHelper(clone, host); copyHelper(clone, host);
@@ -909,6 +909,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
clone.changeZoneTable.putAll(changeZoneTable); clone.changeZoneTable.putAll(changeZoneTable);
} }
clone.setPaidHash(Maps.newHashMap(getPaidHash()));
// clear maps for copy, the values will be added later // clear maps for copy, the values will be added later
clone.additionalAbilities = Maps.newHashMap(); clone.additionalAbilities = Maps.newHashMap();
clone.additionalAbilityLists = Maps.newHashMap(); clone.additionalAbilityLists = Maps.newHashMap();