Merge branch 'master' into Playerbot

# Conflicts: # src/server/game/Entities/GameObject/GameObject.h
2026-02-14 07:53:44 +00:00 · 2023-02-13 13:07:03 -07:00
parent ccee04c908 fdfa88093e
commit 4bc9901f16
312 changed files with 6400 additions and 4718 deletions
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -394,6 +394,7 @@ public:
    uint32 GetTotalTime() const { return m_total_time; }

    void InitWarden(SessionKey const&, std::string const& os);
+    Warden* GetWarden();

    /// Session in auth.queue currently
    void SetInQueue(bool state) { m_inQueue = state; }