From 77832d3a832e8125751f4217f01f64370fd45056 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Thu, 21 Apr 2022 02:09:50 -0400 Subject: [PATCH] Remove an unused field from OrTriggeredAbility --- .../main/java/mage/abilities/meta/OrTriggeredAbility.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java index 5b278552106..e6da4948459 100644 --- a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java @@ -26,7 +26,6 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { private final String ruleTrigger; private TriggeredAbility[] triggeredAbilities; - private List triggeringAbilities; public OrTriggeredAbility(Zone zone, Effect effect, TriggeredAbility... abilities) { this(zone, effect, false, null, abilities); @@ -36,7 +35,6 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { super(zone, effect, optional); this.triggeredAbilities = abilities; this.ruleTrigger = ruleTrigger; - this.triggeringAbilities = new ArrayList<>(); for (TriggeredAbility ability : triggeredAbilities) { //Remove useless data ability.getEffects().clear(); @@ -49,7 +47,6 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { for (int i = 0; i < this.triggeredAbilities.length; i++) { this.triggeredAbilities[i] = ability.triggeredAbilities[i].copy(); } - this.triggeringAbilities = new ArrayList<>(ability.triggeringAbilities); this.ruleTrigger = ability.ruleTrigger; } @@ -66,10 +63,8 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { boolean toRet = false; - for (int i = 0; i < triggeredAbilities.length; i++) { - TriggeredAbility ability = triggeredAbilities[i]; + for (TriggeredAbility ability : triggeredAbilities) { if (ability.checkEventType(event, game) && ability.checkTrigger(event, game)) { - triggeringAbilities.add(i); toRet = true; } } @@ -123,5 +118,4 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl { ability.addWatcher(watcher); } } - }