From 21214d12c81ef5828a778854f066561e5ed2b7ef Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Fri, 5 Nov 2021 00:42:34 +0700
Subject: [PATCH] feat(Core/Socket): make world OnSocketAccept like auth
 (#8946)

---
 src/server/game/Server/WorldSocketMgr.cpp | 7 +------
 src/server/game/Server/WorldSocketMgr.h   | 5 +++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index c1bcff5ef..3ea3e5324 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -22,11 +22,6 @@
 #include "WorldSocketMgr.h"
 #include <boost/system/error_code.hpp>
 
-static void OnSocketAccept(tcp::socket&& sock, uint32 threadIndex)
-{
-    sWorldSocketMgr.OnSocketOpen(std::forward<tcp::socket>(sock), threadIndex);
-}
-
 class WorldSocketThread : public NetworkThread<WorldSocket>
 {
 public:
@@ -73,7 +68,7 @@ bool WorldSocketMgr::StartWorldNetwork(Acore::Asio::IoContext& ioContext, std::s
     if (!BaseSocketMgr::StartNetwork(ioContext, bindIp, port, threadCount))
         return false;
 
-    _acceptor->AsyncAcceptWithCallback<&OnSocketAccept>();
+    _acceptor->AsyncAcceptWithCallback<&WorldSocketMgr::OnSocketAccept>();
 
     sScriptMgr->OnNetworkStart();
     return true;
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index 7ecb4aebb..cf37c3c98 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -50,6 +50,11 @@ protected:
 
     NetworkThread<WorldSocket>* CreateThreads() const override;
 
+    static void OnSocketAccept(tcp::socket&& sock, uint32 threadIndex)
+    {
+        Instance().OnSocketOpen(std::forward<tcp::socket>(sock), threadIndex);
+    }
+
 private:
     int32 _socketSystemSendBufferSize;
     int32 _socketApplicationSendBufferSize;