nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed travis build errors with Talamortis.

Browse Source 
# Conflicts:
#	src/authserver/Server/AuthSocket.cpp
#	src/game/AI/SmartScripts/SmartScript.cpp
#	src/game/Calendar/CalendarMgr.cpp
#	src/game/Chat/Channels/Channel.cpp
#	src/game/Conditions/ConditionMgr.cpp
#	src/game/DungeonFinding/LFGMgr.cpp
#	src/game/DungeonFinding/LFGScripts.cpp
#	src/game/Entities/Player/Player.cpp
#	src/game/Entities/Unit/Unit.cpp
#	src/game/Entities/Vehicle/Vehicle.cpp
#	src/game/Guilds/Guild.cpp
#	src/game/Handlers/ChannelHandler.cpp
#	src/game/Handlers/GuildHandler.cpp
#	src/game/Handlers/LFGHandler.cpp
#	src/game/Handlers/LootHandler.cpp
#	src/game/Handlers/MailHandler.cpp
#	src/game/Handlers/MiscHandler.cpp
#	src/game/Handlers/NPCHandler.cpp
#	src/game/Handlers/PetHandler.cpp
#	src/game/Handlers/PetitionsHandler.cpp
#	src/game/Handlers/QueryHandler.cpp
#	src/game/Handlers/QuestHandler.cpp
#	src/game/Movement/MotionMaster.cpp
#	src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
#	src/game/Server/WorldSession.cpp
#	src/game/Server/WorldSocket.cpp
#	src/game/Spells/SpellEffects.cpp
#	src/scripts/Commands/cs_modify.cpp
This commit is contained in:
Yehonal
2017-08-19 20:31:24 +02:00
parent f794ad2acf
commit bf80a43d78
27 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Server/WorldSession.cpp
View File

@@ -1063,10 +1063,8 @@ void WorldSession::SendAddonsInfo()
if (usepk) // if CRC is wrong, add public key (client need it)
{
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDetail("ADDON: CRC (0x%x) for addon %s is wrong (does not match expected 0x%x), sending pubkey",
sLog->outDetail("ADDON: CRC (0x%x) for addon %s is wrong (does not match expected 0x%x), sending pubkey", itr->CRC, itr->Name.c_str(), STANDARD_ADDON_CRC);
#endif
// itr->CRC, itr->Name.c_str(), STANDARD_ADDON_CRC);
data.append(addonPublicKey, sizeof(addonPublicKey));
}

8
src/game/Server/WorldSocket.cpp
View File

@@ -757,14 +757,8 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
recvPacket.read(digest, 20);
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u",
sLog->outStaticDebug ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u", BuiltNumberClient, unk2, account.c_str(), unk3, clientSeed);
#endif
// BuiltNumberClient,
// unk2,
// account.c_str(),
// unk3,
// clientSeed);
// 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 = ?