Core/Packets: Update multiple opcode names and values (sync with WPP)

7 files changed, 29 insertions, 27 deletions

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 4af31ac738a..77484f372a3 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -2016,7 +2016,7 @@ void Guild::SendEventLog(WorldSession* session) const
 
     session->SendPacket(packet.Write());
 
-    TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT_LOG_QUERY_RESULT [%s]", session->GetPlayerInfo().c_str());
+    TC_LOG_DEBUG("guild", "SMSG_GUILD_EVENT_LOG_QUERY_RESULTS [%s]", session->GetPlayerInfo().c_str());
 }
 
 void Guild::SendNewsUpdate(WorldSession* session)
diff --git a/src/server/game/Handlers/BattlefieldHandler.cpp b/src/server/game/Handlers/BattlefieldHandler.cpp
index 1503e1fb091..e95e9ee9104 100644
--- a/src/server/game/Handlers/BattlefieldHandler.cpp
+++ b/src/server/game/Handlers/BattlefieldHandler.cpp
@@ -167,7 +167,7 @@ void WorldSession::SendBfEntered(ObjectGuid guid)
 {
     uint8 isAFK = _player->isAFK() ? 1 : 0;
 
-    WorldPacket data(SMSG_BATTLEFIELD_MGR_ENTERED, 11);
+    WorldPacket data(SMSG_BATTLEFIELD_MGR_ENTERING, 11);
 
     data.WriteBit(0);               // unk
     data.WriteBit(isAFK);           // Clear AFK
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index c1d29f46fba..b3b9461e5d4 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -1286,7 +1286,7 @@ void WorldSession::HandleItemTextQuery(WorldPacket& recvData )
 
     TC_LOG_DEBUG("network", "CMSG_ITEM_TEXT_QUERY %s", itemGuid.ToString().c_str());
 
-    WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, 14);    // guess size
+    WorldPacket data(SMSG_QUERY_ITEM_TEXT_RESPONSE, 14);    // guess size
 
     if (Item* item = _player->GetItemByGuid(itemGuid))
     {
diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index 4afb2826889..6883ec13aac 100644
--- a/src/server/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
@@ -291,7 +291,7 @@ void WorldSession::HandleQuestNPCQuery(WorldPacket& recvData)
 
         if (!sObjectMgr->GetQuestTemplate(questId))
         {
-            TC_LOG_DEBUG("network", "WORLD: Unknown quest %u in CMSG_QUEST_NPC_QUERY by %s", questId, _player->GetGUID().ToString().c_str());
+            TC_LOG_DEBUG("network", "WORLD: Unknown quest %u in CMSG_QUERY_QUEST_COMPLETION_NPCS by %s", questId, _player->GetGUID().ToString().c_str());
             continue;
         }
 
@@ -304,7 +304,7 @@ void WorldSession::HandleQuestNPCQuery(WorldPacket& recvData)
             quests[questId].push_back(it->second | 0x80000000); // GO mask
     }
 
-    WorldPacket data(SMSG_QUEST_NPC_QUERY_RESPONSE, 3 + quests.size() * 14);
+    WorldPacket data(SMSG_QUEST_COMPLETION_NPC_RESPONSE, 3 + quests.size() * 14);
     data.WriteBits(quests.size(), 23);
 
     for (auto it = quests.begin(); it != quests.end(); ++it)
diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h
index d117fc71f2b..9d146587c46 100644
--- a/src/server/game/Server/Packets/GuildPackets.h
+++ b/src/server/game/Server/Packets/GuildPackets.h
@@ -318,7 +318,7 @@ namespace WorldPackets
         class GuildEventLogQueryResults final : public ServerPacket
         {
         public:
-            GuildEventLogQueryResults() : ServerPacket(SMSG_GUILD_EVENT_LOG_QUERY_RESULT, 4) { }
+            GuildEventLogQueryResults() : ServerPacket(SMSG_GUILD_EVENT_LOG_QUERY_RESULTS, 4) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index c9f450c5e78..08f008d673c 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -694,7 +694,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTLOG_REMOVE_QUEST,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestLogRemoveQuest       );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTLOG_SWAP_QUEST,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUEST_CONFIRM_ACCEPT,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestConfirmAccept        );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUEST_NPC_QUERY,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestNPCQuery             );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_QUEST_COMPLETION_NPCS,             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestNPCQuery             );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUEST_POI_QUERY,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestPOIQuery             );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUEST_PUSH_RESULT,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestPushResult           );
     DEFINE_HANDLER(CMSG_QUEST_QUERY,                                        STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QueryQuestInfo, &WorldSession::HandleQuestQueryOpcode);
@@ -818,7 +818,7 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_SPLIT_ITEM,                                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::SplitItem, &WorldSession::HandleSplitItemOpcode);
     DEFINE_HANDLER(CMSG_STAND_STATE_CHANGE,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Misc::StandStateChange, &WorldSession::HandleStandStateChangeOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_START_QUEST,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_START_SPECTATOR_WARGAME,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_START_SPECTATOR_WAR_GAME,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_START_WARGAME,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_STOP_DANCE,                              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_STORE_LOOT_IN_SLOT,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -988,10 +988,9 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_DROP_TIMER_STARTED,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_EJECTED,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_EJECT_PENDING,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_ENTERED,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_ENTERING,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_ENTRY_INVITE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_EXIT_REQUEST,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_INVITE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_QUEUE_INVITE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE,  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_MGR_STATE_CHANGED,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1303,7 +1302,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_BANK_CONTENTS_CHANGED,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_BANK_MONEY_CHANGED,          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_DISBANDED,                   STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_LOG_QUERY_RESULT,            STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_LOG_QUERY_RESULTS,           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_MOTD,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_NEW_LEADER,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_EVENT_PLAYER_JOINED,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1327,6 +1326,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_UPDATE_NOTE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVED,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVE_STARTING,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NAME_CHANGED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NEWS,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_NEWS_DELETED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_PARTY_STATE_RESPONSE,              STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1377,7 +1377,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALID_PROMOTION_CODE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVENTORY_CHANGE_FAILURE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_IS_QUEST_COMPLETE_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_BONUS_DEBUG,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_COMBAT_LOG_UNK,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_COOLDOWN,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_ENCHANT_TIME_UPDATE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_EXPIRE_PURCHASE_REFUND,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1385,7 +1385,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_PUSH_RESULT,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_REFUND_INFO_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_REFUND_RESULT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_TEXT_QUERY_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_ITEM_TEXT_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_TIME_UPDATE,                        STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_UPGRADE_RESULT,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_JOINED_BATTLEGROUND_QUEUE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1593,6 +1593,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PERIODICAURALOG,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETGODMODE,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_ALREADY_SIGNED,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_DECLINED,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_RENAME_GUILD_RESPONSE,          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SHOW_LIST,                      STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SHOW_SIGNATURES,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
@@ -1674,7 +1675,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_CONFIRM_ACCEPT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_FORCE_REMOVED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_LOG_FULL,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_NPC_QUERY_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_COMPLETION_NPC_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_POI_QUERY_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_PUSH_RESULT,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_QUERY_RESPONSE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index eff8ab83551..f80614f9624 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -318,12 +318,12 @@ enum OpcodeClient : uint32
     CMSG_GUILD_BANK_BUY_TAB                           = 0x1BC3,
     CMSG_GUILD_BANK_DEPOSIT_MONEY                     = 0x1B11,
     CMSG_GUILD_BANK_LOG_QUERY                         = 0x0428,
-    CMSG_GUILD_BANK_REMAINING_WITHDRAW_MONEY_QUERY    = 0x063D,
     CMSG_GUILD_BANK_NOTE                              = 0xBADD,
     CMSG_GUILD_BANK_QUERY_TAB                         = 0x1139,
-    CMSG_GUILD_BANK_TEXT_QUERY                        = 0x062D,
+    CMSG_GUILD_BANK_REMAINING_WITHDRAW_MONEY_QUERY    = 0x063D,
     CMSG_GUILD_BANK_SET_TAB_TEXT                      = 0x0E30,
     CMSG_GUILD_BANK_SWAP_ITEMS                        = 0x1131,
+    CMSG_GUILD_BANK_TEXT_QUERY                        = 0x062D,
     CMSG_GUILD_BANK_UPDATE_TAB                        = 0x13C1,
     CMSG_GUILD_BANK_WITHDRAW_MONEY                    = 0x020D,
     CMSG_GUILD_CHALLENGE_UPDATE_REQUEST               = 0x166E,
@@ -583,6 +583,7 @@ enum OpcodeClient : uint32
     CMSG_QUERY_INSPECT_ACHIEVEMENTS                   = 0x0A07,
     CMSG_QUERY_NEXT_MAIL_TIME                         = 0x0B31,
     CMSG_QUERY_PETITION                               = 0x048B,
+    CMSG_QUERY_QUEST_COMPLETION_NPCS                  = 0x0BD9,
     CMSG_QUERY_SCENARIO_POI                           = 0x09A1,
     CMSG_QUERY_TIME                                   = 0x1489,
     CMSG_QUESTGIVER_ACCEPT_QUEST                      = 0x13D3,
@@ -598,8 +599,7 @@ enum OpcodeClient : uint32
     CMSG_QUESTLOG_REMOVE_QUEST                        = 0x0139,
     CMSG_QUESTLOG_SWAP_QUEST                          = 0xBADD,
     CMSG_QUEST_CONFIRM_ACCEPT                         = 0x058D,
-    CMSG_QUEST_NPC_QUERY                              = 0x0B81,
-    CMSG_QUEST_POI_QUERY                              = 0x0BD9,
+    CMSG_QUEST_POI_QUERY                              = 0x0B81,
     CMSG_QUEST_PUSH_RESULT                            = 0x03D2,
     CMSG_QUEST_QUERY                                  = 0x09A6,
     CMSG_QUEUED_MESSAGES_END                          = 0x04DF,
@@ -722,7 +722,7 @@ enum OpcodeClient : uint32
     CMSG_SPLIT_ITEM                                   = 0x0795,
     CMSG_STAND_STATE_CHANGE                           = 0x0ABD,
     CMSG_START_QUEST                                  = 0xBADD,
-    CMSG_START_SPECTATOR_WARGAME                      = 0x13A3,
+    CMSG_START_SPECTATOR_WAR_GAME                     = 0x13A3,
     CMSG_START_WARGAME                                = 0x03A2,
     CMSG_STOP_DANCE                                   = 0xBADD,
     CMSG_STORE_LOOT_IN_SLOT                           = 0xBADD,
@@ -890,10 +890,9 @@ enum OpcodeServer : uint32
     SMSG_BATTLEFIELD_MGR_DROP_TIMER_STARTED           = 0x098B,
     SMSG_BATTLEFIELD_MGR_EJECTED                      = 0x0DAF,
     SMSG_BATTLEFIELD_MGR_EJECT_PENDING                = 0x09A1,
-    SMSG_BATTLEFIELD_MGR_ENTERED                      = 0x11A3,
-    SMSG_BATTLEFIELD_MGR_ENTRY_INVITE                 = 0xBADD,
+    SMSG_BATTLEFIELD_MGR_ENTERING                     = 0x11A3,
+    SMSG_BATTLEFIELD_MGR_ENTRY_INVITE                 = 0x128B,
     SMSG_BATTLEFIELD_MGR_EXIT_REQUEST                 = 0xBADD,
-    SMSG_BATTLEFIELD_MGR_INVITE                       = 0x128B,
     SMSG_BATTLEFIELD_MGR_QUEUE_INVITE                 = 0x0B32,
     SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE       = 0x0B28,
     SMSG_BATTLEFIELD_MGR_STATE_CHANGED                = 0x13C3,
@@ -1037,6 +1036,7 @@ enum OpcodeServer : uint32
     SMSG_COIN_REMOVED                                 = 0x0D30,
     SMSG_COMBAT_EVENT_FAILED                          = 0x1DAF,
     SMSG_COMBAT_LOG_MULTIPLE                          = 0xBADD,
+    SMSG_COMBAT_LOG_UNK                               = 0x1D8E,
     SMSG_COMMENTATOR_MAP_INFO                         = 0x1922,
     SMSG_COMMENTATOR_PARTY_INFO                       = 0xBADD,
     SMSG_COMMENTATOR_PLAYER_INFO                      = 0x1B23,
@@ -1205,14 +1205,14 @@ enum OpcodeServer : uint32
     SMSG_GUILD_EVENT_BANK_CONTENTS_CHANGED            = 0x1045,
     SMSG_GUILD_EVENT_BANK_MONEY_CHANGED               = 0x1077,
     SMSG_GUILD_EVENT_DISBANDED                        = 0x1A08,
-    SMSG_GUILD_EVENT_LOG_QUERY_RESULT                 = 0x1075,
+    SMSG_GUILD_EVENT_LOG_QUERY_RESULTS                = 0x1075,
     SMSG_GUILD_EVENT_MOTD                             = 0x1825,
     SMSG_GUILD_EVENT_NEW_LEADER                       = 0x1005,
     SMSG_GUILD_EVENT_PLAYER_JOINED                    = 0x1257,
     SMSG_GUILD_EVENT_PLAYER_LEFT                      = 0x1206,
     SMSG_GUILD_EVENT_PRESENCE_CHANGE                  = 0x1228,
-    SMSG_GUILD_EVENT_RANK_CHANGED                     = 0x1276,
     SMSG_GUILD_EVENT_RANKS_UPDATED                    = 0x1018,
+    SMSG_GUILD_EVENT_RANK_CHANGED                     = 0x1276,
     SMSG_GUILD_EVENT_TAB_ADDED                        = 0x1868,
     SMSG_GUILD_EVENT_TAB_DELETED                      = 0x1808,
     SMSG_GUILD_EVENT_TAB_MODIFIED                     = 0x1035,
@@ -1229,6 +1229,7 @@ enum OpcodeServer : uint32
     SMSG_GUILD_MEMBER_UPDATE_NOTE                     = 0x1846,
     SMSG_GUILD_MOVED                                  = 0x1838,
     SMSG_GUILD_MOVE_STARTING                          = 0x1877,
+    SMSG_GUILD_NAME_CHANGED                           = 0x1A07,
     SMSG_GUILD_NEWS                                   = 0x1027,
     SMSG_GUILD_NEWS_DELETED                           = 0x1007,
     SMSG_GUILD_PARTY_STATE_RESPONSE                   = 0x1225,
@@ -1279,7 +1280,6 @@ enum OpcodeServer : uint32
     SMSG_INVALID_PROMOTION_CODE                       = 0x1F09,
     SMSG_INVENTORY_CHANGE_FAILURE                     = 0x0112,
     SMSG_IS_QUEST_COMPLETE_RESPONSE                   = 0x17E1,
-    SMSG_ITEM_BONUS_DEBUG                             = 0x1D8E,
     SMSG_ITEM_COOLDOWN                                = 0x090F,
     SMSG_ITEM_ENCHANT_TIME_UPDATE                     = 0x010D,
     SMSG_ITEM_EXPIRE_PURCHASE_REFUND                  = 0x1282,
@@ -1287,7 +1287,6 @@ enum OpcodeServer : uint32
     SMSG_ITEM_PUSH_RESULT                             = 0x0183,
     SMSG_ITEM_REFUND_INFO_RESPONSE                    = 0xBADD,
     SMSG_ITEM_REFUND_RESULT                           = 0xBADD,
-    SMSG_ITEM_TEXT_QUERY_RESPONSE                     = 0x011A,
     SMSG_ITEM_TIME_UPDATE                             = 0x0F3E,
     SMSG_ITEM_UPGRADE_RESULT                          = 0x0B2E,
     SMSG_JOINED_BATTLEGROUND_QUEUE                    = 0xBADD,
@@ -1495,6 +1494,7 @@ enum OpcodeServer : uint32
     SMSG_PERIODICAURALOG                              = 0x0B1B,
     SMSG_PETGODMODE                                   = 0xBADD,
     SMSG_PETITION_ALREADY_SIGNED                      = 0x0D8E,
+    SMSG_PETITION_DECLINED                            = 0x1B32,
     SMSG_PETITION_RENAME_GUILD_RESPONSE               = 0x1055,
     SMSG_PETITION_SHOW_LIST                           = 0x0915,
     SMSG_PETITION_SHOW_SIGNATURES                     = 0x0830,
@@ -1562,6 +1562,7 @@ enum OpcodeServer : uint32
     SMSG_PVP_OPTIONS_ENABLED                          = 0x0320,
     SMSG_PVP_SEASON                                   = 0x09E3,
     SMSG_QUERY_BATTLE_PET_NAME_RESPONSE               = 0x09EC,
+    SMSG_QUERY_ITEM_TEXT_RESPONSE                     = 0x011A,
     SMSG_QUERY_PETITION_RESPONSE                      = 0x13AC,
     SMSG_QUERY_TIME_RESPONSE                          = 0x1DB0,
     SMSG_QUESTGIVER_INVALID_QUEST                     = 0x15E1,
@@ -1574,10 +1575,10 @@ enum OpcodeServer : uint32
     SMSG_QUESTGIVER_REQUEST_ITEMS                     = 0x17B8,
     SMSG_QUESTGIVER_STATUS                            = 0x1567,
     SMSG_QUESTGIVER_STATUS_MULTIPLE                   = 0x17C6,
+    SMSG_QUEST_COMPLETION_NPC_RESPONSE                = 0x1591,
     SMSG_QUEST_CONFIRM_ACCEPT                         = 0x15B2,
     SMSG_QUEST_FORCE_REMOVED                          = 0x1D13,
     SMSG_QUEST_LOG_FULL                               = 0x17E4,
-    SMSG_QUEST_NPC_QUERY_RESPONSE                     = 0x1591,
     SMSG_QUEST_POI_QUERY_RESPONSE                     = 0x1715,
     SMSG_QUEST_PUSH_RESULT                            = 0x1797,
     SMSG_QUEST_QUERY_RESPONSE                         = 0x1547,