Core/Combat: Some more sanity check asserts to try and track down #21187.

Also, some anti-annoyance treatment for dot tele.

(cherry picked from commit fdacf127395965b426185f05a7b1351138775e89)

1 files changed, 6 insertions, 0 deletions

diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp
index 3e3dde0c184..f2186d7fa8a 100644
--- a/src/server/game/Combat/CombatManager.cpp
+++ b/src/server/game/Combat/CombatManager.cpp
@@ -125,6 +125,12 @@ void PvPCombatReference::SuppressFor(Unit* who)
             who->GetAI()->JustExitedCombat();
 }
 
+CombatManager::~CombatManager()
+{
+    ASSERT(_pveRefs.empty(), "CombatManager::~CombatManager - %s: we still have %zu PvE combat references, one of them is with %s", _owner->GetGUID().ToString().c_str(), _pveRefs.size(), _pveRefs.begin()->first.ToString().c_str());
+    ASSERT(_pvpRefs.empty(), "CombatManager::~CombatManager - %s: we still have %zu PvP combat references, one of them is with %s", _owner->GetGUID().ToString().c_str(), _pvpRefs.size(), _pvpRefs.begin()->first.ToString().c_str());
+}
+
 void CombatManager::Update(uint32 tdiff)
 {
     auto it = _pvpRefs.begin(), end = _pvpRefs.end();