From 6c5384af7b44bf3978644c8532770783459c0b97 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Wed, 24 Jan 2024 18:51:05 +0100
Subject: [PATCH] Fix Tormod, the Desecrator not triggering from Gravecrawler
 (#4585)

---
 forge-game/src/main/java/forge/game/ability/AbilityUtils.java | 2 +-
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java   | 2 +-
 forge-gui/res/cardsfolder/d/dralnus_pet.txt                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index a3c21ab74a1..a841d06dfa4 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -79,7 +79,7 @@ public class AbilityUtils {
             cards.add(hostCard);
             defined = defined.replace("AndSelf", "");
         }
-        
+
         if (defined.equals("Self")) {
             c = hostCard;
         } else if (defined.equals("CorrectedSelf")) {
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 477abec1676..68edd77059f 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -1101,7 +1101,7 @@ public class PhaseHandler implements java.io.Serializable {
                         // Need to check if Zone did change
                         if (currentZone != null && originZone != null && !currentZone.equals(originZone) && (sa.isSpell() || sa instanceof LandAbility)) {
                             // currently there can be only one Spell put on the Stack at once, or Land Abilities be played
-                            final CardZoneTable triggerList = new CardZoneTable();
+                            final CardZoneTable triggerList = new CardZoneTable(game.getLastStateBattlefield(), game.getLastStateGraveyard());
                             triggerList.put(originZone.getZoneType(), currentZone.getZoneType(), saHost);
                             triggerList.triggerChangesZoneAll(game, sa);
                         }
diff --git a/forge-gui/res/cardsfolder/d/dralnus_pet.txt b/forge-gui/res/cardsfolder/d/dralnus_pet.txt
index b103d58975a..9e5b4def9f2 100644
--- a/forge-gui/res/cardsfolder/d/dralnus_pet.txt
+++ b/forge-gui/res/cardsfolder/d/dralnus_pet.txt
@@ -6,7 +6,7 @@ K:Kicker:2 B Discard<1/Creature>
 R:Event$ Moved | ValidCard$ Card.Self+kicked | Destination$ Battlefield | ReplaceWith$ DBPump | ReplacementResult$ Updated | Description$ If CARDNAME was kicked, it enters the battlefield with flying and with X +1/+1 counters on it, where X is the discarded card's mana value.
 SVar:DBPump:DB$ Animate | Defined$ Self | Keywords$ Flying | Duration$ Permanent | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ KickedPet
-SVar:KickedPet:Discarded$CardManaCost
+SVar:KickedPet:CastSA>Discarded$CardManaCost
 AI:RemoveDeck:Random
 DeckHints:Color$Black
 DeckHas:Ability$Counters