Update WorldSocket.cpp

This commit is contained in:
Yehonal
2017-08-20 05:39:17 +02:00
committed by GitHub
parent 69d35aed10
commit 41efb63b29
+7 -7
View File
@@ -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); sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u", BuiltNumberClient, unk2, account.c_str(), unk3, clientSeed);
#endif #endif
// Get the account information from the realmd database // Get the account information from the realmd database
// 0 1 2 3 4 5 6 7 8 // 0 1 2 3 4 5 6 7 8 9
// SELECT id, sessionkey, last_ip, locked, expansion, mutetime, locale, recruiter, os FROM account WHERE username = ? // 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); PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_INFO_BY_NAME);
stmt->setString(0, account); stmt->setString(0, account);
@@ -782,7 +782,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
Field* fields = result->Fetch(); Field* fields = result->Fetch();
uint8 expansion = fields[4].GetUInt8(); uint8 expansion = fields[5].GetUInt8();
uint32 world_expansion = sWorld->getIntConfig(CONFIG_EXPANSION); uint32 world_expansion = sWorld->getIntConfig(CONFIG_EXPANSION);
if (expansion > world_expansion) if (expansion > world_expansion)
expansion = world_expansion; expansion = world_expansion;
@@ -809,7 +809,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
k.SetHexStr (fields[1].GetCString()); 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. //! Negative mutetime indicates amount of seconds to be muted effective on next login - which is now.
if (mutetime < 0) if (mutetime < 0)
{ {
@@ -823,12 +823,12 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
LoginDatabase.Execute(stmt); LoginDatabase.Execute(stmt);
} }
locale = LocaleConstant (fields[6].GetUInt8()); locale = LocaleConstant (fields[7].GetUInt8());
if (locale >= TOTAL_LOCALES) if (locale >= TOTAL_LOCALES)
locale = LOCALE_enUS; locale = LOCALE_enUS;
uint32 recruiter = fields[7].GetUInt32(); uint32 recruiter = fields[8].GetUInt32();
std::string os = fields[8].GetString(); std::string os = fields[9].GetString();
// Must be done before WorldSession is created // Must be done before WorldSession is created
if (sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED) && os != "Win" && os != "OSX") if (sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED) && os != "Win" && os != "OSX")