From bf01151085817e6e93fa2038b809ad1df091e8e4 Mon Sep 17 00:00:00 2001
From: jmlundeen <jmlundee@yahoo.com>
Date: Tue, 18 Mar 2025 23:05:41 -0500
Subject: [PATCH] Replace UntapAllThatAttackedEffect

---
 Mage.Sets/src/mage/cards/f/FullThrottle.java  | 10 ++++++--
 .../common/AdditionalCombatPhaseEffect.java   | 23 +------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/f/FullThrottle.java b/Mage.Sets/src/mage/cards/f/FullThrottle.java
index 2f2577ef2bf..99feea84526 100644
--- a/Mage.Sets/src/mage/cards/f/FullThrottle.java
+++ b/Mage.Sets/src/mage/cards/f/FullThrottle.java
@@ -10,6 +10,8 @@ import mage.abilities.effects.common.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.AttackedThisTurnPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.turn.Turn;
@@ -26,7 +28,7 @@ public final class FullThrottle extends CardImpl {
 
         // After this main phase, there are two additional combat phases.
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
-                new AdditionalCombatPhaseEffect(2, TargetController.ANY),
+                new AdditionalCombatPhaseEffect(2),
                 new OrCondition(new IsPhaseCondition(TurnPhase.PRECOMBAT_MAIN), new IsPhaseCondition(TurnPhase.POSTCOMBAT_MAIN)),
                 "After this main phase, there are two additional combat phases."
         ));
@@ -46,9 +48,13 @@ public final class FullThrottle extends CardImpl {
 }
 
 class FullThrottleTriggeredAbility extends DelayedTriggeredAbility {
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures that attacked this turn");
 
+    static {
+        filter.add(AttackedThisTurnPredicate.instance);
+    }
     public FullThrottleTriggeredAbility() {
-        super(new UntapAllThatAttackedEffect(), Duration.EndOfTurn, false);
+        super(new UntapAllEffect(filter), Duration.EndOfTurn, false);
         setTriggerPhrase("At the beginning of each combat this turn, ");
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java
index 52012fa514c..273fcbe3cff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java
@@ -3,30 +3,22 @@ package mage.abilities.effects.common;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
-import mage.constants.TargetController;
 import mage.constants.TurnPhase;
 import mage.game.Game;
 import mage.game.turn.TurnMod;
 
-import java.util.UUID;
 
 public class AdditionalCombatPhaseEffect extends OneShotEffect {
 
     private final int additionalPhases;
-    private final TargetController targetController;
 
     public AdditionalCombatPhaseEffect() {
         super(Outcome.Benefit);
         this.additionalPhases = 1;
-        this.targetController = TargetController.YOU;
         staticText = "after this phase, there is an additional combat phase";
     }
 
     public AdditionalCombatPhaseEffect(int additionalPhases) {
-        this(additionalPhases, TargetController.YOU);
-    }
-
-    public AdditionalCombatPhaseEffect(int additionalPhases, TargetController targetController) {
         super(Outcome.Benefit);
         if (additionalPhases < 1) {
             throw new IllegalArgumentException("Number of additional phases must be at least 1");
@@ -38,13 +30,11 @@ public class AdditionalCombatPhaseEffect extends OneShotEffect {
             this.additionalPhases = additionalPhases;
             staticText = "after this phase, there are " + additionalPhases + " additional combat phases";
         }
-        this.targetController = targetController;
     }
 
     protected AdditionalCombatPhaseEffect(final AdditionalCombatPhaseEffect effect) {
         super(effect);
         this.additionalPhases = effect.additionalPhases;
-        this.targetController = effect.targetController;
     }
 
     @Override
@@ -54,19 +44,8 @@ public class AdditionalCombatPhaseEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        UUID controllerId;
-        switch (targetController) {
-            case YOU:
-                controllerId = source.getControllerId();
-                break;
-            case ANY:
-                controllerId = game.getActivePlayerId();
-                break;
-            default:
-                throw new UnsupportedOperationException("Unsupported TargetController in AdditionalCombatPhaseEffect: " + targetController);
-        }
         for (int i = 0; i < additionalPhases; i++) {
-            TurnMod combat = new TurnMod(controllerId).withExtraPhase(TurnPhase.COMBAT);
+            TurnMod combat = new TurnMod(game.getState().getActivePlayerId()).withExtraPhase(TurnPhase.COMBAT);
             game.getState().getTurnMods().add(combat);
         }
         return true;