Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Handlers/CharacterHandler.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Spell.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/CMakeLists.txt src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_moonglade.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp src/server/scripts/Spells/spell_hunter.cpp
This commit is contained in:
commit
f16f427c48
82 files changed
+1040
-582
No files matched your search
@@ -773,11 +773,11 @@ int WorldSocket::HandleSendAuthSession()
|
||||
WorldPacket packet(SMSG_AUTH_CHALLENGE, 37);
|
||||
BigNumber seed1;
|
||||
seed1.SetRand(16 * 8);
|
||||
packet.append(seed1.AsByteArray(16), 16); // new encryption seeds
|
||||
packet.append(seed1.AsByteArray(16).get(), 16); // new encryption seeds
|
||||
|
||||
BigNumber seed2;
|
||||
seed2.SetRand(16 * 8);
|
||||
packet.append(seed2.AsByteArray(16), 16); // new encryption seeds
|
||||
packet.append(seed2.AsByteArray(16).get(), 16); // new encryption seeds
|
||||
|
||||
packet << m_Seed;
|
||||
packet << uint8(1);
|
||||
|
||||
Reference in new issue
Block a user