Merge branch 'mutate_skip_permanent_sa' into 'master'

Don't add SA that are permanent spells to mutated creature

See merge request core-developers/forge!4116
This commit is contained in:
Michael Kamensky
2021-03-06 04:58:33 +00:00

View File

@@ -27,6 +27,7 @@ import forge.game.CardTraitBase;
import forge.game.ForgeScript; import forge.game.ForgeScript;
import forge.game.GameObject; import forge.game.GameObject;
import forge.game.IHasSVars; import forge.game.IHasSVars;
import forge.game.ability.ApiType;
import forge.game.card.CardView.CardStateView; import forge.game.card.CardView.CardStateView;
import forge.game.keyword.Keyword; import forge.game.keyword.Keyword;
import forge.game.keyword.KeywordCollection; import forge.game.keyword.KeywordCollection;
@@ -580,7 +581,7 @@ public class CardState extends GameObject implements IHasSVars {
} }
for (SpellAbility sa : source.nonManaAbilities) { for (SpellAbility sa : source.nonManaAbilities) {
if (sa.isIntrinsic()) { if (sa.isIntrinsic() && sa.getApi() != ApiType.PermanentCreature && sa.getApi() != ApiType.PermanentNoncreature) {
nonManaAbilities.add(sa.copy(card, lki)); nonManaAbilities.add(sa.copy(card, lki));
} }
} }