2 files changed, 7 insertions, 13 deletions
diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp
index 519cd1f19f7..57e5d6682f2 100644
--- a/src/server/authserver/Server/AuthSession.cpp
+++ b/src/server/authserver/Server/AuthSession.cpp
@@ -274,10 +274,7 @@ void AuthSession::SendPacket(ByteBuffer& packet)
     {
         MessageBuffer buffer;
         buffer.Write(packet.contents(), packet.size());
-
-        std::unique_lock<std::mutex> guard(_writeLock);
-
-        QueuePacket(std::move(buffer), guard);
+        QueuePacket(std::move(buffer));
     }
 }
 
diff --git a/src/server/authserver/Server/AuthSocketMgr.h b/src/server/authserver/Server/AuthSocketMgr.h
index fa96502663f..a16b7d405b9 100644
--- a/src/server/authserver/Server/AuthSocketMgr.h
+++ b/src/server/authserver/Server/AuthSocketMgr.h
@@ -21,8 +21,6 @@
 #include "SocketMgr.h"
 #include "AuthSession.h"
 
-void OnSocketAccept(tcp::socket&& sock);
-
 class AuthSocketMgr : public SocketMgr<AuthSession>
 {
     typedef SocketMgr<AuthSession> BaseSocketMgr;
@@ -39,7 +37,7 @@ public:
         if (!BaseSocketMgr::StartNetwork(service, bindIp, port))
             return false;
 
-        _acceptor->AsyncAcceptManaged(&OnSocketAccept);
+        _acceptor->AsyncAcceptWithCallback<&AuthSocketMgr::OnSocketAccept>();
         return true;
     }
 
@@ -48,14 +46,13 @@ protected:
     {
         return new NetworkThread<AuthSession>[1];
     }
+
+    static void OnSocketAccept(tcp::socket&& sock, uint32 threadIndex)
+    {
+        Instance().OnSocketOpen(std::forward<tcp::socket>(sock), threadIndex);
+    }
 };
 
 #define sAuthSocketMgr AuthSocketMgr::Instance()
 
-void OnSocketAccept(tcp::socket&& sock)
-{
-    sAuthSocketMgr.OnSocketOpen(std::forward<tcp::socket>(sock));
-}
-
-
 #endif // AuthSocketMgr_h__