Core/Common: Include cleanup

15 files changed, 72 insertions, 43 deletions

diff --git a/src/server/game/Server/Packets/AreaTriggerPackets.h b/src/server/game/Server/Packets/AreaTriggerPackets.h
index 967a8ba0f5f..02e30093501 100644
--- a/src/server/game/Server/Packets/AreaTriggerPackets.h
+++ b/src/server/game/Server/Packets/AreaTriggerPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "PacketUtilities.h"
 #include "ObjectGuid.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h
index 967829c2c17..725edc21d41 100644
--- a/src/server/game/Server/Packets/BattlegroundPackets.h
+++ b/src/server/game/Server/Packets/BattlegroundPackets.h
@@ -23,6 +23,7 @@
 #include "LFGPackets.h"
 #include "PacketUtilities.h"
 #include "Packet.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/BattlenetPackets.h b/src/server/game/Server/Packets/BattlenetPackets.h
index 6b7a8c9c50e..ba3f4299ab9 100644
--- a/src/server/game/Server/Packets/BattlenetPackets.h
+++ b/src/server/game/Server/Packets/BattlenetPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "MessageBuffer.h"
 #include "BattlenetRpcErrorCodes.h"
+#include <array>
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/GuildFinderPackets.h b/src/server/game/Server/Packets/GuildFinderPackets.h
index 1cc3b00094c..843b39e1c32 100644
--- a/src/server/game/Server/Packets/GuildFinderPackets.h
+++ b/src/server/game/Server/Packets/GuildFinderPackets.h
@@ -20,6 +20,7 @@
 
 #include "Packet.h"
 #include "ObjectGuid.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp
index d9bb746eb73..0b5f38909ea 100644
--- a/src/server/game/Server/Packets/GuildPackets.cpp
+++ b/src/server/game/Server/Packets/GuildPackets.cpp
@@ -749,7 +749,9 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Guild::GuildNewsEvent con
 
 WorldPacket const* WorldPackets::Guild::GuildNews::Write()
 {
-    _worldPacket << NewsEvents;
+    _worldPacket << uint32(NewsEvents.size());
+    for (GuildNewsEvent const& newsEvent : NewsEvents)
+        _worldPacket << newsEvent;
 
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/HotfixPackets.h b/src/server/game/Server/Packets/HotfixPackets.h
index eb87ddba1e6..884478ee45b 100644
--- a/src/server/game/Server/Packets/HotfixPackets.h
+++ b/src/server/game/Server/Packets/HotfixPackets.h
@@ -22,6 +22,7 @@
 #include "Common.h"
 #include "DB2Stores.h"
 #include "ObjectGuid.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index 6b813c82d54..012e6800174 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "Item.h"
 #include "PacketUtilities.h"
+#include "Optional.h"
 
 struct VoidStorageItem;
 
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index 2695db47e4b..243faeec7ad 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -20,7 +20,7 @@
 
 #include "Packet.h"
 #include "Object.h"
-
+#include "Optional.h"
 #include <G3D/Vector3.h>
 
 namespace Movement
diff --git a/src/server/game/Server/Packets/PartyPackets.h b/src/server/game/Server/Packets/PartyPackets.h
index 3fbbc3381a7..d4c03e3b78c 100644
--- a/src/server/game/Server/Packets/PartyPackets.h
+++ b/src/server/game/Server/Packets/PartyPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "ObjectGuid.h"
 #include "Group.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h
index 362fdb3af8b..7440bebd853 100644
--- a/src/server/game/Server/Packets/SystemPackets.h
+++ b/src/server/game/Server/Packets/SystemPackets.h
@@ -19,6 +19,7 @@
 #define SystemPackets_h__
 
 #include "Packet.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/TaxiPackets.h b/src/server/game/Server/Packets/TaxiPackets.h
index 2fd002aacf1..c9d7ba8e061 100644
--- a/src/server/game/Server/Packets/TaxiPackets.h
+++ b/src/server/game/Server/Packets/TaxiPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "ObjectGuid.h"
 #include "DBCEnums.h"
+#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/TicketPackets.h b/src/server/game/Server/Packets/TicketPackets.h
index 27866e767ef..4cce35a0b85 100644
--- a/src/server/game/Server/Packets/TicketPackets.h
+++ b/src/server/game/Server/Packets/TicketPackets.h
@@ -20,6 +20,7 @@
 
 #include "Packet.h"
 #include "LFGPackets.h"
+#include "Optional.h"
 #include <G3D/Vector3.h>
 
 namespace WorldPackets
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 56f5cd1128d..103f3ebbd4d 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -17,8 +17,11 @@
  */
 
 #include "Opcodes.h"
+#include "Log.h"
 #include "WorldSession.h"
 #include "Packets/AllPackets.h"
+#include <iomanip>
+#include <sstream>
 
 template<class PacketClass, void(WorldSession::*HandlerFunction)(PacketClass&)>
 class PacketHandler : public ClientOpcodeHandler
@@ -61,6 +64,21 @@ struct get_packet_class<void(WorldSession::*)(PacketClass&)>
     using type = PacketClass;
 };
 
+OpcodeTable::OpcodeTable()
+{
+    memset(_internalTableClient, 0, sizeof(_internalTableClient));
+    memset(_internalTableServer, 0, sizeof(_internalTableServer));
+}
+
+OpcodeTable::~OpcodeTable()
+{
+    for (uint16 i = 0; i < NUM_OPCODE_HANDLERS; ++i)
+    {
+        delete _internalTableClient[i];
+        delete _internalTableServer[i];
+    }
+}
+
 template<typename Handler, Handler HandlerFunction>
 void OpcodeTable::ValidateAndSetClientOpcode(OpcodeClient opcode, char const* name, SessionStatus status, PacketProcessing processing)
 {
@@ -1818,3 +1836,34 @@ void OpcodeTable::Initialize()
 
 #undef DEFINE_SERVER_OPCODE_HANDLER
 };
+
+template<typename T>
+inline std::string GetOpcodeNameForLoggingImpl(T id)
+{
+    uint32 opcode = uint32(id);
+    std::ostringstream ss;
+    ss << '[';
+
+    if (static_cast<uint32>(id) < NUM_OPCODE_HANDLERS)
+    {
+        if (OpcodeHandler const* handler = opcodeTable[id])
+            ss << handler->Name;
+        else
+            ss << "UNKNOWN OPCODE";
+    }
+    else
+        ss << "INVALID OPCODE";
+
+    ss << " 0x" << std::hex << std::setw(4) << std::setfill('0') << std::uppercase << opcode << std::nouppercase << std::dec << " (" << opcode << ")]";
+    return ss.str();
+}
+
+std::string GetOpcodeNameForLogging(OpcodeClient opcode)
+{
+    return GetOpcodeNameForLoggingImpl(opcode);
+}
+
+std::string GetOpcodeNameForLogging(OpcodeServer opcode)
+{
+    return GetOpcodeNameForLoggingImpl(opcode);
+}
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index c764b6d669e..58834139c01 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -23,10 +23,10 @@
 #ifndef _OPCODES_H
 #define _OPCODES_H
 
-#include "Common.h"
-#include <iomanip>
+#include "Define.h"
+#include <string>
 
-enum ConnectionType
+enum ConnectionType : int8
 {
     CONNECTION_TYPE_REALM       = 0,
     CONNECTION_TYPE_INSTANCE    = 1,
@@ -1785,8 +1785,6 @@ enum PacketProcessing
 class WorldPacket;
 class WorldSession;
 
-#pragma pack(push, 1)
-
 class OpcodeHandler
 {
 public:
@@ -1820,23 +1818,12 @@ public:
 class OpcodeTable
 {
     public:
-        OpcodeTable()
-        {
-            memset(_internalTableClient, 0, sizeof(_internalTableClient));
-            memset(_internalTableServer, 0, sizeof(_internalTableServer));
-        }
+        OpcodeTable();
 
         OpcodeTable(OpcodeTable const&) = delete;
         OpcodeTable& operator=(OpcodeTable const&) = delete;
 
-        ~OpcodeTable()
-        {
-            for (uint16 i = 0; i < NUM_OPCODE_HANDLERS; ++i)
-            {
-                delete _internalTableClient[i];
-                delete _internalTableServer[i];
-            }
-        }
+        ~OpcodeTable();
 
         void Initialize();
 
@@ -1862,29 +1849,9 @@ class OpcodeTable
 
 extern OpcodeTable opcodeTable;
 
-#pragma pack(pop)
-
-/// Lookup opcode name for human understandable logging (T = OpcodeClient|OpcodeServer)
-template<typename T>
-inline std::string GetOpcodeNameForLogging(T id)
-{
-    uint32 opcode = uint32(id);
-    std::ostringstream ss;
-    ss << '[';
-
-    if (static_cast<uint32>(id) < NUM_OPCODE_HANDLERS)
-    {
-        if (OpcodeHandler const* handler = opcodeTable[id])
-            ss << handler->Name;
-        else
-            ss << "UNKNOWN OPCODE";
-    }
-    else
-        ss << "INVALID OPCODE";
-
-    ss << " 0x" << std::hex << std::setw(4) << std::setfill('0') << std::uppercase << opcode << std::nouppercase << std::dec << " (" << opcode << ")]";
-    return ss.str();
-}
+/// Lookup opcode name for human understandable logging
+std::string GetOpcodeNameForLogging(OpcodeClient opcode);
+std::string GetOpcodeNameForLogging(OpcodeServer opcode);
 
 #endif
 /// @}
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 62e83ce253e..cd0de310b75 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -53,6 +53,7 @@
 #include "PacketUtilities.h"
 #include "CollectionMgr.h"
 #include "Metric.h"
+#include "Random.h"
 
 #include <zlib.h>