From 41efb63b292ca4f7831dc798b40d78b35cdc14f1 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sun, 20 Aug 2017 05:39:17 +0200 Subject: [PATCH] Update WorldSocket.cpp --- src/game/Server/WorldSocket.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/Server/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp index f0ebcb90e..e457a9a8c 100644 --- a/src/game/Server/WorldSocket.cpp +++ b/src/game/Server/WorldSocket.cpp @@ -760,8 +760,8 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u", BuiltNumberClient, unk2, account.c_str(), unk3, clientSeed); #endif // Get the account information from the realmd database - // 0 1 2 3 4 5 6 7 8 - // SELECT id, sessionkey, last_ip, locked, expansion, mutetime, locale, recruiter, os FROM account WHERE username = ? + // 0 1 2 3 4 5 6 7 8 9 + // SELECT id, sessionkey, last_ip, locked, lock_country, expansion, mutetime, locale, recruiter, os FROM account WHERE username = ? PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_INFO_BY_NAME); stmt->setString(0, account); @@ -782,7 +782,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) Field* fields = result->Fetch(); - uint8 expansion = fields[4].GetUInt8(); + uint8 expansion = fields[5].GetUInt8(); uint32 world_expansion = sWorld->getIntConfig(CONFIG_EXPANSION); if (expansion > world_expansion) expansion = world_expansion; @@ -809,7 +809,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) k.SetHexStr (fields[1].GetCString()); - int64 mutetime = fields[5].GetInt64(); + int64 mutetime = fields[6].GetInt64(); //! Negative mutetime indicates amount of seconds to be muted effective on next login - which is now. if (mutetime < 0) { @@ -823,12 +823,12 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) LoginDatabase.Execute(stmt); } - locale = LocaleConstant (fields[6].GetUInt8()); + locale = LocaleConstant (fields[7].GetUInt8()); if (locale >= TOTAL_LOCALES) locale = LOCALE_enUS; - uint32 recruiter = fields[7].GetUInt32(); - std::string os = fields[8].GetString(); + uint32 recruiter = fields[8].GetUInt32(); + std::string os = fields[9].GetString(); // Must be done before WorldSession is created if (sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED) && os != "Win" && os != "OSX")