Fix queued session state

celguar · Nov 4, 2024 · c5f98ec · c5f98ec
1 parent cd422e4
commit c5f98ec
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
@@ -501,7 +501,23 @@ bool WorldSession::Update(uint32 diff)
                 m_socket = m_requestSocket;
                 m_requestSocket = nullptr;
                 sLog.outDetail("New Session key %s", m_socket->GetSessionKey().AsHexStr());
-                SendAuthOk();
+                if (m_inQueue)
+                {
+                    if (!sWorld.GetQueuedSessionPos(this))
+                    {
+                        SetInQueue(false);
+                        SendAuthOk();
+                    }
+                    else
+                    {
+                        // reset state
+                        m_sessionState = WORLD_SESSION_STATE_CREATED;
+                        SendAuthQueued();
+                        return true;
+                    }
+                }
+                else
+                    SendAuthOk();
             }
             else
             {