Merge pull request #14291 from DJScias/6.x

Core/PacketIO: Update some opcodes for 6.1.0

2 files changed, 13 insertions, 13 deletions

diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 1aa5d6608f5..0240f67dbab 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -348,7 +348,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_EMOTE,                                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode               );
     DEFINE_HANDLER(CMSG_ENABLE_NAGLE,                                       STATUS_UNHANDLED, PROCESS_INPLACE,      WorldPacket, &WorldSession::Handle_EarlyProccess);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_ENABLE_TAXI_NODE,                        STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleTaxiQueryAvailableNodes   );
-    DEFINE_HANDLER(CMSG_EQUIPMENT_SET_SAVE,                                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::EquipmentSet::SaveEquipmentSet, &WorldSession::HandleEquipmentSetSave);
+    DEFINE_HANDLER(CMSG_EQUIPMENT_SET_SAVE,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::EquipmentSet::SaveEquipmentSet, &WorldSession::HandleEquipmentSetSave);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_FAR_SIGHT,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleFarSightOpcode            );
     DEFINE_HANDLER(CMSG_GAMEOBJECT_QUERY,                                   STATUS_LOGGEDIN,  PROCESS_INPLACE,      WorldPackets::Query::QueryGameObject, &WorldSession::HandleGameObjectQueryOpcode);
     DEFINE_HANDLER(CMSG_GAMEOBJ_REPORT_USE,                                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::GameObject::GameObjectReportUse, &WorldSession::HandleGameobjectReportUse);
@@ -735,7 +735,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SCENE_TRIGGER_EVENT,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SELF_RES,                                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSelfResOpcode             );
     DEFINE_HANDLER(CMSG_SELL_ITEM,                                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Item::SellItem, &WorldSession::HandleSellItemOpcode);
-    DEFINE_HANDLER(CMSG_SEND_CONTACT_LIST,                                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Social::SendContactList, &WorldSession::HandleContactListOpcode);
+    DEFINE_HANDLER(CMSG_SEND_CONTACT_LIST,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Social::SendContactList, &WorldSession::HandleContactListOpcode);
     DEFINE_HANDLER(CMSG_SEND_MAIL,                                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Mail::SendMail, &WorldSession::HandleSendMail);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SEND_SOR_REQUEST_VIA_ADDRESS,            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SEND_SOR_REQUEST_VIA_BNET_ACCOUNT_ID,    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -809,7 +809,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SUPPORT_TICKET_SUBMIT_SUGGESTION,        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SUSPEND_COMMS_ACK,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SUSPEND_TOKEN_RESPONSE,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_HANDLER(CMSG_SWAP_INV_ITEM,                                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Item::SwapInvItem, &WorldSession::HandleSwapInvItemOpcode);
+    DEFINE_HANDLER(CMSG_SWAP_INV_ITEM,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::SwapInvItem, &WorldSession::HandleSwapInvItemOpcode);
     DEFINE_HANDLER(CMSG_SWAP_ITEM,                                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Item::SwapItem, &WorldSession::HandleSwapItem);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SWAP_SUB_GROUPS,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleGroupSwapSubGroupOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SYNC_DANCE,                              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -1399,7 +1399,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOAD_CUF_PROFILES,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_SETTIMESPEED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_VERIFY_WORLD,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_COMPLETE,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGOUT_RESPONSE,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOG_XPGAIN,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 01c120c3ed5..ade04c51721 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -229,7 +229,7 @@ enum OpcodeClient : uint32
     CMSG_DB_QUERY_BULK                                = 0x1731,
     CMSG_DECLINE_GUILD_INVITES                        = 0xBADD,
     CMSG_DECLINE_PETITION                             = 0xBADD,
-    CMSG_DELETE_EQUIPMENT_SET                         = 0xBADD,
+    CMSG_DELETE_EQUIPMENT_SET                         = 0x1599,
     CMSG_DEL_FRIEND                                   = 0x1B71,
     CMSG_DEL_IGNORE                                   = 0x1BB3,
     CMSG_DEPOSIT_REAGENT_BANK                         = 0x1142,
@@ -252,7 +252,7 @@ enum OpcodeClient : uint32
     CMSG_EMOTE                                        = 0xBADD,
     CMSG_ENABLE_NAGLE                                 = 0xBADD,
     CMSG_ENABLE_TAXI_NODE                             = 0xBADD,
-    CMSG_EQUIPMENT_SET_SAVE                           = 0xBADD,
+    CMSG_EQUIPMENT_SET_SAVE                           = 0x0A7C,
     CMSG_FAR_SIGHT                                    = 0xBADD,
     CMSG_GAMEOBJECT_QUERY                             = 0x021A,
     CMSG_GAMEOBJ_REPORT_USE                           = 0xBADD,
@@ -687,12 +687,12 @@ enum OpcodeClient : uint32
     CMSG_SET_SORT_BAGS_RIGHT_TO_LEFT                  = 0xBADD,
     CMSG_SET_SPECIALIZATION                           = 0xBADD,
     CMSG_SET_TAXI_BENCHMARK_MODE                      = 0xBADD,
-    CMSG_SET_TITLE                                    = 0xBADD,
+    CMSG_SET_TITLE                                    = 0x0654,
     CMSG_SET_TRADE_CURRENCY                           = 0xBADD,
     CMSG_SET_TRADE_GOLD                               = 0xBADD,
     CMSG_SET_TRADE_ITEM                               = 0xBADD,
     CMSG_SET_VEHICLE_REC_ID_ACK                       = 0xBADD,
-    CMSG_SET_WATCHED_FACTION                          = 0xBADD,
+    CMSG_SET_WATCHED_FACTION                          = 0x154B,
     CMSG_SHOWING_CLOAK                                = 0xBADD,
     CMSG_SHOWING_HELM                                 = 0xBADD,
     CMSG_SHOW_TRADE_SKILL                             = 0xBADD,
@@ -717,7 +717,7 @@ enum OpcodeClient : uint32
     CMSG_SUPPORT_TICKET_SUBMIT_SUGGESTION             = 0xBADD,
     CMSG_SUSPEND_COMMS_ACK                            = 0x123C,
     CMSG_SUSPEND_TOKEN_RESPONSE                       = 0xBADD,
-    CMSG_SWAP_INV_ITEM                                = 0xBADD,
+    CMSG_SWAP_INV_ITEM                                = 0x00C5,
     CMSG_SWAP_ITEM                                    = 0x0206,
     CMSG_SWAP_SUB_GROUPS                              = 0xBADD,
     CMSG_SYNC_DANCE                                   = 0xBADD,
@@ -758,7 +758,7 @@ enum OpcodeClient : uint32
     CMSG_UPGRADE_ITEM                                 = 0xBADD,
     CMSG_USED_FOLLOW                                  = 0xBADD,
     CMSG_USE_CRITTER_ITEM                             = 0xBADD,
-    CMSG_USE_EQUIPMENT_SET                            = 0xBADD,
+    CMSG_USE_EQUIPMENT_SET                            = 0x0026,
     CMSG_USE_ITEM                                     = 0x0A5A,
     CMSG_USE_PARTY_GARRISON                           = 0xBADD,
     CMSG_USE_TOY                                      = 0xBADD,
@@ -979,7 +979,7 @@ enum OpcodeServer : uint32
     SMSG_CHANNEL_NOTIFY_LEFT                          = 0x143B,
     SMSG_CHANNEL_START                                = 0x0F5A,
     SMSG_CHANNEL_UPDATE                               = 0xBADD,
-    SMSG_CHARACTER_LOGIN_FAILED                       = 0xBADD,
+    SMSG_CHARACTER_LOGIN_FAILED                       = 0x1722,
     SMSG_CHARACTER_OBJECT_TEST_RESPONSE               = 0xBADD,
     SMSG_CHARACTER_UPGRADE_COMPLETE                   = 0xBADD,
     SMSG_CHARACTER_UPGRADE_SPELL_TIER_SET             = 0xBADD,
@@ -1334,9 +1334,9 @@ enum OpcodeServer : uint32
     SMSG_LOAD_CUF_PROFILES                            = 0x17EA,
     SMSG_LOGIN_SETTIMESPEED                           = 0x1573,
     SMSG_LOGIN_VERIFY_WORLD                           = 0x0B31,
-    SMSG_LOGOUT_CANCEL_ACK                            = 0xBADD,
+    SMSG_LOGOUT_CANCEL_ACK                            = 0x1D8A,
     SMSG_LOGOUT_COMPLETE                              = 0x17AA,
-    SMSG_LOGOUT_RESPONSE                              = 0x1BB4,
+    SMSG_LOGOUT_RESPONSE                              = 0x05C3,
     SMSG_LOG_XPGAIN                                   = 0xBADD,
     SMSG_LOOT_ALL_PASSED                              = 0xBADD,
     SMSG_LOOT_CONTENTS                                = 0xBADD,