Merge branch 'azerothcore:master' into Playerbot

2022-05-19 12:55:28 -06:00
parent cc94955bb2 d94f8b5970
commit 34b332b51b
80 changed files with 280 additions and 175 deletions
@@ -126,7 +126,7 @@ public:

    void setThreatMgr(ThreatMgr* pThreatMgr) { iThreatMgr = pThreatMgr; }

-    [[nodiscard]] ThreatMgr* getThreatMgr() const { return iThreatMgr; }
+    [[nodiscard]] ThreatMgr* GetThreatMgr() const { return iThreatMgr; }
 };

 //==============================================================