From 9b34c322b5cb9765dba3188a6cf4e1b784ff4f7e Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 23 Apr 2025 04:37:54 +0400
Subject: [PATCH] Oni-Cult Anvil - fixed that it doesn't trigger on itself

---
 Mage.Sets/src/mage/cards/o/OniCultAnvil.java | 30 +++++++-------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/o/OniCultAnvil.java b/Mage.Sets/src/mage/cards/o/OniCultAnvil.java
index 7b13c92accb..023b518277f 100644
--- a/Mage.Sets/src/mage/cards/o/OniCultAnvil.java
+++ b/Mage.Sets/src/mage/cards/o/OniCultAnvil.java
@@ -1,9 +1,7 @@
 package mage.cards.o;
 
-import java.util.UUID;
-
 import mage.abilities.Ability;
-import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.LeavesBattlefieldAllTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.common.TapSourceCost;
@@ -14,14 +12,13 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.TargetController;
-import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
-import mage.game.permanent.Permanent;
 import mage.game.permanent.token.ConstructToken;
 
+import java.util.UUID;
+
 /**
  * @author weirddan455
  */
@@ -50,10 +47,10 @@ public final class OniCultAnvil extends CardImpl {
     }
 }
 
-class OniCultAnvilTriggeredAbility extends TriggeredAbilityImpl {
+class OniCultAnvilTriggeredAbility extends LeavesBattlefieldAllTriggeredAbility {
 
     public OniCultAnvilTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new CreateTokenEffect(new ConstructToken()));
+        super(new CreateTokenEffect(new ConstructToken()), StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACTS);
         this.setTriggersLimitEachTurn(1);
         setTriggerPhrase("Whenever one or more artifacts you control leave the battlefield during your turn, ");
     }
@@ -67,20 +64,13 @@ class OniCultAnvilTriggeredAbility extends TriggeredAbilityImpl {
         return new OniCultAnvilTriggeredAbility(this);
     }
 
-    @Override
-    public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.ZONE_CHANGE;
-    }
-
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (game.isActivePlayer(controllerId)) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-            if (zEvent.getFromZone() == Zone.BATTLEFIELD) {
-                Permanent permanent = zEvent.getTarget();
-                return permanent != null && permanent.isControlledBy(controllerId) && permanent.isArtifact(game);
-            }
+        if (!super.checkTrigger(event, game)) {
+            return false;
         }
-        return false;
+
+        // during your turn
+        return game.isActivePlayer(controllerId);
     }
 }