From 23859c59b3a6f5546d439b5913fa9329ab4350aa Mon Sep 17 00:00:00 2001
From: xenohedron <12538125+xenohedron@users.noreply.github.com>
Date: Tue, 11 Mar 2025 01:20:06 -0400
Subject: [PATCH] fix Macabre Reconstruction condition

---
 .../mage/cards/m/MacabreReconstruction.java   | 72 ++-----------------
 1 file changed, 4 insertions(+), 68 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MacabreReconstruction.java b/Mage.Sets/src/mage/cards/m/MacabreReconstruction.java
index cf4dc3a5f4d..8463d84dc66 100644
--- a/Mage.Sets/src/mage/cards/m/MacabreReconstruction.java
+++ b/Mage.Sets/src/mage/cards/m/MacabreReconstruction.java
@@ -1,26 +1,17 @@
 package mage.cards.m;
 
-import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.condition.Condition;
+import mage.abilities.condition.common.CreaturePutInYourGraveyardCondition;
 import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
 import mage.abilities.effects.common.cost.SpellCostReductionSourceEffect;
-import mage.abilities.hint.ConditionHint;
-import mage.abilities.hint.Hint;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.WatcherScope;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.events.ZoneChangeEvent;
 import mage.target.common.TargetCardInYourGraveyard;
-import mage.watchers.Watcher;
+import mage.watchers.common.CreaturePutIntoGraveyardWatcher;
 
-import java.util.HashSet;
-import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -33,8 +24,8 @@ public final class MacabreReconstruction extends CardImpl {
 
         // This spell costs {2} less to cast if a creature card was put into your graveyard from anywhere this turn.
         this.addAbility(new SimpleStaticAbility(
-                Zone.ALL, new SpellCostReductionSourceEffect(2, MacabreReconstructionCondition.instance)
-        ).setRuleAtTheTop(true).addHint(MacabreReconstructionCondition.getHint()), new MacabreReconstructionWatcher());
+                Zone.ALL, new SpellCostReductionSourceEffect(2, CreaturePutInYourGraveyardCondition.instance)
+        ).setRuleAtTheTop(true).addHint(CreaturePutInYourGraveyardCondition.getHint()), new CreaturePutIntoGraveyardWatcher());
 
         // Return up to two target creature cards from your graveyard to your hand.
         this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect());
@@ -52,58 +43,3 @@ public final class MacabreReconstruction extends CardImpl {
         return new MacabreReconstruction(this);
     }
 }
-
-enum MacabreReconstructionCondition implements Condition {
-    instance;
-    private static final Hint hint = new ConditionHint(
-            instance, "A card was put into your graveyard this turn"
-    );
-
-    public static Hint getHint() {
-        return hint;
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        return MacabreReconstructionWatcher.checkPlayer(source.getControllerId(), game);
-    }
-
-    @Override
-    public String toString() {
-        return "a creature card was put into your graveyard from anywhere this turn";
-    }
-}
-
-class MacabreReconstructionWatcher extends Watcher {
-
-    private final Set<UUID> set = new HashSet<>();
-
-    MacabreReconstructionWatcher() {
-        super(WatcherScope.GAME);
-    }
-
-    @Override
-    public void watch(GameEvent event, Game game) {
-        if (event.getType() != GameEvent.EventType.ZONE_CHANGE) {
-            return;
-        }
-        ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
-        if (Zone.GRAVEYARD.match(zEvent.getToZone())) {
-            set.add(game.getOwnerId(zEvent.getTargetId()));
-        }
-    }
-
-    @Override
-    public void reset() {
-        super.reset();
-        set.clear();
-    }
-
-    static boolean checkPlayer(UUID playerId, Game game) {
-        return game
-                .getState()
-                .getWatcher(MacabreReconstructionWatcher.class)
-                .set
-                .contains(playerId);
-    }
-}