Core: Updated to 7.0.3.21916

9 files changed, 29 insertions, 29 deletions

diff --git a/src/server/game/Server/Packets/AuthenticationPackets.h b/src/server/game/Server/Packets/AuthenticationPackets.h
index 0912c85dcb4..f17e079f0fb 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.h
+++ b/src/server/game/Server/Packets/AuthenticationPackets.h
@@ -209,6 +209,14 @@ namespace WorldPackets
             ConnectToSerial Serial = ConnectToSerial::None;
             uint8 Con = 0;
         };
+
+        class EnableEncryption final : public ServerPacket
+        {
+        public:
+            EnableEncryption() : ServerPacket(SMSG_ENABLE_ENCRYPTION, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
     }
 }
 
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index 4907e42f808..5e7efd257f7 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -88,6 +88,7 @@ WorldPackets::Character::EnumCharactersResult::CharacterInfo::CharacterInfo(Fiel
         CustomizationFlag = CHAR_CUSTOMIZE_FLAG_RACE;
 
     Flags3 = 0;
+    Flags4 = 0;
     FirstLogin = (atLoginFlags & AT_LOGIN_FIRST) != 0;
 
     // show pet at selection character in character list only for non-ghost character
@@ -177,8 +178,9 @@ WorldPacket const* WorldPackets::Character::EnumCharactersResult::Write()
         }
 
         _worldPacket << uint32(charInfo.LastPlayedTime);
-        _worldPacket << uint16(charInfo.UnkLegion);
-        _worldPacket << uint32(charInfo.ClassTrialFlags);
+        _worldPacket << uint16(charInfo.SpecID);
+        _worldPacket << uint32(charInfo.Unknown703);
+        _worldPacket << uint32(charInfo.Flags4);
         _worldPacket.WriteBits(charInfo.Name.length(), 6);
         _worldPacket.WriteBit(charInfo.FirstLogin);
         _worldPacket.WriteBit(charInfo.BoostInProgress);
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index e61b7535cca..ec3ac9dc172 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -135,10 +135,12 @@ namespace WorldPackets
                 uint32 Flags             = 0; ///< Character flag @see enum CharacterFlags
                 uint32 CustomizationFlag = 0; ///< Character customization flags @see enum CharacterCustomizeFlags
                 uint32 Flags3            = 0; ///< Character flags 3 @todo research
+                uint32 Flags4            = 0;
                 bool FirstLogin      = false;
                 uint8 unkWod61x          = 0;
                 uint32 LastPlayedTime    = 0;
-                uint16 UnkLegion         = 0; // may be spec id
+                uint16 SpecID            = 0;
+                uint32 Unknown703;
 
                 struct PetInfo
                 {
@@ -149,7 +151,6 @@ namespace WorldPackets
 
                 bool BoostInProgress = false; ///< @todo
                 int32 ProfessionIds[2];       ///< @todo
-                uint32 ClassTrialFlags      = 0;
 
                 struct VisualItemInfo
                 {
diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp
index 21626fd8640..8cc97ca2557 100644
--- a/src/server/game/Server/Packets/GuildPackets.cpp
+++ b/src/server/game/Server/Packets/GuildPackets.cpp
@@ -69,14 +69,13 @@ WorldPacket const* WorldPackets::Guild::GuildRoster::Write()
     _worldPacket.AppendPackedTime(CreateDate);
     _worldPacket << GuildFlags;
     _worldPacket << uint32(MemberData.size());
+    _worldPacket.WriteBits(WelcomeText.length(), 10);
+    _worldPacket.WriteBits(InfoText.length(), 11);
+    _worldPacket.FlushBits();
 
     for (GuildRosterMemberData const& member : MemberData)
         _worldPacket << member;
 
-    _worldPacket.WriteBits(WelcomeText.length(), 10);
-    _worldPacket.WriteBits(InfoText.length(), 10);
-    _worldPacket.FlushBits();
-
     _worldPacket.WriteString(WelcomeText);
     _worldPacket.WriteString(InfoText);
 
diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp
index 9e8090b03b2..33721e23d5b 100644
--- a/src/server/game/Server/Packets/NPCPackets.cpp
+++ b/src/server/game/Server/Packets/NPCPackets.cpp
@@ -142,15 +142,6 @@ WorldPacket const* WorldPackets::NPC::PlayerTabardVendorActivate::Write()
     return &_worldPacket;
 }
 
-WorldPacket const* WorldPackets::NPC::SuppressNPCGreetings::Write()
-{
-    _worldPacket << UnitGUID;
-    _worldPacket.WriteBit(SuppressNPCGreeting);
-    _worldPacket.FlushBits();
-
-    return &_worldPacket;
-}
-
 WorldPacket const* WorldPackets::NPC::GossipPOI::Write()
 {
     _worldPacket.WriteBits(Flags, 14);
diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h
index 98fa079afaa..b18ce340ae0 100644
--- a/src/server/game/Server/Packets/NPCPackets.h
+++ b/src/server/game/Server/Packets/NPCPackets.h
@@ -172,17 +172,6 @@ namespace WorldPackets
             ObjectGuid Vendor;
         };
 
-        class SuppressNPCGreetings final : public ServerPacket
-        {
-        public:
-            SuppressNPCGreetings() : ServerPacket(SMSG_SUPPRESS_NPC_GREETINGS, 16 + 1) { }
-
-            WorldPacket const* Write() override;
-
-            ObjectGuid UnitGUID;
-            bool SuppressNPCGreeting = false;
-        };
-
         class GossipPOI final : public ServerPacket
         {
         public:
diff --git a/src/server/game/Server/Packets/ReputationPackets.cpp b/src/server/game/Server/Packets/ReputationPackets.cpp
index b3d4572f550..524ab132c80 100644
--- a/src/server/game/Server/Packets/ReputationPackets.cpp
+++ b/src/server/game/Server/Packets/ReputationPackets.cpp
@@ -42,7 +42,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Reputation::ForcedReactio
 
 WorldPacket const* WorldPackets::Reputation::SetForcedReactions::Write()
 {
-    _worldPacket.WriteBits(Reactions.size(), 6);
+    _worldPacket << uint32(Reactions.size());
     for (ForcedReaction const& reaction : Reactions)
         _worldPacket << reaction;
 
diff --git a/src/server/game/Server/Packets/SystemPackets.cpp b/src/server/game/Server/Packets/SystemPackets.cpp
index 395a7c66fe6..e39182b280f 100644
--- a/src/server/game/Server/Packets/SystemPackets.cpp
+++ b/src/server/game/Server/Packets/SystemPackets.cpp
@@ -49,6 +49,7 @@ WorldPacket const* WorldPackets::System::FeatureSystemStatus::Write()
     _worldPacket.WriteBit(Unk67);
     _worldPacket.WriteBit(WillKickFromWorld);
     _worldPacket.WriteBit(KioskModeEnabled);
+    _worldPacket.WriteBit(RaceClassExpansionLevels.is_initialized());
 
     _worldPacket.FlushBits();
 
@@ -72,6 +73,13 @@ WorldPacket const* WorldPackets::System::FeatureSystemStatus::Write()
         _worldPacket << int32(SessionAlert->DisplayTime);
     }
 
+    if (RaceClassExpansionLevels)
+    {
+        _worldPacket << uint32(RaceClassExpansionLevels->size());
+        if (!RaceClassExpansionLevels->empty())
+            _worldPacket.append(RaceClassExpansionLevels->data(), RaceClassExpansionLevels->size());
+    }
+
     return &_worldPacket;
 }
 
diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h
index 1ae7d73d28e..7a420df6859 100644
--- a/src/server/game/Server/Packets/SystemPackets.h
+++ b/src/server/game/Server/Packets/SystemPackets.h
@@ -85,6 +85,8 @@ namespace WorldPackets
             bool TutorialsEnabled                    = false;
             bool NPETutorialsEnabled                 = false;
             bool KioskModeEnabled                    = false;
+
+            Optional<std::vector<uint8>> RaceClassExpansionLevels;
         };
 
         class FeatureSystemStatusGlueScreen final : public ServerPacket