From 3e5b3922873cd20cb0943dbc7ccb77508c9b4399 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sun, 7 May 2023 13:31:23 -0400
Subject: [PATCH] Fix Haunt ability to trigger on haunted tokens dying (#7689,
 #10308); add test (#10310)

---
 .../cards/abilities/keywords/HauntTest.java   | 28 +++++++++++++++++--
 .../mage/abilities/keyword/HauntAbility.java  |  3 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HauntTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HauntTest.java
index 417aa80cbd4..3da1ca040ff 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HauntTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HauntTest.java
@@ -47,6 +47,7 @@ public class HauntTest extends CardTestPlayerBase {
                 for (String rule : card.getRules(currentGame)) {
                     if (rule.startsWith("Haunting") &&  rule.contains("Goblin Roughrider")) {
                         found = true;
+                        break;
                     }
                 }
             }
@@ -57,8 +58,9 @@ public class HauntTest extends CardTestPlayerBase {
         for (Card card : currentGame.getBattlefield().getAllActivePermanents()) {
             if (card.getName().equals("Goblin Roughrider")) {
                 for (String rule : card.getRules(currentGame)) {
-                    if (rule.startsWith("Haunted by") &&  rule.contains("Blind Hunter")) {
+                    if (rule.startsWith("Haunted by") && rule.contains("Blind Hunter")) {
                         found = true;
+                        break;
                     }
                 }
             }
@@ -85,14 +87,15 @@ public class HauntTest extends CardTestPlayerBase {
         assertGraveyardCount(playerA, "Lightning Bolt", 2);
         assertExileCount("Blind Hunter", 1);
         assertGraveyardCount(playerA, "Goblin Roughrider", 1);
-        
+        assertLife(playerA, 22);
 
         boolean found = false;
         for (Card card : currentGame.getPlayer(playerA.getId()).getGraveyard().getCards(currentGame)) {
             if (card.getName().equals("Goblin Roughrider")) {
                 for (String rule : card.getRules(currentGame)) {
-                    if (rule.startsWith("Haunted by") &&  rule.contains("Blind Hunter")) {
+                    if (rule.startsWith("Haunted by") && rule.contains("Blind Hunter")) {
                         found = true;
+                        break;
                     }
                 }
             }
@@ -100,5 +103,24 @@ public class HauntTest extends CardTestPlayerBase {
         Assert.assertFalse("Found Haunted by rule text displayed for the card", found);
         
     }
+
+    @Test
+    public void testHauntToken() {
+        addCard(Zone.BATTLEFIELD, playerA, "Blind Hunter");
+        addCard(Zone.HAND, playerA, "Satyr's Cunning");
+        addCard(Zone.HAND, playerA, "Lightning Bolt", 2);
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Satyr's Cunning");
+        castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", "Blind Hunter");
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Satyr Token");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertGraveyardCount(playerA, "Lightning Bolt", 2);
+        assertExileCount("Blind Hunter", 1);
+        assertLife(playerA, 22);
+    }
     
 }
diff --git a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java
index 553dfd8847a..4bd7f4018bc 100644
--- a/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/HauntAbility.java
@@ -81,8 +81,7 @@ public class HauntAbility extends TriggeredAbilityImpl {
                     return false;
                 }
                 Card card = game.getCard(getSourceId());
-                if (card == null
-                        || game.getCard(event.getTargetId()) == null) {
+                if (card == null) {
                     return false;
                 }
                 String key = new StringBuilder("Haunting_")