From bbb4f33e1632d4ab64502ddf108f446ffb148e01 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 7 Nov 2021 17:05:45 -0500 Subject: [PATCH] Core/PacketIO: Updated SMSG_FEATURE_SYSTEM_STATUS to 9.1.5 Port From (https://github.com/TrinityCore/TrinityCore/commit/9630c1b1e5606664ef11a308319db4d21d4c168c) --- Source/Game/Handlers/CharacterHandler.cs | 7 +++---- .../Game/Networking/Packets/SystemPackets.cs | 21 +++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index 31cc4a714..77904d946 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -1112,11 +1112,10 @@ namespace Game features.WarModeFeatureEnabled = WorldConfig.GetBoolValue(WorldCfg.FeatureSystemWarModeEnabled); features.IsMuted = !CanSpeak(); - SendPacket(features); - FeatureSystemStatus2 features2 = new(); - features2.TextToSpeechFeatureEnabled = false; - SendPacket(features2); + features.TextToSpeechFeatureEnabled = false; + + SendPacket(features); } [WorldPacketHandler(ClientOpcodes.SetFactionAtWar)] diff --git a/Source/Game/Networking/Packets/SystemPackets.cs b/Source/Game/Networking/Packets/SystemPackets.cs index 86f5c567b..8b9e69c0a 100644 --- a/Source/Game/Networking/Packets/SystemPackets.cs +++ b/Source/Game/Networking/Packets/SystemPackets.cs @@ -89,6 +89,10 @@ namespace Game.Networking.Packets _worldPacket.WriteBit(IsMuted); _worldPacket.WriteBit(ClubFinderEnabled); _worldPacket.WriteBit(Unknown901CheckoutRelated); + _worldPacket.WriteBit(TextToSpeechFeatureEnabled); + _worldPacket.WriteBit(ChatDisabledByDefault); + _worldPacket.WriteBit(ChatDisabledByPlayer); + _worldPacket.WriteBit(LFGListCustomRequiresAuthenticator); _worldPacket.FlushBits(); { @@ -176,6 +180,10 @@ namespace Game.Networking.Packets public bool IsMuted; public bool ClubFinderEnabled; public bool Unknown901CheckoutRelated; + public bool TextToSpeechFeatureEnabled; + public bool ChatDisabledByDefault; + public bool ChatDisabledByPlayer; + public bool LFGListCustomRequiresAuthenticator; public SocialQueueConfig QuickJoinConfig; public SquelchInfo Squelch; @@ -232,19 +240,6 @@ namespace Game.Networking.Packets public uint DaysInCycle; } } - - public class FeatureSystemStatus2 : ServerPacket - { - public FeatureSystemStatus2() : base(ServerOpcodes.None) { } - - public override void Write() - { - _worldPacket.WriteBit(TextToSpeechFeatureEnabled); - _worldPacket.FlushBits(); - } - - public bool TextToSpeechFeatureEnabled; - } public class FeatureSystemStatusGlueScreen : ServerPacket {