Merge branch 'azerothcore:master' into Playerbot

src/server/game/Combat/ThreatMgr.h

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