1 files changed, 6 insertions, 8 deletions
diff --git a/src/server/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp
index 63e0e546e67..7367d823e68 100644
--- a/src/server/game/Handlers/AuthHandler.cpp
+++ b/src/server/game/Handlers/AuthHandler.cpp
@@ -16,12 +16,13 @@
  */
 
 #include "WorldSession.h"
-#include "ObjectMgr.h"
 #include "AuthenticationPackets.h"
+#include "BattlenetRpcErrorCodes.h"
 #include "ClientConfigPackets.h"
+#include "ObjectMgr.h"
 #include "SystemPackets.h"
 
-void WorldSession::SendAuthResponse(uint8 code, bool queued, uint32 queuePos)
+void WorldSession::SendAuthResponse(uint32 code, bool queued, uint32 queuePos)
 {
     WorldPackets::Auth::AuthResponse response;
     response.Result = code;
@@ -31,8 +32,7 @@ void WorldSession::SendAuthResponse(uint8 code, bool queued, uint32 queuePos)
         response.WaitInfo = boost::in_place();
         response.WaitInfo->WaitCount = queuePos;
     }
-
-    if (code == AUTH_OK)
+    else if (code == ERROR_OK)
     {
         response.SuccessInfo = boost::in_place();
 
@@ -59,14 +59,12 @@ void WorldSession::SendAuthResponse(uint8 code, bool queued, uint32 queuePos)
 void WorldSession::SendAuthWaitQue(uint32 position)
 {
     WorldPackets::Auth::AuthResponse response;
+    response.Result = ERROR_OK;
 
-    if (position == 0)
-        response.Result = AUTH_OK;
-    else
+    if (position)
     {
         response.WaitInfo = boost::in_place();
         response.WaitInfo->WaitCount = position;
-        response.Result = AUTH_WAIT_QUEUE;
     }
 
     SendPacket(response.Write());