From d5534f40ea6d50337bf9ff923020f1df0fca3b0e Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 31 Jan 2017 09:15:39 +0000 Subject: [PATCH] - Simple one-line implementation of getTriggeringAbility --- .../src/main/java/forge/game/spellability/SpellAbility.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 5be7fa85c14..bc2ec52fa48 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -527,11 +527,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit } public SpellAbility getTriggeringAbility() { - SpellAbility trigSa = this; - if (!trigSa.isTrigger()) { - trigSa = trigSa.getRootAbility(); - } - return trigSa; + return this.isTrigger() ? this : this.getRootAbility(); } public Map getTriggeringObjects() {