From 395a8f77c4bcf403350bb54c90b217f6ac8e73b6 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Tue, 17 Mar 2026 23:57:47 -0700
Subject: [PATCH] fix: clear corpse reclaim delay on world reset and
 resurrection

Reset corpseReclaimAvailableMs_ to 0 in both world-teardown/re-login
and ghost-flag-cleared paths so the PvP delay countdown never bleeds
into subsequent deaths or sessions.
---
 src/game/game_handler.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index 58b0b622..4ab52388 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -10988,6 +10988,7 @@ void GameHandler::forceClearTaxiAndMovementState() {
     playerDead_ = false;
     releasedSpirit_ = false;
     corpseGuid_ = 0;
+    corpseReclaimAvailableMs_ = 0;
     repopPending_ = false;
     pendingSpiritHealerGuid_ = 0;
     resurrectCasterGuid_ = 0;
@@ -12168,6 +12169,7 @@ void GameHandler::applyUpdateObjectBlock(const UpdateBlock& block, bool& newItem
                                 resurrectPending_ = false;
                                 corpseMapId_ = 0;  // corpse reclaimed
                                 corpseGuid_ = 0;
+                                corpseReclaimAvailableMs_ = 0;
                                 LOG_INFO("Player resurrected (PLAYER_FLAGS ghost cleared)");
                                 if (ghostStateCallback_) ghostStateCallback_(false);
                             }