From 129f6ddc7570d0d1d182bd2de394dd7fcc6fa72f Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 8 Dec 2018 09:12:26 +0300 Subject: [PATCH] - Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi. --- .../main/java/forge/game/spellability/SpellAbility.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 3e866b91fb1..b06759ea044 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -400,6 +400,14 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit } public void setOriginalHost(final Card c) { grantorCard = c; + for (List addSaList : this.getAdditionalAbilityLists().values()) { + for (SpellAbility addSa : addSaList) { + addSa.setOriginalHost(c); + } + } + if (this.getSubAbility() != null) { + this.getSubAbility().setOriginalHost(c); + } }