From ff777c568716f2b6f894a07f8858ed21aeed2377 Mon Sep 17 00:00:00 2001
From: "Alex W. Jackson" <alex.w.jackson@gmail.com>
Date: Sat, 5 Nov 2022 04:48:23 -0400
Subject: [PATCH] [STX] Simplify Strict Proctor trigger check

---
 Mage.Sets/src/mage/cards/s/StrictProctor.java | 23 ++++++++++---------
 .../mage/abilities/TriggeredAbilities.java    |  3 ---
 .../mage/abilities/TriggeredAbilityImpl.java  |  1 +
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/s/StrictProctor.java b/Mage.Sets/src/mage/cards/s/StrictProctor.java
index e94df1af1f..af21410dbc 100644
--- a/Mage.Sets/src/mage/cards/s/StrictProctor.java
+++ b/Mage.Sets/src/mage/cards/s/StrictProctor.java
@@ -1,6 +1,8 @@
 package mage.cards.s;
 
 import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbility;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.CounterUnlessPaysEffect;
@@ -12,10 +14,10 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.stack.StackObject;
 import mage.target.targetpointer.FixedTarget;
 
 import java.util.UUID;
-import mage.game.stack.StackAbility;
 
 /**
  * @author TheElk801
@@ -25,8 +27,7 @@ public final class StrictProctor extends CardImpl {
     public StrictProctor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
 
-        this.subtype.add(SubType.SPIRIT);
-        this.subtype.add(SubType.CLERIC);
+        this.subtype.add(SubType.SPIRIT, SubType.CLERIC);
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
@@ -64,16 +65,16 @@ class StrictProctorTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        // retrieve the event that led to the trigger triggering
-        // verify that it is a ETB event
-        StackAbility stackAbilityOfTriggeredAbility = (StackAbility) game.getObject(event.getTargetId());
-        if (stackAbilityOfTriggeredAbility == null
-                || stackAbilityOfTriggeredAbility.getSourceId() == null) {
+        StackObject stackObject = game.getStack().getStackObject(event.getTargetId());
+        if (stackObject == null) {
             return false;
         }
-        GameEvent triggeringEvent = (GameEvent) game.getState().getValue("triggeringEvent" + stackAbilityOfTriggeredAbility.getSourceId());
-        if (triggeringEvent == null
-                || triggeringEvent.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
+        Ability ability = stackObject.getStackAbility();
+        if (!(ability instanceof TriggeredAbility)) {
+            return false;
+        }
+        GameEvent triggerEvent = ((TriggeredAbility) ability).getTriggerEvent();
+        if (triggerEvent == null || triggerEvent.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
             return false;
         }
         // set the target to the ability that gets triggered from the enter the battlefield trigger
diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
index aa6f89bb1d..199da56edc 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilities.java
@@ -93,9 +93,6 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
 
                 if (ability.checkTrigger(event, game) && ability.checkTriggeredAlready(game) && ability.checkUsedAlready(game)) {
                     NumberOfTriggersEvent numberOfTriggersEvent = new NumberOfTriggersEvent(ability, event);
-                    // store the event that led to the triggered event (Strict Proctor)
-                    // numberOfTriggerers event is only checked in replacement effects
-                    game.getState().setValue("triggeringEvent" + ability.getSourceId(), event);
                     if (!game.replaceEvent(numberOfTriggersEvent)) {
                         for (int i = 0; i < numberOfTriggersEvent.getAmount(); i++) {
                             ability.trigger(game, ability.getControllerId(), event);
diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
index f00abee48e..bf0e81d6b3 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
@@ -54,6 +54,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
         this.leavesTheBattlefieldTrigger = ability.leavesTheBattlefieldTrigger;
         this.triggersOnce = ability.triggersOnce;
         this.doOnlyOnce = ability.doOnlyOnce;
+        this.triggerEvent = ability.triggerEvent;
         this.triggerPhrase = ability.triggerPhrase;
     }