Merge branch 'azerothcore:master' into Playerbot

src/server/game/Combat/ThreatMgr.cpp

@@ -406,6 +406,13 @@ ThreatMgr::ThreatMgr(Unit* owner) : iCurrentVictim(nullptr), iOwner(owner), iUpd
 {
 }
 
+void ThreatMgr::ClearAllThreat()
+{
+    if (iOwner->CanHaveThreatList() && !isThreatListEmpty())
+        iOwner->SendClearThreatListOpcode();
+    clearReferences();
+}
+
 //============================================================
 
 void ThreatMgr::clearReferences()

src/server/game/Combat/ThreatMgr.h

@@ -236,6 +236,8 @@ public:
     // -- compatibility layer for combat rewrite
     void ResetAllThreat() { resetAllAggro(); }
 
+    void ClearAllThreat();
+
     // Reset all aggro of unit in threadlist satisfying the predicate.
     template<class PREDICATE> void resetAggro(PREDICATE predicate)
     {