From a40c3627643a10df59ef824ea4d51dbe44291157 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 6 Oct 2017 12:44:55 +0000 Subject: [PATCH] - Fixed getTriggeringAbility not finding triggering abilities in the middle of a subability chain, which can happen when e.g. a delayed trigger is generated in the middle of a chain (fixes Goblin Kites). --- .../src/main/java/forge/game/spellability/SpellAbility.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 cc5bd0e46dd..17f3e9035ac 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -541,7 +541,11 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit } public SpellAbility getTriggeringAbility() { - return this.isTrigger() ? this : this.getRootAbility(); + SpellAbility sa = this; + while (sa.getParent() != null && !sa.isTrigger()) { + sa = sa.getParent(); + } + return sa; } public Map getTriggeringObjects() {