Core/Misc: Minor header cleanup

7 files changed, 61 insertions, 34 deletions

diff --git a/src/server/game/Entities/Object/BaseEntity.cpp b/src/server/game/Entities/Object/BaseEntity.cpp
index 6aa451618a0..3559c851d80 100644
--- a/src/server/game/Entities/Object/BaseEntity.cpp
+++ b/src/server/game/Entities/Object/BaseEntity.cpp
@@ -637,7 +637,7 @@ void BaseEntity::ClearUpdateMask(bool remove)
 
 void BaseEntity::BuildFieldsUpdate(Player* player, UpdateDataMapType& data_map) const
 {
-    UpdateDataMapType::iterator iter = data_map.try_emplace(player, player->GetMapId()).first;
+    UpdateDataMapType::iterator iter = data_map.emplace(player, player->GetMapId()).first;
     BuildValuesUpdateBlockForPlayer(&iter->second, iter->first);
 }
 
diff --git a/src/server/game/Entities/Object/SmoothPhasing.cpp b/src/server/game/Entities/Object/SmoothPhasing.cpp
index 4b5377eb043..a1b504a5b78 100644
--- a/src/server/game/Entities/Object/SmoothPhasing.cpp
+++ b/src/server/game/Entities/Object/SmoothPhasing.cpp
@@ -18,6 +18,13 @@
 #include "SmoothPhasing.h"
 #include "MapUtils.h"
 
+SmoothPhasing::SmoothPhasing() = default;
+SmoothPhasing::SmoothPhasing(SmoothPhasing const&) = default;
+SmoothPhasing::SmoothPhasing(SmoothPhasing&&) noexcept = default;
+SmoothPhasing& SmoothPhasing::operator=(SmoothPhasing const&) = default;
+SmoothPhasing& SmoothPhasing::operator=(SmoothPhasing&&) noexcept = default;
+SmoothPhasing::~SmoothPhasing() = default;
+
 void SmoothPhasing::SetViewerDependentInfo(ObjectGuid seer, SmoothPhasingInfo const& info)
 {
     if (!std::holds_alternative<SmoothPhasingInfoViewerDependent>(_storage))
diff --git a/src/server/game/Entities/Object/SmoothPhasing.h b/src/server/game/Entities/Object/SmoothPhasing.h
index 6d211e8da28..520a6d97126 100644
--- a/src/server/game/Entities/Object/SmoothPhasing.h
+++ b/src/server/game/Entities/Object/SmoothPhasing.h
@@ -37,6 +37,13 @@ struct SmoothPhasingInfo
 class TC_GAME_API SmoothPhasing
 {
 public:
+    SmoothPhasing();
+    SmoothPhasing(SmoothPhasing const&);
+    SmoothPhasing(SmoothPhasing&&) noexcept;
+    SmoothPhasing& operator=(SmoothPhasing const&);
+    SmoothPhasing& operator=(SmoothPhasing&&) noexcept;
+    ~SmoothPhasing();
+
     void SetViewerDependentInfo(ObjectGuid seer, SmoothPhasingInfo const& info);
     void ClearViewerDependentInfo(ObjectGuid seer);
 
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp
index 34fe6d86f89..1b342102f9f 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp
@@ -18,18 +18,36 @@
 #include "UpdateData.h"
 #include "Errors.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"
+#include <utility>
 
 UpdateData::UpdateData(uint32 map) : m_map(map), m_blockCount(0) { }
 
-void UpdateData::AddDestroyObject(ObjectGuid guid)
+UpdateData::UpdateData(UpdateData&& right) noexcept :
+    m_map(right.m_map), m_blockCount(std::exchange(right.m_blockCount, 0)),
+    m_destroyGUIDs(std::move(right.m_destroyGUIDs)),
+    m_outOfRangeGUIDs(std::move(right.m_outOfRangeGUIDs)),
+    m_data(std::move(right.m_data))
 {
-    m_destroyGUIDs.insert(guid);
 }
 
-void UpdateData::AddOutOfRangeGUID(GuidSet& guids)
+UpdateData& UpdateData::operator=(UpdateData&& right) noexcept
+{
+    if (this != &right)
+    {
+        m_map = right.m_map;
+        m_blockCount = std::exchange(right.m_blockCount, 0);
+        m_destroyGUIDs = std::move(right.m_destroyGUIDs);
+        m_outOfRangeGUIDs = std::move(right.m_outOfRangeGUIDs);
+        m_data = std::move(right.m_data);
+    }
+    return *this;
+}
+
+UpdateData::~UpdateData() = default;
+
+void UpdateData::AddDestroyObject(ObjectGuid guid)
 {
-    m_outOfRangeGUIDs.insert(guids.begin(), guids.end());
+    m_destroyGUIDs.insert(guid);
 }
 
 void UpdateData::AddOutOfRangeGUID(ObjectGuid guid)
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index 3dc50bde23d..48ad58659e5 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -15,13 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __UPDATEDATA_H
-#define __UPDATEDATA_H
+#ifndef TRINITYCORE_UPDATE_DATA_H
+#define TRINITYCORE_UPDATE_DATA_H
 
-#include "Define.h"
 #include "ByteBuffer.h"
+#include "Define.h"
+#include "FlatSet.h"
 #include "ObjectGuid.h"
-#include <set>
 
 class WorldPacket;
 
@@ -37,14 +37,11 @@ class UpdateData
 {
     public:
         UpdateData(uint32 map);
-        UpdateData(UpdateData&& right) noexcept : m_map(right.m_map), m_blockCount(right.m_blockCount),
-            m_outOfRangeGUIDs(std::move(right.m_outOfRangeGUIDs)),
-            m_data(std::move(right.m_data))
-        {
-        }
+        UpdateData(UpdateData&& right) noexcept;
+        UpdateData& operator=(UpdateData&& right) noexcept;
+        ~UpdateData();
 
         void AddDestroyObject(ObjectGuid guid);
-        void AddOutOfRangeGUID(GuidSet& guids);
         void AddOutOfRangeGUID(ObjectGuid guid);
         void AddUpdateBlock() { ++m_blockCount; }
         ByteBuffer& GetBuffer() { return m_data; }
@@ -52,16 +49,15 @@ class UpdateData
         bool HasData() const { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty() || !m_destroyGUIDs.empty(); }
         void Clear();
 
-        GuidSet const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; }
-
     protected:
         uint32 m_map;
         uint32 m_blockCount;
-        GuidSet m_destroyGUIDs;
-        GuidSet m_outOfRangeGUIDs;
+        Trinity::Containers::FlatSet<ObjectGuid> m_destroyGUIDs;
+        Trinity::Containers::FlatSet<ObjectGuid> m_outOfRangeGUIDs;
         ByteBuffer m_data;
 
         UpdateData(UpdateData const& right) = delete;
         UpdateData& operator=(UpdateData const& right) = delete;
 };
-#endif
+
+#endif // TRINITYCORE_UPDATE_DATA_H
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 232c5748d51..ca39f80ec34 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -34,6 +34,18 @@
 #include "Unit.h"
 #include <sstream>
 
+class VehicleJoinEvent : public BasicEvent
+{
+public:
+    VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) { }
+    bool Execute(uint64, uint32) override;
+    void Abort(uint64) override;
+
+    Vehicle* Target;
+    Unit* Passenger;
+    SeatMap::iterator Seat;
+};
+
 Vehicle::Vehicle(Unit* unit, VehicleEntry const* vehInfo, uint32 creatureEntry) :
 UsableSeatNum(0), _me(unit), _vehicleInfo(vehInfo), _creatureEntry(creatureEntry), _status(STATUS_NONE)
 {
diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
index fb740a7d962..f494f0684b3 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.h
+++ b/src/server/game/Entities/Vehicle/Vehicle.h
@@ -122,17 +122,4 @@ class TC_GAME_API Vehicle final : public TransportBase
         PendingJoinEventContainer _pendingJoinEvents;       ///< Collection of delayed join events for prospective passengers
 };
 
-class TC_GAME_API VehicleJoinEvent : public BasicEvent
-{
-    friend class Vehicle;
-    protected:
-        VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) { }
-        bool Execute(uint64, uint32) override;
-        void Abort(uint64) override;
-
-        Vehicle* Target;
-        Unit* Passenger;
-        SeatMap::iterator Seat;
-};
-
 #endif