From bfd73e7f47ec670308f72cbd0dbc42ef80cd7e92 Mon Sep 17 00:00:00 2001 From: ForesterDev <11771800+ForesterDev@users.noreply.github.com> Date: Sat, 11 Apr 2020 21:49:36 +0400 Subject: Core/PacketIO: updated SMSG_FEATURE_SYSTEM_STATUS (#24403) * Core/Packets: updated SMSG_FEATURE_SYSTEM_STATUS (cherry picked from commit 231207970bf9c28971def453d2622aa17fe36b43) # Conflicts: # src/server/game/Battlegrounds/ArenaTeam.cpp # src/server/game/Entities/Player/Player.cpp # src/server/game/Entities/Player/Player.h # src/server/game/Handlers/CharacterHandler.cpp # src/server/game/Handlers/GroupHandler.cpp # src/server/game/Handlers/SpellHandler.cpp # src/server/game/Server/Packets/SpellPackets.cpp # src/server/game/Server/Packets/SpellPackets.h # src/server/game/Server/Packets/SystemPackets.cpp # src/server/game/Server/Packets/SystemPackets.h # src/server/game/Server/Protocol/Opcodes.cpp # src/server/game/Server/Protocol/Opcodes.h # src/server/game/Server/WorldSession.h * Define complaint status values and replace magic numbers * Add missing header Co-authored-by: joschiwald --- src/server/game/Handlers/CharacterHandler.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/server/game/Handlers/CharacterHandler.cpp') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index bb7117e2f3b..ed3923ca971 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -48,6 +48,7 @@ #include "ScriptMgr.h" #include "ServerMotd.h" #include "SocialMgr.h" +#include "SystemPackets.h" #include "QueryHolder.h" #include "World.h" @@ -747,10 +748,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) LoadAccountData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_ACCOUNT_DATA), PER_CHARACTER_CACHE_MASK); SendAccountDataTimes(PER_CHARACTER_CACHE_MASK); - WorldPacket data(SMSG_FEATURE_SYSTEM_STATUS, 2); // added in 2.2.0 - data << uint8(2); // unknown value - data << uint8(0); // enable(1)/disable(0) voice chat interface in client - SendPacket(&data); + SendFeatureSystemStatus(); // Send MOTD { @@ -786,7 +784,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) } } - data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4+4); + WorldPacket data(SMSG_LEARNED_DANCE_MOVES, 4+4); data << uint32(0); data << uint32(0); SendPacket(&data); @@ -1004,6 +1002,14 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) delete holder; } +void WorldSession::SendFeatureSystemStatus() +{ + WorldPackets::System::FeatureSystemStatus features; + features.ComplaintStatus = COMPLAINT_ENABLED_WITH_AUTO_IGNORE; + features.VoiceEnabled = false; + SendPacket(features.Write()); +} + void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData) { TC_LOG_DEBUG("network", "WORLD: Received CMSG_SET_FACTION_ATWAR"); -- cgit v1.2.3