Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

src/common/Common.h

@@ -62,7 +62,6 @@ enum LocaleConstant : uint8
 #define DEFAULT_LOCALE LOCALE_enUS
 
 #define MAX_LOCALES 8
-#define MAX_ACCOUNT_TUTORIAL_VALUES 8
 
 TC_COMMON_API extern char const* localeNames[TOTAL_LOCALES];
 

src/server/game/Combat/ThreatManager.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "ThreatManager.h"
+#include "CombatPackets.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureGroups.h"
@@ -833,31 +834,42 @@ void ThreatManager::SendClearAllThreatToClients() const
 
 void ThreatManager::SendRemoveToClients(Unit const* victim) const
 {
-    WorldPacket data(SMSG_THREAT_REMOVE, 16);
-    data << _owner->GetPackGUID();
-    data << victim->GetPackGUID();
-    _owner->SendMessageToSet(&data, false);
+    WorldPackets::Combat::ThreatRemove threatRemove;
+    threatRemove.UnitGUID = _owner->GetGUID();
+    threatRemove.AboutGUID = victim->GetGUID();
+    _owner->SendMessageToSet(threatRemove.Write(), false);
 }
 
 void ThreatManager::SendThreatListToClients(bool newHighest) const
 {
-    WorldPacket data(newHighest ? SMSG_HIGHEST_THREAT_UPDATE : SMSG_THREAT_UPDATE, (_sortedThreatList->size() + 2) * 8); // guess
-    data << _owner->GetPackGUID();
+    auto fillSharedPacketDataAndSend = [&](auto& packet)
+    {
+        packet.UnitGUID = _owner->GetGUID();
+        packet.ThreatList.reserve(_sortedThreatList->size());
+        for (ThreatReference const* ref : *_sortedThreatList)
+        {
+            if (!ref->IsAvailable())
+                continue;
+
+            WorldPackets::Combat::ThreatInfo threatInfo;
+            threatInfo.UnitGUID = ref->GetVictim()->GetGUID();
+            threatInfo.Threat = int32(ref->GetThreat() * 100);
+            packet.ThreatList.push_back(threatInfo);
+        }
+        _owner->SendMessageToSet(packet.Write(), false);
+    };
+
     if (newHighest)
-        data << _currentVictimRef->GetVictim()->GetPackGUID();
-    size_t countPos = data.wpos();
-    data << uint32(0); // placeholder
-    uint32 count = 0;
-    for (ThreatReference const* ref : *_sortedThreatList)
     {
-        if (!ref->IsAvailable())
-            continue;
-        data << ref->GetVictim()->GetPackGUID();
-        data << uint32(ref->GetThreat() * 100);
-        ++count;
+        WorldPackets::Combat::HighestThreatUpdate highestThreatUpdate;
+        highestThreatUpdate.HighestThreatGUID = _currentVictimRef->GetVictim()->GetGUID();
+        fillSharedPacketDataAndSend(highestThreatUpdate);
+    }
+    else
+    {
+        WorldPackets::Combat::ThreatUpdate threatUpdate;
+        fillSharedPacketDataAndSend(threatUpdate);
     }
-    data.put<uint32>(countPos, count);
-    _owner->SendMessageToSet(&data, false);
 }
 
 void ThreatManager::PutThreatListRef(ObjectGuid const& guid, ThreatReference* ref)

src/server/game/Entities/Creature/Creature.cpp

@@ -18,6 +18,7 @@
 #include "Creature.h"
 #include "BattlegroundMgr.h"
 #include "CellImpl.h"
+#include "CombatPackets.h"
 #include "Common.h"
 #include "Containers.h"
 #include "CreatureAI.h"
@@ -2312,12 +2313,12 @@ Unit* Creature::SelectNearestTargetInAttackDistance(float dist) const
 
 void Creature::SendAIReaction(AiReaction reactionType)
 {
-    WorldPacket data(SMSG_AI_REACTION, 12);
+    WorldPackets::Combat::AIReaction packet;
 
-    data << GetGUID();
-    data << uint32(reactionType);
+    packet.UnitGUID = GetGUID();
+    packet.Reaction = reactionType;
 
-    ((WorldObject*)this)->SendMessageToSet(&data, true);
+    SendMessageToSet(packet.Write(), true);
 
     TC_LOG_DEBUG("network", "WORLD: Sent SMSG_AI_REACTION, type {}.", reactionType);
 }

src/server/game/Entities/Creature/GossipDef.cpp

@@ -385,14 +385,14 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string
     TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST (QuestGiver: {})", guid.ToString());
 }
 
-void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID) const
+void PlayerMenu::SendQuestGiverStatus(QuestGiverStatus questStatus, ObjectGuid npcGUID) const
 {
-    WorldPacket data(SMSG_QUESTGIVER_STATUS, 9);
-    data << npcGUID;
-    data << uint8(questStatus);
+    WorldPackets::Quest::QuestGiverStatus packet;
+    packet.QuestGiver.Guid = npcGUID;
+    packet.QuestGiver.Status = questStatus;
 
-    _session->SendPacket(&data);
-    TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC={}, status={}", npcGUID.ToString(), questStatus);
+    _session->SendPacket(packet.Write());
+    TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC={}, status={}", npcGUID.ToString(), AsUnderlyingType(questStatus));
 }
 
 void PlayerMenu::SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGUID, bool activateAccept) const

src/server/game/Entities/Creature/GossipDef.h

@@ -25,6 +25,7 @@
 
 class Quest;
 class WorldSession;
+enum QuestGiverStatus : uint8;
 
 #define GOSSIP_MAX_MENU_ITEMS               32
 #define DEFAULT_GOSSIP_MESSAGE              0xffffff
@@ -276,7 +277,7 @@ class TC_GAME_API PlayerMenu
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
         /*********************************************************/
-        void SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID) const;
+        void SendQuestGiverStatus(QuestGiverStatus questStatus, ObjectGuid npcGUID) const;
 
         void SendQuestGiverQuestList(QEmote const& eEmote, const std::string& Title, ObjectGuid npcGUID);
 

src/server/game/Entities/Object/Object.cpp

@@ -30,7 +30,7 @@
 #include "Map.h"
 #include "MiscPackets.h"
 #include "MovementInfo.h"
-#include "MovementPacketBuilder.h"
+#include "MovementPackets.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "OutdoorPvPMgr.h"
@@ -316,7 +316,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
 
         // 0x08000000
         if (unit->m_movementInfo.GetMovementFlags() & MOVEMENTFLAG_SPLINE_ENABLED)
-            Movement::PacketBuilder::WriteCreate(*unit->movespline, *data);
+            WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(*unit->movespline, *data);
     }
     else
     {

src/server/game/Entities/Player/EquipmentSet.h

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EquipmentSet_h__
-#define EquipmentSet_h__
+#ifndef TRINITYCORE_EQUIPMENT_SET_H
+#define TRINITYCORE_EQUIPMENT_SET_H
 
 #include "Define.h"
 #include "ObjectGuid.h"
@@ -35,6 +35,8 @@ enum EquipmentSetUpdateState
 
 struct EquipmentSetInfo
 {
+    static ObjectGuid const IgnoredSlot;
+
     /// Data sent in EquipmentSet related packets
     struct EquipmentSetData
     {
@@ -54,4 +56,4 @@ struct EquipmentSetInfo
 
 typedef std::map<uint64, EquipmentSetInfo> EquipmentSetContainer;
 
-#endif // EquipmentSet_h__
+#endif // TRINITYCORE_EQUIPMENT_SET_H