Core/Packets: updated EquipmentSet save packets

(cherry picked from commit abff9de)

Author: joschiwald

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

@@ -2306,7 +2306,7 @@ void Creature::SendAIReaction(AiReaction reactionType)
     packet.UnitGUID = GetGUID();
     packet.Reaction = reactionType;
 
-    ((WorldObject*)this)->SendMessageToSet(packet.Write(), true);
+    SendMessageToSet(packet.Write(), true);
 
     TC_LOG_DEBUG("network", "WORLD: Sent SMSG_AI_REACTION, type {}.", reactionType);
 }

src/server/game/Entities/Player/Player.cpp

@@ -5985,7 +5985,7 @@ void Player::SendActionButtons(uint32 state) const
 
     packet.Reason = state;
 
-    GetSession()->SendPacket(packet.Write());
+    SendDirectMessage(packet.Write());
 }
 
 bool Player::IsActionButtonDataValid(uint8 button, uint32 action, uint8 type) const
@@ -25373,33 +25373,33 @@ void Player::SendEquipmentSetList()
     SendDirectMessage(data.Write());
 }
 
-void Player::SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& eqSet)
+void Player::SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& newEqSet)
 {
-    if (eqSet.Guid != 0)
+    if (newEqSet.Guid != 0)
     {
         // something wrong...
-        auto itr = _equipmentSets.find(eqSet.Guid);
-        if (itr == _equipmentSets.end() || itr->second.Data.Guid != eqSet.Guid)
+        auto itr = _equipmentSets.find(newEqSet.Guid);
+        if (itr == _equipmentSets.end() || itr->second.Data.Guid != newEqSet.Guid)
         {
             TC_LOG_ERROR("entities.player", "Player::SetEquipmentSet: Player '{}' ({}) tried to save nonexistent equipment set {} (index: {})",
-                GetName(), GetGUID().ToString(), eqSet.Guid, eqSet.SetID);
+                GetName(), GetGUID().ToString(), newEqSet.Guid, newEqSet.SetID);
             return;
         }
     }
 
-    uint64 setGuid = (eqSet.Guid != 0) ? eqSet.Guid : sObjectMgr->GenerateEquipmentSetGuid();
+    uint64 setGuid = (newEqSet.Guid != 0) ? newEqSet.Guid : sObjectMgr->GenerateEquipmentSetGuid();
 
     EquipmentSetInfo& eqSlot = _equipmentSets[setGuid];
-    eqSlot.Data = eqSet;
+    eqSlot.Data = newEqSet;
 
-    if (eqSet.Guid == 0)
+    if (eqSlot.Data.Guid == 0)
     {
         eqSlot.Data.Guid = setGuid;
 
-        WorldPacket data(SMSG_EQUIPMENT_SET_SAVED, 4 + 1);
-        data << uint32(eqSlot.Data.SetID);
-        data.appendPackGUID(eqSlot.Data.Guid);
-        SendDirectMessage(&data);
+        WorldPackets::EquipmentSet::EquipmentSetID data;
+        data.GUID = eqSlot.Data.Guid;
+        data.SetID = eqSlot.Data.SetID;
+        SendDirectMessage(data.Write());
     }
 
     eqSlot.State = (eqSlot.State == EQUIPMENT_SET_NEW ? EQUIPMENT_SET_NEW : EQUIPMENT_SET_CHANGED);
@@ -25476,11 +25476,11 @@ void Player::_SaveBGData(CharacterDatabaseTransaction trans)
     trans->Append(stmt);
 }
 
-void Player::DeleteEquipmentSet(uint64 setGuid)
+void Player::DeleteEquipmentSet(uint64 id)
 {
     for (EquipmentSetContainer::iterator itr = _equipmentSets.begin(); itr != _equipmentSets.end();)
     {
-        if (itr->second.Data.Guid == setGuid)
+        if (itr->second.Data.Guid == id)
         {
             if (itr->second.State == EQUIPMENT_SET_NEW)
                 itr = _equipmentSets.erase(itr);

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

@@ -1952,7 +1952,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
 
         void SendEquipmentSetList();
         void SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& eqset);
-        void DeleteEquipmentSet(uint64 setGuid);
+        void DeleteEquipmentSet(uint64 id);
 
         void SendInitWorldStates(uint32 zoneId, uint32 areaId);
         void SendUpdateWorldState(uint32 variable, uint32 value) const;

src/server/game/Handlers/CharacterHandler.cpp

@@ -23,6 +23,7 @@
 #include "Chat.h"
 #include "DatabaseEnv.h"
 #include "DBCStores.h"
+#include "EquipmentSetPackets.h"
 #include "GameObject.h"
 #include "GameTime.h"
 #include "GitRevision.h"
@@ -1475,34 +1476,14 @@ void WorldSession::HandleCharCustomizeCallback(std::shared_ptr<WorldPackets::Cha
         GetAccountId(), GetRemoteAddress(), oldName, customizeInfo->CharGUID.ToString(), customizeInfo->CharName);
 }
 
-void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData)
+void WorldSession::HandleEquipmentSetSave(WorldPackets::EquipmentSet::SaveEquipmentSet& saveEquipmentSet)
 {
-    TC_LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_SAVE");
-
-    uint64 setGuid;
-    recvData.readPackGUID(setGuid);
-
-    uint32 index;
-    recvData >> index;
-    if (index >= MAX_EQUIPMENT_SET_INDEX)                    // client set slots amount
+    if (saveEquipmentSet.Set.SetID >= MAX_EQUIPMENT_SET_INDEX) // client set slots amount
         return;
 
-    std::string name;
-    recvData >> name;
-
-    std::string iconName;
-    recvData >> iconName;
-
-    EquipmentSetInfo::EquipmentSetData eqData;
-    eqData.Guid    = setGuid;
-    eqData.SetID   = index;
-    eqData.SetName = name;
-    eqData.SetIcon = iconName;
-
     for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
-        ObjectGuid itemGuid;
-        recvData >> itemGuid.ReadAsPacked();
+        ObjectGuid const& itemGuid = saveEquipmentSet.Set.Pieces[i];
 
         // if client sends 0, it means empty slot
         if (itemGuid.IsEmpty())
@@ -1512,19 +1493,17 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData)
         if (itemGuid == EquipmentSetInfo::IgnoredSlot)
         {
             // ignored slots saved as bit mask because we have no free special values for Items[i]
-            eqData.IgnoreMask |= 1 << i;
+            saveEquipmentSet.Set.IgnoreMask |= 1 << i;
             continue;
         }
 
         // some cheating checks
         Item* item = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
         if (!item || item->GetGUID() != itemGuid)
-            continue;
-
-        eqData.Pieces[i] = itemGuid;
+            saveEquipmentSet.Set.Pieces[i].Clear();
     }
 
-    _player->SetEquipmentSet(eqData);
+    _player->SetEquipmentSet(saveEquipmentSet.Set);
 }
 
 void WorldSession::HandleEquipmentSetDelete(WorldPacket& recvData)

src/server/game/Server/Packets/EquipmentSetPackets.cpp

@@ -17,6 +17,14 @@
 
 #include "EquipmentSetPackets.h"
 
+WorldPacket const* WorldPackets::EquipmentSet::EquipmentSetID::Write()
+{
+    _worldPacket << uint32(SetID);
+    _worldPacket.appendPackGUID(GUID);
+
+    return &_worldPacket;
+}
+
 WorldPacket const* WorldPackets::EquipmentSet::LoadEquipmentSet::Write()
 {
     _worldPacket << uint32(SetData.size());
@@ -40,3 +48,14 @@ WorldPacket const* WorldPackets::EquipmentSet::LoadEquipmentSet::Write()
 
     return &_worldPacket;
 }
+
+void WorldPackets::EquipmentSet::SaveEquipmentSet::Read()
+{
+    _worldPacket.readPackGUID(Set.Guid);
+    _worldPacket >> Set.SetID;
+    _worldPacket >> Set.SetName;
+    _worldPacket >> Set.SetIcon;
+
+    for (uint8 i = 0; i < EQUIPMENT_SET_SLOTS; ++i)
+        _worldPacket >> Set.Pieces[i].ReadAsPacked();
+}

src/server/game/Server/Packets/EquipmentSetPackets.h

@@ -25,6 +25,17 @@ namespace WorldPackets
 {
     namespace EquipmentSet
     {
+        class EquipmentSetID final : public ServerPacket
+        {
+        public:
+            explicit EquipmentSetID() : ServerPacket(SMSG_EQUIPMENT_SET_SAVED, 8 + 4) { }
+
+            WorldPacket const* Write() override;
+
+            uint64 GUID = 0; ///< Set Identifier
+            uint32 SetID = 0; ///< Index
+        };
+
         class LoadEquipmentSet final : public ServerPacket
         {
         public:
@@ -34,6 +45,16 @@ namespace WorldPackets
 
             std::vector<EquipmentSetInfo::EquipmentSetData const*> SetData;
         };
+
+        class SaveEquipmentSet final : public ClientPacket
+        {
+        public:
+            SaveEquipmentSet(WorldPacket&& packet) : ClientPacket(CMSG_EQUIPMENT_SET_SAVE, std::move(packet)) { }
+
+            void Read() override;
+
+            EquipmentSetInfo::EquipmentSetData Set;
+        };
     }
 }
 

src/server/game/Server/Packets/QuestPackets.h

@@ -49,8 +49,7 @@ namespace WorldPackets
         {
             QuestGiverInfo() { }
             QuestGiverInfo(ObjectGuid const& guid, ::QuestGiverStatus status)
-                : Guid(guid), Status(status)
-            { }
+                : Guid(guid), Status(status) { }
 
             ObjectGuid Guid;
             ::QuestGiverStatus Status = DIALOG_STATUS_NONE;

src/server/game/Server/WorldSession.h

@@ -164,6 +164,11 @@ namespace WorldPackets
         class SetSheathed;
     }
 
+    namespace EquipmentSet
+    {
+        class SaveEquipmentSet;
+    }
+
     namespace Guild
     {
         class QueryGuildInfo;
@@ -1179,7 +1184,7 @@ class TC_GAME_API WorldSession
         void HandleMirrorImageDataRequest(WorldPacket& recvData);
         void HandleRemoveGlyph(WorldPacket& recvData);
         void HandleQueryInspectAchievements(WorldPacket& recvData);
-        void HandleEquipmentSetSave(WorldPacket& recvData);
+        void HandleEquipmentSetSave(WorldPackets::EquipmentSet::SaveEquipmentSet& saveEquipmentSet);
         void HandleEquipmentSetDelete(WorldPacket& recvData);
         void HandleEquipmentSetUse(WorldPacket& recvData);
         void HandleWorldStateUITimerUpdate(WorldPackets::Misc::UITimeRequest& recvData);