Core/PacketIO: Updated SMSG_FEATURE_SYSTEM_STATUS to 9.1.5

3 files changed, 10 insertions, 23 deletions

diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index e3dfd722880..e0ed3b3a997 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -1435,11 +1435,9 @@ void WorldSession::SendFeatureSystemStatus()
     features.BpayStoreEnabled = sWorld->getBoolConfig(CONFIG_FEATURE_SYSTEM_BPAY_STORE_ENABLED);
     features.IsMuted = !CanSpeak();
 
-    SendPacket(features.Write());
+    features.TextToSpeechFeatureEnabled = false;
 
-    WorldPackets::System::FeatureSystemStatus2 features2;
-    features2.TextToSpeechFeatureEnabled = false;
-    SendPacket(features2.Write());
+    SendPacket(features.Write());
 }
 
 void WorldSession::HandleSetFactionAtWar(WorldPackets::Character::SetFactionAtWar& packet)
diff --git a/src/server/game/Server/Packets/SystemPackets.cpp b/src/server/game/Server/Packets/SystemPackets.cpp
index b72a40c7da8..509e73cf838 100644
--- a/src/server/game/Server/Packets/SystemPackets.cpp
+++ b/src/server/game/Server/Packets/SystemPackets.cpp
@@ -102,6 +102,10 @@ WorldPacket const* FeatureSystemStatus::Write()
     _worldPacket.WriteBit(IsMuted);
     _worldPacket.WriteBit(ClubFinderEnabled);
     _worldPacket.WriteBit(Unknown901CheckoutRelated);
+    _worldPacket.WriteBit(TextToSpeechFeatureEnabled);
+    _worldPacket.WriteBit(ChatDisabledByDefault);
+    _worldPacket.WriteBit(ChatDisabledByPlayer);
+    _worldPacket.WriteBit(LFGListCustomRequiresAuthenticator);
 
     _worldPacket.FlushBits();
 
@@ -150,15 +154,6 @@ WorldPacket const* FeatureSystemStatus::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* FeatureSystemStatus2::Write()
-{
-    _worldPacket.WriteBit(TextToSpeechFeatureEnabled);
-    _worldPacket.FlushBits();
-
-    return &_worldPacket;
-}
-
-
 WorldPacket const* FeatureSystemStatusGlueScreen::Write()
 {
     _worldPacket.WriteBit(BpayStoreEnabled);
diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h
index dec27f1017c..65608acea49 100644
--- a/src/server/game/Server/Packets/SystemPackets.h
+++ b/src/server/game/Server/Packets/SystemPackets.h
@@ -146,22 +146,16 @@ namespace WorldPackets
             bool IsMuted                             = false;
             bool ClubFinderEnabled                   = false;
             bool Unknown901CheckoutRelated           = false;
+            bool TextToSpeechFeatureEnabled          = false;
+            bool ChatDisabledByDefault               = false;
+            bool ChatDisabledByPlayer                = false;
+            bool LFGListCustomRequiresAuthenticator  = false;
 
             SocialQueueConfig QuickJoinConfig;
             SquelchInfo Squelch;
             RafSystemFeatureInfo RAFSystem;
         };
 
-        class FeatureSystemStatus2 final : ServerPacket
-        {
-        public:
-            FeatureSystemStatus2() : ServerPacket(SMSG_FEATURE_SYSTEM_STATUS2, 1) { }
-
-            WorldPacket const* Write() override;
-
-            bool TextToSpeechFeatureEnabled = false;
-        };
-
         class FeatureSystemStatusGlueScreen final : public ServerPacket
         {
         public: