Core/Packets: updated SMSG_FEATURE_SYSTEM_STATUS, SMSG_INITIAL_SPELLS and SMSG_SPELL_CATEGORY_COOLDOWN

2 files changed, 27 insertions, 23 deletions

diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 9f9f11e8fa2..556560c5e70 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -415,6 +415,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_WHISPER,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MESSAGECHAT_YELL,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMessagechatOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MINIGAME_MOVE,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_MINIMAP_PING,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMinimapPingOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOUNTSPECIAL_ANIM,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMountSpecialAnimOpcode    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOVE_CHNG_TRANSPORT,                     STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_MOVE_FALL_RESET,                         STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
@@ -525,6 +526,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_RANDOM_ROLL,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleRandomRollOpcode          );
     DEFINE_HANDLER(CMSG_RANDOMIZE_CHAR_NAME,                                STATUS_AUTHED,    PROCESS_THREADUNSAFE, WorldPackets::Character::GenerateRandomCharacterName, &WorldSession::HandleRandomizeCharNameOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_READ_ITEM,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleReadItem                  );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_REALM_NAME_QUERY,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REALM_SPLIT,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleRealmSplitOpcode          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_RECLAIM_CORPSE,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleReclaimCorpseOpcode       );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REFORGE_ITEM,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleReforgeItemOpcode         );
@@ -652,7 +654,6 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(MSG_CORPSE_QUERY,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleCorpseQueryOpcode         );
     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_MINIMAP_PING,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleMinimapPingOpcode         );
     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           );
@@ -881,7 +882,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EXPECTED_SPAM_RECORDS,                   STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_EXPLORATION_EXPERIENCE,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FAILED_PLAYER_CONDITION,                 STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEATURE_SYSTEM_STATUS,                   STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEATURE_SYSTEM_STATUS,                   STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEATURE_SYSTEM_STATUS_GLUE_SCREEN,       STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FEIGN_DEATH_RESISTED,                    STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FISH_ESCAPED,                            STATUS_UNHANDLED);
@@ -980,7 +981,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_HOTFIX_NOTIFY,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIALIZE_FACTIONS,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SETUP,                           STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SPELLS,                          STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INITIAL_SPELLS,                          STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INIT_CURRENCY,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INIT_WORLD_STATES,                       STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_HONOR_STATS,                     STATUS_UNHANDLED);
@@ -1025,7 +1026,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_TELEPORT_DENIED,                     STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_UPDATE_SEARCH,                       STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_UPDATE_STATUS,                       STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_UPDATE_STATUS_NONE,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_APPLICANT_LIST_UPDATED,         STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED,      STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_BROWSE_UPDATED,                 STATUS_UNHANDLED);
@@ -1062,6 +1062,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MESSAGE_BOX,                             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MINIGAME_SETUP,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MINIGAME_STATE,                          STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MINIMAP_PING,                            STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MIRRORIMAGE_DATA,                        STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MISSILE_CANCEL,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_COOLDOWN,                         STATUS_UNHANDLED);
@@ -1215,6 +1216,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RATED_BG_STATS,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READ_ITEM_FAILED,                        STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_READ_ITEM_OK,                            STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_QUERY_RESPONSE,                    STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_SPLIT,                             STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REAL_GROUP_UPDATE,                       STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RECEIVED_MAIL,                           STATUS_UNHANDLED);
@@ -1280,7 +1282,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLNONMELEEDAMAGELOG,                  STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLORDAMAGE_IMMUNE,                    STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLSTEALLOG,                           STATUS_UNHANDLED);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_CATEGORY_COOLDOWN,                 STATUS_UNHANDLED);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_CATEGORY_COOLDOWN,                 STATUS_NEVER);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_COOLDOWN,                          STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_DELAYED,                           STATUS_UNHANDLED);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELL_FAILED_OTHER,                      STATUS_UNHANDLED);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index c5e92afa690..65c33537ec6 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -91,7 +91,7 @@ enum OpcodeClient : uint32
     CMSG_BANKER_ACTIVATE                              = 0x1B24,
     CMSG_BATTLEFIELD_JOIN                             = 0xBADD,
     CMSG_BATTLEFIELD_LEAVE                            = 0xBADD,
-    CMSG_BATTLEFIELD_LIST                             = 0xBADD,
+    CMSG_BATTLEFIELD_LIST                             = 0x03B1,
     CMSG_BATTLEFIELD_MGR_ENTRY_INVITE_RESPONSE        = 0xBADD,
     CMSG_BATTLEFIELD_MGR_EXIT_REQUEST                 = 0xBADD,
     CMSG_BATTLEFIELD_MGR_QUEUE_INVITE_RESPONSE        = 0xBADD,
@@ -340,7 +340,7 @@ enum OpcodeClient : uint32
     CMSG_LOOT                                         = 0x01B1,
     CMSG_LOOT_CURRENCY                                = 0xBADD,
     CMSG_LOOT_MASTER_GIVE                             = 0xBADD,
-    CMSG_LOOT_METHOD                                  = 0xBADD,
+    CMSG_LOOT_METHOD                                  = 0x0729,
     CMSG_LOOT_MONEY                                   = 0xBADD,
     CMSG_LOOT_RELEASE                                 = 0xBADD,
     CMSG_LOOT_ROLL                                    = 0xBADD,
@@ -371,6 +371,7 @@ enum OpcodeClient : uint32
     CMSG_MESSAGECHAT_WHISPER                          = 0x1829,
     CMSG_MESSAGECHAT_YELL                             = 0x1161,
     CMSG_MINIGAME_MOVE                                = 0xBADD,
+    CMSG_MINIMAP_PING                                 = 0x0837,
     CMSG_MOUNTSPECIAL_ANIM                            = 0xBADD,
     CMSG_MOVE_CHARM_TELEPORT_CHEAT                    = 0xBADD,
     CMSG_MOVE_CHNG_TRANSPORT                          = 0xBADD,
@@ -463,7 +464,7 @@ enum OpcodeClient : uint32
     CMSG_PLAYER_VEHICLE_ENTER                         = 0xBADD,
     CMSG_PLAY_DANCE                                   = 0xBADD,
     CMSG_PUSHQUESTTOPARTY                             = 0xBADD,
-    CMSG_PVP_LOG_DATA                                 = 0xBADD,
+    CMSG_PVP_LOG_DATA                                 = 0x08B5,
     CMSG_QUERY_BATTLEFIELD_STATE                      = 0xBADD,
     CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE               = 0xBADD,
     CMSG_QUERY_GUILD_MEMBER_RECIPES                   = 0xBADD,
@@ -493,6 +494,7 @@ enum OpcodeClient : uint32
     CMSG_RANDOM_ROLL                                  = 0x12AA,
     CMSG_RANDOMIZE_CHAR_NAME                          = 0x1981,
     CMSG_READ_ITEM                                    = 0xBADD,
+    CMSG_REALM_NAME_QUERY                             = 0x1189,
     CMSG_REALM_SPLIT                                  = 0xBADD,
     CMSG_RECLAIM_CORPSE                               = 0xBADD,
     CMSG_REFORGE_ITEM                                 = 0xBADD,
@@ -638,7 +640,6 @@ enum OpcodeClient : uint32
     MSG_GM_SUMMON                                     = 0xBADD,
     MSG_INSPECT_ARENA_TEAMS                           = 0xBADD,
     MSG_LIST_STABLED_PETS                             = 0xBADD,
-    MSG_MINIMAP_PING                                  = 0xBADD,
     MSG_MOVE_CHARM_TELEPORT_CHEAT                     = 0xBADD,
     MSG_MOVE_SET_ALL_SPEED_CHEAT                      = 0xBADD,
     MSG_MOVE_SET_FLIGHT_SPEED_CHEAT                   = 0xBADD,
@@ -757,13 +758,13 @@ enum OpcodeServer : uint32
     SMSG_BATTLE_PET_JOURNAL                           = 0x19A2,
     SMSG_BATTLE_PET_JOURNAL_LOCK_ACQUIRED             = 0x01A3,
     SMSG_BATTLE_PET_NAME_QUERY_RESPONSE               = 0x09EC,
-    SMSG_BINDER_CONFIRM                               = 0xBADD,
+    SMSG_BINDER_CONFIRM                               = 0x0B11,
     SMSG_BINDPOINTUPDATE                              = 0x0A30,
     SMSG_BINDZONEREPLY                                = 0xBADD,
     SMSG_BREAK_TARGET                                 = 0xBADD,
     SMSG_BUY_BANK_SLOT_RESULT                         = 0xBADD,
-    SMSG_BUY_FAILED                                   = 0xBADD,
-    SMSG_BUY_ITEM                                     = 0xBADD,
+    SMSG_BUY_FAILED                                   = 0x013A,
+    SMSG_BUY_ITEM                                     = 0x0BD1,
     SMSG_CALENDAR_ACTION_PENDING                      = 0xBADD,
     SMSG_CALENDAR_ARENA_TEAM                          = 0xBADD,
     SMSG_CALENDAR_CLEAR_PENDING_ACTION                = 0xBADD,
@@ -935,7 +936,7 @@ enum OpcodeServer : uint32
     SMSG_GROUP_DECLINE                                = 0xBADD,
     SMSG_GROUP_DESTROYED                              = 0xBADD,
     SMSG_GROUP_INVITE                                 = 0xBADD,
-    SMSG_GROUP_LIST                                   = 0xBADD,
+    SMSG_GROUP_LIST                                   = 0x15BE,
     SMSG_GROUP_SET_LEADER                             = 0xBADD,
     SMSG_GROUP_SET_ROLE                               = 0xBADD,
     SMSG_GROUP_UNINVITE                               = 0xBADD,
@@ -1033,7 +1034,7 @@ enum OpcodeServer : uint32
     SMSG_LEVELUP_INFO                                 = 0xBADD,
     SMSG_LFG_BOOT_PROPOSAL_UPDATE                     = 0xBADD,
     SMSG_LFG_DISABLED                                 = 0xBADD,
-    SMSG_LFG_JOIN_RESULT                              = 0xBADD,
+    SMSG_LFG_JOIN_RESULT                              = 0x0F72,
     SMSG_LFG_OFFER_CONTINUE                           = 0xBADD,
     SMSG_LFG_OPEN_FROM_GOSSIP                         = 0xBADD,
     SMSG_LFG_PARTY_INFO                               = 0xBADD,
@@ -1047,8 +1048,7 @@ enum OpcodeServer : uint32
     SMSG_LFG_TELEPORT_DENIED                          = 0xBADD,
     SMSG_LFG_UPDATE_LIST                              = 0xBADD,
     SMSG_LFG_UPDATE_SEARCH                            = 0xBADD,
-    SMSG_LFG_UPDATE_STATUS                            = 0xBADD,
-    SMSG_LFG_UPDATE_STATUS_NONE                       = 0xBADD,
+    SMSG_LFG_UPDATE_STATUS                            = 0x07F7,
     SMSG_LF_GUILD_APPLICANT_LIST_UPDATED              = 0xBADD,
     SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED           = 0xBADD,
     SMSG_LF_GUILD_BROWSE_UPDATED                      = 0xBADD,
@@ -1063,14 +1063,14 @@ enum OpcodeServer : uint32
     SMSG_LOGOUT_CANCEL_ACK                            = 0x0FAD,
     SMSG_LOGOUT_COMPLETE                              = 0x0B21,
     SMSG_LOGOUT_RESPONSE                              = 0x052D,
-    SMSG_LOG_XPGAIN                                   = 0xBADD,
+    SMSG_LOG_XPGAIN                                   = 0x1B53,
     SMSG_LOOT_ALL_PASSED                              = 0xBADD,
     SMSG_LOOT_CLEAR_MONEY                             = 0xBADD,
     SMSG_LOOT_CONTENTS                                = 0xBADD,
     SMSG_LOOT_ITEM_NOTIFY                             = 0xBADD,
     SMSG_LOOT_LIST                                    = 0xBADD,
     SMSG_LOOT_MASTER_LIST                             = 0xBADD,
-    SMSG_LOOT_MONEY_NOTIFY                            = 0xBADD,
+    SMSG_LOOT_MONEY_NOTIFY                            = 0x12A9,
     SMSG_LOOT_RELEASE_RESPONSE                        = 0xBADD,
     SMSG_LOOT_REMOVED                                 = 0xBADD,
     SMSG_LOOT_RESPONSE                                = 0xBADD,
@@ -1088,6 +1088,7 @@ enum OpcodeServer : uint32
     SMSG_MESSAGE_BOX                                  = 0xBADD,
     SMSG_MINIGAME_SETUP                               = 0xBADD,
     SMSG_MINIGAME_STATE                               = 0xBADD,
+    SMSG_MINIMAP_PING                                 = 0x07BA,
     SMSG_MIRRORIMAGE_DATA                             = 0xBADD,
     SMSG_MISSILE_CANCEL                               = 0xBADD,
     SMSG_MODIFY_COOLDOWN                              = 0xBADD,
@@ -1211,13 +1212,13 @@ enum OpcodeServer : uint32
     SMSG_PROPOSE_LEVEL_GRANT                          = 0xBADD,
     SMSG_PUREMOUNT_CANCELLED_OBSOLETE                 = 0xBADD,
     SMSG_PVP_CREDIT                                   = 0xBADD,
-    SMSG_PVP_LOG_DATA                                 = 0xBADD,
+    SMSG_PVP_LOG_DATA                                 = 0x1ECA,
     SMSG_PVP_OPTIONS_ENABLED                          = 0xBADD,
     SMSG_PVP_SEASON                                   = 0x09E3,
     SMSG_QUERY_QUESTS_COMPLETED_RESPONSE              = 0xBADD,
     SMSG_QUERY_TIME_RESPONSE                          = 0x1DB0,
     SMSG_QUESTGIVER_OFFER_REWARD                      = 0xBADD,
-    SMSG_QUESTGIVER_QUEST_COMPLETE                    = 0xBADD,
+    SMSG_QUESTGIVER_QUEST_COMPLETE                    = 0x1773,
     SMSG_QUESTGIVER_QUEST_DETAILS                     = 0x15B3,
     SMSG_QUESTGIVER_QUEST_FAILED                      = 0xBADD,
     SMSG_QUESTGIVER_QUEST_INVALID                     = 0xBADD,
@@ -1248,6 +1249,7 @@ enum OpcodeServer : uint32
     SMSG_RATED_BG_STATS                               = 0xBADD,
     SMSG_READ_ITEM_FAILED                             = 0xBADD,
     SMSG_READ_ITEM_OK                                 = 0xBADD,
+    SMSG_REALM_QUERY_RESPONSE                         = 0x011D,
     SMSG_REALM_SPLIT                                  = 0xBADD,
     SMSG_REAL_GROUP_UPDATE                            = 0xBADD,
     SMSG_RECEIVED_MAIL                                = 0xBADD,
@@ -1277,7 +1279,7 @@ enum OpcodeServer : uint32
     SMSG_SERVERTIME                                   = 0xBADD,
     SMSG_SERVER_FIRST_ACHIEVEMENT                     = 0xBADD,
     SMSG_SERVER_INFO_RESPONSE                         = 0xBADD,
-    SMSG_SERVER_MESSAGE                               = 0xBADD,
+    SMSG_SERVER_MESSAGE                               = 0x0683,
     SMSG_SERVER_PERF                                  = 0xBADD,
     SMSG_SET_AI_ANIM_KIT                              = 0xBADD,
     SMSG_SET_DF_FAST_LAUNCH_RESULT                    = 0xBADD,
@@ -1297,7 +1299,7 @@ enum OpcodeServer : uint32
     SMSG_SET_PROJECTILE_POSITION                      = 0xBADD,
     SMSG_SET_TIME_ZONE_INFORMATION                    = 0x153E,
     SMSG_SET_VIGNETTE                                 = 0x09AC,
-    SMSG_SHOWTAXINODES                                = 0xBADD,
+    SMSG_SHOWTAXINODES                                = 0x12A1,
     SMSG_SHOW_BANK                                    = 0x0204,
     SMSG_SHOW_MAILBOX                                 = 0xBADD,
     SMSG_SHOW_RATINGS                                 = 0xBADD,
@@ -1436,7 +1438,7 @@ enum OpcodeServer : uint32
     SMSG_WORLD_SERVER_INFO                            = 0x11AC,
     SMSG_WORLD_STATE_UI_TIMER_UPDATE                  = 0xBADD,
     SMSG_XP_GAIN_ABORTED                              = 0xBADD,
-    SMSG_ZONE_UNDER_ATTACK                            = 0xBADD,
+    SMSG_ZONE_UNDER_ATTACK                            = 0x1401
 };
 
 /// Player state