Core/NetworkIO: sync opcodes with wpp

21 files changed, 280 insertions, 259 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 152d74bf674..bd084491dee 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -8581,7 +8581,7 @@ void Player::RemovedInsignia(Player* looterPlr)
 
 void Player::SendLootRelease(ObjectGuid guid)
 {
-    WorldPacket data(SMSG_LOOT_RELEASE_RESPONSE, (8+1));
+    WorldPacket data(SMSG_LOOT_RELEASE, (8+1));
     data << guid << uint8(1);
     SendDirectMessage(&data);
 }
@@ -15006,7 +15006,7 @@ bool Player::SatisfyQuestLog(bool msg)
 
     if (msg)
     {
-        WorldPacket data(SMSG_QUESTLOG_FULL, 0);
+        WorldPacket data(SMSG_QUEST_LOG_FULL, 0);
         GetSession()->SendPacket(&data);
         TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTLOG_FULL");
     }
@@ -16330,7 +16330,7 @@ void Player::SendQuestComplete(Quest const* quest)
 {
     if (quest)
     {
-        WorldPacket data(SMSG_QUESTUPDATE_COMPLETE, 4);
+        WorldPacket data(SMSG_QUEST_UPDATE_COMPLETE, 4);
         data << uint32(quest->GetQuestId());
         GetSession()->SendPacket(&data);
         TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTUPDATE_COMPLETE quest = %u", quest->GetQuestId());
@@ -16390,7 +16390,7 @@ void Player::SendQuestTimerFailed(uint32 quest_id)
 {
     if (quest_id)
     {
-        WorldPacket data(SMSG_QUESTUPDATE_FAILEDTIMER, 4);
+        WorldPacket data(SMSG_QUEST_UPDATE_FAILED_TIMER, 4);
         data << uint32(quest_id);
         GetSession()->SendPacket(&data);
         TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTUPDATE_FAILEDTIMER");
@@ -16452,7 +16452,7 @@ void Player::SendQuestUpdateAddCredit(Quest const* quest, ObjectGuid guid, Quest
 
 void Player::SendQuestUpdateAddPlayer(Quest const* quest, uint16 newCount, uint32 required)
 {
-    WorldPacket data(SMSG_QUESTUPDATE_ADD_PVP_KILL, (3*4));
+    WorldPacket data(SMSG_QUEST_UPDATE_ADD_PVP_CREDIT, (3*4));
     TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTUPDATE_ADD_PVP_KILL");
     data << uint32(quest->GetQuestId());
     data << uint32(newCount);
@@ -26623,8 +26623,8 @@ VoidStorageItem* Player::GetVoidStorageItem(uint64 id, uint8& slot) const
 void Player::SendMovementSetCanTransitionBetweenSwimAndFly(bool apply)
 {
     Movement::PacketSender(this, static_cast<OpcodeServer>(NULL_OPCODE), apply ?
-        SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY :
-        SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY).Send();
+        SMSG_MOVE_ENABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY :
+        SMSG_MOVE_DISABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY).Send();
 }
 
 void Player::SendMovementSetCollisionHeight(float height)
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 27ecbc10dc6..d25e10d8646 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15892,8 +15892,8 @@ bool Unit::SetDisableGravity(bool disable, bool packetOnly /*= false*/)
 
     static OpcodeServer const gravityOpcodeTable[2][2] =
     {
-        {SMSG_MOVE_SPLINE_ENABLE_GRAVITY,   SMSG_MOVE_GRAVITY_ENABLE    },
-        {SMSG_MOVE_SPLINE_DISABLE_GRAVITY,  SMSG_MOVE_GRAVITY_DISABLE   }
+        { SMSG_MOVE_SPLINE_ENABLE_GRAVITY,  SMSG_MOVE_ENABLE_GRAVITY  },
+        { SMSG_MOVE_SPLINE_DISABLE_GRAVITY, SMSG_MOVE_DISABLE_GRAVITY }
     };
 
     bool player = GetTypeId() == TYPEID_PLAYER && ToPlayer()->m_mover->GetTypeId() == TYPEID_PLAYER;
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index f4a884f4e26..97450ec3f92 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -805,7 +805,7 @@ void Group::Disband(bool hideDestroy /* = false */)
 
 void Group::SendLootStartRoll(uint32 countDown, uint32 mapid, const Roll &r)
 {
-    WorldPacket data(SMSG_LOOT_START_ROLL, (8+4+4+4+4+4+4+1));
+    WorldPacket data(SMSG_START_LOOT_ROLL, (8+4+4+4+4+4+4+1));
     data << r.itemGUID;                                     // guid of rolled item
     data << uint32(mapid);                                  // 3.3.3 mapid
     data << uint32(r.itemSlot);                             // itemslot
@@ -833,7 +833,7 @@ void Group::SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p,
     if (!p || !p->GetSession())
         return;
 
-    WorldPacket data(SMSG_LOOT_START_ROLL, (8 + 4 + 4 + 4 + 4 + 4 + 4 + 1));
+    WorldPacket data(SMSG_START_LOOT_ROLL, (8 + 4 + 4 + 4 + 4 + 4 + 4 + 1));
     data << r.itemGUID;                                     // guid of rolled item
     data << uint32(mapId);                                  // 3.3.3 mapid
     data << uint32(r.itemSlot);                             // itemslot
@@ -1504,7 +1504,7 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid)
 
     m_targetIcons[id] = targetGuid;
 
-    WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+8+1+8));
+    WorldPacket data(SMSG_SEND_RAID_TARGET_UPDATE_SINGLE, (1+8+1+8));
     data << uint8(0);                                       // set targets
     data << whoGuid;
     data << uint8(id);
@@ -1517,7 +1517,7 @@ void Group::SendTargetIconList(WorldSession* session)
     if (!session)
         return;
 
-    WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+TARGETICONCOUNT*9));
+    WorldPacket data(SMSG_SEND_RAID_TARGET_UPDATE_ALL, (1+TARGETICONCOUNT*9));
     data << uint8(1);                                       // list targets
 
     for (uint8 i = 0; i < TARGETICONCOUNT; ++i)
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 9aa87448ceb..44888c7bd6b 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -1366,7 +1366,7 @@ bool Guild::SetName(std::string const& name)
     CharacterDatabase.Execute(stmt);
 
     ObjectGuid guid = GetGUID();
-    WorldPacket data(SMSG_GUILD_RENAMED, 24 + 8 + 1);
+    WorldPacket data(SMSG_GUILD_NAME_CHANGED, 24 + 8 + 1);
     data.WriteBit(guid[5]);
     data.WriteBits(name.length(), 8);
     data.WriteBit(guid[4]);
@@ -1507,7 +1507,7 @@ void Guild::SendQueryResponse(WorldSession* session)
 void Guild::SendGuildRankInfo(WorldSession* session) const
 {
     ByteBuffer rankData(100);
-    WorldPacket data(SMSG_GUILD_RANK, 100);
+    WorldPacket data(SMSG_GUILD_RANKS, 100);
 
     data.WriteBits(_GetRanksSize(), 18);
 
@@ -3493,7 +3493,7 @@ void Guild::SendGuildRanksUpdate(ObjectGuid setterGuid, ObjectGuid targetGuid, u
     Member* member = GetMember(targetGuid);
     ASSERT(member);
 
-    WorldPacket data(SMSG_GUILD_RANKS_UPDATE, 100);
+    WorldPacket data(SMSG_GUILD_SEND_RANK_CHANGE, 100);
     data.WriteBit(setterGuid[7]);
     data.WriteBit(setterGuid[2]);
     data.WriteBit(targetGuid[2]);
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index ba4e4204b14..bef8aa2fdb4 100644
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
@@ -621,7 +621,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData)
 
     AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction());
 
-    WorldPacket data(SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4));
+    WorldPacket data(SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT, (4+4+4));
     Player* player = GetPlayer();
     data << uint32(0);                                     //add 0 as count
     uint32 count = 0;
@@ -670,7 +670,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData)
 
     AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->getFaction());
 
-    WorldPacket data(SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4));
+    WorldPacket data(SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT, (4+4+4));
     data << uint32(0);                                     // amount place holder
 
     uint32 count = 0;
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 8ec6779f2bb..87434e7b29e 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -599,7 +599,7 @@ void WorldSession::HandleBattlefieldLeaveOpcode(WorldPacket& /*recvData*/)
     _player->LeaveBattleground();
 }
 
-void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket & /*recvData*/)
+void WorldSession::HandleRequestBattlefieldStatusOpcode(WorldPacket& /*recvData*/)
 {
     // empty opcode
     TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_BATTLEFIELD_STATUS Message");
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index aca64f99f3b..bfe1664c8eb 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -1093,7 +1093,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
 
 void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData)
 {
-    TC_LOG_DEBUG("network", "WORLD: Received CMSG_SET_FACTION_ATWAR");
+    TC_LOG_DEBUG("network", "WORLD: Received CMSG_SET_FACTION_AT_WAR");
 
     uint32 repListID;
     uint8  flag;
diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
index b297e16e535..103334db568 100644
--- a/src/server/game/Handlers/GuildHandler.cpp
+++ b/src/server/game/Handlers/GuildHandler.cpp
@@ -59,7 +59,7 @@ void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
             guild->HandleInviteMember(this, invitedName);
 }
 
-void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
+void WorldSession::HandleGuildOfficerRemoveMemberOpcode(WorldPacket& recvPacket)
 {
     ObjectGuid playerGuid;
 
@@ -81,7 +81,7 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
     recvPacket.ReadByteSeq(playerGuid[3]);
     recvPacket.ReadByteSeq(playerGuid[0]);
 
-    TC_LOG_DEBUG("guild", "CMSG_GUILD_REMOVE [%s]: Target: %s", GetPlayerInfo().c_str(), playerGuid.ToString().c_str());
+    TC_LOG_DEBUG("guild", "CMSG_GUILD_OFFICER_REMOVE_MEMBER [%s]: Target: %s", GetPlayerInfo().c_str(), playerGuid.ToString().c_str());
 
     if (Guild* guild = GetPlayer()->GetGuild())
         guild->HandleRemoveMember(this, playerGuid);
@@ -278,7 +278,7 @@ void WorldSession::HandleGuildSetNoteOpcode(WorldPacket& recvPacket)
         guild->HandleSetMemberNote(this, note, playerGuid, ispublic);
 }
 
-void WorldSession::HandleGuildQueryRanksOpcode(WorldPacket& recvPacket)
+void WorldSession::HandleGuildGetRanksOpcode(WorldPacket& recvPacket)
 {
     ObjectGuid guildGuid;
 
@@ -300,7 +300,7 @@ void WorldSession::HandleGuildQueryRanksOpcode(WorldPacket& recvPacket)
     recvPacket.ReadByteSeq(guildGuid[6]);
     recvPacket.ReadByteSeq(guildGuid[2]);
 
-    TC_LOG_DEBUG("guild", "CMSG_GUILD_QUERY_RANKS [%s]: Guild: %s",
+    TC_LOG_DEBUG("guild", "CMSG_GUILD_GET_RANKS [%s]: Guild: %s",
         GetPlayerInfo().c_str(), guildGuid.ToString().c_str());
 
     if (Guild* guild = sGuildMgr->GetGuildByGuid(guildGuid))
@@ -322,12 +322,12 @@ void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket)
         guild->HandleAddNewRank(this, rankName);
 }
 
-void WorldSession::HandleGuildDelRankOpcode(WorldPacket& recvPacket)
+void WorldSession::HandleGuildDeleteRankOpcode(WorldPacket& recvPacket)
 {
     uint32 rankId;
     recvPacket >> rankId;
 
-    TC_LOG_DEBUG("guild", "CMSG_GUILD_DEL_RANK [%s]: Rank: %u", GetPlayerInfo().c_str(), rankId);
+    TC_LOG_DEBUG("guild", "CMSG_GUILD_DELETE_RANK [%s]: Rank: %u", GetPlayerInfo().c_str(), rankId);
 
     if (Guild* guild = GetPlayer()->GetGuild())
         guild->HandleRemoveRank(this, rankId);
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index cc09e878056..508ce1c942a 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1264,7 +1264,7 @@ void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recvData)
     Player* player = ObjectAccessor::FindPlayer(guid);
     if (!player)
     {
-        TC_LOG_DEBUG("network", "CMSG_INSPECT_HONOR_STATS: No player found from %s", guid.ToString().c_str());
+        TC_LOG_DEBUG("network", "CMSG_REQUEST_HONOR_STATS: No player found from %s", guid.ToString().c_str());
         return;
     }
 
@@ -1784,7 +1784,7 @@ void WorldSession::SendSetPhaseShift(std::set<uint32> const& phaseIds, std::set<
 {
     ObjectGuid guid = _player->GetGUID();
 
-    WorldPacket data(SMSG_SET_PHASE_SHIFT, 1 + 8 + 4 + 4 + 4 + 4 + 2 * phaseIds.size() + 4 + terrainswaps.size() * 2);
+    WorldPacket data(SMSG_SET_PHASE_SHIFT_CHANGE, 1 + 8 + 4 + 4 + 4 + 4 + 2 * phaseIds.size() + 4 + terrainswaps.size() * 2);
     data.WriteBit(guid[2]);
     data.WriteBit(guid[3]);
     data.WriteBit(guid[1]);
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 447d8e065f1..c47fe33e3b2 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -511,7 +511,7 @@ void WorldSession::HandleMoveNotActiveMover(WorldPacket &recvData)
 
 void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvData*/)
 {
-    WorldPacket data(SMSG_MOUNTSPECIAL_ANIM, 8);
+    WorldPacket data(SMSG_SPECIAL_MOUNT_ANIM, 8);
     data << GetPlayer()->GetGUID();
 
     GetPlayer()->SendMessageToSet(&data, false);
diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp
index 3f18a9bd1ea..77a9aacfda4 100644
--- a/src/server/game/Handlers/PetitionsHandler.cpp
+++ b/src/server/game/Handlers/PetitionsHandler.cpp
@@ -921,7 +921,7 @@ void WorldSession::SendPetitionShowList(ObjectGuid guid)
         return;
     }
 
-    WorldPacket data(SMSG_PETITION_SHOWLIST, 8+1+4*6);
+    WorldPacket data(SMSG_PETITION_SHOW_LIST, 8+1+4*6);
     data << guid;                                           // npc guid
 
     if (creature->IsTabardDesigner())
diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 5c16de1ee4c..b8f13f9d014 100644
--- a/src/server/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
@@ -103,7 +103,7 @@ void WorldSession::SendTaxiMenu(Creature* unit)
 
     TC_LOG_DEBUG("network", "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ", curloc);
 
-    WorldPacket data(SMSG_SHOWTAXINODES, (4 + 8 + 4 + 8 * 4));
+    WorldPacket data(SMSG_SHOW_TAXI_NODES, (4 + 8 + 4 + 8 * 4));
     data << uint32(1);
     data << unit->GetGUID();
     data << uint32(curloc);
diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp
index 01a4f8c437d..0525a567c0b 100644
--- a/src/server/game/Handlers/TicketHandler.cpp
+++ b/src/server/game/Handlers/TicketHandler.cpp
@@ -114,7 +114,7 @@ void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData)
         response = GMTICKET_RESPONSE_CREATE_SUCCESS;
     }
 
-    WorldPacket data(SMSG_GMTICKET_CREATE, 4);
+    WorldPacket data(SMSG_GM_TICKET_UPDATE, 4);
     data << uint32(response);
     SendPacket(&data);
 }
@@ -136,7 +136,7 @@ void WorldSession::HandleGMTicketUpdateOpcode(WorldPacket& recvData)
         response = GMTICKET_RESPONSE_UPDATE_SUCCESS;
     }
 
-    WorldPacket data(SMSG_GMTICKET_UPDATETEXT, 4);
+    WorldPacket data(SMSG_GM_TICKET_UPDATE, 4);
     data << uint32(response);
     SendPacket(&data);
 }
@@ -145,7 +145,7 @@ void WorldSession::HandleGMTicketDeleteOpcode(WorldPacket & /*recvData*/)
 {
     if (GmTicket* ticket = sTicketMgr->GetTicketByPlayer(GetPlayer()->GetGUID()))
     {
-        WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
+        WorldPacket data(SMSG_GM_TICKET_UPDATE, 4);
         data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
         SendPacket(&data);
 
@@ -175,7 +175,7 @@ void WorldSession::HandleGMTicketSystemStatusOpcode(WorldPacket & /*recvData*/)
 {
     // Note: This only disables the ticket UI at client side and is not fully reliable
     // are we sure this is a uint32? Should ask Zor
-    WorldPacket data(SMSG_GMTICKET_SYSTEMSTATUS, 4);
+    WorldPacket data(SMSG_GM_TICKET_SYSTEM_STATUS, 4);
     data << uint32(sTicketMgr->GetStatus() ? GMTICKET_QUEUE_STATUS_ENABLED : GMTICKET_QUEUE_STATUS_DISABLED);
     SendPacket(&data);
 }
@@ -261,11 +261,11 @@ void WorldSession::HandleGMResponseResolve(WorldPacket& /*recvPacket*/)
         if (float(rand_chance()) < sWorld->getFloatConfig(CONFIG_CHANCE_OF_GM_SURVEY))
             getSurvey = 1;
 
-        WorldPacket data(SMSG_GMRESPONSE_STATUS_UPDATE, 4);
+        WorldPacket data(SMSG_GM_TICKET_STATUS_UPDATE, 4);
         data << uint8(getSurvey);
         SendPacket(&data);
 
-        WorldPacket data2(SMSG_GMTICKET_DELETETICKET, 4);
+        WorldPacket data2(SMSG_GM_TICKET_UPDATE, 4);
         data2 << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
         SendPacket(&data2);
 
diff --git a/src/server/game/Server/Packets/AuctionHousePackets.h b/src/server/game/Server/Packets/AuctionHousePackets.h
index 7169c623ee3..0af8f488dfd 100644
--- a/src/server/game/Server/Packets/AuctionHousePackets.h
+++ b/src/server/game/Server/Packets/AuctionHousePackets.h
@@ -38,7 +38,7 @@ namespace WorldPackets
         class AuctionHelloResponse final : public ServerPacket
         {
         public:
-            AuctionHelloResponse() : ServerPacket(SMSG_AUCTION_HELLO, 1 + 16) { }
+            AuctionHelloResponse() : ServerPacket(SMSG_AUCTION_HELLO_RESPONSE, 1 + 16) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 8776e680775..3796649f2c9 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -184,7 +184,7 @@ namespace WorldPackets
         class QuestUpdateAddCredit final : public ServerPacket
         {
         public:
-            QuestUpdateAddCredit() : ServerPacket(SMSG_QUESTUPDATE_ADD_KILL, 16+4+4+2+2+1) { }
+            QuestUpdateAddCredit() : ServerPacket(SMSG_QUEST_UPDATE_ADD_CREDIT, 16+4+4+2+2+1) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 03fc0e9438d..63ea7d66252 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -191,14 +191,15 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST,           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_PORT,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleFieldPortOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_REQUEST_SCORE_DATA,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_STATUS,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldStatusOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEGROUND_PLAYER_POSITIONS,           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleBattlegroundPlayerPositionsOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEMASTER_HELLO,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlemasterHelloOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEMASTER_JOIN,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlemasterJoinOpcode    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEMASTER_JOIN_ARENA,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlemasterJoinArena     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEMASTER_JOIN_RATED,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLENET_CHALLENGE_RESPONSE,            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE,    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET, STATUS_UNHANDLED, PROCESS_INPLACE,     &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_GET_PRODUCT_LIST_QUERY,       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_GET_PURCHASE_LIST_QUERY,      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PAY_START_PURCHASE,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -209,10 +210,10 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_REQUEST_JOURNAL,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_REQUEST_JOURNAL_LOCK,         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_REQUEST_UPDATE,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_REQUEST_WILD,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_SET_BATTLE_SLOT,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_SET_FLAGS,                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_SUMMON,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLE_PET_UPDATE_NOTIFY,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BEGIN_TRADE,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBeginTradeOpcode          );
     DEFINE_HANDLER(CMSG_BINDER_ACTIVATE,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::NPC::Hello, &WorldSession::HandleBinderActivateOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BLACK_MARKET_BID_ON_ITEM,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -253,12 +254,14 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CANCEL_QUEUED_SPELL,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CANCEL_TEMP_ENCHANTMENT,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleCancelTempEnchantmentOpcode);
     DEFINE_HANDLER(CMSG_CANCEL_TRADE,                                       STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT, PROCESS_THREADUNSAFE, WorldPackets::Trade::CancelTrade, &WorldSession::HandleCancelTradeOpcode);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_CAN_DUEL,                                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_CAST_SPELL,                                         STATUS_LOGGEDIN,  PROCESS_THREADSAFE,   WorldPackets::Spells::SpellCastRequest, &WorldSession::HandleCastSpellOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHALLENGE_MODE_REQUEST_LEADERS,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHALLENGE_MODE_REQUEST_MAP_STATS,        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANGEPLAYER_DIFFICULTY,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANGE_BAG_SLOT_FLAG,                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE,      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleChangeSeatsOnControlledVehicle);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANGE_SUB_GROUP,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANGE_TROPHY,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_CHANNEL_ANNOUNCEMENTS,                              STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Channel::ChannelPlayerCommand, &WorldSession::HandleChannelCommand<&Channel::Announce>);
     DEFINE_HANDLER(CMSG_CHANNEL_BAN,                                        STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Channel::ChannelPlayerCommand, &WorldSession::HandleChannelPlayerCommand<&Channel::Ban>);
@@ -318,7 +321,7 @@ void OpcodeTable::Initialize()
     DEFINE_HANDLER(CMSG_DB_QUERY_BULK,                                      STATUS_AUTHED,    PROCESS_INPLACE,      WorldPackets::Query::DBQueryBulk, &WorldSession::HandleDBQueryBulk);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_DECLINE_GUILD_INVITES,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_DECLINE_PETITION,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionDeclineOpcode     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_DELETE_EQUIPMENT_SET,                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_DELETE_EQUIPMENT_SET,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDelete        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_DEL_FRIEND,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleDelFriendOpcode           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_DEL_IGNORE,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleDelIgnoreOpcode           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_DEL_MUTE,                                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -341,7 +344,6 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_EMOTE,                                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode               );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_ENABLE_NAGLE,                            STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess            );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_ENABLE_TAXI_NODE,                        STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleTaxiQueryAvailableNodes   );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_EQUIPMENT_SET_DELETE,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDelete        );
     DEFINE_HANDLER(CMSG_EQUIPMENT_SET_SAVE,                                 STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::EquipmentSet::SaveEquipmentSet, &WorldSession::HandleEquipmentSetSave);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_EQUIPMENT_SET_USE,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetUse           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_FAR_SIGHT,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleFarSightOpcode            );
@@ -421,29 +423,25 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_CHANGE_NAME_REQUEST,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DECLINE,                           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildDeclineOpcode        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DELETE,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DELETE_RANK,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DEL_RANK,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildDelRankOpcode        );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DELETE_RANK,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildDeleteRankOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DEMOTE,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildDemoteOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_DISBAND,                           STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildDisbandOpcode        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_EVENT_LOG_QUERY,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildEventLogQueryOpcode  );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_GET_ACHIEVEMENT_MEMBERS,           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_GET_GUILD_POST,                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_GET_RANKS,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_GET_RANKS,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildGetRanksOpcode       );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_GET_ROSTER,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRosterOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_INVITE_BY_NAME,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildInviteOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_LEAVE,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildLeaveOpcode          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_MEMBER_SEND_SOR_REQUEST,           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_NEWS_UPDATE_STICKY,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleGuildNewsUpdateStickyOpcode);
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_OFFICER_REMOVE_MEMBER,             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_OFFICER_REMOVE_MEMBER,             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildOfficerRemoveMemberOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_PERMISSIONS_QUERY,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildPermissions          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_PROMOTE_MEMBER,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildPromoteOpcode        );
     DEFINE_HANDLER(CMSG_GUILD_QUERY,                                        STATUS_AUTHED,    PROCESS_THREADUNSAFE, WorldPackets::Guild::QueryGuildInfo, &WorldSession::HandleGuildQueryOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_QUERY_MEMBERS_FOR_RECIPE,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_QUERY_MEMBER_RECIPES,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_QUERY_NEWS,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleGuildQueryNewsOpcode      );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_QUERY_RANKS,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryRanksOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_QUERY_RECIPES,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_REMOVE,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRemoveOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_REPLACE_GUILD_MASTER,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_REQUEST_CHALLENGE_INFO,            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_REQUEST_CHALLENGE_UPDATE,          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRequestChallengeUpdate);
@@ -456,31 +454,37 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_SET_NOTE,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildSetNoteOpcode        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_SET_RANK_PERMISSIONS,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildSetRankPermissionsOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_SHIFT_RANK,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_SWITCH_RANK,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_UPDATE_INFO_TEXT,                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildChangeInfoTextOpcode );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_GUILD_UPDATE_MOTD_TEXT,                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildMOTDOpcode           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_HEARTH_AND_RESURRECT,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleHearthAndResurrect        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_IGNORE_TRADE,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleIgnoreTradeOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_INITIATE_TRADE,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleInitiateTradeOpcode       );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_INSPECT,                                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectOpcode             );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_INSPECT_HONOR_STATS,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectHonorStatsOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_INSTANCE_LOCK_WARNING_RESPONSE,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_ITEM_REFUND,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleItemRefund                );
     DEFINE_HANDLER(CMSG_ITEM_REFUND_INFO,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::ItemRefundInfo, &WorldSession::HandleItemRefundInfoRequest);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_ITEM_TEXT_QUERY,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleItemTextQuery             );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_JOIN_ARENA_SKIRMISH,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_JOIN_CHANNEL,                                       STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Channel::JoinChannel, &WorldSession::HandleJoinChannel);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_JOIN_PET_BATTLE_QUEUE,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_JOIN_RATED_BATTLEGROUND,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_KEEP_ALIVE,                              STATUS_NEVER,     PROCESS_THREADUNSAFE, &WorldSession::Handle_EarlyProccess            );
     DEFINE_HANDLER(CMSG_LEARN_TALENTS,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Talent::LearnTalents, &WorldSession::HandleLearnTalentsOpcode);
     DEFINE_HANDLER(CMSG_LEAVE_CHANNEL,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Channel::LeaveChannel, &WorldSession::HandleLeaveChannel);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LEAVE_GROUP,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LEAVE_PET_BATTLE_QUEUE,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_GET_STATUS,                          STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleLfgGetStatus              );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_JOIN,                                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgJoinOpcode             );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LEAVE,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgLeaveOpcode            );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LFR_JOIN,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LFR_LEAVE,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_DECLINE_APPLICANT,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_GET_STATUS,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_INVITE_APPLICANT,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_INVITE_RESPONSE,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_JOIN,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_LEAVE,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LIST_SEARCH,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_LOCK_INFO_REQUEST,                   STATUS_UNHANDLED, PROCESS_THREADSAFE,   &WorldSession::HandleLfgGetLockInfoOpcode      );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_PROPOSAL_RESULT,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgProposalResultOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LFG_SET_BOOT_VOTE,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgSetBootVoteOpcode      );
@@ -491,6 +495,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_BROWSE,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderBrowse         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_DECLINE_RECRUIT,                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderDeclineRecruit );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_GET_APPLICATIONS,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderGetApplications);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_GET_GUILD_POST,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_GET_RECRUITS,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderGetRecruits    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_POST_REQUEST,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderPostRequest    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_LF_GUILD_REMOVE_RECRUIT,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderRemoveRecruit  );
@@ -609,6 +614,7 @@ void OpcodeTable::Initialize()
     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);
     DEFINE_HANDLER(CMSG_NAME_QUERY,                                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryPlayerName, &WorldSession::HandleNameQueryOpcode);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_NEUTRAL_PLAYER_SELECT_FACTION,           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_NEW_SPELL_SLOT,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_NEXT_CINEMATIC_CAMERA,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleNextCinematicCamera       );
     DEFINE_HANDLER(CMSG_NPC_TEXT_QUERY,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryNPCText, &WorldSession::HandleNpcTextQueryOpcode);
@@ -618,6 +624,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_OPENING_CINEMATIC,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleOpeningCinematic          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_OPEN_GARRISON_MISSION_NPC,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_OPEN_ITEM,                               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleOpenItemOpcode            );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_OPEN_SHIPMENT_GAME_OBJ,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_OPEN_SHIPMENT_NPC,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_OPT_OUT_OF_LOOT,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleOptOutOfLootOpcode        );
     DEFINE_HANDLER(CMSG_PAGE_TEXT_QUERY,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryPageText, &WorldSession::HandlePageTextQueryOpcode);
@@ -636,7 +643,11 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_ACTION,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePetAction                 );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_FINAL_NOTIF,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_INPUT,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_QUEUE_PROPOSE_MATCH_RESULT,   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_QUIT_NOTIFY,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_REPLACE_FRONT_PET,            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_REQUEST_PVP,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_REQUEST_WILD,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_BATTLE_SCRIPT_ERROR_NOTIFY,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_CANCEL_AURA,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePetCancelAuraOpcode       );
     DEFINE_HANDLER(CMSG_PET_CAST_SPELL,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Spells::SpellCastRequest, &WorldSession::HandlePetCastSpellOpcode);
@@ -650,27 +661,21 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PET_STOP_ATTACK,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePetStopAttack             );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PING,                                    STATUS_NEVER,     PROCESS_INPLACE,      &WorldSession::Handle_EarlyProccess            );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PLAYED_TIME,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePlayedTime                );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_PLAYER_DIFFICULTY_CHANGE,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_PLAYER_LOGIN,                                       STATUS_AUTHED,    PROCESS_THREADUNSAFE, WorldPackets::Character::PlayerLogin, &WorldSession::HandlePlayerLoginOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PLAYER_VEHICLE_ENTER,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleEnterPlayerVehicle        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PLAY_DANCE,                              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_PORT_GRAVEYARD,                                     STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Misc::PortGraveyard, &WorldSession::HandlePortGraveyard);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PUSH_QUEST_TO_PARTY,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePushQuestToParty          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_PVP_LOG_DATA,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandlePVPLogDataOpcode          );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_BATTLEFIELD_STATE,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_QUERY_CORPSE_LOCATION_FROM_CLIENT,                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryCorpseLocationFromClient, &WorldSession::HandleQueryCorpseLocation);
     DEFINE_HANDLER(CMSG_QUERY_CORPSE_TRANSPORT,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryCorpseTransport, &WorldSession::HandleQueryCorpseTransport);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_COUNTDOWN_TIMER,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_MEMBER_RECIPES,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_RECIPES,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_REWARDS,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleGuildRewardsQueryOpcode   );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_XP,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryXPOpcode        ); // STATUS_AUTHED
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_GUILD_XP,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryXPOpcode        );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_INSPECT_ACHIEVEMENTS,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQueryInspectAchievements  );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_NEXT_MAIL_TIME,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQueryNextMailTime         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_PETITION,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUERY_SCENARIO_POI,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_HANDLER(CMSG_QUERY_TIME,                                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryTime, &WorldSession::HandleQueryTimeOpcode           );
+    DEFINE_HANDLER(CMSG_QUERY_TIME,                                         STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Query::QueryTime, &WorldSession::HandleQueryTimeOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTGIVER_ACCEPT_QUEST,                 STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestgiverAcceptQuestOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTGIVER_CANCEL,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_QUESTGIVER_CHOOSE_REWARD,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverChooseReward, &WorldSession::HandleQuestgiverChooseRewardOpcode);
@@ -705,13 +710,13 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REPORT_PVP_AFK,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleReportPvPAFK              );
     DEFINE_HANDLER(CMSG_REQUEST_ACCOUNT_DATA,                               STATUS_AUTHED,    PROCESS_THREADUNSAFE, WorldPackets::ClientConfig::RequestAccountData, &WorldSession::HandleRequestAccountData);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_ARTIFACT_COMPLETION_HISTORY,     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_BATTLEFIELD_STATUS,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_BATTLEFIELD_STATUS,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestBattlefieldStatusOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_CATEGORY_COOLDOWNS,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleRequestCategoryCooldowns  );
     DEFINE_HANDLER(CMSG_REQUEST_CEMETERY_LIST,                              STATUS_LOGGEDIN,  PROCESS_INPLACE,      WorldPackets::Misc::RequestCemeteryList, &WorldSession::HandleRequestCemeteryList);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_CONQUEST_FORMULA_CONSTANTS,      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_FORCED_REACTIONS,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_GUILD_REWARDS_LIST,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_HONOR_STATS,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_GUILD_REWARDS_LIST,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRewardsQueryOpcode   );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_HONOR_STATS,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectHonorStatsOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_INSPECT_PVP,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_INSPECT_RATED_BG_STATS,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_LFG_LIST_BLACKLIST,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -742,8 +747,6 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SCENE_PLAYBACK_CANCELED,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SCENE_PLAYBACK_COMPLETE,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SCENE_TRIGGER_EVENT,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_SEARCH_LFG_JOIN,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_SEARCH_LFG_LEAVE,                        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_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::SellItem, &WorldSession::HandleSellItemOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SEND_CONTACT_LIST,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -756,7 +759,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ACTIONBAR_TOGGLES,                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarToggles       );
     DEFINE_HANDLER(CMSG_SET_ACTION_BUTTON,                                  STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Spells::SetActionButton, &WorldSession::HandleSetActionButtonOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ACTIVE_MOVER,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActiveMoverOpcode      );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ACTIVE_VOICE_CHANNEL,                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActiveVoiceChannel     ); // STATUS_AUTHED
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ACTIVE_VOICE_CHANNEL,                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetActiveVoiceChannel     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ALLOW_LOW_LEVEL_RAID1,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_ALLOW_LOW_LEVEL_RAID2,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_BACKPACK_AUTOSORT_DISABLED,          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -765,8 +768,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_CURRENCY_FLAGS,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_SET_DUNGEON_DIFFICULTY,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Misc::SetDungeonDifficulty, &WorldSession::HandleSetDungeonDifficultyOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_EVERYONE_IS_ASSISTANT,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_ATWAR,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetFactionAtWar           );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_AT_WAR,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_AT_WAR,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetFactionAtWar           );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_CHEAT,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_INACTIVE,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetFactionInactiveOpcode  );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_FACTION_NOT_AT_WAR,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -774,6 +776,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_LFG_BONUS_FACTION_ID,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_LFG_COMMENT,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_LOOT_SPECIALIZATION,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_PARTY_ASSIGNMENT,                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePartyAssignmentOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_PARTY_LEADER,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_PET_SLOT,                            STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SET_PLAYER_DECLINED_NAMES,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSetPlayerDeclinedNames    );
@@ -798,6 +801,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SHOWING_HELM,                            STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingHelmOpcode         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SHOW_TRADE_SKILL,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SIGN_PETITION,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_SILENCE_PARTY_TALKER,                    STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SOCKET_GEMS,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleSocketOpcode              );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SORT_BAGS,                               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SORT_BANK_BAGS,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -820,6 +824,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SUSPEND_TOKEN_RESPONSE,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_SWAP_INV_ITEM,                                      STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::SwapInvItem, &WorldSession::HandleSwapInvItemOpcode);
     DEFINE_HANDLER(CMSG_SWAP_ITEM,                                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Item::SwapItem, &WorldSession::HandleSwapItem);
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_SWAP_SUB_GROUPS,                         STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_SYNC_DANCE,                              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TABARD_VENDOR_ACTIVATE,                  STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleTabardVendorActivateOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TAXICLEARALLNODES,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -832,7 +837,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_ADJUSTMENT_RESPONSE,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_TIME_SYNC_RESPONSE,                                 STATUS_LOGGEDIN,  PROCESS_INPLACE,      WorldPackets::Misc::TimeSyncResponse, &WorldSession::HandleTimeSyncResponse);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_SYNC_RESPONSE_DROPPED,              STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_SYNC_RESP_FAILED,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_TIME_SYNC_RESPONSE_FAILED,               STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TOGGLE_PVP,                              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleTogglePvP                 );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TOTEM_DESTROYED,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleTotemDestroyed            );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_TRAINER_BUY_SPELL,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleTrainerBuySpellOpcode     );
@@ -851,7 +856,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_UPDATE_CLIENT_SETTINGS,                  STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_UPDATE_MISSILE_TRAJECTORY,               STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateMissileTrajectory   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_UPDATE_PROJECTILE_POSITION,              STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleUpdateProjectilePosition  );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_UPDATE_RAID_TARGET,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_UPDATE_RAID_TARGET,                      STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_UPGRADE_GARRISON,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_USED_FOLLOW,                             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_USE_CRITTER_ITEM,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -863,7 +868,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_VOID_STORAGE_TRANSFER,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleVoidStorageTransfer       );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_VOID_STORAGE_UNLOCK,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleVoidStorageUnlock         );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_VOID_SWAP_ITEM,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleVoidSwapItem              );
-    DEFINE_OPCODE_HANDLER_OLD(CMSG_WARDEN_DATA,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode          ); // STATUS_AUTHED
+    DEFINE_OPCODE_HANDLER_OLD(CMSG_WARDEN_DATA,                             STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleWardenDataOpcode          );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_WARGAME_ACCEPT,                          STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_WARGAME_START,                           STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_WHO,                                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoOpcode                 );
@@ -888,11 +893,8 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_SET_WALK_SPEED_CHEAT,                STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TOGGLE_FALL_LOGGING,                 STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_TOGGLE_LOGGING,                      STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(MSG_MOVE_UPDATE_MOUSE,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_NOTIFY_PARTY_SQUELCH,                     STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    DEFINE_OPCODE_HANDLER_OLD(MSG_PARTY_ASSIGNMENT,                         STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePartyAssignmentOpcode     );
     DEFINE_OPCODE_HANDLER_OLD(MSG_PETITION_RENAME,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionRenameOpcode      );
-    DEFINE_OPCODE_HANDLER_OLD(MSG_RAID_TARGET_UPDATE,                       STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode    );
 
 #undef DEFINE_OPCODE_HANDLER_OLD
 #undef DEFINE_HANDLER
@@ -943,18 +945,19 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_DEADTARGET,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_ERROR,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_NOTINRANGE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_BIDDER_LIST_RESULT,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_BIDDER_NOTIFICATION,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_CLOSED_NOTIFICATION,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_COMMAND_RESULT,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_HELLO,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_HELLO_RESPONSE,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_ITEMS_RESULT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_LIST_PENDING_SALES_RESULT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OWNER_LIST_RESULT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OUTBID_NOTIFICATION,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OWNER_BID_NOTIFICATION,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_OWNER_NOTIFICATION,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_REMOVED_NOTIFICATION,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_REPLICATE_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AUCTION_WON_NOTIFICATION,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AURACASTLOG,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_AURA_POINTS_DEPLETED,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -989,27 +992,27 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEGROUND_PLAYER_LEFT,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEGROUND_PLAYER_POSITIONS,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEGROUND_POINTS,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_CHALLENGE_ABORT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLENET_CHALLENGE_START,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_ACK_FAILED,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_CONFIRM_PURCHASE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DELIVERY_ENDED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DELIVERY_STARTED,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_DISTRIBUTION_UPDATE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE, STATUS_UNHANDLED,  CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_PRODUCT_LIST_RESPONSE,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_GET_PURCHASE_LIST_RESPONSE,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_PURCHASE_UPDATE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_START_DISTRIBUTION_ASSIGN_TO_TARGET_RESPONSE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PAY_START_PURCHASE_RESPONSE,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_CAGE_DATE_ERROR,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_DELETED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_FINALIZE_LOCATION,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_FINAL_ROUND,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_FIRST_ROUND,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_INITIAL_UPDATE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_ERROR,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_HEALED,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_JOURNAL,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_JOURNAL_LOCK_ACQUIRED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_JOURNAL_LOCK_DENIED,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_NAME_QUERY_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_PVP_CHALLENGE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_REPLACEMENTS_MADE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_REQUEST_FAILED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_LICENSE_CHANGED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_RESTORED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_REVOKED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLE_PET_SLOT_UPDATES,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1060,6 +1063,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CANCEL_ORPHAN_SPELL_VISUAL,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CANCEL_SCENE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CANCEL_SPELL_VISUAL,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAN_DUEL_RESULT,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CAST_FAILED,                             STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_ALL_MAP_STATS,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHALLENGE_MODE_COMPLETE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1127,6 +1131,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_LOCATION,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_RECLAIM_DELAY,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CORPSE_TRANSPORT_QUERY,                  STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_CREATE_SHIPMENT_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CREATURE_QUERY_RESPONSE,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CRITERIA_DELETED,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_CRITERIA_UPDATE,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1154,6 +1159,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_GAME_ERROR,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_PLAYER_CHOICE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_PROMOTION,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_QUEST_POPUP,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_TOAST,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_DROP_NEW_CONNECTION,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1190,7 +1196,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCED_DEATH_UPDATE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_ANIM,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_DISPLAY_UPDATE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORCE_SET_VEHICLE_REC_ID,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FORGE_MASTER_SET,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_FRIEND_STATUS,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_ACTIVATE_ANIM_KIT,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1203,37 +1208,31 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMEOBJECT_RESET_STATE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMESPEED_SET,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMETIME_SET,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAMETIME_UPDATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_EVENT_DEBUG_LOG,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GAME_TIME_UPDATE,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_ADD_FOLLOWER_RESULT,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_ADD_MISSION_RESULT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_ASSIGN_FOLLOWER_TO_BUILDING_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_BUILDING_ACTIVATED,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_BUILDING_REMOVED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_COMPLETE_MISSION_RESULT,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_FOLLOWER_CHANGED_ITEM_LEVEL,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_FOLLOWER_CHANGED_XP,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_FOLLOWER_XP_CHANGED_RESULT,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LANDINGPAGE_SHIPMENTS,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_LIST_FOLLOWERS_CHEAT_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_MISSION_BONUS_ROLL_RESULT,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_MONUMENT_SELECTED_TROPHY_ID_LOADED, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_OPEN_TRADESKILL,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_PLOT_REMOVED,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_REMOTE_INFO,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_REQUEST_BLUEPRINT_AND_SPECIALIZATION_DATA_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_SET_NUM_FOLLOWER_ACTIVATIONS_REMAINING, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_START_MISSION_RESULT,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UNK1,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UNK3,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UPGRADEABLE_RESULT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UPGRADE_FOLLOWER_ITEM_LEVEL,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GARRISON_UPGRADE_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_GARRISON_INFO_RESULT,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_SHIPMENTS_OF_TYPE_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_SHIPMENT_INFO_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GET_TROPHY_LIST_RESPONSE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMRESPONSE_DB_ERROR,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMRESPONSE_RECEIVED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMRESPONSE_STATUS_UPDATE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_CREATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_DELETETICKET,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_GETTICKET,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_SYSTEMSTATUS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GMTICKET_UPDATETEXT,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_MESSAGECHAT,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_PLAYER_INFO,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GM_TICKET_CASE_STATUS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1248,7 +1247,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_COMPLETE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_MESSAGE,                          STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GOSSIP_POI,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUPACTION_THROTTLED,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_ACTION_THROTTLED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_CANCEL,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_DECLINE,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GROUP_DESTROYED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1298,7 +1297,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_DAILY_RESET,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_RECIPES,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_UPDATE_NOTE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOTD,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVED,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVE_COMPLETE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MOVE_STARTING,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1309,19 +1307,16 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_PARTY_STATE_RESPONSE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_PERMISSIONS_QUERY_RESULTS,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_QUERY_RESPONSE,                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RANK,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RANKS_UPDATE,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RECIPES,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RENAMED,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RANKS,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REPUTATION_REACTION_CHANGED,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REPUTATION_WEEKLY_CAP,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RESET,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REWARDS_LIST,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ROSTER,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ROSTER_UPDATE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_SEND_RANK_CHANGE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_SET_NOTE,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_TRADESKILL_UPDATE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_UPDATE_ROSTER,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_XP,                                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_XP_GAIN,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_XP_UPDATE,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1341,6 +1336,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_RATED_BG_STATS,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_RESULT,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSPECT_TALENT,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_CHANGE_PRIORITY,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_DISENGAGE_UNIT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_END,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1358,10 +1354,12 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALIDATE_PLAYER,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     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_ADD_PASSIVE,                        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);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_ITEM_PURCHASE_REFUND_RESULT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     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);
@@ -1391,6 +1389,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_QUEUE_STATUS,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_ROLE_CHECK_UPDATE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_ROLE_CHOSEN,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_SEARCH_RESULTS,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_SLOT_INVALID,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_TELEPORT_DENIED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_UPDATE_LIST,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1407,7 +1406,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIST_INVENTORY,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_ACCOUNT_RESTORE_RESULT,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_CHARACTER_COPY_RESULT,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_GET_ACCOUNT_CHARACTER_LIST_RESULT, STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_GET_ACCOUNT_CHARACTER_LIST_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOAD_CUF_PROFILES,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_SETTIMESPEED,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOGIN_VERIFY_WORLD,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1425,14 +1424,12 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_MONEY_NOTIFY,                       STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_RELEASE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_RELEASE_ALL,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_RELEASE_RESPONSE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_REMOVED,                            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_RESPONSE,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_ROLL,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_ROLLS_COMPLETE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_ROLL_WON,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_SLOT_CHANGED,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOOT_START_ROLL,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_LOSS_OF_CONTROL_AURA_UPDATE,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAIL_LIST_RESULT,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MAIL_QUERY_NEXT_TIME_RESULT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1455,24 +1452,20 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MODIFY_COOLDOWN,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MONEY_NOTIFY,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOTD,                                    STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNTRESULT,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNTSPECIAL_ANIM,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOUNT_RESULT,                            STATUS_UNHANDLED,    CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_APPLY_MOVEMENT_FORCE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_COLLISION_DISABLE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_COLLISION_ENABLE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_DISABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_DISABLE_COLLISION,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_DISABLE_GRAVITY,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_ENABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_ENABLE_COLLISION,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_ENABLE_GRAVITY,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_GRAVITY_DISABLE,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_GRAVITY_ENABLE,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_KNOCK_BACK,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_REMOVE_MOVEMENT_FORCE,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_ROOT,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_ACTIVE_MOVER,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_ANIM_KIT,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_CAN_FLY,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_CAN_TURN_WHILE_FALLING,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_COLLISION_HEIGHT,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_SET_COMPOUND_STATE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1526,7 +1519,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_TELEPORT,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNROOT,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_CAN_FLY,                      STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_HOVER,                        STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_IGNORE_MOVEMENT_FORCES,       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_MOVE_UNSET_WALK_IN_AIR,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1565,6 +1557,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_LFG_DUNGEON_FINDER,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OPEN_SHIPMENT_NPC_FROM_GOSSIP,           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_OVERRIDE_LIGHT,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAGE_TEXT,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PAGE_TEXT_QUERY_RESPONSE,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_COMMAND_RESULT,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PARTY_INVITE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1578,15 +1571,27 @@ void OpcodeTable::Initialize()
     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_RENAME_GUILD_RESULT,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SHOWLIST,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SHOW_LIST,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SHOW_SIGNATURES,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PETITION_SIGN_RESULTS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_ACTION_FEEDBACK,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_ACTION_SOUND,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_ADDED,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_CHAT_RESTRICTED,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_DEBUG_QUEUE_DUMP_RESPONSE,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_FINALIZE_LOCATION,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_FINAL_ROUND,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_FINISHED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_FIRST_ROUND,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_INITIAL_UPDATE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_MAX_GAME_LENGTH_WARNING,      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_PVP_CHALLENGE,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_QUEUE_PROPOSE_MATCH,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_QUEUE_STATUS,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_REPLACEMENTS_MADE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_REQUEST_FAILED,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_ROUND_RESULT,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BATTLE_SLOT_UPDATE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_BROKEN,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_CAST_FAILED,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PET_CLEAR_SPELLS,                        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1618,6 +1623,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_ORPHAN_SPELL_VISUAL,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_SCENE,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_SOUND,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_SPEAKERBOT_SOUND,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_SPELL_VISUAL,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_SPELL_VISUAL_KIT,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PLAY_TIME_WARNING,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1625,12 +1631,14 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_POWER_UPDATE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PRE_RESSURECT,                           STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PROCRESIST,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_PROC_RESIST,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PROPOSE_LEVEL_GRANT,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PUREMOUNT_CANCELLED_OBSOLETE,            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_CREDIT,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_LOG_DATA,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_OPTIONS_ENABLED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_PVP_SEASON,                              STATUS_NEVER,        CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_BATTLE_PET_NAME_RESPONSE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_PETITION_RESPONSE,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_TIME_RESPONSE,                     STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_INVALID_QUEST,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1643,22 +1651,19 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_REQUEST_ITEMS,                STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_STATUS,                       STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_STATUS_MULTIPLE,              STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTLOG_FULL,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_ADD_ITEM,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_ADD_KILL,                    STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_ADD_PVP_KILL,                STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_COMPLETE,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_FAILED,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTUPDATE_FAILEDTIMER,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     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_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);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_CREDIT,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_CREDIT_SIMPLE,          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_KILL,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_ADD_PVP_CREDIT,             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_COMPLETE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_FAILED,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_UPDATE_FAILED_TIMER,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_GROUP_ONLY,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_INSTANCE_INFO,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RAID_INSTANCE_MESSAGE,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1677,6 +1682,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REALM_SPLIT,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REAL_GROUP_UPDATE,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RECEIVED_MAIL,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RECRUIT_A_FRIEND_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REDIRECT_CLIENT,                         STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REFER_A_FRIEND_EXPIRED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_REFER_A_FRIEND_FAILURE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1695,6 +1701,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESISTLOG,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESPEC_WIPE_CONFIRM,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESPOND_INSPECT_ACHIEVEMENTS,            STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESTRICTED_ACCOUNT_WARNING,              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_CAST_BAR,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_COMMS,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_RESUME_TOKEN,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1715,6 +1722,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_FINAL_ROUND,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_FINISHED,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_FIRST_ROUND,     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_INITIAL_UPDATE,  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_REPLACEMENTS_MADE, STATUS_UNHANDLED,  CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT,    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCRIPT_CAST,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1733,6 +1741,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_MESSAGE,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_PERF,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SETUP_CURRENCY,                          STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SETUP_TROPHY,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_AI_ANIM_KIT,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ALL_TASK_PROGRESS,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ANIM_TIER,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1746,12 +1755,13 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_FLAT_SPELL_MODIFIER,                 STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_FORCED_REACTIONS,                    STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ITEM_PURCHASE_DATA,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_LFG_TIME_WALKER,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_LOOT_METHOD_FAILED,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_MAX_WEEKLY_QUANTITY,                 STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_MELEE_ANIM_KIT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_MOVEMENT_ANIM_KIT,                   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PCT_SPELL_MODIFIER,                  STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PHASE_SHIFT,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PHASE_SHIFT_CHANGE,                  STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT,        STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PLAY_HOVER_ANIM,                     STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_PROFICIENCY,                         STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
@@ -1761,15 +1771,16 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_SPELL_CHARGES,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_TASK_COMPLETE,                       STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_TIME_ZONE_INFORMATION,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VEHILCE_REC_ID,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VEHICLE_REC_ID,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VIGNETTE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOWTAXINODES,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_BANK,                               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_MAILBOX,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_NEUTRAL_PLAYER_FACTION_SELECT_UI,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_RATINGS,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_TAXI_NODES,                         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_TRADE_SKILL_RESPONSE,               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOCKET_GEMS_RESULT,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SORT_BAGS_ACK,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SOR_START_EXPERIENCE_INCOMPLETE,         STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPECIAL_MOUNT_ANIM,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SPELLBREAKLOG,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
@@ -1826,7 +1837,6 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TIME_SYNC_REQ,                           STATUS_NEVER,        CONNECTION_TYPE_INSTANCE);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TITLE_EARNED,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TITLE_LOST,                              STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_TOGGLE_XP_GAIN,                          STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TOTEM_CREATED,                           STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TOTEM_MOVED,                             STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRADE_STATUS,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index a04647a6e7b..8e6cc96a517 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -101,14 +101,15 @@ enum OpcodeClient : uint32
     CMSG_BATTLEFIELD_MGR_QUEUE_REQUEST                = 0x0B49,
     CMSG_BATTLEFIELD_PORT                             = 0x11EB,
     CMSG_BATTLEFIELD_REQUEST_SCORE_DATA               = 0xBADD,
-    CMSG_BATTLEFIELD_STATUS                           = 0x0320,
     CMSG_BATTLEGROUND_PLAYER_POSITIONS                = 0xBADD,
     CMSG_BATTLEMASTER_HELLO                           = 0xBADD,
     CMSG_BATTLEMASTER_JOIN                            = 0x0D2E,
     CMSG_BATTLEMASTER_JOIN_ARENA                      = 0x0DAE,
     CMSG_BATTLEMASTER_JOIN_RATED                      = 0xBADD,
     CMSG_BATTLENET_CHALLENGE_RESPONSE                 = 0x0138,
+    CMSG_BATTLE_PAY_ACK_FAILED_RESPONSE               = 0x052A,
     CMSG_BATTLE_PAY_CONFIRM_PURCHASE_RESPONSE         = 0x012E,
+    CMSG_BATTLE_PAY_DISTRIBUTION_ASSIGN_TO_TARGET     = 0x198A,
     CMSG_BATTLE_PAY_GET_PRODUCT_LIST_QUERY            = 0x1389,
     CMSG_BATTLE_PAY_GET_PURCHASE_LIST_QUERY           = 0x120C,
     CMSG_BATTLE_PAY_START_PURCHASE                    = 0x011E,
@@ -119,10 +120,10 @@ enum OpcodeClient : uint32
     CMSG_BATTLE_PET_REQUEST_JOURNAL                   = 0x0117,
     CMSG_BATTLE_PET_REQUEST_JOURNAL_LOCK              = 0x07AA,
     CMSG_BATTLE_PET_REQUEST_UPDATE                    = 0x134A,
-    CMSG_BATTLE_PET_REQUEST_WILD                      = 0x03C6,
     CMSG_BATTLE_PET_SET_BATTLE_SLOT                   = 0x120B,
     CMSG_BATTLE_PET_SET_FLAGS                         = 0x0BA2,
     CMSG_BATTLE_PET_SUMMON                            = 0x0B38,
+    CMSG_BATTLE_PET_UPDATE_NOTIFY                     = 0x03B5,
     CMSG_BEGIN_TRADE                                  = 0x06CC,
     CMSG_BINDER_ACTIVATE                              = 0x02F3,
     CMSG_BLACK_MARKET_BID_ON_ITEM                     = 0x13C2,
@@ -144,7 +145,7 @@ enum OpcodeClient : uint32
     CMSG_CALENDAR_EVENT_MODERATOR_STATUS              = 0x118C,
     CMSG_CALENDAR_EVENT_REMOVE_INVITE                 = 0xBADD,
     CMSG_CALENDAR_EVENT_RSVP                          = 0x11A4,
-    CMSG_CALENDAR_EVENT_SIGNUP                        = 0x0BA4,
+    CMSG_CALENDAR_EVENT_SIGNUP                        = 0x0BAA,
     CMSG_CALENDAR_EVENT_STATUS                        = 0x1201,
     CMSG_CALENDAR_GET                                 = 0x0336,
     CMSG_CALENDAR_GET_EVENT                           = 0x1229,
@@ -163,12 +164,14 @@ enum OpcodeClient : uint32
     CMSG_CANCEL_QUEUED_SPELL                          = 0xBADD,
     CMSG_CANCEL_TEMP_ENCHANTMENT                      = 0x13C4,
     CMSG_CANCEL_TRADE                                 = 0x1159,
+    CMSG_CAN_DUEL                                     = 0x0B25,
     CMSG_CAST_SPELL                                   = 0x08FE,
     CMSG_CHALLENGE_MODE_REQUEST_LEADERS               = 0x0E66,
     CMSG_CHALLENGE_MODE_REQUEST_MAP_STATS             = 0x0E78,
     CMSG_CHANGEPLAYER_DIFFICULTY                      = 0xBADD,
     CMSG_CHANGE_BAG_SLOT_FLAG                         = 0x1959,
     CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE           = 0xBADD,
+    CMSG_CHANGE_SUB_GROUP                             = 0x0BA4,
     CMSG_CHANGE_TROPHY                                = 0x0B91,
     CMSG_CHANNEL_ANNOUNCEMENTS                        = 0x1313,
     CMSG_CHANNEL_BAN                                  = 0x1A82,
@@ -251,13 +254,12 @@ enum OpcodeClient : uint32
     CMSG_EMOTE                                        = 0x0A27,
     CMSG_ENABLE_NAGLE                                 = 0x0460,
     CMSG_ENABLE_TAXI_NODE                             = 0x00D2,
-    CMSG_EQUIPMENT_SET_DELETE                         = 0xBADD,
     CMSG_EQUIPMENT_SET_SAVE                           = 0x1B54,
     CMSG_EQUIPMENT_SET_USE                            = 0xBADD,
     CMSG_FAR_SIGHT                                    = 0x1C8A,
     CMSG_GAMEOBJECT_QUERY                             = 0x03AE,
-    CMSG_GAMEOBJ_REPORT_USE                           = 0x0B19,
-    CMSG_GAMEOBJ_USE                                  = 0x082E,
+    CMSG_GAMEOBJ_REPORT_USE                           = 0x082E,
+    CMSG_GAMEOBJ_USE                                  = 0x0B19,
     CMSG_GAMESPEED_SET                                = 0xBADD,
     CMSG_GAMETIME_SET                                 = 0xBADD,
     CMSG_GARRISON_ASSIGN_FOLLOWER_TO_BUILDING         = 0x095A,
@@ -292,7 +294,7 @@ enum OpcodeClient : uint32
     CMSG_GM_REPORT_LAG                                = 0xBADD,
     CMSG_GM_SET_SECURITY_GROUP                        = 0xBADD,
     CMSG_GM_TICKET_ACKNOWLEDGE_SURVEY                 = 0x0327,
-    CMSG_GM_TICKET_CREATE                             = 0x0932,
+    CMSG_GM_TICKET_CREATE                             = 0x0935,
     CMSG_GM_TICKET_DELETE_TICKET                      = 0x0F2E,
     CMSG_GM_TICKET_GET_CASE_STATUS                    = 0x0F0A,
     CMSG_GM_TICKET_GET_SYSTEM_STATUS                  = 0x0B0E,
@@ -332,12 +334,10 @@ enum OpcodeClient : uint32
     CMSG_GUILD_DECLINE                                = 0x0667,
     CMSG_GUILD_DELETE                                 = 0x1427,
     CMSG_GUILD_DELETE_RANK                            = 0x0C28,
-    CMSG_GUILD_DEL_RANK                               = 0x0C28,
     CMSG_GUILD_DEMOTE                                 = 0x142F,
-    CMSG_GUILD_DISBAND                                = 0x0E68,
+    CMSG_GUILD_DISBAND                                = 0xBADD,
     CMSG_GUILD_EVENT_LOG_QUERY                        = 0x0E37,
     CMSG_GUILD_GET_ACHIEVEMENT_MEMBERS                = 0x0C40,
-    CMSG_GUILD_GET_GUILD_POST                         = 0x0E68,
     CMSG_GUILD_GET_RANKS                              = 0x0C37,
     CMSG_GUILD_GET_ROSTER                             = 0x0638,
     CMSG_GUILD_INVITE_BY_NAME                         = 0x19A4,
@@ -351,9 +351,7 @@ enum OpcodeClient : uint32
     CMSG_GUILD_QUERY_MEMBERS_FOR_RECIPE               = 0x0E2E,
     CMSG_GUILD_QUERY_MEMBER_RECIPES                   = 0x163D,
     CMSG_GUILD_QUERY_NEWS                             = 0x0676,
-    CMSG_GUILD_QUERY_RANKS                            = 0x0C37,
     CMSG_GUILD_QUERY_RECIPES                          = 0x1438,
-    CMSG_GUILD_REMOVE                                 = 0x042F,
     CMSG_GUILD_REPLACE_GUILD_MASTER                   = 0x163E,
     CMSG_GUILD_REQUEST_CHALLENGE_INFO                 = 0x166E,
     CMSG_GUILD_REQUEST_CHALLENGE_UPDATE               = 0xBADD,
@@ -366,31 +364,37 @@ enum OpcodeClient : uint32
     CMSG_GUILD_SET_NOTE                               = 0xBADD,
     CMSG_GUILD_SET_RANK_PERMISSIONS                   = 0x0E38,
     CMSG_GUILD_SHIFT_RANK                             = 0x0627,
-    CMSG_GUILD_SWITCH_RANK                            = 0xBADD,
     CMSG_GUILD_UPDATE_INFO_TEXT                       = 0x0C75,
     CMSG_GUILD_UPDATE_MOTD_TEXT                       = 0x0C2F,
     CMSG_HEARTH_AND_RESURRECT                         = 0x0D9D,
     CMSG_IGNORE_TRADE                                 = 0x1419,
     CMSG_INITIATE_TRADE                               = 0x19BB,
     CMSG_INSPECT                                      = 0x01EC,
-    CMSG_INSPECT_HONOR_STATS                          = 0xBADD,
     CMSG_INSTANCE_LOCK_WARNING_RESPONSE               = 0xBADD,
     CMSG_ITEM_REFUND                                  = 0xBADD,
     CMSG_ITEM_REFUND_INFO                             = 0x0924,
     CMSG_ITEM_TEXT_QUERY                              = 0xBADD,
+    CMSG_JOIN_ARENA_SKIRMISH                          = 0x09EB,
     CMSG_JOIN_CHANNEL                                 = 0x0B4B,
+    CMSG_JOIN_PET_BATTLE_QUEUE                        = 0x04F4,
     CMSG_JOIN_RATED_BATTLEGROUND                      = 0x065A,
     CMSG_KEEP_ALIVE                                   = 0x0981,
     CMSG_LEARN_TALENTS                                = 0x0BB6,
     CMSG_LEAVE_CHANNEL                                = 0x19F2,
     CMSG_LEAVE_GROUP                                  = 0x1BA3,
+    CMSG_LEAVE_PET_BATTLE_QUEUE                       = 0x038D,
     CMSG_LFG_GET_STATUS                               = 0x1BA4,
     CMSG_LFG_JOIN                                     = 0xBADD,
     CMSG_LFG_LEAVE                                    = 0xBADD,
     CMSG_LFG_LFR_JOIN                                 = 0xBADD,
     CMSG_LFG_LFR_LEAVE                                = 0xBADD,
+    CMSG_LFG_LIST_DECLINE_APPLICANT                   = 0x0916,
     CMSG_LFG_LIST_GET_STATUS                          = 0x0B17,
+    CMSG_LFG_LIST_INVITE_APPLICANT                    = 0x12AB,
+    CMSG_LFG_LIST_INVITE_RESPONSE                     = 0x13AB,
     CMSG_LFG_LIST_JOIN                                = 0x0B84,
+    CMSG_LFG_LIST_LEAVE                               = 0x0DA9,
+    CMSG_LFG_LIST_SEARCH                              = 0x0915,
     CMSG_LFG_LOCK_INFO_REQUEST                        = 0x030F,
     CMSG_LFG_PROPOSAL_RESULT                          = 0xBADD,
     CMSG_LFG_SET_BOOT_VOTE                            = 0xBADD,
@@ -401,6 +405,7 @@ enum OpcodeClient : uint32
     CMSG_LF_GUILD_BROWSE                              = 0x0BA3,
     CMSG_LF_GUILD_DECLINE_RECRUIT                     = 0x066D,
     CMSG_LF_GUILD_GET_APPLICATIONS                    = 0x043F,
+    CMSG_LF_GUILD_GET_GUILD_POST                      = 0x0E68,
     CMSG_LF_GUILD_GET_RECRUITS                        = 0x0430,
     CMSG_LF_GUILD_POST_REQUEST                        = 0xBADD,
     CMSG_LF_GUILD_REMOVE_RECRUIT                      = 0x0680,
@@ -519,15 +524,17 @@ enum OpcodeClient : uint32
     CMSG_MOVE_WATER_WALK_ACK                          = 0x0543,
     CMSG_MOVE_WORLDPORT_ACK                           = 0x0938,
     CMSG_NAME_QUERY                                   = 0x0B15,
+    CMSG_NEUTRAL_PLAYER_SELECT_FACTION                = 0x0B5A,
     CMSG_NEW_SPELL_SLOT                               = 0xBADD,
     CMSG_NEXT_CINEMATIC_CAMERA                        = 0x1B3A,
     CMSG_NPC_TEXT_QUERY                               = 0x0ECB,
-    CMSG_OBJECT_UPDATE_FAILED                         = 0xBADD,
-    CMSG_OBJECT_UPDATE_RESCUED                        = 0xBADD,
+    CMSG_OBJECT_UPDATE_FAILED                         = 0x14E2,
+    CMSG_OBJECT_UPDATE_RESCUED                        = 0x0AD6,
     CMSG_OFFER_PETITION                               = 0x0315,
     CMSG_OPENING_CINEMATIC                            = 0xBADD,
     CMSG_OPEN_GARRISON_MISSION_NPC                    = 0x03D9,
     CMSG_OPEN_ITEM                                    = 0x08AD,
+    CMSG_OPEN_SHIPMENT_GAME_OBJ                       = 0x1359,
     CMSG_OPEN_SHIPMENT_NPC                            = 0x0432,
     CMSG_OPT_OUT_OF_LOOT                              = 0x0810,
     CMSG_PAGE_TEXT_QUERY                              = 0x0BBB,
@@ -546,7 +553,11 @@ enum OpcodeClient : uint32
     CMSG_PET_ACTION                                   = 0x133A,
     CMSG_PET_BATTLE_FINAL_NOTIF                       = 0x0565,
     CMSG_PET_BATTLE_INPUT                             = 0x0989,
+    CMSG_PET_BATTLE_QUEUE_PROPOSE_MATCH_RESULT        = 0x140A,
+    CMSG_PET_BATTLE_QUIT_NOTIFY                       = 0x03D5,
     CMSG_PET_BATTLE_REPLACE_FRONT_PET                 = 0x0936,
+    CMSG_PET_BATTLE_REQUEST_PVP                       = 0x1CDC,
+    CMSG_PET_BATTLE_REQUEST_WILD                      = 0x03C6,
     CMSG_PET_BATTLE_SCRIPT_ERROR_NOTIFY               = 0x09CA,
     CMSG_PET_CANCEL_AURA                              = 0xBADD,
     CMSG_PET_CAST_SPELL                               = 0x0286,
@@ -560,21 +571,15 @@ enum OpcodeClient : uint32
     CMSG_PET_STOP_ATTACK                              = 0x19E2,
     CMSG_PING                                         = 0x0416,
     CMSG_PLAYED_TIME                                  = 0x1BB2,
-    CMSG_PLAYER_DIFFICULTY_CHANGE                     = 0xBADD,
     CMSG_PLAYER_LOGIN                                 = 0x0B1D,
     CMSG_PLAYER_VEHICLE_ENTER                         = 0xBADD,
     CMSG_PLAY_DANCE                                   = 0xBADD,
     CMSG_PORT_GRAVEYARD                               = 0x0D3E,
     CMSG_PUSH_QUEST_TO_PARTY                          = 0x13E3,
     CMSG_PVP_LOG_DATA                                 = 0x08B5,
-    CMSG_QUERY_BATTLEFIELD_STATE                      = 0x0359,
     CMSG_QUERY_CORPSE_LOCATION_FROM_CLIENT            = 0x128A,
     CMSG_QUERY_CORPSE_TRANSPORT                       = 0x0908,
     CMSG_QUERY_COUNTDOWN_TIMER                        = 0x09DE,
-    CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE               = 0xBADD,
-    CMSG_QUERY_GUILD_MEMBER_RECIPES                   = 0xBADD,
-    CMSG_QUERY_GUILD_RECIPES                          = 0xBADD,
-    CMSG_QUERY_GUILD_REWARDS                          = 0xBADD,
     CMSG_QUERY_GUILD_XP                               = 0xBADD,
     CMSG_QUERY_INSPECT_ACHIEVEMENTS                   = 0x0A07,
     CMSG_QUERY_NEXT_MAIL_TIME                         = 0x0B31,
@@ -636,7 +641,7 @@ enum OpcodeClient : uint32
     CMSG_REQUEST_RATED_BG_STATS                       = 0xBADD,
     CMSG_REQUEST_RESEARCH_HISTORY                     = 0xBADD,
     CMSG_REQUEST_STABLED_PETS                         = 0x059D,
-    CMSG_REQUEST_VEHICLE_EXIT                         = 0xBADD,
+    CMSG_REQUEST_VEHICLE_EXIT                         = 0x09CE,
     CMSG_REQUEST_VEHICLE_NEXT_SEAT                    = 0xBADD,
     CMSG_REQUEST_VEHICLE_PREV_SEAT                    = 0x0527,
     CMSG_REQUEST_VEHICLE_SWITCH_SEAT                  = 0xBADD,
@@ -652,8 +657,6 @@ enum OpcodeClient : uint32
     CMSG_SCENE_PLAYBACK_CANCELED                      = 0x14B3,
     CMSG_SCENE_PLAYBACK_COMPLETE                      = 0x0537,
     CMSG_SCENE_TRIGGER_EVENT                          = 0x11B9,
-    CMSG_SEARCH_LFG_JOIN                              = 0xBADD,
-    CMSG_SEARCH_LFG_LEAVE                             = 0xBADD,
     CMSG_SELF_RES                                     = 0x1343,
     CMSG_SELL_ITEM                                    = 0x0351,
     CMSG_SEND_CONTACT_LIST                            = 0x079E,
@@ -675,7 +678,6 @@ enum OpcodeClient : uint32
     CMSG_SET_CURRENCY_FLAGS                           = 0xBADD,
     CMSG_SET_DUNGEON_DIFFICULTY                       = 0x012F,
     CMSG_SET_EVERYONE_IS_ASSISTANT                    = 0xBADD,
-    CMSG_SET_FACTION_ATWAR                            = 0xBADD,
     CMSG_SET_FACTION_AT_WAR                           = 0x051E,
     CMSG_SET_FACTION_CHEAT                            = 0xBADD,
     CMSG_SET_FACTION_INACTIVE                         = 0x09E2,
@@ -684,6 +686,7 @@ enum OpcodeClient : uint32
     CMSG_SET_LFG_BONUS_FACTION_ID                     = 0x009D,
     CMSG_SET_LFG_COMMENT                              = 0xBADD,
     CMSG_SET_LOOT_SPECIALIZATION                      = 0x0226,
+    CMSG_SET_PARTY_ASSIGNMENT                         = 0x050A,
     CMSG_SET_PARTY_LEADER                             = 0x091E,
     CMSG_SET_PET_SLOT                                 = 0xBADD,
     CMSG_SET_PLAYER_DECLINED_NAMES                    = 0x018B,
@@ -708,6 +711,7 @@ enum OpcodeClient : uint32
     CMSG_SHOWING_HELM                                 = 0x11E1,
     CMSG_SHOW_TRADE_SKILL                             = 0x07AD,
     CMSG_SIGN_PETITION                                = 0x0B03,
+    CMSG_SILENCE_PARTY_TALKER                         = 0x0BAC,
     CMSG_SOCKET_GEMS                                  = 0x1BE1,
     CMSG_SORT_BAGS                                    = 0x0AE6,
     CMSG_SORT_BANK_BAGS                               = 0x06E4,
@@ -730,6 +734,7 @@ enum OpcodeClient : uint32
     CMSG_SUSPEND_TOKEN_RESPONSE                       = 0x041E,
     CMSG_SWAP_INV_ITEM                                = 0x0F17,
     CMSG_SWAP_ITEM                                    = 0x0736,
+    CMSG_SWAP_SUB_GROUPS                              = 0x0106,
     CMSG_SYNC_DANCE                                   = 0xBADD,
     CMSG_TABARD_VENDOR_ACTIVATE                       = 0x08EE,
     CMSG_TAXICLEARALLNODES                            = 0xBADD,
@@ -742,7 +747,7 @@ enum OpcodeClient : uint32
     CMSG_TIME_ADJUSTMENT_RESPONSE                     = 0xBADD,
     CMSG_TIME_SYNC_RESPONSE                           = 0x0003,
     CMSG_TIME_SYNC_RESPONSE_DROPPED                   = 0x0D93,
-    CMSG_TIME_SYNC_RESP_FAILED                        = 0xBADD,
+    CMSG_TIME_SYNC_RESPONSE_FAILED                    = 0x1B73,
     CMSG_TOGGLE_PVP                                   = 0x149B,
     CMSG_TOTEM_DESTROYED                              = 0x000D,
     CMSG_TRAINER_BUY_SPELL                            = 0x0A28,
@@ -763,7 +768,7 @@ enum OpcodeClient : uint32
     CMSG_UPDATE_PROJECTILE_POSITION                   = 0xBADD,
     CMSG_UPDATE_RAID_TARGET                           = 0x1122,
     CMSG_UPGRADE_GARRISON                             = 0x0526,
-    CMSG_USED_FOLLOW                                  = 0xBADD,
+    CMSG_USED_FOLLOW                                  = 0x1609,
     CMSG_USE_CRITTER_ITEM                             = 0x0BBE,
     CMSG_USE_ITEM                                     = 0x08B6,
     CMSG_USE_TOY                                      = 0x16E2,
@@ -798,11 +803,8 @@ enum OpcodeClient : uint32
     MSG_MOVE_SET_WALK_SPEED_CHEAT                     = 0xBADD,
     MSG_MOVE_TOGGLE_FALL_LOGGING                      = 0xBADD,
     MSG_MOVE_TOGGLE_LOGGING                           = 0xBADD,
-    MSG_MOVE_UPDATE_MOUSE                             = 0xBADD,
     MSG_NOTIFY_PARTY_SQUELCH                          = 0xBADD,
-    MSG_PARTY_ASSIGNMENT                              = 0xBADD,
-    MSG_PETITION_RENAME                               = 0xBADD,
-    MSG_RAID_TARGET_UPDATE                            = 0xBADD
+    MSG_PETITION_RENAME                               = 0xBADD
 };
 
 // SMSGs 6.0.3.19342
@@ -851,18 +853,19 @@ enum OpcodeServer : uint32
     SMSG_ATTACKSWING_DEADTARGET                       = 0xBADD,
     SMSG_ATTACKSWING_ERROR                            = 0x0509,
     SMSG_ATTACKSWING_NOTINRANGE                       = 0xBADD,
-    SMSG_AUCTION_BIDDER_LIST_RESULT                   = 0xBADD,
     SMSG_AUCTION_BIDDER_NOTIFICATION                  = 0xBADD,
     SMSG_AUCTION_CLOSED_NOTIFICATION                  = 0x058E,
     SMSG_AUCTION_COMMAND_RESULT                       = 0x0B2D,
-    SMSG_AUCTION_HELLO                                = 0x011F,
+    SMSG_AUCTION_HELLO_RESPONSE                       = 0x011F,
     SMSG_AUCTION_LIST_BIDDER_ITEMS_RESULT             = 0x01E9,
     SMSG_AUCTION_LIST_ITEMS_RESULT                    = 0x0BA4,
     SMSG_AUCTION_LIST_OWNER_ITEMS_RESULT              = 0x0B42,
     SMSG_AUCTION_LIST_PENDING_SALES_RESULT            = 0x0332,
-    SMSG_AUCTION_OWNER_LIST_RESULT                    = 0xBADD,
+    SMSG_AUCTION_OUTBID_NOTIFICATION                  = 0x172E,
+    SMSG_AUCTION_OWNER_BID_NOTIFICATION               = 0x0026,
     SMSG_AUCTION_OWNER_NOTIFICATION                   = 0xBADD,
     SMSG_AUCTION_REMOVED_NOTIFICATION                 = 0xBADD,
+    SMSG_AUCTION_REPLICATE_RESPONSE                   = 0x0325,
     SMSG_AUCTION_WON_NOTIFICATION                     = 0x0D90,
     SMSG_AURACASTLOG                                  = 0xBADD,
     SMSG_AURA_POINTS_DEPLETED                         = 0x093B,
@@ -883,7 +886,7 @@ enum OpcodeServer : uint32
     SMSG_BATTLEFIELD_MGR_QUEUE_REQUEST_RESPONSE       = 0x0B28,
     SMSG_BATTLEFIELD_MGR_STATE_CHANGED                = 0x13C3,
     SMSG_BATTLEFIELD_PLAYER_POSITIONS                 = 0xBADD,
-    SMSG_BATTLEFIELD_PORT_DENIED                      = 0xBADD,
+    SMSG_BATTLEFIELD_PORT_DENIED                      = 0x0930,
     SMSG_BATTLEFIELD_RATED_INFO                       = 0x1F0A,
     SMSG_BATTLEFIELD_STATUS_ACTIVE                    = 0x1284,
     SMSG_BATTLEFIELD_STATUS_FAILED                    = 0x0308,
@@ -891,33 +894,33 @@ enum OpcodeServer : uint32
     SMSG_BATTLEFIELD_STATUS_NONE                      = 0x1E89,
     SMSG_BATTLEFIELD_STATUS_QUEUED                    = 0x002D,
     SMSG_BATTLEFIELD_STATUS_WAITFORGROUPS             = 0x082D,
-    SMSG_BATTLEGROUND_INFO_THROTTLED                  = 0xBADD,
+    SMSG_BATTLEGROUND_INFO_THROTTLED                  = 0x19E2,
     SMSG_BATTLEGROUND_INIT                            = 0x13C4,
     SMSG_BATTLEGROUND_PLAYER_JOINED                   = 0x13EA,
     SMSG_BATTLEGROUND_PLAYER_LEFT                     = 0x1BD1,
     SMSG_BATTLEGROUND_PLAYER_POSITIONS                = 0x1BE9,
     SMSG_BATTLEGROUND_POINTS                          = 0x122A,
+    SMSG_BATTLENET_CHALLENGE_ABORT                    = 0x0010,
     SMSG_BATTLENET_CHALLENGE_START                    = 0x1322,
+    SMSG_BATTLE_PAY_ACK_FAILED                        = 0x013D,
     SMSG_BATTLE_PAY_CONFIRM_PURCHASE                  = 0x0938,
     SMSG_BATTLE_PAY_DELIVERY_ENDED                    = 0x1D2F,
+    SMSG_BATTLE_PAY_DELIVERY_STARTED                  = 0x0927,
     SMSG_BATTLE_PAY_DISTRIBUTION_UPDATE               = 0x0BE3,
     SMSG_BATTLE_PAY_GET_DISTRIBUTION_LIST_RESPONSE    = 0x0F2A,
     SMSG_BATTLE_PAY_GET_PRODUCT_LIST_RESPONSE         = 0x12A4,
     SMSG_BATTLE_PAY_GET_PURCHASE_LIST_RESPONSE        = 0x168A,
     SMSG_BATTLE_PAY_PURCHASE_UPDATE                   = 0x092F,
+    SMSG_BATTLE_PAY_START_DISTRIBUTION_ASSIGN_TO_TARGET_RESPONSE = 0x03A2,
     SMSG_BATTLE_PAY_START_PURCHASE_RESPONSE           = 0x0BA3,
+    SMSG_BATTLE_PET_CAGE_DATE_ERROR                   = 0x1D1E,
     SMSG_BATTLE_PET_DELETED                           = 0x0138,
-    SMSG_BATTLE_PET_FINALIZE_LOCATION                 = 0x0F09,
-    SMSG_BATTLE_PET_FINAL_ROUND                       = 0x05BA,
-    SMSG_BATTLE_PET_FIRST_ROUND                       = 0x1981,
-    SMSG_BATTLE_PET_INITIAL_UPDATE                    = 0x0D19,
+    SMSG_BATTLE_PET_ERROR                             = 0x0227,
+    SMSG_BATTLE_PET_HEALED                            = 0x1BC1,
     SMSG_BATTLE_PET_JOURNAL                           = 0x19A2,
     SMSG_BATTLE_PET_JOURNAL_LOCK_ACQUIRED             = 0x01A3,
     SMSG_BATTLE_PET_JOURNAL_LOCK_DENIED               = 0x1BEC,
-    SMSG_BATTLE_PET_NAME_QUERY_RESPONSE               = 0x09EC,
-    SMSG_BATTLE_PET_PVP_CHALLENGE                     = 0x11EC,
-    SMSG_BATTLE_PET_REPLACEMENTS_MADE                 = 0x1B83,
-    SMSG_BATTLE_PET_REQUEST_FAILED                    = 0x1353,
+    SMSG_BATTLE_PET_LICENSE_CHANGED                   = 0x0FA9,
     SMSG_BATTLE_PET_RESTORED                          = 0x159D,
     SMSG_BATTLE_PET_REVOKED                           = 0x0936,
     SMSG_BATTLE_PET_SLOT_UPDATES                      = 0x1D8F,
@@ -968,13 +971,14 @@ enum OpcodeServer : uint32
     SMSG_CANCEL_ORPHAN_SPELL_VISUAL                   = 0x1BFB,
     SMSG_CANCEL_SCENE                                 = 0x033F,
     SMSG_CANCEL_SPELL_VISUAL                          = 0x0361,
+    SMSG_CAN_DUEL_RESULT                              = 0x03E9,
     SMSG_CAST_FAILED                                  = 0x1A89,
-    SMSG_CHALLENGE_MODE_ALL_MAP_STATS                 = 0x1CC9,
+    SMSG_CHALLENGE_MODE_ALL_MAP_STATS                 = 0x0904,
     SMSG_CHALLENGE_MODE_COMPLETE                      = 0x1B31,
     SMSG_CHALLENGE_MODE_MAP_STATS_UPDATE              = 0x0135,
     SMSG_CHALLENGE_MODE_NEW_PLAYER_RECORD             = 0x13A3,
     SMSG_CHALLENGE_MODE_REQUEST_LEADERS_RESULT        = 0x07AA,
-    SMSG_CHALLENGE_MODE_REWARDS                       = 0x0904,
+    SMSG_CHALLENGE_MODE_REWARDS                       = 0x1CC9,
     SMSG_CHANGE_PLAYER_DIFFICULTY_RESULT              = 0x0826,
     SMSG_CHANNEL_LIST                                 = 0x1411,
     SMSG_CHANNEL_NOTIFY                               = 0x0643,
@@ -991,7 +995,7 @@ enum OpcodeServer : uint32
     SMSG_CHAR_FACTION_CHANGE                          = 0x0810,
     SMSG_CHAR_RENAME                                  = 0x0D89,
     SMSG_CHAT_IGNORED_ACCOUNT_MUTED                   = 0xBADD,
-    SMSG_CHAT_NOT_IN_PARTY                            = 0xBADD,
+    SMSG_CHAT_NOT_IN_PARTY                            = 0x0604,
     SMSG_CHAT_PLAYER_AMBIGUOUS                        = 0xBADD,
     SMSG_CHAT_PLAYER_NOT_FOUND                        = 0x0614,
     SMSG_CHAT_RESTRICTED                              = 0x0484,
@@ -1001,7 +1005,7 @@ enum OpcodeServer : uint32
     SMSG_CHAT_WRONG_FACTION                           = 0xBADD,
     SMSG_CHECK_FOR_BOTS                               = 0xBADD,
     SMSG_CLEAR_ALL_SPELL_CHARGE                       = 0x088B,
-    SMSG_CLEAR_BOSS_EMOTES                            = 0xBADD,
+    SMSG_CLEAR_BOSS_EMOTES                            = 0x118B,
     SMSG_CLEAR_COOLDOWN                               = 0x0226,
     SMSG_CLEAR_COOLDOWNS                              = 0x0BFA,
     SMSG_CLEAR_FAR_SIGHT_IMMEDIATE                    = 0xBADD,
@@ -1035,6 +1039,7 @@ enum OpcodeServer : uint32
     SMSG_CORPSE_LOCATION                              = 0x09E1,
     SMSG_CORPSE_RECLAIM_DELAY                         = 0x0BE2,
     SMSG_CORPSE_TRANSPORT_QUERY                       = 0x13AB,
+    SMSG_CREATE_SHIPMENT_RESPONSE                     = 0x11AB,
     SMSG_CREATURE_QUERY_RESPONSE                      = 0x0A26,
     SMSG_CRITERIA_DELETED                             = 0x0105,
     SMSG_CRITERIA_UPDATE                              = 0x1904,
@@ -1053,8 +1058,8 @@ enum OpcodeServer : uint32
     SMSG_DEBUG_SERVER_GEO                             = 0xBADD,
     SMSG_DEFENSE_MESSAGE                              = 0x1442,
     SMSG_DESTROY_ARENA_UNIT                           = 0x19E1,
-    SMSG_DESTRUCTIBLE_BUILDING_DAMAGE                 = 0xBADD,
-    SMSG_DIFFERENT_INSTANCE_FROM_PARTY                = 0xBADD,
+    SMSG_DESTRUCTIBLE_BUILDING_DAMAGE                 = 0x0A28,
+    SMSG_DIFFERENT_INSTANCE_FROM_PARTY                = 0x0B12,
     SMSG_DISENCHANT_CREDIT                            = 0x050F,
     SMSG_DISMOUNT                                     = 0x0B89,
     SMSG_DISMOUNTRESULT                               = 0xBADD,
@@ -1062,6 +1067,7 @@ enum OpcodeServer : uint32
     SMSG_DISPLAY_GAME_ERROR                           = 0x090D,
     SMSG_DISPLAY_PLAYER_CHOICE                        = 0x0907,
     SMSG_DISPLAY_PROMOTION                            = 0x151D,
+    SMSG_DISPLAY_QUEST_POPUP                          = 0x15D7,
     SMSG_DISPLAY_TOAST                                = 0x17BD,
     SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR          = 0xBADD,
     SMSG_DROP_NEW_CONNECTION                          = 0xBADD,
@@ -1098,7 +1104,6 @@ enum OpcodeServer : uint32
     SMSG_FORCED_DEATH_UPDATE                          = 0xBADD,
     SMSG_FORCE_ANIM                                   = 0xBADD,
     SMSG_FORCE_DISPLAY_UPDATE                         = 0xBADD,
-    SMSG_FORCE_SET_VEHICLE_REC_ID                     = 0xBADD,
     SMSG_FORGE_MASTER_SET                             = 0xBADD,
     SMSG_FRIEND_STATUS                                = 0xBADD,
     SMSG_GAMEOBJECT_ACTIVATE_ANIM_KIT                 = 0x038C,
@@ -1111,37 +1116,32 @@ enum OpcodeServer : uint32
     SMSG_GAMEOBJECT_RESET_STATE                       = 0x090E,
     SMSG_GAMESPEED_SET                                = 0xBADD,
     SMSG_GAMETIME_SET                                 = 0xBADD,
-    SMSG_GAMETIME_UPDATE                              = 0xBADD,
     SMSG_GAME_EVENT_DEBUG_LOG                         = 0xBADD,
     SMSG_GAME_TIME_UPDATE                             = 0x1709,
+    SMSG_GARRISON_ADD_FOLLOWER_RESULT                 = 0x0544,
     SMSG_GARRISON_ADD_MISSION_RESULT                  = 0x0973,
     SMSG_GARRISON_ASSIGN_FOLLOWER_TO_BUILDING_RESULT  = 0x0B7C,
     SMSG_GARRISON_BUILDING_ACTIVATED                  = 0x1974,
     SMSG_GARRISON_BUILDING_REMOVED                    = 0x1151,
-    SMSG_GARRISON_COMPLETE_MISSION_RESULT             = 0x0952,
-    SMSG_GARRISON_FOLLOWER_CHANGED_ITEM_LEVEL         = 0x0D01,
-    SMSG_GARRISON_FOLLOWER_CHANGED_XP                 = 0x0973,
-    SMSG_GARRISON_FOLLOWER_XP_CHANGED_RESULT          = 0x1B64,
+    SMSG_GARRISON_COMPLETE_MISSION_RESULT             = 0x0D54,
+    SMSG_GARRISON_FOLLOWER_XP_CHANGED                 = 0x1B64,
     SMSG_GARRISON_LANDINGPAGE_SHIPMENTS               = 0x1901,
-    SMSG_GARRISON_LIST_FOLLOWERS_CHEAT_RESULT         = 0x096B,
+    SMSG_GARRISON_MISSION_BONUS_ROLL_RESULT           = 0x0952,
     SMSG_GARRISON_MONUMENT_SELECTED_TROPHY_ID_LOADED  = 0x09EA,
+    SMSG_GARRISON_OPEN_TRADESKILL                     = 0x09C1,
+    SMSG_GARRISON_PLOT_REMOVED                        = 0x0513,
     SMSG_GARRISON_REMOTE_INFO                         = 0x0151,
     SMSG_GARRISON_REQUEST_BLUEPRINT_AND_SPECIALIZATION_DATA_RESULT = 0x0964,
+    SMSG_GARRISON_SET_NUM_FOLLOWER_ACTIVATIONS_REMAINING = 0x0D92,
     SMSG_GARRISON_START_MISSION_RESULT                = 0x0D01,
     SMSG_GARRISON_UNK1                                = 0x0543,
+    SMSG_GARRISON_UNK3                                = 0x096B,
     SMSG_GARRISON_UPGRADEABLE_RESULT                  = 0x0522,
+    SMSG_GARRISON_UPGRADE_FOLLOWER_ITEM_LEVEL         = 0x000C,
+    SMSG_GARRISON_UPGRADE_RESULT                      = 0x0D51,
     SMSG_GET_GARRISON_INFO_RESULT                     = 0x0521,
-    SMSG_GET_SHIPMENTS_OF_TYPE_RESPONSE               = 0x11AB,
     SMSG_GET_SHIPMENT_INFO_RESPONSE                   = 0x1BAB,
     SMSG_GET_TROPHY_LIST_RESPONSE                     = 0x0126,
-    SMSG_GMRESPONSE_DB_ERROR                          = 0xBADD,
-    SMSG_GMRESPONSE_RECEIVED                          = 0xBADD,
-    SMSG_GMRESPONSE_STATUS_UPDATE                     = 0xBADD,
-    SMSG_GMTICKET_CREATE                              = 0xBADD,
-    SMSG_GMTICKET_DELETETICKET                        = 0xBADD,
-    SMSG_GMTICKET_GETTICKET                           = 0xBADD,
-    SMSG_GMTICKET_SYSTEMSTATUS                        = 0xBADD,
-    SMSG_GMTICKET_UPDATETEXT                          = 0xBADD,
     SMSG_GM_MESSAGECHAT                               = 0xBADD,
     SMSG_GM_PLAYER_INFO                               = 0xBADD,
     SMSG_GM_TICKET_CASE_STATUS                        = 0x1D8D,
@@ -1156,10 +1156,10 @@ enum OpcodeServer : uint32
     SMSG_GOSSIP_COMPLETE                              = 0x15D1,
     SMSG_GOSSIP_MESSAGE                               = 0x1746,
     SMSG_GOSSIP_POI                                   = 0x011E,
-    SMSG_GROUPACTION_THROTTLED                        = 0xBADD,
+    SMSG_GROUP_ACTION_THROTTLED                       = 0x0136,
     SMSG_GROUP_CANCEL                                 = 0xBADD,
     SMSG_GROUP_DECLINE                                = 0x153F,
-    SMSG_GROUP_DESTROYED                              = 0xBADD,
+    SMSG_GROUP_DESTROYED                              = 0x1982,
     SMSG_GROUP_NEW_LEADER                             = 0x0984,
     SMSG_GROUP_SET_ROLE                               = 0xBADD,
     SMSG_GROUP_UNINVITE                               = 0x0110,
@@ -1179,34 +1179,33 @@ enum OpcodeServer : uint32
     SMSG_GUILD_CRITERIA_DELETED                       = 0x1805,
     SMSG_GUILD_CRITERIA_UPDATE                        = 0x1208,
     SMSG_GUILD_DECLINE                                = 0xBADD,
-    SMSG_GUILD_EVENT                                  = 0x1027,
+    SMSG_GUILD_EVENT                                  = 0xBADD,
     SMSG_GUILD_EVENT_BANK_CONTENTS_CHANGED            = 0x1045,
     SMSG_GUILD_EVENT_BANK_MONEY_CHANGED               = 0x1077,
     SMSG_GUILD_EVENT_DISBANDED                        = 0x1A08,
     SMSG_GUILD_EVENT_LOG_QUERY_RESULTS                = 0x1075,
     SMSG_GUILD_EVENT_MOTD                             = 0x1825,
-    SMSG_GUILD_EVENT_NEW_LEADER                       = 0x0FAE,
+    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_RANKS_UPDATED                    = 0x1005,
+    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                     = 0x1018,
+    SMSG_GUILD_EVENT_TAB_MODIFIED                     = 0x1035,
     SMSG_GUILD_EVENT_TAB_TEXT_CHANGED                 = 0x1076,
     SMSG_GUILD_FLAGGED_FOR_RENAME                     = 0x1248,
     SMSG_GUILD_INVITE                                 = 0x1025,
     SMSG_GUILD_INVITE_CANCEL                          = 0xBADD,
     SMSG_GUILD_INVITE_DECLINED                        = 0x1226,
     SMSG_GUILD_INVITE_EXPIRED                         = 0x1246,
-    SMSG_GUILD_KNOWN_RECIPES                          = 0xBADD,
+    SMSG_GUILD_KNOWN_RECIPES                          = 0x1078,
     SMSG_GUILD_MAX_DAILY_XP                           = 0xBADD,
     SMSG_GUILD_MEMBERS_WITH_RECIPE                    = 0x1277,
     SMSG_GUILD_MEMBER_DAILY_RESET                     = 0x1015,
     SMSG_GUILD_MEMBER_RECIPES                         = 0x1036,
     SMSG_GUILD_MEMBER_UPDATE_NOTE                     = 0x1846,
-    SMSG_GUILD_MOTD                                   = 0x1825,
     SMSG_GUILD_MOVED                                  = 0x1838,
     SMSG_GUILD_MOVE_COMPLETE                          = 0xBADD,
     SMSG_GUILD_MOVE_STARTING                          = 0x1877,
@@ -1217,19 +1216,16 @@ enum OpcodeServer : uint32
     SMSG_GUILD_PARTY_STATE_RESPONSE                   = 0x1225,
     SMSG_GUILD_PERMISSIONS_QUERY_RESULTS              = 0x1827,
     SMSG_GUILD_QUERY_RESPONSE                         = 0x1046,
-    SMSG_GUILD_RANK                                   = 0x1218,
-    SMSG_GUILD_RANKS_UPDATE                           = 0x1207,
-    SMSG_GUILD_RECIPES                                = 0x1078,
-    SMSG_GUILD_RENAMED                                = 0xBADD,
+    SMSG_GUILD_RANKS                                  = 0x1218,
     SMSG_GUILD_REPUTATION_REACTION_CHANGED            = 0x1068,
     SMSG_GUILD_REPUTATION_WEEKLY_CAP                  = 0xBADD,
     SMSG_GUILD_RESET                                  = 0x1258,
     SMSG_GUILD_REWARDS_LIST                           = 0x1818,
     SMSG_GUILD_ROSTER                                 = 0x1026,
     SMSG_GUILD_ROSTER_UPDATE                          = 0x1265,
+    SMSG_GUILD_SEND_RANK_CHANGE                       = 0x1207,
     SMSG_GUILD_SET_NOTE                               = 0xBADD,
     SMSG_GUILD_TRADESKILL_UPDATE                      = 0xBADD,
-    SMSG_GUILD_UPDATE_ROSTER                          = 0xBADD,
     SMSG_GUILD_XP                                     = 0xBADD,
     SMSG_GUILD_XP_GAIN                                = 0xBADD,
     SMSG_GUILD_XP_UPDATE                              = 0xBADD,
@@ -1249,6 +1245,7 @@ enum OpcodeServer : uint32
     SMSG_INSPECT_RATED_BG_STATS                       = 0xBADD,
     SMSG_INSPECT_RESULT                               = 0x052E,
     SMSG_INSPECT_TALENT                               = 0xBADD,
+    SMSG_INSTANCE_ENCOUNTER_CHANGE_PRIORITY           = 0x0B03,
     SMSG_INSTANCE_ENCOUNTER_DISENGAGE_UNIT            = 0x05AE,
     SMSG_INSTANCE_ENCOUNTER_END                       = 0x0B1A,
     SMSG_INSTANCE_ENCOUNTER_ENGAGE_UNIT               = 0x0137,
@@ -1266,10 +1263,12 @@ enum OpcodeServer : uint32
     SMSG_INVALIDATE_PLAYER                            = 0x0B37,
     SMSG_INVALID_PROMOTION_CODE                       = 0xBADD,
     SMSG_INVENTORY_CHANGE_FAILURE                     = 0x0112,
+    SMSG_IS_QUEST_COMPLETE_RESPONSE                   = 0x17E1,
     SMSG_ITEM_ADD_PASSIVE                             = 0xBADD,
     SMSG_ITEM_COOLDOWN                                = 0x090F,
     SMSG_ITEM_ENCHANT_TIME_UPDATE                     = 0x010D,
-    SMSG_ITEM_EXPIRE_PURCHASE_REFUND                  = 0xBADD,
+    SMSG_ITEM_EXPIRE_PURCHASE_REFUND                  = 0x1282,
+    SMSG_ITEM_PURCHASE_REFUND_RESULT                  = 0x0B3D,
     SMSG_ITEM_PUSH_RESULT                             = 0x0183,
     SMSG_ITEM_REFUND_INFO_RESPONSE                    = 0xBADD,
     SMSG_ITEM_REFUND_RESULT                           = 0xBADD,
@@ -1285,7 +1284,7 @@ enum OpcodeServer : uint32
     SMSG_LEVELUP_INFO                                 = 0x1BE4,
     SMSG_LFG_BOOT_PLAYER                              = 0x07B3,
     SMSG_LFG_BOOT_PROPOSAL_UPDATE                     = 0xBADD,
-    SMSG_LFG_DISABLED                                 = 0xBADD,
+    SMSG_LFG_DISABLED                                 = 0x0714,
     SMSG_LFG_JOIN_RESULT                              = 0x0F72,
     SMSG_LFG_LIST_JOIN_RESULT                         = 0x0793,
     SMSG_LFG_LIST_UPDATE_BLACKLIST                    = 0x0754,
@@ -1299,8 +1298,9 @@ enum OpcodeServer : uint32
     SMSG_LFG_QUEUE_STATUS                             = 0x07F1,
     SMSG_LFG_ROLE_CHECK_UPDATE                        = 0x0736,
     SMSG_LFG_ROLE_CHOSEN                              = 0xBADD,
-    SMSG_LFG_SLOT_INVALID                             = 0xBADD,
-    SMSG_LFG_TELEPORT_DENIED                          = 0xBADD,
+    SMSG_LFG_SEARCH_RESULTS                           = 0x0798,
+    SMSG_LFG_SLOT_INVALID                             = 0x07B1,
+    SMSG_LFG_TELEPORT_DENIED                          = 0x0795,
     SMSG_LFG_UPDATE_LIST                              = 0xBADD,
     SMSG_LFG_UPDATE_SEARCH                            = 0xBADD,
     SMSG_LFG_UPDATE_STATUS                            = 0x07F7,
@@ -1333,14 +1333,12 @@ enum OpcodeServer : uint32
     SMSG_LOOT_MONEY_NOTIFY                            = 0x12A9,
     SMSG_LOOT_RELEASE                                 = 0x0BD3,
     SMSG_LOOT_RELEASE_ALL                             = 0x198C,
-    SMSG_LOOT_RELEASE_RESPONSE                        = 0xBADD,
     SMSG_LOOT_REMOVED                                 = 0x0906,
     SMSG_LOOT_RESPONSE                                = 0x0F8A,
     SMSG_LOOT_ROLL                                    = 0x1BE2,
     SMSG_LOOT_ROLLS_COMPLETE                          = 0x0D2F,
     SMSG_LOOT_ROLL_WON                                = 0x071E,
     SMSG_LOOT_SLOT_CHANGED                            = 0xBADD,
-    SMSG_LOOT_START_ROLL                              = 0xBADD,
     SMSG_LOSS_OF_CONTROL_AURA_UPDATE                  = 0x0305,
     SMSG_MAIL_LIST_RESULT                             = 0x0B3F,
     SMSG_MAIL_QUERY_NEXT_TIME_RESULT                  = 0x153D,
@@ -1363,27 +1361,23 @@ enum OpcodeServer : uint32
     SMSG_MODIFY_COOLDOWN                              = 0x17BA,
     SMSG_MONEY_NOTIFY                                 = 0xBADD,
     SMSG_MOTD                                         = 0x0442,
-    SMSG_MOUNTRESULT                                  = 0xBADD,
-    SMSG_MOUNTSPECIAL_ANIM                            = 0xBADD,
     SMSG_MOUNT_RESULT                                 = 0x000F,
     SMSG_MOVE_APPLY_MOVEMENT_FORCE                    = 0x06CB,
-    SMSG_MOVE_COLLISION_DISABLE                       = 0xBADD,
-    SMSG_MOVE_COLLISION_ENABLE                        = 0xBADD,
     SMSG_MOVE_DISABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x00C5,
+    SMSG_MOVE_DISABLE_COLLISION                       = 0xBADD,
+    SMSG_MOVE_DISABLE_GRAVITY                         = 0x02C6,
     SMSG_MOVE_ENABLE_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x08CE,
+    SMSG_MOVE_ENABLE_COLLISION                        = 0xBADD,
     SMSG_MOVE_ENABLE_GRAVITY                          = 0x03B4,
-    SMSG_MOVE_GRAVITY_DISABLE                         = 0x02C6,
-    SMSG_MOVE_GRAVITY_ENABLE                          = 0xBADD,
     SMSG_MOVE_KNOCK_BACK                              = 0x0CCB,
     SMSG_MOVE_REMOVE_MOVEMENT_FORCE                   = 0x0073,
     SMSG_MOVE_ROOT                                    = 0x1B5A,
     SMSG_MOVE_SET_ACTIVE_MOVER                        = 0x1021,
     SMSG_MOVE_SET_ANIM_KIT                            = 0x052F,
     SMSG_MOVE_SET_CAN_FLY                             = 0x01F6,
-    SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x08CE,
     SMSG_MOVE_SET_CAN_TURN_WHILE_FALLING              = 0x09B2,
     SMSG_MOVE_SET_COLLISION_HEIGHT                    = 0x008D,
-    SMSG_MOVE_SET_COMPOUND_STATE                      = 0x002E,
+    SMSG_MOVE_SET_COMPOUND_STATE                      = 0x02E5,
     SMSG_MOVE_SET_FEATHER_FALL                        = 0x01DD,
     SMSG_MOVE_SET_FLIGHT_BACK_SPEED                   = 0xBADD,
     SMSG_MOVE_SET_FLIGHT_SPEED                        = 0x100B,
@@ -1424,7 +1418,7 @@ enum OpcodeServer : uint32
     SMSG_MOVE_SPLINE_SET_TURN_RATE                    = 0x03F6,
     SMSG_MOVE_SPLINE_SET_WALK_BACK_SPEED              = 0x01D5,
     SMSG_MOVE_SPLINE_SET_WALK_MODE                    = 0x03D6,
-    SMSG_MOVE_SPLINE_SET_WALK_SPEED                   = 0x01D5,
+    SMSG_MOVE_SPLINE_SET_WALK_SPEED                   = 0xBADD,
     SMSG_MOVE_SPLINE_SET_WATER_WALK                   = 0x02D5,
     SMSG_MOVE_SPLINE_START_SWIM                       = 0x01BB,
     SMSG_MOVE_SPLINE_STOP_SWIM                        = 0x1391,
@@ -1434,7 +1428,6 @@ enum OpcodeServer : uint32
     SMSG_MOVE_TELEPORT                                = 0x03A6,
     SMSG_MOVE_UNROOT                                  = 0x08BD,
     SMSG_MOVE_UNSET_CAN_FLY                           = 0x0BAE,
-    SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x00C5,
     SMSG_MOVE_UNSET_HOVER                             = 0x01A5,
     SMSG_MOVE_UNSET_IGNORE_MOVEMENT_FORCES            = 0x039E,
     SMSG_MOVE_UNSET_WALK_IN_AIR                       = 0xBADD,
@@ -1470,9 +1463,10 @@ enum OpcodeServer : uint32
     SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA         = 0x053F,
     SMSG_ON_MONSTER_MOVE                              = 0x0994,
     SMSG_OPEN_CONTAINER                               = 0xBADD,
-    SMSG_OPEN_LFG_DUNGEON_FINDER                      = 0xBADD,
+    SMSG_OPEN_LFG_DUNGEON_FINDER                      = 0x0F17,
     SMSG_OPEN_SHIPMENT_NPC_FROM_GOSSIP                = 0x0709,
     SMSG_OVERRIDE_LIGHT                               = 0x01EA,
+    SMSG_PAGE_TEXT                                    = 0x158D,
     SMSG_PAGE_TEXT_QUERY_RESPONSE                     = 0x05A0,
     SMSG_PARTY_COMMAND_RESULT                         = 0x0B44,
     SMSG_PARTY_INVITE                                 = 0x0920,
@@ -1486,15 +1480,27 @@ enum OpcodeServer : uint32
     SMSG_PETGODMODE                                   = 0xBADD,
     SMSG_PETITION_ALREADY_SIGNED                      = 0x0D8E,
     SMSG_PETITION_RENAME_GUILD_RESULT                 = 0x1055,
-    SMSG_PETITION_SHOWLIST                            = 0xBADD,
     SMSG_PETITION_SHOW_LIST                           = 0x0915,
     SMSG_PETITION_SHOW_SIGNATURES                     = 0x0830,
     SMSG_PETITION_SIGN_RESULTS                        = 0x11E9,
     SMSG_PET_ACTION_FEEDBACK                          = 0xBADD,
     SMSG_PET_ACTION_SOUND                             = 0x0D39,
     SMSG_PET_ADDED                                    = 0x0327,
+    SMSG_PET_BATTLE_CHAT_RESTRICTED                   = 0x0982,
+    SMSG_PET_BATTLE_DEBUG_QUEUE_DUMP_RESPONSE         = 0x0B35,
+    SMSG_PET_BATTLE_FINALIZE_LOCATION                 = 0x0F09,
+    SMSG_PET_BATTLE_FINAL_ROUND                       = 0x05BA,
     SMSG_PET_BATTLE_FINISHED                          = 0x0D1F,
+    SMSG_PET_BATTLE_FIRST_ROUND                       = 0x1981,
+    SMSG_PET_BATTLE_INITIAL_UPDATE                    = 0x0D19,
+    SMSG_PET_BATTLE_MAX_GAME_LENGTH_WARNING           = 0x0F1A,
+    SMSG_PET_BATTLE_PVP_CHALLENGE                     = 0x11EC,
+    SMSG_PET_BATTLE_QUEUE_PROPOSE_MATCH               = 0x0F19,
+    SMSG_PET_BATTLE_QUEUE_STATUS                      = 0x0905,
+    SMSG_PET_BATTLE_REPLACEMENTS_MADE                 = 0x1B83,
+    SMSG_PET_BATTLE_REQUEST_FAILED                    = 0x1353,
     SMSG_PET_BATTLE_ROUND_RESULT                      = 0x0341,
+    SMSG_PET_BATTLE_SLOT_UPDATE                       = 0x1D8E,
     SMSG_PET_BROKEN                                   = 0xBADD,
     SMSG_PET_CAST_FAILED                              = 0x1914,
     SMSG_PET_CLEAR_SPELLS                             = 0x1113,
@@ -1526,6 +1532,7 @@ enum OpcodeServer : uint32
     SMSG_PLAY_ORPHAN_SPELL_VISUAL                     = 0x0BF9,
     SMSG_PLAY_SCENE                                   = 0x0917,
     SMSG_PLAY_SOUND                                   = 0x02D2,
+    SMSG_PLAY_SPEAKERBOT_SOUND                        = 0x1C8A,
     SMSG_PLAY_SPELL_VISUAL                            = 0x1A84,
     SMSG_PLAY_SPELL_VISUAL_KIT                        = 0x0171,
     SMSG_PLAY_TIME_WARNING                            = 0x082F,
@@ -1533,12 +1540,14 @@ enum OpcodeServer : uint32
     SMSG_POWER_UPDATE                                 = 0x0B27,
     SMSG_PRE_RESSURECT                                = 0x0D2E,
     SMSG_PROCRESIST                                   = 0xBADD,
+    SMSG_PROC_RESIST                                  = 0x1DAD,
     SMSG_PROPOSE_LEVEL_GRANT                          = 0xBADD,
     SMSG_PUREMOUNT_CANCELLED_OBSOLETE                 = 0xBADD,
     SMSG_PVP_CREDIT                                   = 0x13A9,
     SMSG_PVP_LOG_DATA                                 = 0x1ECA,
     SMSG_PVP_OPTIONS_ENABLED                          = 0x0320,
     SMSG_PVP_SEASON                                   = 0x09E3,
+    SMSG_QUERY_BATTLE_PET_NAME_RESPONSE               = 0x09EC,
     SMSG_QUERY_PETITION_RESPONSE                      = 0x13AC,
     SMSG_QUERY_TIME_RESPONSE                          = 0x1DB0,
     SMSG_QUESTGIVER_INVALID_QUEST                     = 0x15E1,
@@ -1551,23 +1560,20 @@ enum OpcodeServer : uint32
     SMSG_QUESTGIVER_REQUEST_ITEMS                     = 0x17B8,
     SMSG_QUESTGIVER_STATUS                            = 0x1567,
     SMSG_QUESTGIVER_STATUS_MULTIPLE                   = 0x17C6,
-    SMSG_QUESTLOG_FULL                                = 0xBADD,
-    SMSG_QUESTUPDATE_ADD_ITEM                         = 0xBADD,
-    SMSG_QUESTUPDATE_ADD_KILL                         = 0x1515,
-    SMSG_QUESTUPDATE_ADD_PVP_KILL                     = 0xBADD,
-    SMSG_QUESTUPDATE_COMPLETE                         = 0x1787,
-    SMSG_QUESTUPDATE_FAILED                           = 0xBADD,
-    SMSG_QUESTUPDATE_FAILEDTIMER                      = 0xBADD,
-    SMSG_QUEST_CONFIRM_ACCEPT                         = 0xBADD,
+    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,
+    SMSG_QUEST_UPDATE_ADD_CREDIT                      = 0x1515,
     SMSG_QUEST_UPDATE_ADD_CREDIT_SIMPLE               = 0x1D11,
-    SMSG_QUEST_UPDATE_ADD_KILL                        = 0x1515,
+    SMSG_QUEST_UPDATE_ADD_PVP_CREDIT                  = 0x15A6,
     SMSG_QUEST_UPDATE_COMPLETE                        = 0x1787,
-    SMSG_RAID_GROUP_ONLY                              = 0xBADD,
+    SMSG_QUEST_UPDATE_FAILED                          = 0x1542,
+    SMSG_QUEST_UPDATE_FAILED_TIMER                    = 0x1D01,
+    SMSG_RAID_GROUP_ONLY                              = 0x0D9D,
     SMSG_RAID_INSTANCE_INFO                           = 0xBADD,
     SMSG_RAID_INSTANCE_MESSAGE                        = 0x0494,
     SMSG_RAID_MARKERS_CHANGED                         = 0x0384,
@@ -1585,6 +1591,7 @@ enum OpcodeServer : uint32
     SMSG_REALM_SPLIT                                  = 0xBADD,
     SMSG_REAL_GROUP_UPDATE                            = 0xBADD,
     SMSG_RECEIVED_MAIL                                = 0xBADD,
+    SMSG_RECRUIT_A_FRIEND_RESPONSE                    = 0x0B3E,
     SMSG_REDIRECT_CLIENT                              = 0x175A,
     SMSG_REFER_A_FRIEND_EXPIRED                       = 0xBADD,
     SMSG_REFER_A_FRIEND_FAILURE                       = 0xBADD,
@@ -1603,6 +1610,7 @@ enum OpcodeServer : uint32
     SMSG_RESISTLOG                                    = 0xBADD,
     SMSG_RESPEC_WIPE_CONFIRM                          = 0x1341,
     SMSG_RESPOND_INSPECT_ACHIEVEMENTS                 = 0x1BA2,
+    SMSG_RESTRICTED_ACCOUNT_WARNING                   = 0x0A2E,
     SMSG_RESUME_CAST_BAR                              = 0x082C,
     SMSG_RESUME_COMMS                                 = 0x07C9,
     SMSG_RESUME_TOKEN                                 = 0x0326,
@@ -1623,6 +1631,7 @@ enum OpcodeServer : uint32
     SMSG_SCENE_OBJECT_PET_BATTLE_FINAL_ROUND          = 0x092E,
     SMSG_SCENE_OBJECT_PET_BATTLE_FINISHED             = 0x1B44,
     SMSG_SCENE_OBJECT_PET_BATTLE_FIRST_ROUND          = 0x000E,
+    SMSG_SCENE_OBJECT_PET_BATTLE_INITIAL_UPDATE       = 0x0540,
     SMSG_SCENE_OBJECT_PET_BATTLE_REPLACEMENTS_MADE    = 0x098A,
     SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT         = 0x0130,
     SMSG_SCRIPT_CAST                                  = 0x1B1C,
@@ -1641,11 +1650,12 @@ enum OpcodeServer : uint32
     SMSG_SERVER_MESSAGE                               = 0x0683,
     SMSG_SERVER_PERF                                  = 0xBADD,
     SMSG_SETUP_CURRENCY                               = 0x0B06,
+    SMSG_SETUP_TROPHY                                 = 0x0B63,
     SMSG_SET_AI_ANIM_KIT                              = 0x0335,
     SMSG_SET_ALL_TASK_PROGRESS                        = 0x1B52,
     SMSG_SET_ANIM_TIER                                = 0x079E,
     SMSG_SET_CURRENCY                                 = 0x17BE,
-    SMSG_SET_DF_FAST_LAUNCH_RESULT                    = 0xBADD,
+    SMSG_SET_DF_FAST_LAUNCH_RESULT                    = 0x0F52,
     SMSG_SET_DUNGEON_DIFFICULTY                       = 0x0719,
     SMSG_SET_FACTION_ATWAR                            = 0xBADD,
     SMSG_SET_FACTION_NOT_VISIBLE                      = 0x1224,
@@ -1654,12 +1664,13 @@ enum OpcodeServer : uint32
     SMSG_SET_FLAT_SPELL_MODIFIER                      = 0x1884,
     SMSG_SET_FORCED_REACTIONS                         = 0x09A9,
     SMSG_SET_ITEM_PURCHASE_DATA                       = 0x0316,
+    SMSG_SET_LFG_TIME_WALKER                          = 0x0731,
     SMSG_SET_LOOT_METHOD_FAILED                       = 0x070E,
     SMSG_SET_MAX_WEEKLY_QUANTITY                      = 0x1489,
     SMSG_SET_MELEE_ANIM_KIT                           = 0xBADD,
     SMSG_SET_MOVEMENT_ANIM_KIT                        = 0xBADD,
     SMSG_SET_PCT_SPELL_MODIFIER                       = 0x113C,
-    SMSG_SET_PHASE_SHIFT                              = 0x00D1,
+    SMSG_SET_PHASE_SHIFT_CHANGE                       = 0x00D1,
     SMSG_SET_PLAYER_DECLINED_NAMES_RESULT             = 0xBADD,
     SMSG_SET_PLAY_HOVER_ANIM                          = 0x02D4,
     SMSG_SET_PROFICIENCY                              = 0x00D3,
@@ -1669,15 +1680,16 @@ enum OpcodeServer : uint32
     SMSG_SET_SPELL_CHARGES                            = 0x18AB,
     SMSG_SET_TASK_COMPLETE                            = 0x0B24,
     SMSG_SET_TIME_ZONE_INFORMATION                    = 0x153E,
-    SMSG_SET_VEHILCE_REC_ID                           = 0x1BA1,
+    SMSG_SET_VEHICLE_REC_ID                           = 0x1BA1,
     SMSG_SET_VIGNETTE                                 = 0x09AC,
-    SMSG_SHOWTAXINODES                                = 0x12A1,
     SMSG_SHOW_BANK                                    = 0x1B51,
     SMSG_SHOW_MAILBOX                                 = 0xBADD,
+    SMSG_SHOW_NEUTRAL_PLAYER_FACTION_SELECT_UI        = 0x053D,
     SMSG_SHOW_RATINGS                                 = 0xBADD,
     SMSG_SHOW_TAXI_NODES                              = 0x12A1,
     SMSG_SHOW_TRADE_SKILL_RESPONSE                    = 0x15C0,
     SMSG_SOCKET_GEMS_RESULT                           = 0xBADD,
+    SMSG_SORT_BAGS_ACK                                = 0x09E4,
     SMSG_SOR_START_EXPERIENCE_INCOMPLETE              = 0xBADD,
     SMSG_SPECIAL_MOUNT_ANIM                           = 0x159F,
     SMSG_SPELLBREAKLOG                                = 0xBADD,
@@ -1717,7 +1729,7 @@ enum OpcodeServer : uint32
     SMSG_SUMMON_RAID_MEMBER_VALIDATE_FAILED           = 0x1B24,
     SMSG_SUMMON_REQUEST                               = 0xBADD,
     SMSG_SUPERCEDED_SPELL                             = 0x0172,
-    SMSG_SUPPRESS_NPC_GREETINGS                       = 0xBADD,
+    SMSG_SUPPRESS_NPC_GREETINGS                       = 0x193A,
     SMSG_SUSPEND_COMMS                                = 0x076A,
     SMSG_SUSPEND_TOKEN                                = 0x12A2,
     SMSG_TABARD_VENDOR_ACTIVATE                       = 0x1389,
@@ -1734,13 +1746,12 @@ enum OpcodeServer : uint32
     SMSG_TIME_SYNC_REQ                                = 0x03B1,
     SMSG_TITLE_EARNED                                 = 0x1324,
     SMSG_TITLE_LOST                                   = 0x1D0E,
-    SMSG_TOGGLE_XP_GAIN                               = 0xBADD,
     SMSG_TOTEM_CREATED                                = 0x0352,
     SMSG_TOTEM_MOVED                                  = 0x12AB,
     SMSG_TRADE_STATUS                                 = 0x093D,
     SMSG_TRADE_STATUS_EXTENDED                        = 0xBADD,
     SMSG_TRADE_UPDATED                                = 0x0B43,
-    SMSG_TRAINER_BUY_FAILED                           = 0xBADD,
+    SMSG_TRAINER_BUY_FAILED                           = 0x1BD2,
     SMSG_TRAINER_BUY_SUCCEEDED                        = 0xBADD,
     SMSG_TRAINER_LIST                                 = 0x0BA9,
     SMSG_TRANSFER_ABORTED                             = 0x03C2,
@@ -1777,7 +1788,7 @@ enum OpcodeServer : uint32
     SMSG_VOICE_SET_TALKER_MUTED                       = 0xBADD,
     SMSG_VOID_ITEM_SWAP_RESPONSE                      = 0x1131,
     SMSG_VOID_STORAGE_CONTENTS                        = 0x0108,
-    SMSG_VOID_STORAGE_FAILED                          = 0xBADD,
+    SMSG_VOID_STORAGE_FAILED                          = 0x0B01,
     SMSG_VOID_STORAGE_TRANSFER_CHANGES                = 0x0321,
     SMSG_VOID_TRANSFER_RESULT                         = 0x0539,
     SMSG_WAIT_QUEUE_FINISH                            = 0x198A,
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index a12af44c15c..3567067252f 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -1249,7 +1249,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
         case CMSG_SELF_RES:                             //   0               1.5
         case CMSG_UNLEARN_SKILL:                        //   0               1.5
         case CMSG_EQUIPMENT_SET_SAVE:                   //   0               1.5
-        case CMSG_EQUIPMENT_SET_DELETE:                 //   0               1.5
+        case CMSG_DELETE_EQUIPMENT_SET:                 //   0               1.5
         //case CMSG_DISMISS_CRITTER:                      //   0               1.5
         case CMSG_REPOP_REQUEST:                        //   0               1.5
         //case CMSG_GROUP_INVITE:                         //   0               1.5
@@ -1400,7 +1400,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
         //case CMSG_GUILD_MOTD:                           // not profiled
         case CMSG_GUILD_SET_RANK_PERMISSIONS:           // not profiled
         case CMSG_GUILD_ADD_RANK:                       // not profiled
-        case CMSG_GUILD_DEL_RANK:                       // not profiled
+        case CMSG_GUILD_DELETE_RANK:                    // not profiled
         case CMSG_GUILD_UPDATE_INFO_TEXT:                 // not profiled
         case CMSG_GUILD_BANK_DEPOSIT_MONEY:             // not profiled
         //case CMSG_GUILD_BANK_WITHDRAW_MONEY:            // not profiled
@@ -1413,7 +1413,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
         case CMSG_SET_DUNGEON_DIFFICULTY:               // not profiled
         case CMSG_SET_RAID_DIFFICULTY:                  // not profiled
         //case MSG_PARTY_ASSIGNMENT:                      // not profiled
-        //case MSG_RAID_READY_CHECK:                      // not profiled
+        //case CMSG_DO_READY_CHECK:                       // not profiled
         {
             maxPacketCounterAllowed = 3;
             break;
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 331db7a42d5..71cfaa634d0 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -779,7 +779,7 @@ class WorldSession
 
         void HandleRequestRaidInfoOpcode(WorldPacket& recvData);
 
-        void HandleBattlefieldStatusOpcode(WorldPacket& recvData);
+        void HandleRequestBattlefieldStatusOpcode(WorldPacket& recvData);
         void HandleBattleMasterHelloOpcode(WorldPacket& recvData);
 
         void HandleGroupInviteOpcode(WorldPacket& recvPacket);
@@ -814,7 +814,7 @@ class WorldSession
 
         void HandleGuildQueryOpcode(WorldPackets::Guild::QueryGuildInfo& query);
         void HandleGuildInviteOpcode(WorldPacket& recvPacket);
-        void HandleGuildRemoveOpcode(WorldPacket& recvPacket);
+        void HandleGuildOfficerRemoveMemberOpcode(WorldPacket& recvPacket);
         void HandleGuildAcceptOpcode(WorldPacket& recvPacket);
         void HandleGuildDeclineOpcode(WorldPacket& recvPacket);
         void HandleGuildEventLogQueryOpcode(WorldPacket& recvPacket);
@@ -830,11 +830,11 @@ class WorldSession
         void HandleGuildMOTDOpcode(WorldPacket& recvPacket);
         void HandleGuildNewsUpdateStickyOpcode(WorldPacket& recvPacket);
         void HandleGuildSetNoteOpcode(WorldPacket& recvPacket);
-        void HandleGuildQueryRanksOpcode(WorldPacket& recvPacket);
+        void HandleGuildGetRanksOpcode(WorldPacket& recvPacket);
         void HandleGuildQueryNewsOpcode(WorldPacket& recvPacket);
         void HandleGuildSetRankPermissionsOpcode(WorldPacket& recvPacket);
         void HandleGuildAddRankOpcode(WorldPacket& recvPacket);
-        void HandleGuildDelRankOpcode(WorldPacket& recvPacket);
+        void HandleGuildDeleteRankOpcode(WorldPacket& recvPacket);
         void HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket);
         void HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket);
         void HandleGuildRequestPartyState(WorldPacket& recvPacket);
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index fb812cfbeec..7cd27fdaa62 100644
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -139,7 +139,7 @@ void GmTicket::WritePacket(WorldPacket& data) const
 
 void GmTicket::SendResponse(WorldSession* session) const
 {
-    WorldPacket data(SMSG_GMRESPONSE_RECEIVED);
+    WorldPacket data(SMSG_GM_TICKET_RESPONSE);
     data << uint32(1);          // responseID
     data << uint32(_id);        // ticketID
     data << _message.c_str();
@@ -408,7 +408,7 @@ void TicketMgr::ShowEscalatedList(ChatHandler& handler) const
 
 void TicketMgr::SendTicket(WorldSession* session, GmTicket* ticket) const
 {
-    WorldPacket data(SMSG_GMTICKET_GETTICKET, (ticket ? (4 + 4 + 1 + 4 + 4 + 4 + 1 + 1) : 4));
+    WorldPacket data(SMSG_GM_TICKET_GET_TICKET_RESPONSE, (ticket ? (4 + 4 + 1 + 4 + 4 + 4 + 1 + 1) : 4));
 
     if (ticket)
         ticket->WritePacket(data);
diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
index d6614255ee3..98d1b2c7192 100644
--- a/src/server/scripts/Commands/cs_ticket.cpp
+++ b/src/server/scripts/Commands/cs_ticket.cpp
@@ -168,7 +168,7 @@ public:
         // Inform player, who submitted this ticket, that it is closed
         if (Player* submitter = ticket->GetPlayer())
         {
-            WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
+            WorldPacket data(SMSG_GM_TICKET_UPDATE, 4);
             data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
             submitter->GetSession()->SendPacket(&data);
         }
@@ -276,7 +276,7 @@ public:
         if (Player* player = ticket->GetPlayer())
         {
             // Force abandon ticket
-            WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
+            WorldPacket data(SMSG_GM_TICKET_UPDATE, 4);
             data << uint32(GMTICKET_RESPONSE_TICKET_DELETED);
             player->GetSession()->SendPacket(&data);
         }