Player: Refactor corpse reclaim delay code to fix crash

Closes #477
cmangos · Oct 29, 2023 · 030f137 · 030f137
1 parent 5247c28
commit 030f137
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -1459,6 +1459,22 @@ SpellAuraHolder const* Player::GetMirrorTimerBuff(MirrorTimer::Type timer) const
     }
 }
 
+uint32 Player::getCorpseReclaimDelayHelper(time_t deathExpirationTime, time_t time, bool pvp) const
+{
+    uint32 count;
+    if ((pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
+        (!pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
+    {
+        count = uint32(deathExpirationTime - time) / DEATH_EXPIRE_STEP;
+        if (count >= MAX_DEATH_COUNT)
+            count = MAX_DEATH_COUNT - 1;
+    }
+    else
+        count = 0;
+
+    return corpseReclaimDelay[count];
+}
+
 bool Player::IsMirrorTimerActive(MirrorTimer::Type timer) const
 {
     return m_mirrorTimers[timer].IsActive();
@@ -22358,16 +22374,11 @@ void Player::UpdateZoneDependentPets()
 
 uint32 Player::GetCorpseReclaimDelay(bool pvp) const
 {
-    if ((pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
-            (!pvp && !sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
-    {
-        return corpseReclaimDelay[0];
-    }
-
     time_t now = time(nullptr);
+    if (now > m_deathExpireTime)
+        now = m_deathExpireTime;
     // 0..2 full period
-    uint32 count = (now < m_deathExpireTime) ? uint32((m_deathExpireTime - now) / DEATH_EXPIRE_STEP) : 0;
-    return corpseReclaimDelay[count];
+    return getCorpseReclaimDelayHelper(m_deathExpireTime, now, pvp);
 }
 
 void Player::UpdateCorpseReclaimDelay()
@@ -22405,19 +22416,7 @@ void Player::SendCorpseReclaimDelay(bool load) const
             return;
 
         bool pvp = corpse->GetType() == CORPSE_RESURRECTABLE_PVP;
-
-        uint32 count;
-        if ((pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
-                (!pvp && sWorld.getConfig(CONFIG_BOOL_DEATH_CORPSE_RECLAIM_DELAY_PVE)))
-        {
-            count = uint32(m_deathExpireTime - corpse->GetGhostTime()) / DEATH_EXPIRE_STEP;
-            if (count >= MAX_DEATH_COUNT)
-                count = MAX_DEATH_COUNT - 1;
-        }
-        else
-            count = 0;
-
-        time_t expected_time = corpse->GetGhostTime() + corpseReclaimDelay[count];
+        time_t expected_time = corpse->GetGhostTime() + getCorpseReclaimDelayHelper(m_deathExpireTime, corpse->GetGhostTime(), pvp);
 
         time_t now = time(nullptr);
         if (now >= expected_time)

diff --git a/src/game/Entities/Player.h b/src/game/Entities/Player.h
@@ -2685,6 +2685,8 @@ class Player : public Unit
         inline uint32 GetMirrorTimerMaxDuration(MirrorTimer::Type timer) const;
         inline SpellAuraHolder const* GetMirrorTimerBuff(MirrorTimer::Type timer) const;
 
+        uint32 getCorpseReclaimDelayHelper(time_t deathExpirationTime, time_t time, bool pvp) const;
+
         /*********************************************************/
         /***                  HONOR SYSTEM                     ***/
         /*********************************************************/