From a1891d8d8f8acd42dc1bd0c55ef4be3a8763cac9 Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Sat, 13 Jan 2024 05:45:43 -0300
Subject: [PATCH] fix(Core/ThreatMgr): Remove temp threat on resetting threat
 list (#18162)

---
 src/server/game/Combat/ThreatMgr.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/server/game/Combat/ThreatMgr.cpp b/src/server/game/Combat/ThreatMgr.cpp
index c1041da49..21b3741d8 100644
--- a/src/server/game/Combat/ThreatMgr.cpp
+++ b/src/server/game/Combat/ThreatMgr.cpp
@@ -654,8 +654,12 @@ void ThreatMgr::ResetAllThreat()
     if (threatList.empty())
         return;
 
-    for (ThreatContainer::StorageType::iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
-        (*itr)->SetThreat(0);
+    for (HostileReference* ref : threatList)
+    {
+        // Reset temp threat before setting threat back to 0.
+        ref->resetTempThreat();
+        ref->SetThreat(0.f);
+    }
 
     setDirty(true);
 }