mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-19 18:24:34 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -520,39 +520,39 @@ bool AuthSession::HandleLogonProof()
|
||||
stmt->SetData(2, GetLocaleByName(_localizationName));
|
||||
stmt->SetData(3, _os);
|
||||
stmt->SetData(4, _accountInfo.Login);
|
||||
LoginDatabase.DirectExecute(stmt);
|
||||
|
||||
// Finish SRP6 and send the final result to the client
|
||||
Acore::Crypto::SHA1::Digest M2 = Acore::Crypto::SRP6::GetSessionVerifier(logonProof->A, logonProof->clientM, _sessionKey);
|
||||
|
||||
ByteBuffer packet;
|
||||
if (_expversion & POST_BC_EXP_FLAG) // 2.x and 3.x clients
|
||||
_queryProcessor.AddCallback(LoginDatabase.AsyncQuery(stmt)
|
||||
.WithPreparedCallback([this, M2 = Acore::Crypto::SRP6::GetSessionVerifier(logonProof->A, logonProof->clientM, _sessionKey)](PreparedQueryResult const&)
|
||||
{
|
||||
sAuthLogonProof_S proof;
|
||||
proof.M2 = M2;
|
||||
proof.cmd = AUTH_LOGON_PROOF;
|
||||
proof.error = 0;
|
||||
proof.AccountFlags = 0x00800000; // 0x01 = GM, 0x08 = Trial, 0x00800000 = Pro pass (arena tournament)
|
||||
proof.SurveyId = 0;
|
||||
proof.LoginFlags = 0; // 0x1 = has account message
|
||||
// Finish SRP6 and send the final result to the client
|
||||
ByteBuffer packet;
|
||||
if (_expversion & POST_BC_EXP_FLAG) // 2.x and 3.x clients
|
||||
{
|
||||
sAuthLogonProof_S proof;
|
||||
proof.M2 = M2;
|
||||
proof.cmd = AUTH_LOGON_PROOF;
|
||||
proof.error = 0;
|
||||
proof.AccountFlags = ACCOUNT_FLAG_PROPASS_LOCK; // enum AccountFlag
|
||||
proof.SurveyId = 0;
|
||||
proof.LoginFlags = 0; // 0x1 = has account message
|
||||
|
||||
packet.resize(sizeof(proof));
|
||||
std::memcpy(packet.contents(), &proof, sizeof(proof));
|
||||
}
|
||||
else
|
||||
{
|
||||
sAuthLogonProof_S_Old proof;
|
||||
proof.M2 = M2;
|
||||
proof.cmd = AUTH_LOGON_PROOF;
|
||||
proof.error = 0;
|
||||
proof.unk2 = 0x00;
|
||||
packet.resize(sizeof(proof));
|
||||
std::memcpy(packet.contents(), &proof, sizeof(proof));
|
||||
}
|
||||
else
|
||||
{
|
||||
sAuthLogonProof_S_Old proof;
|
||||
proof.M2 = M2;
|
||||
proof.cmd = AUTH_LOGON_PROOF;
|
||||
proof.error = 0;
|
||||
proof.unk2 = 0x00;
|
||||
|
||||
packet.resize(sizeof(proof));
|
||||
std::memcpy(packet.contents(), &proof, sizeof(proof));
|
||||
}
|
||||
packet.resize(sizeof(proof));
|
||||
std::memcpy(packet.contents(), &proof, sizeof(proof));
|
||||
}
|
||||
|
||||
SendPacket(packet);
|
||||
_status = STATUS_AUTHED;
|
||||
SendPacket(packet);
|
||||
_status = STATUS_AUTHED;
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1295,7 +1295,7 @@ Visibility.GroupMode = 1
|
||||
# Description: Visibility distance to see other players or gameobjects.
|
||||
# Visibility on continents on retail ~100 yards. In BG/Arenas ~250.
|
||||
# For instances default ~170.
|
||||
# Max limited by active player zone: ~ 333
|
||||
# Max: 250
|
||||
# Min limit is max aggro radius (45) * Rate.Creature.Aggro
|
||||
# Default: 100 - (Visibility.Distance.Continents)
|
||||
# 170 - (Visibility.Distance.Instances)
|
||||
@@ -4457,7 +4457,8 @@ Minigob.Manabonk.Enable = 1
|
||||
|
||||
#
|
||||
# Calculate.Creature.Zone.Area.Data
|
||||
# Description: Calculate at loading creature zoneId / areaId and save in creature table (WARNING: SLOW WORLD SERVER STARTUP)
|
||||
# Description: Calculate at loading creature zoneId / areaId and save in creature table
|
||||
# WARNING: SLOW WORLD SERVER STARTUP. Should only be used for debugging.
|
||||
# Default: 0 - (Do not show)
|
||||
#
|
||||
|
||||
@@ -4465,7 +4466,8 @@ Calculate.Creature.Zone.Area.Data = 0
|
||||
|
||||
#
|
||||
# Calculate.Gameoject.Zone.Area.Data
|
||||
# Description: Calculate at loading gameobject zoneId / areaId and save in gameobject table (WARNING: SLOW WORLD SERVER STARTUP)
|
||||
# Description: Calculate at loading gameobject zoneId / areaId and save in gameobject table
|
||||
# WARNING: SLOW WORLD SERVER STARTUP. Should only be used for debugging.
|
||||
# Default: 0 - (Do not show)
|
||||
#
|
||||
|
||||
|
||||
Reference in New Issue
Block a user