From a4096ebd0c47665ecc44bdd853e5ee1696c49795 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 9 Feb 2020 17:02:45 -0500 Subject: [PATCH] Core/PacketIO: Name unknown field in SMSG_FEATURE_SYSTEM_STATUS Port From (https://github.com/TrinityCore/TrinityCore/commit/bdc34c46aaa6b3e25a634c077976bb089a5cfd76) --- Source/Game/Handlers/CharacterHandler.cs | 4 ++++ Source/Game/Network/Packets/SystemPackets.cs | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index c029f1b42..9f920b1d7 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -909,6 +909,10 @@ namespace Game features.EuropaTicketSystemStatus.Value.ComplaintsEnabled = WorldConfig.GetBoolValue(WorldCfg.SupportComplaintsEnabled); features.EuropaTicketSystemStatus.Value.SuggestionsEnabled = WorldConfig.GetBoolValue(WorldCfg.SupportSuggestionsEnabled); + features.CharUndeleteEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemCharacterUndeleteEnabled); + features.BpayStoreEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemBpayStoreEnabled); + features.IsMuted = !CanSpeak(); + SendPacket(features); } diff --git a/Source/Game/Network/Packets/SystemPackets.cs b/Source/Game/Network/Packets/SystemPackets.cs index 251527b83..4ffd786b1 100644 --- a/Source/Game/Network/Packets/SystemPackets.cs +++ b/Source/Game/Network/Packets/SystemPackets.cs @@ -87,7 +87,7 @@ namespace Game.Network.Packets _worldPacket.WriteBit(VoiceChatDisabledByParentalControl); _worldPacket.WriteBit(VoiceChatMutedByParentalControl); _worldPacket.WriteBit(QuestSessionEnabled); - _worldPacket.WriteBit(Unused825); + _worldPacket.WriteBit(IsMuted); _worldPacket.WriteBit(ClubFinderEnabled); _worldPacket.FlushBits(); @@ -131,7 +131,7 @@ namespace Game.Network.Packets _worldPacket.WriteUInt8(level); } - _worldPacket.WriteBit(VoiceChatManagerSettings.Enabled); + _worldPacket.WriteBit(VoiceChatManagerSettings.IsSquelched); _worldPacket.WritePackedGuid(VoiceChatManagerSettings.BnetAccountGuid); _worldPacket.WritePackedGuid(VoiceChatManagerSettings.GuildGuid); @@ -189,7 +189,7 @@ namespace Game.Network.Packets public bool VoiceChatDisabledByParentalControl; public bool VoiceChatMutedByParentalControl; public bool QuestSessionEnabled; - public bool Unused825; + public bool IsMuted; public bool ClubFinderEnabled; public Optional> RaceClassExpansionLevels; @@ -251,7 +251,7 @@ namespace Game.Network.Packets public struct VoiceChatProxySettings { - public bool Enabled; + public bool IsSquelched; public ObjectGuid BnetAccountGuid; public ObjectGuid GuildGuid; }