Core/Combat: some more detailed assertions to possibly shed light on #21187.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp
index 0ea271e4016..1700a2803c2 100644
--- a/src/server/game/Combat/CombatManager.cpp
+++ b/src/server/game/Combat/CombatManager.cpp
@@ -308,13 +308,13 @@ void CombatManager::PutReference(ObjectGuid const& guid, CombatReference* ref)
     if (ref->_isPvP)
     {
         auto& inMap = _pvpRefs[guid];
-        ASSERT(!inMap && "Duplicate combat state detected - memory leak!");
+        ASSERT(!inMap, "Duplicate combat state at %p being inserted for %s vs %s - memory leak!", ref, _owner->GetGUID().ToString().c_str(), guid.ToString().c_str());
         inMap = static_cast<PvPCombatReference*>(ref);
     }
     else
     {
         auto& inMap = _pveRefs[guid];
-        ASSERT(!inMap && "Duplicate combat state detected - memory leak!");
+        ASSERT(!inMap, "Duplicate combat state at %p being inserted for %s vs %s - memory leak!", ref, _owner->GetGUID().ToString().c_str(), guid.ToString().c_str());
         inMap = ref;
     }
 }
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 3356dba4d13..5ccecaf1e97 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -684,7 +684,7 @@ void ThreatManager::SendNewVictimToClients(ThreatReference const* victimRef) con
 void ThreatManager::PutThreatListRef(ObjectGuid const& guid, ThreatReference* ref)
 {
     auto& inMap = _myThreatListEntries[guid];
-    ASSERT(!inMap && "Duplicate threat list entry being inserted - memory leak!");
+    ASSERT(!inMap, "Duplicate threat reference at %p being inserted on %s for %s - memory leak!", ref, _owner->GetGUID().ToString().c_str(), guid.ToString().c_str());
     inMap = ref;
     ref->_handle = _sortedThreatList.push(ref);
 }
@@ -708,7 +708,7 @@ void ThreatManager::PurgeThreatListRef(ObjectGuid const& guid, bool sendRemove)
 void ThreatManager::PutThreatenedByMeRef(ObjectGuid const& guid, ThreatReference* ref)
 {
     auto& inMap = _threatenedByMe[guid];
-    ASSERT(!inMap && "Duplicate entry being inserted into threatened by me list - potential memory leak!");
+    ASSERT(!inMap, "Duplicate threatened-by-me reference at %p being inserted on %s for %s - memory leak!", ref, _owner->GetGUID().ToString().c_str(), guid.ToString().c_str());
     inMap = ref;
 }