Core/Packets: updated SMSG_INITIALIZE_FACTIONS and added struct for SMSG_CHANNEL_LIST

11 files changed, 166 insertions, 57 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b7cefedec87..e5a719b5021 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15831,7 +15831,7 @@ void Unit::SendTeleportPacket(Position& pos)
 
     if (GetTypeId() == TYPEID_PLAYER)
     {
-        WorldPacket data2(MSG_MOVE_TELEPORT, 38);
+        WorldPacket data2(SMSG_MOVE_TELEPORT, 38);
         data2.WriteBit(guid[6]);
         data2.WriteBit(guid[0]);
         data2.WriteBit(guid[3]);
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
index 359a8f3946a..3bf3464f016 100644
--- a/src/server/game/Reputation/ReputationMgr.cpp
+++ b/src/server/game/Reputation/ReputationMgr.cpp
@@ -18,6 +18,7 @@
 
 #include "DatabaseEnv.h"
 #include "ReputationMgr.h"
+#include "ReputationPackets.h"
 #include "DBCStores.h"
 #include "Player.h"
 #include "WorldPacket.h"
@@ -199,38 +200,17 @@ void ReputationMgr::SendState(FactionState const* faction)
 
 void ReputationMgr::SendInitialReputations()
 {
-    uint16 count = 256;
-    WorldPacket data(SMSG_INITIALIZE_FACTIONS, 4 + count * 5);
-    data << uint32(count);
-
-    RepListID a = 0;
+    WorldPackets::Reputation::InitializeFactions initFactions;
 
     for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr)
     {
-        // fill in absent fields
-        for (; a != itr->first; ++a)
-        {
-            data << uint8(0);
-            data << uint32(0);
-        }
-
-        // fill in encountered data
-        data << uint8(itr->second.Flags);
-        data << uint32(itr->second.Standing);
-
+        initFactions.FactionFlags[itr->first] = itr->second.Flags;
+        initFactions.FactionStandings[itr->first] = itr->second.Standing;
+        /// @todo faction bonus
         itr->second.needSend = false;
-
-        ++a;
     }
 
-    // fill in absent fields
-    for (; a != count; ++a)
-    {
-        data << uint8(0);
-        data << uint32(0);
-    }
-
-    _player->SendDirectMessage(&data);
+    _player->SendDirectMessage(initFactions.Write());
 }
 
 void ReputationMgr::SendStates()
diff --git a/src/server/game/Server/Packets/ChannelPackets.cpp b/src/server/game/Server/Packets/ChannelPackets.cpp
index 8aa4ac51d42..28a50a6c9aa 100644
--- a/src/server/game/Server/Packets/ChannelPackets.cpp
+++ b/src/server/game/Server/Packets/ChannelPackets.cpp
@@ -18,6 +18,24 @@
 #include "ChannelPackets.h"
 #include "Channel.h"
 
+WorldPacket const* WorldPackets::Channel::ChannelList::Write()
+{
+    _worldPacket.WriteBit(Display);
+    _worldPacket.WriteBits(Channel.length(), 7);
+    _worldPacket << uint8(ChannelFlags);
+    _worldPacket << uint32(Members.size());
+    _worldPacket.WriteString(Channel);
+
+    for (ChannelPlayer const& player : Members)
+    {
+        _worldPacket << player.Guid;
+        _worldPacket << uint32(player.VirtualRealmAddress);
+        _worldPacket << uint8(player.Flags);
+    }
+
+    return &_worldPacket;
+}
+
 WorldPacket const* WorldPackets::Channel::ChannelNotify::Write()
 {
     _worldPacket.WriteBits(Type, 6);
diff --git a/src/server/game/Server/Packets/ChannelPackets.h b/src/server/game/Server/Packets/ChannelPackets.h
index b6c8eb3b928..3fe2a353070 100644
--- a/src/server/game/Server/Packets/ChannelPackets.h
+++ b/src/server/game/Server/Packets/ChannelPackets.h
@@ -25,6 +25,29 @@ namespace WorldPackets
 {
     namespace Channel
     {
+        class ChannelList final : public ServerPacket
+        {
+        public:
+            struct ChannelPlayer
+            {
+                ChannelPlayer(ObjectGuid const& guid, uint32 realm, uint8 flags) :
+                    Guid(guid), VirtualRealmAddress(realm), Flags(flags) { }
+
+                ObjectGuid Guid; ///< Player Guid
+                uint32 VirtualRealmAddress;
+                uint8 Flags = 0; ///< @see enum ChannelMemberFlags
+            };
+
+            ChannelList() : ServerPacket(SMSG_CHANNEL_LIST) { }
+
+            WorldPacket const* Write() override;
+
+            std::vector<ChannelPlayer> Members;
+            std::string Channel; ///< Channel Name
+            uint8 ChannelFlags = 0; ///< @see enum ChannelFlags
+            bool Display = false;
+        };
+
         class ChannelNotify final : public ServerPacket
         {
         public:
diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h
index 2402daf6b22..5c6576e68c5 100644
--- a/src/server/game/Server/Packets/CombatPackets.h
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -19,6 +19,7 @@
 #define CombatPackets_h__
 
 #include "Packet.h"
+#include "ObjectGuid.h"
 
 namespace WorldPackets
 {
@@ -39,7 +40,7 @@ namespace WorldPackets
         public:
             AttackStop(WorldPacket&& packet) : ClientPacket(CMSG_ATTACKSTOP, std::move(packet)) { }
 
-            void Read() override {};
+            void Read() override { }
         };
     }
 }
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index d88438908d5..bc643e6f3bf 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -38,7 +38,7 @@ namespace WorldPackets
         class ServerPlayerMovement final : public ServerPacket
         {
         public:
-            ServerPlayerMovement() : ServerPacket(SMSG_PLAYER_MOVE) {}
+            ServerPlayerMovement() : ServerPacket(SMSG_PLAYER_MOVE) { }
 
             WorldPacket const* Write() override;
 
@@ -48,7 +48,7 @@ namespace WorldPackets
         class NewWorld final : public ServerPacket
         {
         public:
-            NewWorld() : ServerPacket(SMSG_NEW_WORLD, 24) {}
+            NewWorld() : ServerPacket(SMSG_NEW_WORLD, 24) { }
 
             WorldPacket const* Write() override;
 
@@ -62,7 +62,7 @@ namespace WorldPackets
         public:
             WorldPortAck(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
 
-            void Read() override {};
+            void Read() override { }
         };
     }
 }
diff --git a/src/server/game/Server/Packets/ReputationPackets.cpp b/src/server/game/Server/Packets/ReputationPackets.cpp
new file mode 100644
index 00000000000..4acecf851f4
--- /dev/null
+++ b/src/server/game/Server/Packets/ReputationPackets.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ReputationPackets.h"
+
+WorldPacket const* WorldPackets::Reputation::InitializeFactions::Write()
+{
+    for (uint16 i = 0; i < FactionCount; ++i)
+    {
+        _worldPacket << uint8(FactionFlags[i]);
+        _worldPacket << int32(FactionStandings[i]);
+    }
+
+    for (uint16 i = 0; i < FactionCount; ++i)
+        _worldPacket.WriteBit(FactionHasBonus[i]);
+
+    _worldPacket.FlushBits();
+
+    return &_worldPacket;
+}
diff --git a/src/server/game/Server/Packets/ReputationPackets.h b/src/server/game/Server/Packets/ReputationPackets.h
new file mode 100644
index 00000000000..b893d6b522f
--- /dev/null
+++ b/src/server/game/Server/Packets/ReputationPackets.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "Packet.h"
+
+namespace WorldPackets
+{
+    namespace Reputation
+    {
+        static uint16 const FactionCount = 256;
+
+        class InitializeFactions final : public ServerPacket
+        {
+        public:
+            InitializeFactions() : ServerPacket(SMSG_INITIALIZE_FACTIONS)
+            {
+                for (uint16 i = 0; i < FactionCount; ++i)
+                {
+                    FactionStandings[i] = 0;
+                    FactionHasBonus[i] = false;
+                    FactionFlags[i] = 0;
+                }
+            }
+
+            WorldPacket const* Write() override;
+
+            int32 FactionStandings[FactionCount];
+            bool FactionHasBonus[FactionCount]; ///< @todo: implement faction bonus
+            uint8 FactionFlags[FactionCount]; ///< @see enum FactionFlags
+        };
+    }
+}
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 7da92b20908..99e46f6f591 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -472,6 +472,7 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_MOVE_STOP_STRAFE,                                   STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   WorldPackets::Movement::ClientPlayerMovement, &WorldSession::HandleMovementOpcodes);
     DEFINE_HANDLER(CMSG_MOVE_STOP_SWIM,                                     STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   WorldPackets::Movement::ClientPlayerMovement, &WorldSession::HandleMovementOpcodes);
     DEFINE_HANDLER(CMSG_MOVE_STOP_TURN,                                     STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   WorldPackets::Movement::ClientPlayerMovement, &WorldSession::HandleMovementOpcodes);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_MOVE_TELEPORT_ACK,                       STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleMoveTeleportAck           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOVE_TIME_SKIPPED,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleMoveTimeSkippedOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOVE_WATER_WALK_ACK,                     STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleMoveWaterWalkAck          );
     DEFINE_HANDLER(CMSG_MOVE_WORLDPORT_ACK,                                 STATUS_TRANSFER,  PROCESS_THREADUNSAFE, WorldPackets::Movement::WorldPortAck, &WorldSession::HandleMoveWorldportAckOpcode);
@@ -665,8 +666,6 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(MSG_INSPECT_ARENA_TEAMS,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectArenaTeamsOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(MSG_LIST_STABLED_PETS,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleListStabledPetsOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_CHARM_TELEPORT_CHEAT,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TELEPORT,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TELEPORT_ACK,                        STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleMoveTeleportAck           );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TELEPORT_CHEAT,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TIME_SKIPPED,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TOGGLE_COLLISION_CHEAT,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -909,8 +908,10 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_SET_VEHICLE_REC_ID,                STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORGE_MASTER_SET,                        STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FRIEND_STATUS,                           STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_ACTIVATE_ANIM_KIT,            STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_CUSTOM_ANIM,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_DESPAWN_ANIM,                 STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_DESPAWN,                      STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_PAGETEXT,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_QUERY_RESPONSE,               STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_RESET_STATE,                  STATUS_UNHANDLED);
@@ -918,7 +919,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMETIME_SET,                            STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMETIME_UPDATE,                         STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_EVENT_DEBUG_LOG,                    STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_OBJECT_ACTIVATE_ANIM_KIT,           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_COMPLETE_MISSION_RESULT,        STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMRESPONSE_DB_ERROR,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMRESPONSE_RECEIVED,                     STATUS_UNHANDLED);
@@ -930,6 +930,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_UPDATETEXT,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_MESSAGECHAT,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_PLAYER_INFO,                          STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_TICKET_CASE_STATUS,                   STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_TICKET_STATUS_UPDATE,                 STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GODMODE,                                 STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_COMPLETE,                         STATUS_UNHANDLED);
@@ -959,6 +960,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_COMMAND_RESULT_2,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_CRITERIA_DATA,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_CRITERIA_DELETED,                  STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_CRITERIA_UPDATE,                   STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_DECLINE,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT,                             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_LOG_QUERY_RESULT,            STATUS_UNHANDLED);
@@ -994,7 +996,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HIGHEST_THREAT_UPDATE,                   STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_INFO,                             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_NOTIFY,                           STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIALIZE_FACTIONS,                     STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIALIZE_FACTIONS,                     STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SETUP,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SPELLS,                          STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INIT_CURRENCY,                           STATUS_UNHANDLED);
@@ -1003,6 +1005,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_RATED_BG_STATS,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_RESULTS_UPDATE,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_TALENT,                          STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_INFO,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_LOCK_WARNING_QUERY,             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_RESET,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED,                   STATUS_UNHANDLED);
@@ -1113,6 +1116,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_SWIM_SPEED,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_TURN_RATE,                      STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_WALK_SPEED,                     STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_TELEPORT,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNROOT,                             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_CAN_FLY,                      STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_UNHANDLED);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 1fd3250d8ca..413a99bb9c4 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -355,11 +355,11 @@ enum OpcodeClient : uint32
     CMSG_MAIL_TAKE_MONEY                              = 0xBADD,
     CMSG_MEETINGSTONE_INFO                            = 0xBADD,
     CMSG_MESSAGECHAT_ADDON_BATTLEGROUND               = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_GUILD                      = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_OFFICER                    = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_PARTY                      = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_RAID                       = 0xBADD,
-    CMSG_MESSAGECHAT_ADDON_WHISPER                    = 0xBADD,
+    CMSG_MESSAGECHAT_ADDON_GUILD                      = 0x137C,
+    CMSG_MESSAGECHAT_ADDON_OFFICER                    = 0x188A,
+    CMSG_MESSAGECHAT_ADDON_PARTY                      = 0x015C,
+    CMSG_MESSAGECHAT_ADDON_RAID                       = 0x082C,
+    CMSG_MESSAGECHAT_ADDON_WHISPER                    = 0x18A2,
     CMSG_MESSAGECHAT_AFK                              = 0x1BDC,
     CMSG_MESSAGECHAT_BATTLEGROUND                     = 0xBADD,
     CMSG_MESSAGECHAT_CHANNEL                          = 0x0913,
@@ -426,6 +426,7 @@ enum OpcodeClient : uint32
     CMSG_MOVE_STOP_STRAFE                             = 0x01D1,
     CMSG_MOVE_STOP_SWIM                               = 0x097C,
     CMSG_MOVE_STOP_TURN                               = 0x0964,
+    CMSG_MOVE_TELEPORT_ACK                            = 0x0D01,
     CMSG_MOVE_TIME_SKIPPED                            = 0x19C2,
     CMSG_MOVE_TOGGLE_COLLISION_ACK                    = 0xBADD,
     CMSG_MOVE_WATER_WALK_ACK                          = 0xBADD,
@@ -486,7 +487,7 @@ enum OpcodeClient : uint32
     CMSG_QUESTGIVER_QUEST_AUTOLAUNCH                  = 0xBADD,
     CMSG_QUESTGIVER_REQUEST_REWARD                    = 0xBADD,
     CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY             = 0x0131,
-    CMSG_QUESTGIVER_STATUS_QUERY                      = 0x0704,
+    CMSG_QUESTGIVER_STATUS_QUERY                      = 0x01E2,
     CMSG_QUESTLOG_REMOVE_QUEST                        = 0xBADD,
     CMSG_QUESTLOG_SWAP_QUEST                          = 0xBADD,
     CMSG_QUEST_CONFIRM_ACCEPT                         = 0xBADD,
@@ -654,8 +655,6 @@ enum OpcodeClient : uint32
     MSG_MOVE_SET_SWIM_SPEED_CHEAT                     = 0xBADD,
     MSG_MOVE_SET_TURN_RATE_CHEAT                      = 0xBADD,
     MSG_MOVE_SET_WALK_SPEED_CHEAT                     = 0xBADD,
-    MSG_MOVE_TELEPORT                                 = 0xBADD,
-    MSG_MOVE_TELEPORT_ACK                             = 0xBADD,
     MSG_MOVE_TELEPORT_CHEAT                           = 0xBADD,
     MSG_MOVE_TIME_SKIPPED                             = 0xBADD,
     MSG_MOVE_TOGGLE_COLLISION_CHEAT                   = 0xBADD,
@@ -913,8 +912,10 @@ enum OpcodeServer : uint32
     SMSG_FORCE_SET_VEHICLE_REC_ID                     = 0xBADD,
     SMSG_FORGE_MASTER_SET                             = 0xBADD,
     SMSG_FRIEND_STATUS                                = 0xBADD,
+    SMSG_GAMEOBJECT_ACTIVATE_ANIM_KIT                 = 0x038C,
     SMSG_GAMEOBJECT_CUSTOM_ANIM                       = 0x03EB,
     SMSG_GAMEOBJECT_DESPAWN_ANIM                      = 0xBADD,
+    SMSG_GAMEOBJECT_DESPAWN                           = 0x0D29,
     SMSG_GAMEOBJECT_PAGETEXT                          = 0xBADD,
     SMSG_GAMEOBJECT_QUERY_RESPONSE                    = 0xBADD,
     SMSG_GAMEOBJECT_RESET_STATE                       = 0xBADD,
@@ -922,7 +923,6 @@ enum OpcodeServer : uint32
     SMSG_GAMETIME_SET                                 = 0xBADD,
     SMSG_GAMETIME_UPDATE                              = 0xBADD,
     SMSG_GAME_EVENT_DEBUG_LOG                         = 0xBADD,
-    SMSG_GAME_OBJECT_ACTIVATE_ANIM_KIT                = 0xBADD,
     SMSG_GARRISON_COMPLETE_MISSION_RESULT             = 0x0952,
     SMSG_GMRESPONSE_DB_ERROR                          = 0xBADD,
     SMSG_GMRESPONSE_RECEIVED                          = 0xBADD,
@@ -934,6 +934,7 @@ enum OpcodeServer : uint32
     SMSG_GMTICKET_UPDATETEXT                          = 0xBADD,
     SMSG_GM_MESSAGECHAT                               = 0xBADD,
     SMSG_GM_PLAYER_INFO                               = 0xBADD,
+    SMSG_GM_TICKET_CASE_STATUS                        = 0x1D8D,
     SMSG_GM_TICKET_STATUS_UPDATE                      = 0xBADD,
     SMSG_GODMODE                                      = 0xBADD,
     SMSG_GOSSIP_COMPLETE                              = 0x15D1,
@@ -964,6 +965,7 @@ enum OpcodeServer : uint32
     SMSG_GUILD_COMMAND_RESULT_2                       = 0xBADD,
     SMSG_GUILD_CRITERIA_DATA                          = 0xBADD,
     SMSG_GUILD_CRITERIA_DELETED                       = 0xBADD,
+    SMSG_GUILD_CRITERIA_UPDATE                        = 0x1208,
     SMSG_GUILD_DECLINE                                = 0xBADD,
     SMSG_GUILD_EVENT                                  = 0x1027,
     SMSG_GUILD_EVENT_LOG_QUERY_RESULT                 = 0xBADD,
@@ -1016,12 +1018,13 @@ enum OpcodeServer : uint32
     SMSG_INSPECT_RATED_BG_STATS                       = 0xBADD,
     SMSG_INSPECT_RESULTS_UPDATE                       = 0xBADD,
     SMSG_INSPECT_TALENT                               = 0xBADD,
+    SMSG_INSTANCE_INFO                                = 0x0DA0,
     SMSG_INSTANCE_LOCK_WARNING_QUERY                  = 0xBADD,
     SMSG_INSTANCE_RESET                               = 0xBADD,
     SMSG_INSTANCE_RESET_FAILED                        = 0xBADD,
     SMSG_INSTANCE_SAVE_CREATED                        = 0xBADD,
     SMSG_INVALIDATE_DANCE                             = 0xBADD,
-    SMSG_INVALIDATE_PLAYER                            = 0xBADD,
+    SMSG_INVALIDATE_PLAYER                            = 0x0B37,
     SMSG_INVALID_PROMOTION_CODE                       = 0xBADD,
     SMSG_INVENTORY_CHANGE_FAILURE                     = 0xBADD,
     SMSG_ITEM_ADD_PASSIVE                             = 0xBADD,
@@ -1134,6 +1137,7 @@ enum OpcodeServer : uint32
     SMSG_MOVE_SET_VEHICLE_REC_ID                      = 0xBADD,
     SMSG_MOVE_SET_WALK_IN_AIR                         = 0xBADD,
     SMSG_MOVE_SET_WALK_SPEED                          = 0xBADD,
+    SMSG_MOVE_TELEPORT                                = 0x03A6,
     SMSG_MOVE_UNROOT                                  = 0xBADD,
     SMSG_MOVE_UNSET_CAN_FLY                           = 0xBADD,
     SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0xBADD,
@@ -1143,14 +1147,14 @@ enum OpcodeServer : uint32
     SMSG_MOVE_UPDATE_FLIGHT_BACK_SPEED                = 0xBADD,
     SMSG_MOVE_UPDATE_FLIGHT_SPEED                     = 0xBADD,
     SMSG_MOVE_UPDATE_KNOCK_BACK                       = 0xBADD,
-    SMSG_MOVE_UPDATE_PITCH_RATE                       = 0xBADD,
-    SMSG_MOVE_UPDATE_RUN_BACK_SPEED                   = 0xBADD,
-    SMSG_MOVE_UPDATE_RUN_SPEED                        = 0xBADD,
-    SMSG_MOVE_UPDATE_SWIM_BACK_SPEED                  = 0xBADD,
-    SMSG_MOVE_UPDATE_SWIM_SPEED                       = 0xBADD,
+    SMSG_MOVE_UPDATE_PITCH_RATE                       = 0x13D9,
+    SMSG_MOVE_UPDATE_RUN_BACK_SPEED                   = 0x09DE,
+    SMSG_MOVE_UPDATE_RUN_SPEED                        = 0x09AD,
+    SMSG_MOVE_UPDATE_SWIM_BACK_SPEED                  = 0x1083,
+    SMSG_MOVE_UPDATE_SWIM_SPEED                       = 0x0B95,
     SMSG_MOVE_UPDATE_TELEPORT                         = 0x03D5,
-    SMSG_MOVE_UPDATE_TURN_RATE                        = 0xBADD,
-    SMSG_MOVE_UPDATE_WALK_SPEED                       = 0xBADD,
+    SMSG_MOVE_UPDATE_TURN_RATE                        = 0x08BE,
+    SMSG_MOVE_UPDATE_WALK_SPEED                       = 0x01E5,
     SMSG_MOVE_WATER_WALK                              = 0xBADD,
     SMSG_MULTIPLE_PACKETS                             = 0xBADD,
     SMSG_NAME_QUERY_RESPONSE                          = 0x0828,
@@ -1383,7 +1387,7 @@ enum OpcodeServer : uint32
     SMSG_TEST_DROP_RATE_RESULT                        = 0xBADD,
     SMSG_TEXT_EMOTE                                   = 0x0383,
     SMSG_THREAT_CLEAR                                 = 0xBADD,
-    SMSG_THREAT_REMOVE                                = 0xBADD,
+    SMSG_THREAT_REMOVE                                = 0x0F3D,
     SMSG_THREAT_UPDATE                                = 0x03A9,
     SMSG_TIME_ADJUSTMENT                              = 0xBADD,
     SMSG_TIME_SYNC_REQ                                = 0x03B1,
diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp
index 9d2aa868234..c82459d0599 100644
--- a/src/server/scripts/World/action_ip_logger.cpp
+++ b/src/server/scripts/World/action_ip_logger.cpp
@@ -16,13 +16,10 @@
  */
 
 #include "ScriptMgr.h"
-#include "Channel.h"
-#include "Guild.h"
-#include "Group.h"
+#include "Player.h"
 
 enum IPLoggingTypes
 {
-
     // AccountActionIpLogger();
     ACCOUNT_LOGIN                = 0,
     ACCOUNT_FAIL_LOGIN           = 1,