diff --git a/Source/Framework/Constants/Network/Opcodes.cs b/Source/Framework/Constants/Network/Opcodes.cs
index 142a07c16..7cf2cce2f 100644
--- a/Source/Framework/Constants/Network/Opcodes.cs
+++ b/Source/Framework/Constants/Network/Opcodes.cs
@@ -19,36 +19,39 @@ namespace Framework.Constants
 {
     public enum ClientOpcodes : uint
     {
-        AcceptGuildInvite = 0x35fd,
-        AcceptLevelGrant = 0x34ef,
+        AcceptGuildInvite = 0x35fc,
+        AcceptLevelGrant = 0x34fd,
         AcceptTrade = 0x315a,
         AcceptWargameInvite = 0x35e0,
-        ActivateTaxi = 0x34ac,
+        ActivateTaxi = 0x34ae,
         AddonList = 0x35d8,
-        AddBattlenetFriend = 0x365d,
-        AddFriend = 0x36d2,
-        AddIgnore = 0x36d6,
-        AddToy = 0x327d,
-        AdventureJournalOpenQuest = 0x31ef,
-        AdventureJournalStartQuest = 0x3325,
-        AlterAppearance = 0x34eb,
-        AreaSpiritHealerQuery = 0x34b1,
-        AreaSpiritHealerQueue = 0x34b2,
-        AreaTrigger = 0x31c5,
+        AddBattlenetFriend = 0x365c,
+        AddFriend = 0x36d1,
+        AddIgnore = 0x36d5,
+        AddToy = 0x3287,
+        AdventureJournalOpenQuest = 0x31f7,
+        AdventureJournalStartQuest = 0x332b,
+        AlterAppearance = 0x34f9,
+        AreaSpiritHealerQuery = 0x34b3,
+        AreaSpiritHealerQueue = 0x34b4,
+        AreaTrigger = 0x31cc,
         ArtifactAddPower = 0x31a5,
+        ArtifactAddRelicTalent = 0x31a8,
+        ArtifactAttunePreviewRelic = 0x31a9,
+        ArtifactAttuneSocketedRelic = 0x31aa,
         ArtifactSetAppearance = 0x31a7,
-        AssignEquipmentSetSpec = 0x31f6,
-        AttackStop = 0x3240,
-        AttackSwing = 0x323f,
-        AuctionHelloRequest = 0x34c1,
-        AuctionListBidderItems = 0x34c7,
-        AuctionListItems = 0x34c4,
-        AuctionListOwnerItems = 0x34c6,
-        AuctionListPendingSales = 0x34c9,
-        AuctionPlaceBid = 0x34c8,
-        AuctionRemoveItem = 0x34c3,
-        AuctionReplicateItems = 0x34c5,
-        AuctionSellItem = 0x34c2,
+        AssignEquipmentSetSpec = 0x31fe,
+        AttackStop = 0x3249,
+        AttackSwing = 0x3248,
+        AuctionHelloRequest = 0x34cf,
+        AuctionListBidderItems = 0x34d5,
+        AuctionListItems = 0x34d2,
+        AuctionListOwnerItems = 0x34d4,
+        AuctionListPendingSales = 0x34d7,
+        AuctionPlaceBid = 0x34d6,
+        AuctionRemoveItem = 0x34d1,
+        AuctionReplicateItems = 0x34d3,
+        AuctionSellItem = 0x34d0,
         AuthContinuedSession = 0x3766,
         AuthSession = 0x3765,
         AutobankItem = 0x3996,
@@ -58,94 +61,94 @@ namespace Framework.Constants
         AutoEquipItem = 0x399a,
         AutoEquipItemSlot = 0x399f,
         AutoStoreBagItem = 0x399b,
-        BankerActivate = 0x34b4,
+        BankerActivate = 0x34b6,
         BattlefieldLeave = 0x3171,
         BattlefieldList = 0x317d,
-        BattlefieldPort = 0x351b,
-        BattlemasterHello = 0x3293,
-        BattlemasterJoin = 0x3516,
-        BattlemasterJoinArena = 0x3517,
-        BattlemasterJoinBrawl = 0x3519,
-        BattlemasterJoinSkirmish = 0x3518,
-        BattlenetChallengeResponse = 0x36d5,
-        BattlenetRequest = 0x36f9,
-        BattlenetRequestRealmListTicket = 0x36fa,
-        BattlePayAckFailedResponse = 0x36cd,
-        BattlePayConfirmPurchaseResponse = 0x36cc,
-        BattlePayDistributionAssignToTarget = 0x36c3,
-        BattlePayGetProductList = 0x36be,
-        BattlePayGetPurchaseList = 0x36bf,
-        BattlePayQueryClassTrialBoostResult = 0x36c6,
-        BattlePayRequestCharacterBoostUnrevoke = 0x36c4,
+        BattlefieldPort = 0x3529,
+        BattlemasterHello = 0x329d,
+        BattlemasterJoin = 0x3524,
+        BattlemasterJoinArena = 0x3525,
+        BattlemasterJoinBrawl = 0x3527,
+        BattlemasterJoinSkirmish = 0x3526,
+        BattlenetChallengeResponse = 0x36d4,
+        BattlenetRequest = 0x36f8,
+        BattlenetRequestRealmListTicket = 0x36f9,
+        BattlePayAckFailedResponse = 0x36cc,
+        BattlePayConfirmPurchaseResponse = 0x36cb,
+        BattlePayDistributionAssignToTarget = 0x36c2,
+        BattlePayGetProductList = 0x36bc,
+        BattlePayGetPurchaseList = 0x36bd,
+        BattlePayQueryClassTrialBoostResult = 0x36c5,
+        BattlePayRequestCharacterBoostUnrevoke = 0x36c3,
         BattlePayRequestCurrentVasTransferQueues = 0x370a,
         BattlePayRequestPriceInfo = 0x3709,
         BattlePayRequestVasCharacterQueueTime = 0x370b,
-        BattlePayStartPurchase = 0x36f5,
-        BattlePayStartVasPurchase = 0x36f6,
-        BattlePayTrialBoostCharacter = 0x36c5,
+        BattlePayStartPurchase = 0x36f4,
+        BattlePayStartVasPurchase = 0x36f5,
+        BattlePayTrialBoostCharacter = 0x36c4,
         BattlePayValidateBnetVasTransfer = 0x370c,
         BattlePetClearFanfare = 0x312c,
-        BattlePetDeletePet = 0x3627,
-        BattlePetDeletePetCheat = 0x3628,
-        BattlePetModifyName = 0x362a,
-        BattlePetRequestJournal = 0x3626,
-        BattlePetRequestJournalLock = 0x3625,
-        BattlePetSetBattleSlot = 0x362e,
-        BattlePetSetFlags = 0x3632,
-        BattlePetSummon = 0x362b,
-        BattlePetUpdateNotify = 0x31ce,
+        BattlePetDeletePet = 0x3626,
+        BattlePetDeletePetCheat = 0x3627,
+        BattlePetModifyName = 0x3629,
+        BattlePetRequestJournal = 0x3625,
+        BattlePetRequestJournalLock = 0x3624,
+        BattlePetSetBattleSlot = 0x362d,
+        BattlePetSetFlags = 0x3631,
+        BattlePetSummon = 0x362a,
+        BattlePetUpdateNotify = 0x31d5,
         BeginTrade = 0x3157,
-        BinderActivate = 0x34b3,
-        BlackMarketBidOnItem = 0x3523,
-        BlackMarketOpen = 0x3521,
-        BlackMarketRequestItems = 0x3522,
-        BugReport = 0x3689,
+        BinderActivate = 0x34b5,
+        BlackMarketBidOnItem = 0x3531,
+        BlackMarketOpen = 0x352f,
+        BlackMarketRequestItems = 0x3530,
+        BugReport = 0x3688,
         BusyTrade = 0x3158,
-        BuyBackItem = 0x34a5,
-        BuyBankSlot = 0x34b5,
-        BuyItem = 0x34a4,
-        BuyReagentBank = 0x34b6,
-        BuyWowTokenConfirm = 0x36ee,
-        BuyWowTokenStart = 0x36ed,
-        CageBattlePet = 0x31df,
-        CalendarAddEvent = 0x3680,
-        CalendarComplain = 0x367c,
-        CalendarCopyEvent = 0x367b,
-        CalendarEventInvite = 0x3675,
-        CalendarEventModeratorStatus = 0x3679,
-        CalendarEventRsvp = 0x3677,
-        CalendarEventSignUp = 0x367e,
-        CalendarEventStatus = 0x3678,
-        CalendarGet = 0x3672,
-        CalendarGetEvent = 0x3673,
-        CalendarGetNumPending = 0x367d,
-        CalendarGuildFilter = 0x3674,
-        CalendarRemoveEvent = 0x367a,
-        CalendarRemoveInvite = 0x3676,
-        CalendarUpdateEvent = 0x3681,
-        CancelAura = 0x31a9,
-        CancelAutoRepeatSpell = 0x34dd,
-        CancelCast = 0x3283,
-        CancelChannelling = 0x324f,
-        CancelGrowthAura = 0x3254,
-        CancelMasterLootRoll = 0x31fe,
-        CancelModSpeedNoControlAuras = 0x31a8,
-        CancelMountAura = 0x3265,
+        BuyBackItem = 0x34a7,
+        BuyBankSlot = 0x34b7,
+        BuyItem = 0x34a6,
+        BuyReagentBank = 0x34b8,
+        BuyWowTokenConfirm = 0x36ed,
+        BuyWowTokenStart = 0x36ec,
+        CageBattlePet = 0x31e6,
+        CalendarAddEvent = 0x367f,
+        CalendarComplain = 0x367b,
+        CalendarCopyEvent = 0x367a,
+        CalendarEventInvite = 0x3674,
+        CalendarEventModeratorStatus = 0x3678,
+        CalendarEventRsvp = 0x3676,
+        CalendarEventSignUp = 0x367d,
+        CalendarEventStatus = 0x3677,
+        CalendarGet = 0x3671,
+        CalendarGetEvent = 0x3672,
+        CalendarGetNumPending = 0x367c,
+        CalendarGuildFilter = 0x3673,
+        CalendarRemoveEvent = 0x3679,
+        CalendarRemoveInvite = 0x3675,
+        CalendarUpdateEvent = 0x3680,
+        CancelAura = 0x31ac,
+        CancelAutoRepeatSpell = 0x34eb,
+        CancelCast = 0x328d,
+        CancelChannelling = 0x3258,
+        CancelGrowthAura = 0x325d,
+        CancelMasterLootRoll = 0x3206,
+        CancelModSpeedNoControlAuras = 0x31ab,
+        CancelMountAura = 0x326e,
         CancelQueuedSpell = 0x317e,
-        CancelTempEnchantment = 0x34e8,
+        CancelTempEnchantment = 0x34f6,
         CancelTrade = 0x315c,
-        CanDuel = 0x3665,
+        CanDuel = 0x3664,
         CanRedeemWowTokenForBalance = 0x3708,
-        CastSpell = 0x3280,
+        CastSpell = 0x328a,
         ChallengeModeRequestLeaders = 0x308f,
         ChallengeModeRequestMapStats = 0x308e,
-        ChangeBagSlotFlag = 0x3308,
-        ChangeMonumentAppearance = 0x32e8,
-        ChangeSubGroup = 0x364f,
-        CharacterRenameRequest = 0x36c1,
-        CharCustomize = 0x3691,
-        CharDelete = 0x369e,
-        CharRaceOrFactionChange = 0x3697,
+        ChangeBagSlotFlag = 0x330e,
+        ChangeMonumentAppearance = 0x32f0,
+        ChangeSubGroup = 0x364e,
+        CharacterRenameRequest = 0x36c0,
+        CharCustomize = 0x3690,
+        CharDelete = 0x369d,
+        CharRaceOrFactionChange = 0x3696,
         ChatAddonMessageChannel = 0x37d0,
         ChatAddonMessageGuild = 0x37d4,
         ChatAddonMessageInstanceChat = 0x37f3,
@@ -190,119 +193,119 @@ namespace Framework.Constants
         ChatReportFiltered = 0x37cc,
         ChatReportIgnored = 0x37cb,
         ChatUnregisterAllAddonPrefixes = 0x37ce,
-        CheckRafEmailEnabled = 0x36ce,
-        CheckWowTokenVeteranEligibility = 0x36ec,
-        ChoiceResponse = 0x3285,
+        CheckRafEmailEnabled = 0x36cd,
+        CheckWowTokenVeteranEligibility = 0x36eb,
+        ChoiceResponse = 0x328f,
         ClearRaidMarker = 0x31a1,
         ClearTradeItem = 0x315e,
-        ClientPortGraveyard = 0x351d,
-        CloseInteraction = 0x3492,
-        CollectionItemSetFavorite = 0x3635,
-        CommentatorEnable = 0x35f1,
-        CommentatorEnterInstance = 0x35f5,
-        CommentatorExitInstance = 0x35f6,
-        CommentatorGetMapInfo = 0x35f2,
-        CommentatorGetPlayerCooldowns = 0x35f4,
-        CommentatorGetPlayerInfo = 0x35f3,
-        CommentatorStartWargame = 0x35f0,
-        Complaint = 0x366f,
-        CompleteCinematic = 0x353b,
-        CompleteMovie = 0x34d3,
+        ClientPortGraveyard = 0x352b,
+        CloseInteraction = 0x3496,
+        CollectionItemSetFavorite = 0x3634,
+        CommentatorEnable = 0x35f0,
+        CommentatorEnterInstance = 0x35f4,
+        CommentatorExitInstance = 0x35f5,
+        CommentatorGetMapInfo = 0x35f1,
+        CommentatorGetPlayerCooldowns = 0x35f3,
+        CommentatorGetPlayerInfo = 0x35f2,
+        CommentatorStartWargame = 0x35ef,
+        Complaint = 0x366e,
+        CompleteCinematic = 0x3549,
+        CompleteMovie = 0x34e1,
         ConfirmArtifactRespec = 0x31a6,
-        ConfirmRespecWipe = 0x31f8,
+        ConfirmRespecWipe = 0x3200,
         ConnectToFailed = 0x35d4,
-        ContributionContribute = 0x354a,
-        ContributionGetState = 0x354b,
-        ConvertConsumptionTime = 0x36fc,
-        ConvertRaid = 0x3651,
-        CreateCharacter = 0x3646,
-        CreateShipment = 0x32d4,
+        ContributionContribute = 0x3558,
+        ContributionGetState = 0x3559,
+        ConvertConsumptionTime = 0x36fb,
+        ConvertRaid = 0x3650,
+        CreateCharacter = 0x3645,
+        CreateShipment = 0x32dc,
         DbQueryBulk = 0x35e4,
-        DeclineGuildInvites = 0x3514,
-        DeclinePetition = 0x352a,
-        DeleteEquipmentSet = 0x3502,
-        DelFriend = 0x36d3,
-        DelIgnore = 0x36d7,
-        DepositReagentBank = 0x3311,
-        DestroyItem = 0x3277,
-        DfBootPlayerVote = 0x3618,
-        DfGetJoinStatus = 0x3616,
-        DfGetSystemInfo = 0x3615,
-        DfJoin = 0x3609,
-        DfLeave = 0x3614,
-        DfProposalResponse = 0x3608,
-        DfReadyCheckResponse = 0x361b,
-        DfSetRoles = 0x3617,
-        DfTeleport = 0x3619,
+        DeclineGuildInvites = 0x3522,
+        DeclinePetition = 0x3538,
+        DeleteEquipmentSet = 0x3510,
+        DelFriend = 0x36d2,
+        DelIgnore = 0x36d6,
+        DepositReagentBank = 0x3317,
+        DestroyItem = 0x3281,
+        DfBootPlayerVote = 0x3617,
+        DfGetJoinStatus = 0x3615,
+        DfGetSystemInfo = 0x3614,
+        DfJoin = 0x3608,
+        DfLeave = 0x3613,
+        DfProposalResponse = 0x3607,
+        DfReadyCheckResponse = 0x361a,
+        DfSetRoles = 0x3616,
+        DfTeleport = 0x3618,
         DiscardedTimeSyncAcks = 0x3a3c,
-        DismissCritter = 0x34f1,
-        DoMasterLootRoll = 0x31fd,
-        DoReadyCheck = 0x3636,
-        DuelResponse = 0x34d8,
-        EjectPassenger = 0x3226,
-        Emote = 0x3537,
+        DismissCritter = 0x34ff,
+        DoMasterLootRoll = 0x3205,
+        DoReadyCheck = 0x3635,
+        DuelResponse = 0x34e6,
+        EjectPassenger = 0x322e,
+        Emote = 0x3545,
         EnableEncryptionAck = 0x3767,
         EnableNagle = 0x376b,
-        EnableTaxiNode = 0x34aa,
-        EngineSurvey = 0x36e6,
+        EnableTaxiNode = 0x34ac,
+        EngineSurvey = 0x36e5,
         EnumCharacters = 0x35e8,
-        EnumCharactersDeletedByClient = 0x36e0,
-        FarSight = 0x34de,
-        GameObjReportUse = 0x34e5,
-        GameObjUse = 0x34e4,
-        GarrisonAssignFollowerToBuilding = 0x32bf,
-        GarrisonCancelConstruction = 0x32b0,
-        GarrisonCheckUpgradeable = 0x3304,
-        GarrisonCompleteMission = 0x32f5,
-        GarrisonGenerateRecruits = 0x32c2,
-        GarrisonGetBuildingLandmarks = 0x32d0,
-        GarrisonGetMissionReward = 0x332b,
-        GarrisonMissionBonusRoll = 0x32f7,
-        GarrisonPurchaseBuilding = 0x32ac,
-        GarrisonRecruitFollower = 0x32c4,
-        GarrisonRemoveFollower = 0x32ec,
-        GarrisonRemoveFollowerFromBuilding = 0x32c0,
-        GarrisonRenameFollower = 0x32c1,
-        GarrisonRequestBlueprintAndSpecializationData = 0x32ab,
-        GarrisonRequestClassSpecCategoryInfo = 0x32c9,
-        GarrisonRequestLandingPageShipmentInfo = 0x32d3,
-        GarrisonRequestShipmentInfo = 0x32d2,
-        GarrisonResearchTalent = 0x32c5,
-        GarrisonSetBuildingActive = 0x32ad,
-        GarrisonSetFollowerFavorite = 0x32bd,
-        GarrisonSetFollowerInactive = 0x32b9,
-        GarrisonSetRecruitmentPreferences = 0x32c3,
-        GarrisonStartMission = 0x32f4,
-        GarrisonSwapBuildings = 0x32b1,
+        EnumCharactersDeletedByClient = 0x36df,
+        FarSight = 0x34ec,
+        GameObjReportUse = 0x34f3,
+        GameObjUse = 0x34f2,
+        GarrisonAssignFollowerToBuilding = 0x32c7,
+        GarrisonCancelConstruction = 0x32b8,
+        GarrisonCheckUpgradeable = 0x330a,
+        GarrisonCompleteMission = 0x32fd,
+        GarrisonGenerateRecruits = 0x32ca,
+        GarrisonGetBuildingLandmarks = 0x32d8,
+        GarrisonGetMissionReward = 0x3331,
+        GarrisonMissionBonusRoll = 0x32ff,
+        GarrisonPurchaseBuilding = 0x32b4,
+        GarrisonRecruitFollower = 0x32cc,
+        GarrisonRemoveFollower = 0x32f4,
+        GarrisonRemoveFollowerFromBuilding = 0x32c8,
+        GarrisonRenameFollower = 0x32c9,
+        GarrisonRequestBlueprintAndSpecializationData = 0x32b3,
+        GarrisonRequestClassSpecCategoryInfo = 0x32d1,
+        GarrisonRequestLandingPageShipmentInfo = 0x32db,
+        GarrisonRequestShipmentInfo = 0x32da,
+        GarrisonResearchTalent = 0x32cd,
+        GarrisonSetBuildingActive = 0x32b5,
+        GarrisonSetFollowerFavorite = 0x32c5,
+        GarrisonSetFollowerInactive = 0x32c1,
+        GarrisonSetRecruitmentPreferences = 0x32cb,
+        GarrisonStartMission = 0x32fc,
+        GarrisonSwapBuildings = 0x32b9,
         GenerateRandomCharacterName = 0x35e7,
-        GetChallengeModeRewards = 0x3686,
-        GetGarrisonInfo = 0x32a6,
-        GetItemPurchaseData = 0x3525,
-        GetMirrorImageData = 0x327b,
-        GetPvpOptionsEnabled = 0x35ef,
-        GetRemainingGameTime = 0x36ef,
-        GetTrophyList = 0x32e5,
-        GetUndeleteCharacterCooldownStatus = 0x36e2,
-        GmTicketAcknowledgeSurvey = 0x3695,
-        GmTicketGetCaseStatus = 0x3694,
-        GmTicketGetSystemStatus = 0x3693,
-        GossipSelectOption = 0x3493,
-        GrantLevel = 0x34ed,
+        GetChallengeModeRewards = 0x3685,
+        GetGarrisonInfo = 0x32ae,
+        GetItemPurchaseData = 0x3533,
+        GetMirrorImageData = 0x3285,
+        GetPvpOptionsEnabled = 0x35ee,
+        GetRemainingGameTime = 0x36ee,
+        GetTrophyList = 0x32ed,
+        GetUndeleteCharacterCooldownStatus = 0x36e1,
+        GmTicketAcknowledgeSurvey = 0x3694,
+        GmTicketGetCaseStatus = 0x3693,
+        GmTicketGetSystemStatus = 0x3692,
+        GossipSelectOption = 0x3497,
+        GrantLevel = 0x34fb,
         GuildAddBattlenetFriend = 0x308d,
         GuildAddRank = 0x3064,
         GuildAssignMemberRank = 0x305f,
         GuildAutoDeclineInvitation = 0x3061,
-        GuildBankActivate = 0x34b7,
-        GuildBankBuyTab = 0x34ba,
-        GuildBankDepositMoney = 0x34bc,
+        GuildBankActivate = 0x34b9,
+        GuildBankBuyTab = 0x34c8,
+        GuildBankDepositMoney = 0x34ca,
         GuildBankLogQuery = 0x3082,
-        GuildBankQueryTab = 0x34b9,
+        GuildBankQueryTab = 0x34c7,
         GuildBankRemainingWithdrawMoneyQuery = 0x3083,
         GuildBankSetTabText = 0x3086,
-        GuildBankSwapItems = 0x34b8,
+        GuildBankSwapItems = 0x34ba,
         GuildBankTextQuery = 0x3087,
-        GuildBankUpdateTab = 0x34bb,
-        GuildBankWithdrawMoney = 0x34bd,
+        GuildBankUpdateTab = 0x34c9,
+        GuildBankWithdrawMoney = 0x34cb,
         GuildChallengeUpdateRequest = 0x307b,
         GuildChangeNameRequest = 0x307e,
         GuildDeclineInvitation = 0x3060,
@@ -313,7 +316,7 @@ namespace Framework.Constants
         GuildGetAchievementMembers = 0x3071,
         GuildGetRanks = 0x306d,
         GuildGetRoster = 0x3073,
-        GuildInviteByName = 0x3607,
+        GuildInviteByName = 0x3606,
         GuildLeave = 0x3062,
         GuildMemberSendSorRequest = 0x308c,
         GuildNewsUpdateSticky = 0x306e,
@@ -327,79 +330,79 @@ namespace Framework.Constants
         GuildReplaceGuildMaster = 0x3088,
         GuildSetAchievementTracking = 0x306f,
         GuildSetFocusedAchievement = 0x3070,
-        GuildSetGuildMaster = 0x36c8,
+        GuildSetGuildMaster = 0x36c7,
         GuildSetMemberNote = 0x3072,
         GuildSetRankPermissions = 0x3067,
         GuildShiftRank = 0x3066,
         GuildUpdateInfoText = 0x3075,
         GuildUpdateMotdText = 0x3074,
-        HearthAndResurrect = 0x34fe,
-        HotfixQuery = 0x35e5,
+        HearthAndResurrect = 0x350c,
+        HotfixRequest = 0x35e5,
         IgnoreTrade = 0x3159,
         InitiateRolePoll = 0x35da,
         InitiateTrade = 0x3156,
-        Inspect = 0x351f,
-        InspectPvp = 0x36a4,
-        InstanceLockResponse = 0x3503,
-        ItemPurchaseRefund = 0x3526,
-        ItemTextQuery = 0x3305,
-        JoinPetBattleQueue = 0x31cc,
+        Inspect = 0x352d,
+        InspectPvp = 0x36a3,
+        InstanceLockResponse = 0x3511,
+        ItemPurchaseRefund = 0x3534,
+        ItemTextQuery = 0x330b,
+        JoinPetBattleQueue = 0x31d3,
         JoinRatedBattleground = 0x3176,
-        KeepAlive = 0x3682,
-        KeyboundOverride = 0x320f,
-        LearnPvpTalents = 0x3549,
-        LearnTalents = 0x3548,
-        LeaveGroup = 0x364c,
-        LeavePetBattleQueue = 0x31cd,
-        LfgListApplyToGroup = 0x360f,
-        LfgListCancelApplication = 0x3610,
-        LfgListDeclineApplicant = 0x3611,
-        LfgListGetStatus = 0x360d,
-        LfgListInviteApplicant = 0x3612,
-        LfgListInviteResponse = 0x3613,
-        LfgListJoin = 0x360a,
-        LfgListLeave = 0x360c,
-        LfgListSearch = 0x360e,
-        LfgListUpdateRequest = 0x360b,
-        LfGuildAddRecruit = 0x361e,
-        LfGuildBrowse = 0x3620,
+        KeepAlive = 0x3681,
+        KeyboundOverride = 0x3217,
+        LearnPvpTalents = 0x3557,
+        LearnTalents = 0x3556,
+        LeaveGroup = 0x364b,
+        LeavePetBattleQueue = 0x31d4,
+        LfgListApplyToGroup = 0x360e,
+        LfgListCancelApplication = 0x360f,
+        LfgListDeclineApplicant = 0x3610,
+        LfgListGetStatus = 0x360c,
+        LfgListInviteApplicant = 0x3611,
+        LfgListInviteResponse = 0x3612,
+        LfgListJoin = 0x3609,
+        LfgListLeave = 0x360b,
+        LfgListSearch = 0x360d,
+        LfgListUpdateRequest = 0x360a,
+        LfGuildAddRecruit = 0x361d,
+        LfGuildBrowse = 0x361f,
         LfGuildDeclineRecruit = 0x3078,
         LfGuildGetApplications = 0x3079,
         LfGuildGetGuildPost = 0x3076,
         LfGuildGetRecruits = 0x3077,
         LfGuildRemoveRecruit = 0x307a,
-        LfGuildSetGuildPost = 0x361f,
-        ListInventory = 0x34a2,
-        LiveRegionAccountRestore = 0x36bd,
-        LiveRegionCharacterCopy = 0x36bc,
-        LiveRegionGetAccountCharacterList = 0x36bb,
-        LoadingScreenNotify = 0x35f9,
-        LoadSelectedTrophy = 0x32e6,
-        LogoutCancel = 0x34ce,
-        LogoutInstant = 0x34cf,
-        LogoutRequest = 0x34cd,
+        LfGuildSetGuildPost = 0x361e,
+        ListInventory = 0x34a4,
+        LiveRegionAccountRestore = 0x36bb,
+        LiveRegionCharacterCopy = 0x36ba,
+        LiveRegionGetAccountCharacterList = 0x36b9,
+        LoadingScreenNotify = 0x35f8,
+        LoadSelectedTrophy = 0x32ee,
+        LogoutCancel = 0x34dc,
+        LogoutInstant = 0x34dd,
+        LogoutRequest = 0x34db,
         LogDisconnect = 0x3769,
         LogStreamingError = 0x376d,
-        LootItem = 0x31fb,
-        LootMoney = 0x31fa,
-        LootRelease = 0x31ff,
-        LootRoll = 0x3200,
-        LootUnit = 0x31f9,
-        LowLevelRaid1 = 0x36a2,
-        LowLevelRaid2 = 0x350a,
-        MailCreateTextItem = 0x3531,
-        MailDelete = 0x3211,
-        MailGetList = 0x352c,
-        MailMarkAsRead = 0x3530,
-        MailReturnToSender = 0x3658,
-        MailTakeItem = 0x352e,
-        MailTakeMoney = 0x352d,
-        MasterLootItem = 0x31fc,
-        MinimapPing = 0x364e,
+        LootItem = 0x3203,
+        LootMoney = 0x3202,
+        LootRelease = 0x3207,
+        LootRoll = 0x3208,
+        LootUnit = 0x3201,
+        LowLevelRaid1 = 0x36a1,
+        LowLevelRaid2 = 0x3518,
+        MailCreateTextItem = 0x353f,
+        MailDelete = 0x3219,
+        MailGetList = 0x353a,
+        MailMarkAsRead = 0x353e,
+        MailReturnToSender = 0x3657,
+        MailTakeItem = 0x353c,
+        MailTakeMoney = 0x353b,
+        MasterLootItem = 0x3204,
+        MinimapPing = 0x364d,
         MissileTrajectoryCollision = 0x3189,
         MountClearFanfare = 0x312d,
-        MountSetFavorite = 0x3634,
-        MountSpecialAnim = 0x3266,
+        MountSetFavorite = 0x3633,
+        MountSpecialAnim = 0x326f,
         MoveApplyMovementForceAck = 0x3a12,
         MoveChangeTransport = 0x3a2c,
         MoveChangeVehicleSeats = 0x3a31,
@@ -461,267 +464,268 @@ namespace Framework.Constants
         MoveTimeSkipped = 0x3a18,
         MoveToggleCollisionCheat = 0x3a05,
         MoveWaterWalkAck = 0x3a1a,
-        NeutralPlayerSelectFaction = 0x31c2,
-        NextCinematicCamera = 0x353a,
+        NeutralPlayerSelectFaction = 0x31c9,
+        NextCinematicCamera = 0x3548,
         ObjectUpdateFailed = 0x317f,
         ObjectUpdateRescued = 0x3180,
-        OfferPetition = 0x36b2,
-        OpeningCinematic = 0x3539,
-        OpenItem = 0x3306,
-        OpenMissionNpc = 0x32cb,
-        OpenShipmentNpc = 0x32d1,
-        OpenTradeskillNpc = 0x32dc,
-        OptOutOfLoot = 0x34ec,
-        PartyInvite = 0x3603,
-        PartyInviteResponse = 0x3604,
-        PartyUninvite = 0x364a,
-        PetitionBuy = 0x34bf,
-        PetitionRenameGuild = 0x36c9,
-        PetitionShowList = 0x34be,
-        PetitionShowSignatures = 0x34c0,
-        PetAbandon = 0x348c,
-        PetAction = 0x348a,
-        PetBattleFinalNotify = 0x31d0,
-        PetBattleInput = 0x3643,
-        PetBattleQueueProposeMatchResult = 0x3210,
-        PetBattleQuitNotify = 0x31cf,
-        PetBattleReplaceFrontPet = 0x3644,
-        PetBattleRequestPvp = 0x31ca,
-        PetBattleRequestUpdate = 0x31cb,
-        PetBattleRequestWild = 0x31c8,
-        PetBattleScriptErrorNotify = 0x31d1,
-        PetBattleWildLocationFail = 0x31c9,
-        PetCancelAura = 0x348d,
-        PetCastSpell = 0x327f,
-        PetRename = 0x3688,
-        PetSetAction = 0x3489,
-        PetSpellAutocast = 0x348e,
-        PetStopAttack = 0x348b,
+        OfferPetition = 0x36b1,
+        OpeningCinematic = 0x3547,
+        OpenItem = 0x330c,
+        OpenMissionNpc = 0x32d3,
+        OpenShipmentNpc = 0x32d9,
+        OpenTradeskillNpc = 0x32e4,
+        OptOutOfLoot = 0x34fa,
+        PartyInvite = 0x3602,
+        PartyInviteResponse = 0x3603,
+        PartyUninvite = 0x3649,
+        PetitionBuy = 0x34cd,
+        PetitionRenameGuild = 0x36c8,
+        PetitionShowList = 0x34cc,
+        PetitionShowSignatures = 0x34ce,
+        PetAbandon = 0x3490,
+        PetAction = 0x348e,
+        PetBattleFinalNotify = 0x31d7,
+        PetBattleInput = 0x3642,
+        PetBattleQueueProposeMatchResult = 0x3218,
+        PetBattleQuitNotify = 0x31d6,
+        PetBattleReplaceFrontPet = 0x3643,
+        PetBattleRequestPvp = 0x31d1,
+        PetBattleRequestUpdate = 0x31d2,
+        PetBattleRequestWild = 0x31cf,
+        PetBattleScriptErrorNotify = 0x31d8,
+        PetBattleWildLocationFail = 0x31d0,
+        PetCancelAura = 0x3491,
+        PetCastSpell = 0x3289,
+        PetRename = 0x3687,
+        PetSetAction = 0x348d,
+        PetSpellAutocast = 0x3492,
+        PetStopAttack = 0x348f,
         Ping = 0x3768,
         PlayerLogin = 0x35ea,
         ProtocolMismatch = 0x376e,
-        PushQuestToParty = 0x34a0,
+        PushQuestToParty = 0x34a2,
         PvpLogData = 0x317a,
-        PvpPrestigeRankUp = 0x3329,
-        QueryBattlePetName = 0x325b,
-        QueryCorpseLocationFromClient = 0x3663,
-        QueryCorpseTransport = 0x3664,
+        PvpPrestigeRankUp = 0x332f,
+        QueryBattlePetName = 0x3264,
+        QueryCorpseLocationFromClient = 0x3662,
+        QueryCorpseTransport = 0x3663,
         QueryCountdownTimer = 0x31a4,
-        QueryCreature = 0x3255,
-        QueryGameObject = 0x3256,
-        QueryGarrisonCreatureName = 0x325c,
-        QueryGuildInfo = 0x3690,
-        QueryInspectAchievements = 0x34f8,
-        QueryNextMailTime = 0x352f,
-        QueryNpcText = 0x3257,
-        QueryPageText = 0x3259,
-        QueryPetition = 0x325d,
-        QueryPetName = 0x325a,
-        QueryPlayerName = 0x368e,
+        QueryCreature = 0x325e,
+        QueryGameObject = 0x325f,
+        QueryGarrisonCreatureName = 0x3265,
+        QueryGuildInfo = 0x368f,
+        QueryInspectAchievements = 0x3506,
+        QueryNextMailTime = 0x353d,
+        QueryNpcText = 0x3260,
+        QueryPageText = 0x3262,
+        QueryPetition = 0x3266,
+        QueryPetName = 0x3263,
+        QueryPlayerName = 0x368d,
         QueryQuestCompletionNpcs = 0x3173,
-        QueryQuestInfo = 0x3258,
-        QueryQuestRewards = 0x332d,
-        QueryRealmName = 0x368f,
-        QueryScenarioPoi = 0x3659,
-        QueryTime = 0x34cc,
+        QueryQuestInfo = 0x3261,
+        QueryQuestRewards = 0x3333,
+        QueryRealmName = 0x368e,
+        QueryScenarioPoi = 0x3658,
+        QueryTime = 0x34da,
         QueryVoidStorage = 0x319d,
-        QuestConfirmAccept = 0x349f,
-        QuestGiverAcceptQuest = 0x3498,
-        QuestGiverChooseReward = 0x349b,
-        QuestGiverCompleteQuest = 0x3499,
-        QuestGiverHello = 0x3495,
-        QuestGiverQueryQuest = 0x3496,
-        QuestGiverRequestReward = 0x349c,
-        QuestGiverStatusMultipleQuery = 0x349e,
-        QuestGiverStatusQuery = 0x349d,
-        QuestLogRemoveQuest = 0x3524,
-        QuestPoiQuery = 0x36b3,
-        QuestPushResult = 0x34a1,
+        QuestConfirmAccept = 0x34a1,
+        QuestGiverAcceptQuest = 0x349b,
+        QuestGiverChooseReward = 0x349d,
+        QuestGiverCompleteQuest = 0x349c,
+        QuestGiverHello = 0x3499,
+        QuestGiverQueryQuest = 0x349a,
+        QuestGiverRequestReward = 0x349e,
+        QuestGiverStatusMultipleQuery = 0x34a0,
+        QuestGiverStatusQuery = 0x349f,
+        QuestLogRemoveQuest = 0x3532,
+        QuestPoiQuery = 0x36b2,
+        QuestPushResult = 0x34a3,
         QueuedMessagesEnd = 0x376c,
         QuickJoinAutoAcceptRequests = 0x3707,
         QuickJoinRequestInvite = 0x3706,
         QuickJoinRespondToInvite = 0x3705,
         QuickJoinSignalToastDisplayed = 0x3704,
-        RaidOrBattlegroundEngineSurvey = 0x36e7,
-        RandomRoll = 0x3657,
-        ReadyCheckResponse = 0x3637,
-        ReadItem = 0x3307,
-        ReclaimCorpse = 0x34d1,
-        RecruitAFriend = 0x36cf,
-        RedeemWowTokenConfirm = 0x36f1,
-        RedeemWowTokenStart = 0x36f0,
-        RemoveNewItem = 0x3330,
+        RaidOrBattlegroundEngineSurvey = 0x36e6,
+        RandomRoll = 0x3656,
+        ReadyCheckResponse = 0x3636,
+        ReadItem = 0x330d,
+        ReclaimCorpse = 0x34df,
+        RecruitAFriend = 0x36ce,
+        RedeemWowTokenConfirm = 0x36f0,
+        RedeemWowTokenStart = 0x36ef,
+        RemoveNewItem = 0x3336,
         ReorderCharacters = 0x35e9,
-        RepairItem = 0x34e2,
-        ReplaceTrophy = 0x32e7,
-        RepopRequest = 0x351c,
-        ReportPvpPlayerAfk = 0x34ea,
-        RequestAccountData = 0x3698,
-        RequestAreaPoiUpdate = 0x332f,
+        RepairItem = 0x34f0,
+        ReplaceTrophy = 0x32ef,
+        RepopRequest = 0x352a,
+        ReportClientVariables = 0x3701,
+        ReportEnabledAddons = 0x3700,
+        ReportKeybindingExecutionCounts = 0x3702,
+        ReportPvpPlayerAfk = 0x34f8,
+        RequestAccountData = 0x3697,
+        RequestAreaPoiUpdate = 0x3335,
         RequestBattlefieldStatus = 0x35dc,
         RequestCategoryCooldowns = 0x317c,
         RequestCemeteryList = 0x3174,
-        RequestConquestFormulaConstants = 0x3296,
-        RequestConsumptionConversionInfo = 0x36fb,
-        RequestCrowdControlSpell = 0x3520,
-        RequestForcedReactions = 0x31f4,
+        RequestConquestFormulaConstants = 0x32a0,
+        RequestConsumptionConversionInfo = 0x36fa,
+        RequestCrowdControlSpell = 0x352e,
+        RequestForcedReactions = 0x31fc,
         RequestGuildPartyState = 0x31a3,
         RequestGuildRewardsList = 0x31a2,
         RequestHonorStats = 0x3179,
-        RequestLfgListBlacklist = 0x3287,
-        RequestPartyJoinUpdates = 0x35f8,
-        RequestPartyMemberStats = 0x3656,
-        RequestPetInfo = 0x348f,
-        RequestPlayedTime = 0x3260,
+        RequestLfgListBlacklist = 0x3291,
+        RequestPartyJoinUpdates = 0x35f7,
+        RequestPartyMemberStats = 0x3655,
+        RequestPetInfo = 0x3493,
+        RequestPlayedTime = 0x3269,
         RequestPvpBrawlInfo = 0x3191,
         RequestPvpRewards = 0x3190,
-        RequestRaidInfo = 0x36ca,
+        RequestRaidInfo = 0x36c9,
         RequestRatedBattlefieldInfo = 0x35e3,
         RequestResearchHistory = 0x3167,
-        RequestStabledPets = 0x3490,
-        RequestVehicleExit = 0x3221,
-        RequestVehicleNextSeat = 0x3223,
-        RequestVehiclePrevSeat = 0x3222,
-        RequestVehicleSwitchSeat = 0x3224,
-        RequestWorldQuestUpdate = 0x332e,
-        RequestWowTokenMarketPrice = 0x36e9,
-        ResetChallengeMode = 0x31f1,
-        ResetChallengeModeCheat = 0x31f2,
-        ResetInstances = 0x366b,
-        ResurrectResponse = 0x3687,
-        RevertMonumentAppearance = 0x32e9,
-        RideVehicleInteract = 0x3225,
-        SaveClientVariables = 0x3702,
+        RequestStabledPets = 0x3494,
+        RequestVehicleExit = 0x3229,
+        RequestVehicleNextSeat = 0x322b,
+        RequestVehiclePrevSeat = 0x322a,
+        RequestVehicleSwitchSeat = 0x322c,
+        RequestWorldQuestUpdate = 0x3334,
+        RequestWowTokenMarketPrice = 0x36e8,
+        ResetChallengeMode = 0x31f9,
+        ResetChallengeModeCheat = 0x31fa,
+        ResetInstances = 0x366a,
+        ResurrectResponse = 0x3686,
+        RevertMonumentAppearance = 0x32f1,
+        RideVehicleInteract = 0x322d,
         SaveCufProfiles = 0x318a,
-        SaveEnabledAddons = 0x3701,
-        SaveEquipmentSet = 0x3501,
-        SaveGuildEmblem = 0x328b,
-        ScenePlaybackCanceled = 0x320c,
-        ScenePlaybackComplete = 0x320b,
-        SceneTriggerEvent = 0x320d,
-        SelfRes = 0x3527,
-        SellItem = 0x34a3,
-        SellWowTokenConfirm = 0x36eb,
-        SellWowTokenStart = 0x36ea,
-        SendContactList = 0x36d1,
-        SendMail = 0x35fb,
-        SendSorRequestViaAddress = 0x3623,
-        SendTextEmote = 0x3486,
-        SetAchievementsHidden = 0x3212,
-        SetActionBarToggles = 0x3528,
-        SetActionButton = 0x3638,
+        SaveEquipmentSet = 0x350f,
+        SaveGuildEmblem = 0x3295,
+        ScenePlaybackCanceled = 0x3214,
+        ScenePlaybackComplete = 0x3213,
+        SceneTriggerEvent = 0x3215,
+        SelfRes = 0x3535,
+        SellItem = 0x34a5,
+        SellWowTokenConfirm = 0x36ea,
+        SellWowTokenStart = 0x36e9,
+        SendContactList = 0x36d0,
+        SendMail = 0x35fa,
+        SendSorRequestViaAddress = 0x3622,
+        SendTextEmote = 0x348a,
+        SetAchievementsHidden = 0x321a,
+        SetActionBarToggles = 0x3536,
+        SetActionButton = 0x3637,
         SetActiveMover = 0x3a37,
-        SetAdvancedCombatLogging = 0x3297,
-        SetAssistantLeader = 0x3652,
-        SetBackpackAutosortDisabled = 0x330a,
-        SetBankAutosortDisabled = 0x330b,
-        SetBankBagSlotFlag = 0x3309,
-        SetContactNotes = 0x36d4,
+        SetAdvancedCombatLogging = 0x32a1,
+        SetAssistantLeader = 0x3651,
+        SetBackpackAutosortDisabled = 0x3310,
+        SetBankAutosortDisabled = 0x3311,
+        SetBankBagSlotFlag = 0x330f,
+        SetContactNotes = 0x36d3,
         SetCurrencyFlags = 0x3169,
-        SetDifficultyId = 0x320e,
-        SetDungeonDifficulty = 0x3685,
-        SetEveryoneIsAssistant = 0x361a,
-        SetFactionAtWar = 0x34d4,
-        SetFactionInactive = 0x34d6,
-        SetFactionNotAtWar = 0x34d5,
-        SetInsertItemsLeftToRight = 0x330d,
-        SetLfgBonusFactionId = 0x3286,
-        SetLootMethod = 0x364b,
-        SetLootSpecialization = 0x3535,
-        SetPartyAssignment = 0x3654,
-        SetPartyLeader = 0x364d,
+        SetDifficultyId = 0x3216,
+        SetDungeonDifficulty = 0x3684,
+        SetEveryoneIsAssistant = 0x3619,
+        SetFactionAtWar = 0x34e2,
+        SetFactionInactive = 0x34e4,
+        SetFactionNotAtWar = 0x34e3,
+        SetInsertItemsLeftToRight = 0x3313,
+        SetLfgBonusFactionId = 0x3290,
+        SetLootMethod = 0x364a,
+        SetLootSpecialization = 0x3543,
+        SetPartyAssignment = 0x3653,
+        SetPartyLeader = 0x364c,
         SetPetSlot = 0x3168,
-        SetPlayerDeclinedNames = 0x368d,
+        SetPlayerDeclinedNames = 0x368c,
         SetPreferredCemetery = 0x3175,
-        SetPvp = 0x328f,
-        SetRaidDifficulty = 0x36de,
+        SetPvp = 0x3299,
+        SetRaidDifficulty = 0x36dd,
         SetRole = 0x35d9,
-        SetSavedInstanceExtend = 0x368b,
-        SetSelection = 0x351e,
-        SetSheathed = 0x3487,
-        SetSortBagsRightToLeft = 0x330c,
-        SetTaxiBenchmarkMode = 0x34e9,
-        SetTitle = 0x3264,
+        SetSavedInstanceExtend = 0x368a,
+        SetSelection = 0x352c,
+        SetSheathed = 0x348b,
+        SetSortBagsRightToLeft = 0x3312,
+        SetTaxiBenchmarkMode = 0x34f7,
+        SetTitle = 0x326d,
         SetTradeCurrency = 0x3160,
         SetTradeGold = 0x315f,
         SetTradeItem = 0x315d,
-        SetUsingPartyGarrison = 0x32cd,
-        SetWatchedFaction = 0x34d7,
-        ShowTradeSkill = 0x36c2,
-        SignPetition = 0x3529,
-        SilencePartyTalker = 0x3655,
-        SocketGems = 0x34e1,
-        SortBags = 0x330e,
-        SortBankBags = 0x330f,
-        SortReagentBankBags = 0x3310,
-        SpellClick = 0x3494,
-        SpiritHealerActivate = 0x34b0,
+        SetUsingPartyGarrison = 0x32d5,
+        SetWatchedFaction = 0x34e5,
+        ShowTradeSkill = 0x36c1,
+        SignPetition = 0x3537,
+        SilencePartyTalker = 0x3654,
+        SocketGems = 0x34ef,
+        SortBags = 0x3314,
+        SortBankBags = 0x3315,
+        SortReagentBankBags = 0x3316,
+        SpellClick = 0x3498,
+        SpiritHealerActivate = 0x34b2,
         SplitItem = 0x399e,
         StandStateChange = 0x3188,
-        StartChallengeMode = 0x3540,
+        StartChallengeMode = 0x354e,
         StartSpectatorWarGame = 0x35df,
         StartWarGame = 0x35de,
-        SummonResponse = 0x366d,
-        SupportTicketSubmitBug = 0x3648,
-        SupportTicketSubmitComplaint = 0x3647,
-        SupportTicketSubmitSuggestion = 0x3649,
+        SummonResponse = 0x366c,
+        SupportTicketSubmitBug = 0x3647,
+        SupportTicketSubmitComplaint = 0x3646,
+        SupportTicketSubmitSuggestion = 0x3648,
         SurrenderArena = 0x3172,
         SuspendCommsAck = 0x3764,
         SuspendTokenResponse = 0x376a,
         SwapInvItem = 0x399d,
         SwapItem = 0x399c,
-        SwapSubGroups = 0x3650,
+        SwapSubGroups = 0x364f,
         SwapVoidItem = 0x319f,
-        TabardVendorActivate = 0x328c,
-        TalkToGossip = 0x3491,
-        TaxiNodeStatusQuery = 0x34a9,
-        TaxiQueryAvailableNodes = 0x34ab,
-        TaxiRequestEarlyLanding = 0x34ad,
+        TabardVendorActivate = 0x3296,
+        TalkToGossip = 0x3495,
+        TaxiNodeStatusQuery = 0x34ab,
+        TaxiQueryAvailableNodes = 0x34ad,
+        TaxiRequestEarlyLanding = 0x34af,
         TimeAdjustmentResponse = 0x3a3b,
         TimeSyncResponse = 0x3a38,
         TimeSyncResponseDropped = 0x3a3a,
         TimeSyncResponseFailed = 0x3a39,
-        ToggleDifficulty = 0x365a,
-        TogglePvp = 0x328e,
-        TotemDestroyed = 0x34f0,
-        TradeSkillSetFavorite = 0x332c,
-        TrainerBuySpell = 0x34af,
-        TrainerList = 0x34ae,
+        ToggleDifficulty = 0x3659,
+        TogglePvp = 0x3298,
+        TotemDestroyed = 0x34fe,
+        TradeSkillSetFavorite = 0x3332,
+        TrainerBuySpell = 0x34b1,
+        TrainerList = 0x34b0,
         TransmogrifyItems = 0x3192,
-        TurnInPetition = 0x352b,
-        Tutorial = 0x36df,
+        TurnInPetition = 0x3539,
+        Tutorial = 0x36de,
         TwitterCheckStatus = 0x312a,
         TwitterConnect = 0x3127,
         TwitterDisconnect = 0x312b,
-        TwitterPost = 0x3312,
-        UiTimeRequest = 0x369d,
+        TwitterPost = 0x3318,
+        UiTimeRequest = 0x369c,
         UnacceptTrade = 0x315b,
-        UndeleteCharacter = 0x36e1,
-        UnlearnSkill = 0x34db,
+        UndeleteCharacter = 0x36e0,
+        UnlearnSkill = 0x34e9,
         UnlearnSpecialization = 0x31a0,
         UnlockVoidStorage = 0x319c,
-        UpdateAccountData = 0x3699,
-        UpdateAreaTriggerVisual = 0x3282,
-        UpdateClientSettings = 0x3667,
+        UpdateAccountData = 0x3698,
+        UpdateAreaTriggerVisual = 0x328c,
+        UpdateClientSettings = 0x3666,
         UpdateMissileTrajectory = 0x3a3e,
-        UpdateRaidTarget = 0x3653,
-        UpdateSpellVisual = 0x3281,
-        UpdateVasPurchaseStates = 0x36f7,
-        UpdateWowTokenAuctionableList = 0x36f2,
-        UpdateWowTokenCount = 0x36e8,
-        UpgradeGarrison = 0x329f,
-        UpgradeItem = 0x3213,
+        UpdateRaidTarget = 0x3652,
+        UpdateSpellVisual = 0x328b,
+        UpdateVasPurchaseStates = 0x36f6,
+        UpdateWowTokenAuctionableList = 0x36f1,
+        UpdateWowTokenCount = 0x36e7,
+        UpgradeGarrison = 0x32a9,
+        UpgradeItem = 0x321b,
         UsedFollow = 0x3185,
-        UseCritterItem = 0x322c,
+        UseCritterItem = 0x3234,
         UseEquipmentSet = 0x3995,
-        UseItem = 0x327c,
-        UseToy = 0x327e,
+        UseItem = 0x3286,
+        UseToy = 0x3288,
         ViolenceLevel = 0x3183,
         VoidStorageTransfer = 0x319e,
         WardenData = 0x35ec,
-        Who = 0x3684,
-        WhoIs = 0x3683,
-        WorldPortResponse = 0x35fa,
+        Who = 0x3683,
+        WhoIs = 0x3682,
+        WorldPortResponse = 0x35f9,
         WrapItem = 0x3994,
 
         Max = 0x3FFF,
@@ -730,188 +734,190 @@ namespace Framework.Constants
 
     public enum ServerOpcodes : uint
     {
-        AbortNewWorld = 0x25ae,
-        AccountCriteriaUpdate = 0x2654,
-        AccountDataTimes = 0x274b,
-        AccountMountUpdate = 0x25c4,
-        AccountToysUpdate = 0x25c5,
-        AchievementDeleted = 0x2720,
-        AchievementEarned = 0x2662,
-        ActivateTaxiReply = 0x26a8,
+        AbortNewWorld = 0x25ad,
+        AccountCriteriaUpdate = 0x2653,
+        AccountDataTimes = 0x274a,
+        AccountMountUpdate = 0x25c3,
+        AccountToysUpdate = 0x25c4,
+        AchievementDeleted = 0x271f,
+        AchievementEarned = 0x2661,
+        ActivateTaxiReply = 0x26a7,
         ActiveGlyphs = 0x2c52,
-        AddBattlenetFriendResponse = 0x265c,
-        AddItemPassive = 0x25c0,
-        AddLossOfControl = 0x2698,
-        AddRunePower = 0x26e4,
-        AdjustSplineDuration = 0x25e9,
-        AeLootTargets = 0x262d,
-        AeLootTargetAck = 0x262e,
-        AiReaction = 0x26e1,
+        AddBattlenetFriendResponse = 0x265b,
+        AddItemPassive = 0x25bf,
+        AddLossOfControl = 0x2697,
+        AddRunePower = 0x26e3,
+        AdjustSplineDuration = 0x25e8,
+        AeLootTargets = 0x262c,
+        AeLootTargetAck = 0x262d,
+        AiReaction = 0x26e0,
         AllAccountCriteria = 0x2570,
         AllAchievementData = 0x256f,
         AllGuildAchievements = 0x29b8,
-        ArchaeologySurveryCast = 0x2587,
-        AreaPoiUpdate = 0x2844,
-        AreaSpiritHealerTime = 0x2784,
-        AreaTriggerDenied = 0x269f,
-        AreaTriggerNoCorpse = 0x2757,
-        AreaTriggerRePath = 0x2641,
-        AreaTriggerReShape = 0x263e,
-        ArenaCrowdControlSpells = 0x2650,
-        ArenaError = 0x2713,
-        ArenaPrepOpponentSpecializations = 0x2667,
-        ArtifactForgeOpened = 0x27e5,
-        ArtifactRespecConfirm = 0x27e8,
-        ArtifactTraitsRefunded = 0x27e9,
-        ArtifactXpGain = 0x282a,
-        AttackerStateUpdate = 0x27d2,
-        AttackStart = 0x266f,
-        AttackStop = 0x2670,
-        AttackSwingError = 0x2735,
-        AttackSwingLandedLog = 0x2736,
-        AuctionClosedNotification = 0x272a,
-        AuctionCommandResult = 0x2727,
-        AuctionHelloResponse = 0x2725,
-        AuctionListBidderItemsResult = 0x272e,
-        AuctionListItemsResult = 0x272c,
-        AuctionListOwnerItemsResult = 0x272d,
-        AuctionListPendingSalesResult = 0x272f,
-        AuctionOutbidNotification = 0x2729,
-        AuctionOwnerBidNotification = 0x272b,
-        AuctionReplicateResponse = 0x2726,
-        AuctionWonNotification = 0x2728,
+        ArchaeologySurveryCast = 0x2586,
+        AreaPoiUpdate = 0x2848,
+        AreaSpiritHealerTime = 0x2783,
+        AreaTriggerDenied = 0x269e,
+        AreaTriggerNoCorpse = 0x2756,
+        AreaTriggerRePath = 0x2640,
+        AreaTriggerReShape = 0x263d,
+        ArenaCrowdControlSpells = 0x264f,
+        ArenaError = 0x2712,
+        ArenaPrepOpponentSpecializations = 0x2666,
+        ArtifactForgeOpened = 0x27e3,
+        ArtifactKnowledge = 0x27eb,
+        ArtifactRespecConfirm = 0x27e6,
+        ArtifactTraitsRefunded = 0x27e7,
+        ArtifactXpGain = 0x282e,
+        AttackerStateUpdate = 0x27d0,
+        AttackStart = 0x266e,
+        AttackStop = 0x266f,
+        AttackSwingError = 0x2734,
+        AttackSwingLandedLog = 0x2735,
+        AuctionClosedNotification = 0x2729,
+        AuctionCommandResult = 0x2726,
+        AuctionHelloResponse = 0x2724,
+        AuctionListBidderItemsResult = 0x272d,
+        AuctionListItemsResult = 0x272b,
+        AuctionListOwnerItemsResult = 0x272c,
+        AuctionListPendingSalesResult = 0x272e,
+        AuctionOutbidNotification = 0x2728,
+        AuctionOwnerBidNotification = 0x272a,
+        AuctionReplicateResponse = 0x2725,
+        AuctionWonNotification = 0x2727,
         AuraPointsDepleted = 0x2c23,
         AuraUpdate = 0x2c22,
         AuthChallenge = 0x3048,
         AuthResponse = 0x256c,
-        BanReason = 0x26b4,
-        BarberShopResult = 0x26ea,
-        BattlefieldList = 0x2595,
-        BattlefieldPortDenied = 0x259b,
-        BattlefieldStatusActive = 0x2591,
-        BattlefieldStatusFailed = 0x2594,
-        BattlefieldStatusNeedConfirmation = 0x2590,
-        BattlefieldStatusNone = 0x2593,
-        BattlefieldStatusQueued = 0x2592,
-        BattlefieldStatusWaitForGroups = 0x25a6,
-        BattlegroundInfoThrottled = 0x259c,
-        BattlegroundInit = 0x27a2,
-        BattlegroundPlayerJoined = 0x2599,
-        BattlegroundPlayerLeft = 0x259a,
-        BattlegroundPlayerPositions = 0x2596,
-        BattlegroundPoints = 0x27a1,
-        BattlenetChallengeAbort = 0x27d1,
-        BattlenetChallengeStart = 0x27d0,
-        BattlenetNotification = 0x283f,
-        BattlenetRealmListTicket = 0x2841,
-        BattlenetResponse = 0x283e,
-        BattlenetSetSessionState = 0x2840,
-        BattlePayAckFailed = 0x27c9,
-        BattlePayBattlePetDelivered = 0x27be,
-        BattlePayConfirmPurchase = 0x27c8,
-        BattlePayDeliveryEnded = 0x27bc,
-        BattlePayDeliveryStarted = 0x27bb,
-        BattlePayDistributionUpdate = 0x27ba,
-        BattlePayGetDistributionListResponse = 0x27b8,
-        BattlePayGetProductListResponse = 0x27b6,
-        BattlePayGetPurchaseListResponse = 0x27b7,
-        BattlePayMountDelivered = 0x27bd,
-        BattlePayPurchaseUpdate = 0x27c7,
-        BattlePayStartDistributionAssignToTargetResponse = 0x27c5,
-        BattlePayStartPurchaseResponse = 0x27c4,
-        BattlePayVasBnetTransferValidationResult = 0x2856,
-        BattlePayVasBoostConsumed = 0x27b9,
-        BattlePayVasCharacterList = 0x282d,
-        BattlePayVasCharacterQueueStatus = 0x2855,
-        BattlePayVasPurchaseComplete = 0x2830,
-        BattlePayVasPurchaseList = 0x2831,
-        BattlePayVasPurchaseStarted = 0x282f,
-        BattlePayVasRealmList = 0x282e,
-        BattlePayVasTransferQueueStatus = 0x2854,
-        BattlePetsHealed = 0x260a,
-        BattlePetCageDateError = 0x26a2,
-        BattlePetDeleted = 0x2607,
-        BattlePetError = 0x2657,
-        BattlePetJournal = 0x2606,
-        BattlePetJournalLockAcquired = 0x2604,
-        BattlePetJournalLockDenied = 0x2605,
-        BattlePetLicenseChanged = 0x260b,
-        BattlePetMaxCountChanged = 0x2602,
-        BattlePetRestored = 0x2609,
-        BattlePetRevoked = 0x2608,
-        BattlePetTrapLevel = 0x2601,
-        BattlePetUpdates = 0x2600,
-        BinderConfirm = 0x273b,
-        BindPointUpdate = 0x257d,
-        BlackMarketBidOnItemResult = 0x2646,
-        BlackMarketOpenResult = 0x2644,
-        BlackMarketOutbid = 0x2647,
-        BlackMarketRequestItemsResult = 0x2645,
-        BlackMarketWon = 0x2648,
-        BonusRollEmpty = 0x2664,
-        BossKillCredit = 0x27c3,
-        BreakTarget = 0x266e,
-        BuyFailed = 0x26f3,
-        BuySucceeded = 0x26f2,
-        CacheInfo = 0x2745,
-        CacheVersion = 0x2744,
-        CalendarClearPendingAction = 0x26c8,
-        CalendarCommandResult = 0x26c9,
-        CalendarEventInitialInvites = 0x26b8,
-        CalendarEventInvite = 0x26b9,
-        CalendarEventInviteAlert = 0x26ba,
-        CalendarEventInviteModeratorStatus = 0x26bd,
-        CalendarEventInviteNotes = 0x26c2,
-        CalendarEventInviteNotesAlert = 0x26c3,
-        CalendarEventInviteRemoved = 0x26be,
-        CalendarEventInviteRemovedAlert = 0x26bf,
-        CalendarEventInviteStatus = 0x26bb,
-        CalendarEventInviteStatusAlert = 0x26bc,
-        CalendarEventRemovedAlert = 0x26c0,
-        CalendarEventUpdatedAlert = 0x26c1,
-        CalendarRaidLockoutAdded = 0x26c4,
-        CalendarRaidLockoutRemoved = 0x26c5,
-        CalendarRaidLockoutUpdated = 0x26c6,
-        CalendarSendCalendar = 0x26b6,
-        CalendarSendEvent = 0x26b7,
-        CalendarSendNumPending = 0x26c7,
-        CameraEffect = 0x2769,
-        CancelAutoRepeat = 0x2714,
-        CancelCombat = 0x2733,
+        AvailableHotfixes = 0x25a1,
+        BanReason = 0x26b3,
+        BarberShopResult = 0x26e9,
+        BattlefieldList = 0x2594,
+        BattlefieldPortDenied = 0x259a,
+        BattlefieldStatusActive = 0x2590,
+        BattlefieldStatusFailed = 0x2593,
+        BattlefieldStatusNeedConfirmation = 0x258f,
+        BattlefieldStatusNone = 0x2592,
+        BattlefieldStatusQueued = 0x2591,
+        BattlefieldStatusWaitForGroups = 0x25a5,
+        BattlegroundInfoThrottled = 0x259b,
+        BattlegroundInit = 0x27a1,
+        BattlegroundPlayerJoined = 0x2598,
+        BattlegroundPlayerLeft = 0x2599,
+        BattlegroundPlayerPositions = 0x2595,
+        BattlegroundPoints = 0x27a0,
+        BattlenetChallengeAbort = 0x27cf,
+        BattlenetChallengeStart = 0x27ce,
+        BattlenetNotification = 0x2843,
+        BattlenetRealmListTicket = 0x2845,
+        BattlenetResponse = 0x2842,
+        BattlenetSetSessionState = 0x2844,
+        BattlePayAckFailed = 0x27c7,
+        BattlePayBattlePetDelivered = 0x27bc,
+        BattlePayConfirmPurchase = 0x27c6,
+        BattlePayDeliveryEnded = 0x27ba,
+        BattlePayDeliveryStarted = 0x27b9,
+        BattlePayDistributionUpdate = 0x27b8,
+        BattlePayGetDistributionListResponse = 0x27b6,
+        BattlePayGetProductListResponse = 0x27b4,
+        BattlePayGetPurchaseListResponse = 0x27b5,
+        BattlePayMountDelivered = 0x27bb,
+        BattlePayPurchaseUpdate = 0x27c5,
+        BattlePayStartDistributionAssignToTargetResponse = 0x27c3,
+        BattlePayStartPurchaseResponse = 0x27c2,
+        BattlePayVasBnetTransferValidationResult = 0x285b,
+        BattlePayVasBoostConsumed = 0x27b7,
+        BattlePayVasCharacterList = 0x2831,
+        BattlePayVasCharacterQueueStatus = 0x2859,
+        BattlePayVasPurchaseComplete = 0x2834,
+        BattlePayVasPurchaseList = 0x2835,
+        BattlePayVasPurchaseStarted = 0x2833,
+        BattlePayVasRealmList = 0x2832,
+        BattlePayVasTransferQueueStatus = 0x2858,
+        BattlePetsHealed = 0x2609,
+        BattlePetCageDateError = 0x26a1,
+        BattlePetDeleted = 0x2606,
+        BattlePetError = 0x2656,
+        BattlePetJournal = 0x2605,
+        BattlePetJournalLockAcquired = 0x2603,
+        BattlePetJournalLockDenied = 0x2604,
+        BattlePetLicenseChanged = 0x260a,
+        BattlePetMaxCountChanged = 0x2601,
+        BattlePetRestored = 0x2608,
+        BattlePetRevoked = 0x2607,
+        BattlePetTrapLevel = 0x2600,
+        BattlePetUpdates = 0x25ff,
+        BinderConfirm = 0x273a,
+        BindPointUpdate = 0x257c,
+        BlackMarketBidOnItemResult = 0x2645,
+        BlackMarketOpenResult = 0x2643,
+        BlackMarketOutbid = 0x2646,
+        BlackMarketRequestItemsResult = 0x2644,
+        BlackMarketWon = 0x2647,
+        BonusRollEmpty = 0x2663,
+        BossKillCredit = 0x27c1,
+        BreakTarget = 0x266d,
+        BuyFailed = 0x26f2,
+        BuySucceeded = 0x26f1,
+        CacheInfo = 0x2744,
+        CacheVersion = 0x2743,
+        CalendarClearPendingAction = 0x26c7,
+        CalendarCommandResult = 0x26c8,
+        CalendarEventInitialInvites = 0x26b7,
+        CalendarEventInvite = 0x26b8,
+        CalendarEventInviteAlert = 0x26b9,
+        CalendarEventInviteModeratorStatus = 0x26bc,
+        CalendarEventInviteNotes = 0x26c1,
+        CalendarEventInviteNotesAlert = 0x26c2,
+        CalendarEventInviteRemoved = 0x26bd,
+        CalendarEventInviteRemovedAlert = 0x26be,
+        CalendarEventInviteStatus = 0x26ba,
+        CalendarEventInviteStatusAlert = 0x26bb,
+        CalendarEventRemovedAlert = 0x26bf,
+        CalendarEventUpdatedAlert = 0x26c0,
+        CalendarRaidLockoutAdded = 0x26c3,
+        CalendarRaidLockoutRemoved = 0x26c4,
+        CalendarRaidLockoutUpdated = 0x26c5,
+        CalendarSendCalendar = 0x26b5,
+        CalendarSendEvent = 0x26b6,
+        CalendarSendNumPending = 0x26c6,
+        CameraEffect = 0x2768,
+        CancelAutoRepeat = 0x2713,
+        CancelCombat = 0x2732,
         CancelOrphanSpellVisual = 0x2c45,
-        CancelScene = 0x2656,
+        CancelScene = 0x2655,
         CancelSpellVisual = 0x2c43,
         CancelSpellVisualKit = 0x2c47,
-        CanDuelResult = 0x2678,
+        CanDuelResult = 0x2677,
         CastFailed = 0x2c55,
         CategoryCooldown = 0x2c16,
-        ChallengeModeAllMapStats = 0x2623,
-        ChallengeModeComplete = 0x2621,
-        ChallengeModeMapStatsUpdate = 0x2624,
-        ChallengeModeNewPlayerRecord = 0x2626,
-        ChallengeModeRequestLeadersResult = 0x2625,
-        ChallengeModeReset = 0x2620,
-        ChallengeModeRewards = 0x2622,
-        ChallengeModeStart = 0x261e,
-        ChallengeModeUpdateDeathCount = 0x261f,
-        ChangePlayerDifficultyResult = 0x2737,
+        ChallengeModeAllMapStats = 0x2622,
+        ChallengeModeComplete = 0x2620,
+        ChallengeModeMapStatsUpdate = 0x2623,
+        ChallengeModeNewPlayerRecord = 0x2625,
+        ChallengeModeRequestLeadersResult = 0x2624,
+        ChallengeModeReset = 0x261f,
+        ChallengeModeRewards = 0x2621,
+        ChallengeModeStart = 0x261d,
+        ChallengeModeUpdateDeathCount = 0x261e,
+        ChangePlayerDifficultyResult = 0x2736,
         ChannelList = 0x2bc3,
         ChannelNotify = 0x2bc0,
         ChannelNotifyJoined = 0x2bc1,
         ChannelNotifyLeft = 0x2bc2,
-        CharacterClassTrialCreate = 0x2802,
-        CharacterItemFixup = 0x2850,
-        CharacterLoginFailed = 0x2746,
-        CharacterObjectTestResponse = 0x27cf,
-        CharacterRenameResult = 0x27a8,
-        CharacterUpgradeComplete = 0x2801,
-        CharacterUpgradeQueued = 0x2800,
-        CharacterUpgradeSpellTierSet = 0x25f5,
-        CharacterUpgradeStarted = 0x27ff,
-        CharacterUpgradeUnrevokeResult = 0x2803,
-        CharCustomize = 0x271b,
-        CharCustomizeFailed = 0x271a,
-        CharFactionChangeResult = 0x27ed,
+        CharacterClassTrialCreate = 0x2805,
+        CharacterItemFixup = 0x2854,
+        CharacterLoginFailed = 0x2745,
+        CharacterObjectTestResponse = 0x27cd,
+        CharacterRenameResult = 0x27a6,
+        CharacterUpgradeComplete = 0x2804,
+        CharacterUpgradeQueued = 0x2803,
+        CharacterUpgradeSpellTierSet = 0x25f4,
+        CharacterUpgradeStarted = 0x2802,
+        CharacterUpgradeUnrevokeResult = 0x2806,
+        CharCustomize = 0x271a,
+        CharCustomizeFailed = 0x2719,
+        CharFactionChangeResult = 0x27ef,
         Chat = 0x2bad,
         ChatAutoResponded = 0x2bb8,
         ChatDown = 0x2bbd,
@@ -924,101 +930,100 @@ namespace Framework.Constants
         ChatRestricted = 0x2bb3,
         ChatServerMessage = 0x2bc4,
         CheatIgnoreDimishingReturns = 0x2c12,
-        CheckWargameEntry = 0x259f,
+        CheckWargameEntry = 0x259e,
         ClearAllSpellCharges = 0x2c27,
-        ClearBossEmotes = 0x25ce,
-        ClearCooldown = 0x26e6,
+        ClearBossEmotes = 0x25cd,
+        ClearCooldown = 0x26e5,
         ClearCooldowns = 0x2c26,
-        ClearLossOfControl = 0x269a,
+        ClearLossOfControl = 0x2699,
         ClearSpellCharges = 0x2c28,
-        ClearTarget = 0x26dd,
-        CoinRemoved = 0x262c,
-        CombatEventFailed = 0x2671,
-        CommentatorMapInfo = 0x2748,
-        CommentatorPlayerInfo = 0x2749,
-        CommentatorStateChanged = 0x2747,
-        ComplaintResult = 0x26d5,
-        CompleteShipmentResponse = 0x27e1,
+        ClearTarget = 0x26dc,
+        CoinRemoved = 0x262b,
+        CombatEventFailed = 0x2670,
+        CommentatorMapInfo = 0x2747,
+        CommentatorPlayerInfo = 0x2748,
+        CommentatorStateChanged = 0x2746,
+        ComplaintResult = 0x26d4,
+        CompleteShipmentResponse = 0x27df,
         ConnectTo = 0x304d,
-        ConquestFormulaConstants = 0x27ca,
-        ConsoleWrite = 0x2653,
-        ConsumptionConversionInfoResponse = 0x2845,
-        ConsumptionConversionResult = 0x2846,
-        ContactList = 0x27cd,
-        ControlUpdate = 0x2666,
-        CooldownCheat = 0x277d,
-        CooldownEvent = 0x26e5,
-        CorpseLocation = 0x266d,
-        CorpseReclaimDelay = 0x2790,
-        CorpseTransportQuery = 0x2753,
-        CreateChar = 0x2740,
-        CreateShipmentResponse = 0x27e0,
-        CriteriaDeleted = 0x271f,
-        CriteriaUpdate = 0x2719,
-        CrossedInebriationThreshold = 0x26ee,
-        CustomLoadScreen = 0x25e4,
+        ConquestFormulaConstants = 0x27c8,
+        ConsoleWrite = 0x2652,
+        ConsumptionConversionInfoResponse = 0x2849,
+        ConsumptionConversionResult = 0x284a,
+        ContactList = 0x27cb,
+        ControlUpdate = 0x2665,
+        CooldownCheat = 0x277c,
+        CooldownEvent = 0x26e4,
+        CorpseLocation = 0x266c,
+        CorpseReclaimDelay = 0x278f,
+        CorpseTransportQuery = 0x2752,
+        CreateChar = 0x273f,
+        CreateShipmentResponse = 0x27de,
+        CriteriaDeleted = 0x271e,
+        CriteriaUpdate = 0x2718,
+        CrossedInebriationThreshold = 0x26ed,
+        CustomLoadScreen = 0x25e3,
         DailyQuestsReset = 0x2a80,
-        DamageCalcLog = 0x280a,
-        DanceStudioCreateResult = 0x27a5,
-        DbReply = 0x25a1,
-        DeathReleaseLoc = 0x2707,
+        DamageCalcLog = 0x280d,
+        DbReply = 0x25a0,
+        DeathReleaseLoc = 0x2706,
         DefenseMessage = 0x2bb6,
-        DeleteChar = 0x2741,
-        DestroyArenaUnit = 0x2786,
-        DestructibleBuildingDamage = 0x2734,
-        DifferentInstanceFromParty = 0x258b,
-        DisenchantCredit = 0x25bd,
-        Dismount = 0x26dc,
-        DismountResult = 0x257c,
+        DeleteChar = 0x2740,
+        DestroyArenaUnit = 0x2785,
+        DestructibleBuildingDamage = 0x2733,
+        DifferentInstanceFromParty = 0x258a,
+        DisenchantCredit = 0x25bc,
+        Dismount = 0x26db,
+        DismountResult = 0x257b,
         DispelFailed = 0x2c30,
-        DisplayGameError = 0x25b6,
-        DisplayPlayerChoice = 0x26a3,
-        DisplayPromotion = 0x266a,
+        DisplayGameError = 0x25b5,
+        DisplayPlayerChoice = 0x26a2,
+        DisplayPromotion = 0x2669,
         DisplayQuestPopup = 0x2a9d,
-        DisplayToast = 0x263a,
-        DontAutoPushSpellsToActionBar = 0x25f7,
+        DisplayToast = 0x2639,
+        DontAutoPushSpellsToActionBar = 0x25f6,
         DropNewConnection = 0x304c,
-        DuelComplete = 0x2676,
-        DuelCountdown = 0x2675,
-        DuelInBounds = 0x2674,
-        DuelOutOfBounds = 0x2673,
-        DuelRequested = 0x2672,
-        DuelWinner = 0x2677,
-        DurabilityDamageDeath = 0x278c,
-        Emote = 0x280b,
-        EnableBarberShop = 0x26e9,
+        DuelComplete = 0x2675,
+        DuelCountdown = 0x2674,
+        DuelInBounds = 0x2673,
+        DuelOutOfBounds = 0x2672,
+        DuelRequested = 0x2671,
+        DuelWinner = 0x2676,
+        DurabilityDamageDeath = 0x278b,
+        Emote = 0x280e,
+        EnableBarberShop = 0x26e8,
         EnableEncryption = 0x3049,
-        EnchantmentLog = 0x2754,
-        EncounterEnd = 0x27c2,
-        EncounterStart = 0x27c1,
-        EnumCharactersResult = 0x2583,
+        EnchantmentLog = 0x2753,
+        EncounterEnd = 0x27c0,
+        EncounterStart = 0x27bf,
+        EnumCharactersResult = 0x2582,
         EnvironmentalDamageLog = 0x2c21,
-        EquipmentSetId = 0x26de,
+        EquipmentSetId = 0x26dd,
         ExpectedSpamRecords = 0x2bb1,
-        ExplorationExperience = 0x27a4,
-        FactionBonusInfo = 0x2768,
-        FailedPlayerCondition = 0x25e3,
-        FeatureSystemStatus = 0x25d2,
-        FeatureSystemStatusGlueScreen = 0x25d3,
-        FeignDeathResisted = 0x2789,
-        FishEscaped = 0x26fb,
-        FishNotHooked = 0x26fa,
+        ExplorationExperience = 0x27a3,
+        FactionBonusInfo = 0x2767,
+        FailedPlayerCondition = 0x25e2,
+        FeatureSystemStatus = 0x25d1,
+        FeatureSystemStatusGlueScreen = 0x25d2,
+        FeignDeathResisted = 0x2788,
+        FishEscaped = 0x26fa,
+        FishNotHooked = 0x26f9,
         FlightSplineSync = 0x2df7,
-        ForcedDeathUpdate = 0x2708,
-        ForceAnim = 0x2796,
-        ForceObjectRelink = 0x2669,
-        FriendStatus = 0x27ce,
-        GameObjectActivateAnimKit = 0x25d7,
-        GameObjectCustomAnim = 0x25d8,
-        GameObjectDespawn = 0x25d9,
+        ForcedDeathUpdate = 0x2707,
+        ForceAnim = 0x2795,
+        ForceObjectRelink = 0x2668,
+        FriendStatus = 0x27cc,
+        GameObjectActivateAnimKit = 0x25d6,
+        GameObjectCustomAnim = 0x25d7,
+        GameObjectDespawn = 0x25d8,
         GameObjectPlaySpellVisual = 0x2c4a,
         GameObjectPlaySpellVisualKit = 0x2c49,
-        GameObjectResetState = 0x275f,
-        GameObjectSetState = 0x283d,
-        GameObjectUiAction = 0x275c,
-        GameSpeedSet = 0x26ac,
-        GameTimeSet = 0x274d,
-        GameTimeUpdate = 0x274c,
+        GameObjectResetState = 0x275e,
+        GameObjectSetState = 0x2841,
+        GameObjectUiAction = 0x275b,
+        GameSpeedSet = 0x26ab,
+        GameTimeSet = 0x274c,
+        GameTimeUpdate = 0x274b,
         GarrisonAddFollowerResult = 0x2902,
         GarrisonAddMissionResult = 0x2906,
         GarrisonAssignFollowerToBuildingResult = 0x2918,
@@ -1036,7 +1041,7 @@ namespace Framework.Constants
         GarrisonFollowerChangedStatus = 0x2915,
         GarrisonFollowerChangedXp = 0x2912,
         GarrisonIsUpgradeableResult = 0x2929,
-        GarrisonLandingPageShipmentInfo = 0x27e3,
+        GarrisonLandingPageShipmentInfo = 0x27e1,
         GarrisonLearnBlueprintResult = 0x28f7,
         GarrisonLearnSpecializationResult = 0x28f5,
         GarrisonListFollowersCheatResult = 0x2905,
@@ -1065,27 +1070,27 @@ namespace Framework.Constants
         GarrisonStartMissionResult = 0x2907,
         GarrisonUnlearnBlueprintResult = 0x28f8,
         GarrisonUpgradeResult = 0x28fd,
-        GenerateRandomCharacterNameResult = 0x2584,
-        GetAccountCharacterListResult = 0x27a6,
+        GenerateRandomCharacterNameResult = 0x2583,
+        GetAccountCharacterListResult = 0x27a4,
         GetDisplayedTrophyListResponse = 0x2928,
         GetGarrisonInfoResult = 0x28f0,
-        GetShipmentsOfTypeResponse = 0x27e2,
-        GetShipmentInfoResponse = 0x27de,
-        GetTrophyListResponse = 0x2806,
-        GmPlayerInfo = 0x277c,
-        GmRequestPlayerInfo = 0x25ee,
-        GmTicketCaseStatus = 0x26ce,
-        GmTicketSystemStatus = 0x26cd,
-        GodMode = 0x273a,
+        GetShipmentsOfTypeResponse = 0x27e0,
+        GetShipmentInfoResponse = 0x27dc,
+        GetTrophyListResponse = 0x2809,
+        GmPlayerInfo = 0x277b,
+        GmRequestPlayerInfo = 0x25ed,
+        GmTicketCaseStatus = 0x26cd,
+        GmTicketSystemStatus = 0x26cc,
+        GodMode = 0x2739,
         GossipComplete = 0x2a96,
         GossipMessage = 0x2a97,
-        GossipPoi = 0x27db,
-        GroupActionThrottled = 0x259d,
-        GroupDecline = 0x27d6,
-        GroupDestroyed = 0x27d8,
-        GroupInviteConfirmation = 0x2851,
-        GroupNewLeader = 0x264b,
-        GroupUninvite = 0x27d7,
+        GossipPoi = 0x27d9,
+        GroupActionThrottled = 0x259c,
+        GroupDecline = 0x27d4,
+        GroupDestroyed = 0x27d6,
+        GroupInviteConfirmation = 0x2855,
+        GroupNewLeader = 0x264a,
+        GroupUninvite = 0x27d5,
         GuildAchievementDeleted = 0x29c5,
         GuildAchievementEarned = 0x29c4,
         GuildAchievementMembers = 0x29c7,
@@ -1138,53 +1143,53 @@ namespace Framework.Constants
         GuildRoster = 0x29bb,
         GuildRosterUpdate = 0x29bc,
         GuildSendRankChange = 0x29b9,
-        HealthUpdate = 0x26fe,
-        HighestThreatUpdate = 0x270e,
-        Hotfixes = 0x25a3,
-        HotfixList = 0x25a2,
-        HotfixQueryResponse = 0x25a4,
-        InitializeFactions = 0x2767,
-        InitialSetup = 0x2580,
-        InitWorldStates = 0x278d,
-        InspectHonorStats = 0x25b3,
-        InspectPvp = 0x2763,
-        InspectResult = 0x264f,
-        InstanceEncounterChangePriority = 0x27f3,
-        InstanceEncounterDisengageUnit = 0x27f2,
-        InstanceEncounterEnd = 0x27fa,
-        InstanceEncounterEngageUnit = 0x27f1,
-        InstanceEncounterGainCombatResurrectionCharge = 0x27fc,
-        InstanceEncounterInCombatResurrection = 0x27fb,
-        InstanceEncounterObjectiveComplete = 0x27f6,
-        InstanceEncounterObjectiveStart = 0x27f5,
-        InstanceEncounterObjectiveUpdate = 0x27f9,
-        InstanceEncounterPhaseShiftChanged = 0x27fd,
-        InstanceEncounterSetSuppressingRelease = 0x27f8,
-        InstanceEncounterStart = 0x27f7,
-        InstanceEncounterTimerStart = 0x27f4,
-        InstanceGroupSizeChanged = 0x2738,
-        InstanceInfo = 0x2652,
-        InstanceReset = 0x26b1,
-        InstanceResetFailed = 0x26b2,
-        InstanceSaveCreated = 0x27c0,
-        InvalidatePageText = 0x2703,
-        InvalidatePlayer = 0x26d4,
-        InvalidPromotionCode = 0x2797,
-        InventoryChangeFailure = 0x2765,
+        HealthUpdate = 0x26fd,
+        HighestThreatUpdate = 0x270d,
+        HotfixMessage = 0x25a2,
+        HotfixResponse = 0x25a3,
+        InitializeFactions = 0x2766,
+        InitialSetup = 0x257f,
+        InitWorldStates = 0x278c,
+        InspectHonorStats = 0x25b2,
+        InspectPvp = 0x2762,
+        InspectResult = 0x264e,
+        InstanceEncounterChangePriority = 0x27f5,
+        InstanceEncounterDisengageUnit = 0x27f4,
+        InstanceEncounterEnd = 0x27fd,
+        InstanceEncounterEngageUnit = 0x27f3,
+        InstanceEncounterGainCombatResurrectionCharge = 0x27ff,
+        InstanceEncounterInCombatResurrection = 0x27fe,
+        InstanceEncounterObjectiveComplete = 0x27f8,
+        InstanceEncounterObjectiveStart = 0x27f7,
+        InstanceEncounterObjectiveUpdate = 0x27fc,
+        InstanceEncounterPhaseShiftChanged = 0x2800,
+        InstanceEncounterSetAllowingRelease = 0x27fb,
+        InstanceEncounterSetSuppressingRelease = 0x27fa,
+        InstanceEncounterStart = 0x27f9,
+        InstanceEncounterTimerStart = 0x27f6,
+        InstanceGroupSizeChanged = 0x2737,
+        InstanceInfo = 0x2651,
+        InstanceReset = 0x26b0,
+        InstanceResetFailed = 0x26b1,
+        InstanceSaveCreated = 0x27be,
+        InvalidatePageText = 0x2702,
+        InvalidatePlayer = 0x26d3,
+        InvalidPromotionCode = 0x2796,
+        InventoryChangeFailure = 0x2764,
         IsQuestCompleteResponse = 0x2a83,
-        ItemChanged = 0x2722,
-        ItemCooldown = 0x2809,
-        ItemEnchantTimeUpdate = 0x2799,
-        ItemExpirePurchaseRefund = 0x25b2,
-        ItemPurchaseRefundResult = 0x25b0,
-        ItemPushResult = 0x2639,
-        ItemTimeUpdate = 0x2798,
-        KickReason = 0x282c,
+        ItemChanged = 0x2721,
+        ItemCooldown = 0x280c,
+        ItemEnchantTimeUpdate = 0x2798,
+        ItemExpirePurchaseRefund = 0x25b1,
+        ItemPurchaseRefundResult = 0x25af,
+        ItemPushResult = 0x2638,
+        ItemTimeUpdate = 0x2797,
+        KickReason = 0x2830,
         LearnedSpells = 0x2c4c,
-        LearnPvpTalentsFailed = 0x25eb,
-        LearnTalentsFailed = 0x25ea,
-        LevelUpdate = 0x2588,
-        LevelUpInfo = 0x2721,
+        LearnPvpTalentsFailed = 0x25ea,
+        LearnTalentsFailed = 0x25e9,
+        LevelUpdate = 0x2587,
+        LevelUpInfo = 0x2720,
         LfgBootPlayer = 0x2a36,
         LfgDisabled = 0x2a34,
         LfgInstanceShutdownCountdown = 0x2a25,
@@ -1213,47 +1218,47 @@ namespace Framework.Constants
         LfGuildCommandResult = 0x29d0,
         LfGuildPost = 0x29cd,
         LfGuildRecruits = 0x29cf,
-        LiveRegionAccountRestoreResult = 0x27b4,
-        LiveRegionCharacterCopyResult = 0x27b2,
-        LiveRegionGetAccountCharacterListResult = 0x27a7,
-        LoadCufProfiles = 0x25cf,
-        LoadEquipmentSet = 0x274f,
-        LoadSelectedTrophyResult = 0x2807,
-        LoginSetTimeSpeed = 0x274e,
-        LoginVerifyWorld = 0x25ad,
-        LogoutCancelAck = 0x26b0,
-        LogoutComplete = 0x26af,
-        LogoutResponse = 0x26ae,
-        LogXpGain = 0x271d,
-        LootAllPassed = 0x2637,
-        LootItemList = 0x2635,
-        LootList = 0x2785,
-        LootMoneyNotify = 0x2631,
-        LootRelease = 0x2630,
-        LootReleaseAll = 0x262f,
-        LootRemoved = 0x262a,
-        LootResponse = 0x2629,
-        LootRoll = 0x2633,
-        LootRollsComplete = 0x2636,
-        LootRollWon = 0x2638,
-        LossOfControlAuraUpdate = 0x2697,
-        MailCommandResult = 0x265a,
-        MailListResult = 0x279a,
-        MailQueryNextTimeResult = 0x279b,
-        MapObjectivesInit = 0x27a3,
-        MapObjEvents = 0x25da,
-        MasterLootCandidateList = 0x2634,
+        LiveRegionAccountRestoreResult = 0x27b2,
+        LiveRegionCharacterCopyResult = 0x27b0,
+        LiveRegionGetAccountCharacterListResult = 0x27a5,
+        LoadCufProfiles = 0x25ce,
+        LoadEquipmentSet = 0x274e,
+        LoadSelectedTrophyResult = 0x280a,
+        LoginSetTimeSpeed = 0x274d,
+        LoginVerifyWorld = 0x25ac,
+        LogoutCancelAck = 0x26af,
+        LogoutComplete = 0x26ae,
+        LogoutResponse = 0x26ad,
+        LogXpGain = 0x271c,
+        LootAllPassed = 0x2636,
+        LootItemList = 0x2634,
+        LootList = 0x2784,
+        LootMoneyNotify = 0x2630,
+        LootRelease = 0x262f,
+        LootReleaseAll = 0x262e,
+        LootRemoved = 0x2629,
+        LootResponse = 0x2628,
+        LootRoll = 0x2632,
+        LootRollsComplete = 0x2635,
+        LootRollWon = 0x2637,
+        LossOfControlAuraUpdate = 0x2696,
+        MailCommandResult = 0x2659,
+        MailListResult = 0x2799,
+        MailQueryNextTimeResult = 0x279a,
+        MapObjectivesInit = 0x27a2,
+        MapObjEvents = 0x25d9,
+        MasterLootCandidateList = 0x2633,
         MessageBox = 0x2575,
-        MinimapPing = 0x26f9,
+        MinimapPing = 0x26f8,
         MirrorImageComponentedData = 0x2c14,
         MirrorImageCreatureData = 0x2c13,
-        MissileCancel = 0x25db,
-        ModifyChargeRecoverySpeed = 0x27ab,
-        ModifyCooldown = 0x27a9,
-        ModifyCooldownRecoverySpeed = 0x27aa,
-        ModifyPartyRange = 0x2788,
+        MissileCancel = 0x25da,
+        ModifyChargeRecoverySpeed = 0x27a9,
+        ModifyCooldown = 0x27a7,
+        ModifyCooldownRecoverySpeed = 0x27a8,
+        ModifyPartyRange = 0x2787,
         Motd = 0x2baf,
-        MountResult = 0x257b,
+        MountResult = 0x257a,
         MoveApplyMovementForce = 0x2de1,
         MoveDisableCollision = 0x2ddd,
         MoveDisableDoubleJump = 0x2dcb,
@@ -1336,110 +1341,110 @@ namespace Framework.Constants
         MoveUpdateTeleport = 0x2daf,
         MoveUpdateTurnRate = 0x2dab,
         MoveUpdateWalkSpeed = 0x2da6,
-        NeutralPlayerFactionSelectResult = 0x25f2,
-        NewTaxiPath = 0x26a9,
-        NewWorld = 0x25ac,
+        NeutralPlayerFactionSelectResult = 0x25f1,
+        NewTaxiPath = 0x26a8,
+        NewWorld = 0x25ab,
         NotifyDestLocSpellCast = 0x2c42,
-        NotifyMissileTrajectoryCollision = 0x26d3,
-        NotifyMoney = 0x25af,
-        NotifyReceivedMail = 0x265b,
-        OfferPetitionError = 0x26e2,
-        OnCancelExpectedRideVehicleAura = 0x271e,
+        NotifyMissileTrajectoryCollision = 0x26d2,
+        NotifyMoney = 0x25ae,
+        NotifyReceivedMail = 0x265a,
+        OfferPetitionError = 0x26e1,
+        OnCancelExpectedRideVehicleAura = 0x271d,
         OnMonsterMove = 0x2da2,
-        OpenContainer = 0x2766,
+        OpenContainer = 0x2765,
         OpenLfgDungeonFinder = 0x2a32,
-        OpenShipmentNpcFromGossip = 0x27dd,
-        OpenShipmentNpcResult = 0x27df,
-        OpenTransmogrifier = 0x2833,
-        OverrideLight = 0x26e8,
-        PageText = 0x275b,
-        PartyCommandResult = 0x27da,
-        PartyInvite = 0x25d0,
-        PartyKillLog = 0x279f,
-        PartyMemberState = 0x279d,
-        PartyMemberStateUpdate = 0x279c,
-        PartyUpdate = 0x260c,
-        PauseMirrorTimer = 0x2751,
-        PendingRaidLock = 0x2732,
-        PetitionAlreadySigned = 0x25b9,
+        OpenShipmentNpcFromGossip = 0x27db,
+        OpenShipmentNpcResult = 0x27dd,
+        OpenTransmogrifier = 0x2837,
+        OverrideLight = 0x26e7,
+        PageText = 0x275a,
+        PartyCommandResult = 0x27d8,
+        PartyInvite = 0x25cf,
+        PartyKillLog = 0x279e,
+        PartyMemberState = 0x279c,
+        PartyMemberStateUpdate = 0x279b,
+        PartyUpdate = 0x260b,
+        PauseMirrorTimer = 0x2750,
+        PendingRaidLock = 0x2731,
+        PetitionAlreadySigned = 0x25b8,
         PetitionRenameGuildResponse = 0x29f7,
-        PetitionShowList = 0x26eb,
-        PetitionShowSignatures = 0x26ec,
-        PetitionSignResults = 0x2791,
-        PetActionFeedback = 0x278f,
-        PetActionSound = 0x26cb,
-        PetAdded = 0x25a9,
-        PetBattleChatRestricted = 0x2619,
-        PetBattleDebugQueueDumpResponse = 0x269e,
-        PetBattleFinalizeLocation = 0x2612,
-        PetBattleFinalRound = 0x2617,
-        PetBattleFinished = 0x2618,
-        PetBattleFirstRound = 0x2614,
-        PetBattleInitialUpdate = 0x2613,
-        PetBattleMaxGameLengthWarning = 0x261a,
-        PetBattlePvpChallenge = 0x2611,
-        PetBattleQueueProposeMatch = 0x2658,
-        PetBattleQueueStatus = 0x2659,
-        PetBattleReplacementsMade = 0x2616,
-        PetBattleRequestFailed = 0x2610,
-        PetBattleRoundResult = 0x2615,
-        PetBattleSlotUpdates = 0x2603,
+        PetitionShowList = 0x26ea,
+        PetitionShowSignatures = 0x26eb,
+        PetitionSignResults = 0x2790,
+        PetActionFeedback = 0x278e,
+        PetActionSound = 0x26ca,
+        PetAdded = 0x25a8,
+        PetBattleChatRestricted = 0x2618,
+        PetBattleDebugQueueDumpResponse = 0x269d,
+        PetBattleFinalizeLocation = 0x2611,
+        PetBattleFinalRound = 0x2616,
+        PetBattleFinished = 0x2617,
+        PetBattleFirstRound = 0x2613,
+        PetBattleInitialUpdate = 0x2612,
+        PetBattleMaxGameLengthWarning = 0x2619,
+        PetBattlePvpChallenge = 0x2610,
+        PetBattleQueueProposeMatch = 0x2657,
+        PetBattleQueueStatus = 0x2658,
+        PetBattleReplacementsMade = 0x2615,
+        PetBattleRequestFailed = 0x260f,
+        PetBattleRoundResult = 0x2614,
+        PetBattleSlotUpdates = 0x2602,
         PetCastFailed = 0x2c56,
         PetClearSpells = 0x2c24,
-        PetDismissSound = 0x26cc,
-        PetGodMode = 0x26a6,
-        PetGuids = 0x2743,
+        PetDismissSound = 0x26cb,
+        PetGodMode = 0x26a5,
+        PetGuids = 0x2742,
         PetLearnedSpells = 0x2c4e,
-        PetMode = 0x258a,
-        PetNameInvalid = 0x26f0,
-        PetSlotUpdated = 0x2589,
+        PetMode = 0x2589,
+        PetNameInvalid = 0x26ef,
+        PetSlotUpdated = 0x2588,
         PetSpellsMessage = 0x2c25,
-        PetStableList = 0x25aa,
-        PetStableResult = 0x25ab,
-        PetTameFailure = 0x26df,
+        PetStableList = 0x25a9,
+        PetStableResult = 0x25aa,
+        PetTameFailure = 0x26de,
         PetUnlearnedSpells = 0x2c4f,
-        PhaseShiftChange = 0x2578,
-        PlayedTime = 0x270a,
-        PlayerBound = 0x257e,
+        PhaseShiftChange = 0x2577,
+        PlayedTime = 0x2709,
+        PlayerBound = 0x257d,
         PlayerSaveGuildEmblem = 0x29f6,
-        PlayerSkinned = 0x278a,
-        PlayerTabardVendorActivate = 0x279e,
-        PlayMusic = 0x27ae,
-        PlayObjectSound = 0x27af,
-        PlayOneShotAnimKit = 0x2774,
+        PlayerSkinned = 0x2789,
+        PlayerTabardVendorActivate = 0x279d,
+        PlayMusic = 0x27ac,
+        PlayObjectSound = 0x27ad,
+        PlayOneShotAnimKit = 0x2773,
         PlayOrphanSpellVisual = 0x2c46,
-        PlayScene = 0x2655,
-        PlaySound = 0x27ad,
-        PlaySpeakerbotSound = 0x27b0,
+        PlayScene = 0x2654,
+        PlaySound = 0x27ab,
+        PlaySpeakerbotSound = 0x27ae,
         PlaySpellVisual = 0x2c44,
         PlaySpellVisualKit = 0x2c48,
-        PlayTimeWarning = 0x273c,
+        PlayTimeWarning = 0x273b,
         Pong = 0x304e,
-        PowerUpdate = 0x26ff,
-        PrestigeAndHonorInvoluntarilyChanged = 0x275a,
-        PreRessurect = 0x27ac,
-        PrintNotification = 0x25e2,
-        ProcResist = 0x27a0,
-        ProposeLevelGrant = 0x2712,
+        PowerUpdate = 0x26fe,
+        PrestigeAndHonorInvoluntarilyChanged = 0x2759,
+        PreRessurect = 0x27aa,
+        PrintNotification = 0x25e1,
+        ProcResist = 0x279f,
+        ProposeLevelGrant = 0x2711,
         PushSpellToActionBar = 0x2c50,
-        PvpCredit = 0x2718,
-        PvpLogData = 0x25b4,
-        PvpOptionsEnabled = 0x25b7,
-        PvpSeason = 0x25d4,
-        QueryBattlePetNameResponse = 0x2705,
-        QueryCreatureResponse = 0x26fc,
-        QueryGameObjectResponse = 0x26fd,
+        PvpCredit = 0x2717,
+        PvpLogData = 0x25b3,
+        PvpOptionsEnabled = 0x25b6,
+        PvpSeason = 0x25d3,
+        QueryBattlePetNameResponse = 0x2704,
+        QueryCreatureResponse = 0x26fb,
+        QueryGameObjectResponse = 0x26fc,
         QueryGarrisonCreatureNameResponse = 0x292b,
         QueryGuildInfoResponse = 0x29e5,
-        QueryItemTextResponse = 0x2808,
-        QueryNpcTextResponse = 0x2700,
-        QueryPageTextResponse = 0x2702,
-        QueryPetitionResponse = 0x2706,
-        QueryPetNameResponse = 0x2704,
-        QueryPlayerNameResponse = 0x2701,
+        QueryItemTextResponse = 0x280b,
+        QueryNpcTextResponse = 0x26ff,
+        QueryPageTextResponse = 0x2701,
+        QueryPetitionResponse = 0x2705,
+        QueryPetNameResponse = 0x2703,
+        QueryPlayerNameResponse = 0x2700,
         QueryQuestInfoResponse = 0x2a95,
-        QueryQuestRewardResponse = 0x2842,
-        QueryTimeResponse = 0x271c,
+        QueryQuestRewardResponse = 0x2846,
+        QueryTimeResponse = 0x271b,
         QuestCompletionNpcResponse = 0x2a81,
         QuestConfirmAccept = 0x2a8e,
         QuestForceRemoved = 0x2a9b,
@@ -1449,7 +1454,7 @@ namespace Framework.Constants
         QuestGiverQuestDetails = 0x2a91,
         QuestGiverQuestFailed = 0x2a85,
         QuestGiverQuestListMessage = 0x2a99,
-        QuestGiverQuestTurnInFailure = 0x284e,
+        QuestGiverQuestTurnInFailure = 0x2852,
         QuestGiverRequestItems = 0x2a92,
         QuestGiverStatus = 0x2a9a,
         QuestGiverStatusMultiple = 0x2a90,
@@ -1465,116 +1470,116 @@ namespace Framework.Constants
         QuestUpdateCompleteBySpell = 0x2a87,
         QuestUpdateFailed = 0x2a89,
         QuestUpdateFailedTimer = 0x2a8a,
-        RafEmailEnabledResponse = 0x27cb,
-        RaidDifficultySet = 0x27ee,
-        RaidGroupOnly = 0x27f0,
+        RafEmailEnabledResponse = 0x27c9,
+        RaidDifficultySet = 0x27f0,
+        RaidGroupOnly = 0x27f2,
         RaidInstanceMessage = 0x2bb4,
-        RaidMarkersChanged = 0x25ba,
-        RandomRoll = 0x264e,
-        RatedBattlefieldInfo = 0x25a7,
-        ReadyCheckCompleted = 0x260f,
-        ReadyCheckResponse = 0x260e,
-        ReadyCheckStarted = 0x260d,
-        ReadItemResultFailed = 0x27ea,
-        ReadItemResultOk = 0x27e4,
-        RealmQueryResponse = 0x26e7,
-        RecruitAFriendResponse = 0x27cc,
-        ReferAFriendExpired = 0x2764,
-        ReferAFriendFailure = 0x26ed,
-        RefreshComponent = 0x267a,
+        RaidMarkersChanged = 0x25b9,
+        RandomRoll = 0x264d,
+        RatedBattlefieldInfo = 0x25a6,
+        ReadyCheckCompleted = 0x260e,
+        ReadyCheckResponse = 0x260d,
+        ReadyCheckStarted = 0x260c,
+        ReadItemResultFailed = 0x27ec,
+        ReadItemResultOk = 0x27e2,
+        RealmQueryResponse = 0x26e6,
+        RecruitAFriendResponse = 0x27ca,
+        ReferAFriendExpired = 0x2763,
+        ReferAFriendFailure = 0x26ec,
+        RefreshComponent = 0x2679,
         RefreshSpellHistory = 0x2c2c,
-        RemoveItemPassive = 0x25c1,
-        RemoveLossOfControl = 0x2699,
-        ReplaceTrophyResponse = 0x2805,
-        ReportPvpPlayerAfkResult = 0x26db,
-        RequestAddonList = 0x2661,
-        RequestCemeteryListResponse = 0x259e,
-        RequestPvpBrawlInfoResponse = 0x25d6,
-        RequestPvpRewardsResponse = 0x25d5,
-        ResearchComplete = 0x2586,
-        ResetAreaTrigger = 0x2642,
+        RemoveItemPassive = 0x25c0,
+        RemoveLossOfControl = 0x2698,
+        ReplaceTrophyResponse = 0x2808,
+        ReportPvpPlayerAfkResult = 0x26da,
+        RequestAddonList = 0x2660,
+        RequestCemeteryListResponse = 0x259d,
+        RequestPvpBrawlInfoResponse = 0x25d5,
+        RequestPvpRewardsResponse = 0x25d4,
+        ResearchComplete = 0x2585,
+        ResetAreaTrigger = 0x2641,
         ResetCompressionContext = 0x304f,
-        ResetFailedNotify = 0x26e3,
-        ResetRangedCombatTimer = 0x2715,
+        ResetFailedNotify = 0x26e2,
+        ResetRangedCombatTimer = 0x2714,
         ResetWeeklyCurrency = 0x2574,
-        RespecWipeConfirm = 0x2627,
+        RespecWipeConfirm = 0x2626,
         RespondInspectAchievements = 0x2571,
         ResumeCastBar = 0x2c3d,
         ResumeComms = 0x304b,
-        ResumeToken = 0x25bf,
-        ResurrectRequest = 0x257f,
-        ResyncRunes = 0x273f,
-        RoleChangedInform = 0x258d,
+        ResumeToken = 0x25be,
+        ResurrectRequest = 0x257e,
+        ResyncRunes = 0x273e,
+        RoleChangedInform = 0x258c,
         RoleChosen = 0x2a3a,
-        RolePollInform = 0x258e,
-        RuneRegenDebug = 0x25c9,
-        ScenarioBoot = 0x27eb,
-        ScenarioCompleted = 0x2829,
-        ScenarioPois = 0x2651,
-        ScenarioProgressUpdate = 0x264a,
-        ScenarioSetShouldShowCriteria = 0x2836,
-        ScenarioSpellUpdate = 0x2835,
-        ScenarioState = 0x2649,
-        SceneObjectEvent = 0x25f8,
-        SceneObjectPetBattleFinalRound = 0x25fd,
-        SceneObjectPetBattleFinished = 0x25fe,
-        SceneObjectPetBattleFirstRound = 0x25fa,
-        SceneObjectPetBattleInitialUpdate = 0x25f9,
-        SceneObjectPetBattleReplacementsMade = 0x25fc,
-        SceneObjectPetBattleRoundResult = 0x25fb,
+        RolePollInform = 0x258d,
+        RuneRegenDebug = 0x25c8,
+        ScenarioBoot = 0x27ed,
+        ScenarioCompleted = 0x282d,
+        ScenarioPois = 0x2650,
+        ScenarioProgressUpdate = 0x2649,
+        ScenarioSetShouldShowCriteria = 0x283a,
+        ScenarioSpellUpdate = 0x2839,
+        ScenarioState = 0x2648,
+        SceneObjectEvent = 0x25f7,
+        SceneObjectPetBattleFinalRound = 0x25fc,
+        SceneObjectPetBattleFinished = 0x25fd,
+        SceneObjectPetBattleFirstRound = 0x25f9,
+        SceneObjectPetBattleInitialUpdate = 0x25f8,
+        SceneObjectPetBattleReplacementsMade = 0x25fb,
+        SceneObjectPetBattleRoundResult = 0x25fa,
         ScriptCast = 0x2c54,
-        SellResponse = 0x26f1,
-        SendItemPassives = 0x25c2,
+        SellResponse = 0x26f0,
+        SendItemPassives = 0x25c1,
         SendKnownSpells = 0x2c2a,
-        SendRaidTargetUpdateAll = 0x264c,
-        SendRaidTargetUpdateSingle = 0x264d,
+        SendRaidTargetUpdateAll = 0x264b,
+        SendRaidTargetUpdateSingle = 0x264c,
         SendSpellCharges = 0x2c2d,
         SendSpellHistory = 0x2c2b,
         SendUnlearnSpells = 0x2c2e,
         ServerFirstAchievement = 0x2bbc,
-        ServerFirstAchievements = 0x266c,
-        ServerTime = 0x26ad,
+        ServerFirstAchievements = 0x266b,
+        ServerTime = 0x26ac,
         SetupCurrency = 0x2572,
-        SetupResearchHistory = 0x2585,
-        SetAiAnimKit = 0x2773,
-        SetAllTaskProgress = 0x27d4,
-        SetAnimTier = 0x2777,
+        SetupResearchHistory = 0x2584,
+        SetAiAnimKit = 0x2772,
+        SetAllTaskProgress = 0x27d2,
+        SetAnimTier = 0x2776,
         SetCurrency = 0x2573,
         SetDfFastLaunchResult = 0x2a2e,
-        SetDungeonDifficulty = 0x26cf,
-        SetFactionAtWar = 0x273e,
-        SetFactionNotVisible = 0x276e,
-        SetFactionStanding = 0x276f,
-        SetFactionVisible = 0x276d,
+        SetDungeonDifficulty = 0x26ce,
+        SetFactionAtWar = 0x273d,
+        SetFactionNotVisible = 0x276d,
+        SetFactionStanding = 0x276e,
+        SetFactionVisible = 0x276c,
         SetFlatSpellModifier = 0x2c36,
-        SetForcedReactions = 0x275e,
-        SetItemPurchaseData = 0x25b1,
-        SetLootMethodFailed = 0x2814,
-        SetMaxWeeklyQuantity = 0x25b8,
-        SetMeleeAnimKit = 0x2776,
-        SetMovementAnimKit = 0x2775,
+        SetForcedReactions = 0x275d,
+        SetItemPurchaseData = 0x25b0,
+        SetLootMethodFailed = 0x2817,
+        SetMaxWeeklyQuantity = 0x25b7,
+        SetMeleeAnimKit = 0x2775,
+        SetMovementAnimKit = 0x2774,
         SetPctSpellModifier = 0x2c37,
-        SetPetSpecialization = 0x2643,
-        SetPlayerDeclinedNamesResult = 0x2709,
-        SetPlayHoverAnim = 0x25cd,
-        SetProficiency = 0x2778,
+        SetPetSpecialization = 0x2642,
+        SetPlayerDeclinedNamesResult = 0x2708,
+        SetPlayHoverAnim = 0x25cc,
+        SetProficiency = 0x2777,
         SetSpellCharges = 0x2c29,
-        SetTaskComplete = 0x27d5,
-        SetTimeZoneInformation = 0x26a1,
-        SetVehicleRecId = 0x2731,
-        ShowAdventureMap = 0x2832,
-        ShowBank = 0x26aa,
-        ShowMailbox = 0x27ec,
-        ShowNeutralPlayerFactionSelectUi = 0x25f1,
-        ShowTaxiNodes = 0x26f8,
-        ShowTradeSkillResponse = 0x27b5,
-        SocketGems = 0x276a,
-        SocketGemsFailure = 0x276b,
-        SortBagsResult = 0x2822,
-        SorStartExperienceIncomplete = 0x25f3,
-        SpecializationChanged = 0x25ed,
-        SpecialMountAnim = 0x26ca,
-        SpecInvoluntarilyChanged = 0x2759,
+        SetTaskComplete = 0x27d3,
+        SetTimeZoneInformation = 0x26a0,
+        SetVehicleRecId = 0x2730,
+        ShowAdventureMap = 0x2836,
+        ShowBank = 0x26a9,
+        ShowMailbox = 0x27ee,
+        ShowNeutralPlayerFactionSelectUi = 0x25f0,
+        ShowTaxiNodes = 0x26f7,
+        ShowTradeSkillResponse = 0x27b3,
+        SocketGems = 0x2769,
+        SocketGemsFailure = 0x276a,
+        SortBagsResult = 0x2825,
+        SorStartExperienceIncomplete = 0x25f2,
+        SpecializationChanged = 0x25ec,
+        SpecialMountAnim = 0x26c9,
+        SpecInvoluntarilyChanged = 0x2758,
         SpellAbsorbLog = 0x2c1f,
         SpellCategoryCooldown = 0x2c17,
         SpellChannelStart = 0x2c34,
@@ -1599,104 +1604,104 @@ namespace Framework.Constants
         SpellPeriodicAuraLog = 0x2c1b,
         SpellPrepare = 0x2c38,
         SpellStart = 0x2c3a,
-        SpiritHealerConfirm = 0x2756,
-        StandStateUpdate = 0x275d,
-        StartElapsedTimer = 0x261b,
-        StartElapsedTimers = 0x261d,
-        StartLootRoll = 0x2632,
-        StartMirrorTimer = 0x2750,
-        StartTimer = 0x25bc,
-        StopElapsedTimer = 0x261c,
-        StopMirrorTimer = 0x2752,
-        StopSpeakerbotSound = 0x27b1,
-        StreamingMovies = 0x25bb,
-        SummonCancel = 0x26da,
-        SummonRaidMemberValidateFailed = 0x258f,
-        SummonRequest = 0x2762,
+        SpiritHealerConfirm = 0x2755,
+        StandStateUpdate = 0x275c,
+        StartElapsedTimer = 0x261a,
+        StartElapsedTimers = 0x261c,
+        StartLootRoll = 0x2631,
+        StartMirrorTimer = 0x274f,
+        StartTimer = 0x25bb,
+        StopElapsedTimer = 0x261b,
+        StopMirrorTimer = 0x2751,
+        StopSpeakerbotSound = 0x27af,
+        StreamingMovies = 0x25ba,
+        SummonCancel = 0x26d9,
+        SummonRaidMemberValidateFailed = 0x258e,
+        SummonRequest = 0x2761,
         SupercededSpells = 0x2c4b,
         SuspendComms = 0x304a,
-        SuspendToken = 0x25be,
-        TalentsInvoluntarilyReset = 0x2758,
-        TaxiNodeStatus = 0x26a7,
-        TextEmote = 0x26a5,
-        ThreatClear = 0x2711,
-        ThreatRemove = 0x2710,
-        ThreatUpdate = 0x270f,
+        SuspendToken = 0x25bd,
+        TalentsInvoluntarilyReset = 0x2757,
+        TaxiNodeStatus = 0x26a6,
+        TextEmote = 0x26a4,
+        ThreatClear = 0x2710,
+        ThreatRemove = 0x270f,
+        ThreatUpdate = 0x270e,
         TimeAdjustment = 0x2da1,
         TimeSyncRequest = 0x2da0,
-        TitleEarned = 0x270c,
-        TitleLost = 0x270d,
-        TotemCreated = 0x26f4,
-        TotemMoved = 0x26f5,
-        TradeStatus = 0x2582,
-        TradeUpdated = 0x2581,
-        TrainerBuyFailed = 0x2717,
-        TrainerList = 0x2716,
-        TransferAborted = 0x2742,
-        TransferPending = 0x25e6,
-        TransmogCollectionUpdate = 0x25c7,
-        TransmogSetCollectionUpdate = 0x25c8,
-        TriggerCinematic = 0x280c,
-        TriggerMovie = 0x26f6,
-        TurnInPetitionResult = 0x2793,
-        TutorialFlags = 0x27fe,
-        TutorialHighlightSpell = 0x283c,
-        TutorialUnhighlightSpell = 0x283b,
+        TitleEarned = 0x270b,
+        TitleLost = 0x270c,
+        TotemCreated = 0x26f3,
+        TotemMoved = 0x26f4,
+        TradeStatus = 0x2581,
+        TradeUpdated = 0x2580,
+        TrainerBuyFailed = 0x2716,
+        TrainerList = 0x2715,
+        TransferAborted = 0x2741,
+        TransferPending = 0x25e5,
+        TransmogCollectionUpdate = 0x25c6,
+        TransmogSetCollectionUpdate = 0x25c7,
+        TriggerCinematic = 0x280f,
+        TriggerMovie = 0x26f5,
+        TurnInPetitionResult = 0x2792,
+        TutorialFlags = 0x2801,
+        TutorialHighlightSpell = 0x2840,
+        TutorialUnhighlightSpell = 0x283f,
         TwitterStatus = 0x2ffd,
-        UiTime = 0x2755,
-        UndeleteCharacterResponse = 0x280f,
-        UndeleteCooldownStatusResponse = 0x2810,
+        UiTime = 0x2754,
+        UndeleteCharacterResponse = 0x2812,
+        UndeleteCooldownStatusResponse = 0x2813,
         UnlearnedSpells = 0x2c4d,
-        UpdateAccountData = 0x274a,
-        UpdateActionButtons = 0x25f6,
-        UpdateCharacterFlags = 0x2804,
+        UpdateAccountData = 0x2749,
+        UpdateActionButtons = 0x25f5,
+        UpdateCharacterFlags = 0x2807,
         UpdateDungeonEncounterForLoot = 0x2a31,
-        UpdateExpansionLevel = 0x2665,
-        UpdateInstanceOwnership = 0x26d2,
-        UpdateLastInstance = 0x26b3,
-        UpdateObject = 0x280d,
-        UpdateTalentData = 0x25ec,
-        UpdateTaskProgress = 0x27d3,
+        UpdateExpansionLevel = 0x2664,
+        UpdateInstanceOwnership = 0x26d1,
+        UpdateLastInstance = 0x26b2,
+        UpdateObject = 0x2810,
+        UpdateTalentData = 0x25eb,
+        UpdateTaskProgress = 0x27d1,
         UpdateWeeklySpellUsage = 0x2c19,
-        UpdateWorldState = 0x278e,
+        UpdateWorldState = 0x278d,
         UserlistAdd = 0x2bb9,
         UserlistRemove = 0x2bba,
         UserlistUpdate = 0x2bbb,
-        UseEquipmentSetResult = 0x2794,
-        VendorInventory = 0x25cb,
-        VignetteUpdate = 0x27b3,
-        VoidItemSwapResponse = 0x25e0,
-        VoidStorageContents = 0x25dd,
-        VoidStorageFailed = 0x25dc,
-        VoidStorageTransferChanges = 0x25de,
-        VoidTransferResult = 0x25df,
+        UseEquipmentSetResult = 0x2793,
+        VendorInventory = 0x25ca,
+        VignetteUpdate = 0x27b1,
+        VoidItemSwapResponse = 0x25df,
+        VoidStorageContents = 0x25dc,
+        VoidStorageFailed = 0x25db,
+        VoidStorageTransferChanges = 0x25dd,
+        VoidTransferResult = 0x25de,
         WaitQueueFinish = 0x256e,
         WaitQueueUpdate = 0x256d,
         WardenData = 0x2576,
-        WargameRequestSuccessfullySentToOpponent = 0x25b5,
-        Weather = 0x26d1,
+        WargameRequestSuccessfullySentToOpponent = 0x25b4,
+        Weather = 0x26d0,
         WeeklySpellUsage = 0x2c18,
         Who = 0x2bae,
-        WhoIs = 0x26d0,
-        WorldQuestUpdate = 0x2843,
-        WorldServerInfo = 0x25c3,
-        WorldText = 0x282b,
-        WowTokenAuctionSold = 0x281a,
-        WowTokenBuyRequestConfirmation = 0x281c,
-        WowTokenBuyResultConfirmation = 0x281d,
-        WowTokenCanRedeemForBalanceResult = 0x2852,
-        WowTokenCanVeteranBuyResult = 0x281b,
-        WowTokenDistributionGlueUpdate = 0x2815,
-        WowTokenDistributionUpdate = 0x2816,
-        WowTokenMarketPriceResponse = 0x2817,
-        WowTokenRedeemGameTimeUpdated = 0x281e,
-        WowTokenRedeemRequestConfirmation = 0x281f,
-        WowTokenRedeemResult = 0x2820,
-        WowTokenSellRequestConfirmation = 0x2818,
-        WowTokenSellResultConfirmation = 0x2819,
-        WowTokenUpdateAuctionableListResponse = 0x2821,
-        XpGainAborted = 0x25e1,
-        XpGainEnabled = 0x27ef,
+        WhoIs = 0x26cf,
+        WorldQuestUpdate = 0x2847,
+        WorldServerInfo = 0x25c2,
+        WorldText = 0x282f,
+        WowTokenAuctionSold = 0x281d,
+        WowTokenBuyRequestConfirmation = 0x281f,
+        WowTokenBuyResultConfirmation = 0x2820,
+        WowTokenCanRedeemForBalanceResult = 0x2856,
+        WowTokenCanVeteranBuyResult = 0x281e,
+        WowTokenDistributionGlueUpdate = 0x2818,
+        WowTokenDistributionUpdate = 0x2819,
+        WowTokenMarketPriceResponse = 0x281a,
+        WowTokenRedeemGameTimeUpdated = 0x2821,
+        WowTokenRedeemRequestConfirmation = 0x2822,
+        WowTokenRedeemResult = 0x2823,
+        WowTokenSellRequestConfirmation = 0x281b,
+        WowTokenSellResultConfirmation = 0x281c,
+        WowTokenUpdateAuctionableListResponse = 0x2824,
+        XpGainAborted = 0x25e0,
+        XpGainEnabled = 0x27f1,
         ZoneUnderAttack = 0x2bb5,
 
         // Opcodes that are not generated automatically
diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index 66b682591..1756abe6a 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -1879,6 +1879,7 @@ namespace Game.Entities
                     // send transfer packets
                     TransferPending transferPending = new TransferPending();
                     transferPending.MapID = (int)mapid;
+                    transferPending.OldMapPosition = GetPosition();
 
                     transport = GetTransport();
                     if (transport)
diff --git a/Source/Game/Entities/Player/PlayerTaxi.cs b/Source/Game/Entities/Player/PlayerTaxi.cs
index 29ac54e7e..56da5e2af 100644
--- a/Source/Game/Entities/Player/PlayerTaxi.cs
+++ b/Source/Game/Entities/Player/PlayerTaxi.cs
@@ -117,9 +117,15 @@ namespace Game.Entities
         public void AppendTaximaskTo(ShowTaxiNodes data, bool all)
         {
             if (all)
-                data.Nodes = CliDB.TaxiNodesMask;              // all existed nodes
+            {
+                data.CanLandNodes = CliDB.TaxiNodesMask;              // all existed nodes
+                data.CanUseNodes = CliDB.TaxiNodesMask;
+            }
             else
-                data.Nodes = m_taximask;                  // known nodes
+            {
+                data.CanLandNodes = m_taximask;                  // known nodes
+                data.CanUseNodes = m_taximask;
+            }
         }
 
         public bool LoadTaxiDestinationsFromString(string values, Team team)
diff --git a/Source/Game/Handlers/HotfixHandler.cs b/Source/Game/Handlers/HotfixHandler.cs
index 7c59ead71..12f9bd0e7 100644
--- a/Source/Game/Handlers/HotfixHandler.cs
+++ b/Source/Game/Handlers/HotfixHandler.cs
@@ -57,17 +57,17 @@ namespace Game
             }
         }
 
-        void SendHotfixList(int version)
+        void SendAvailableHotfixes(int version)
         {
-            SendPacket(new HotfixList(version, Global.DB2Mgr.GetHotfixData()));
+            SendPacket(new AvailableHotfixes(version, Global.DB2Mgr.GetHotfixData()));
         }
 
-        [WorldPacketHandler(ClientOpcodes.HotfixQuery, Status = SessionStatus.Authed)]
-        void HandleHotfixQuery(HotfixQuery hotfixQuery)
+        [WorldPacketHandler(ClientOpcodes.HotfixRequest, Status = SessionStatus.Authed)]
+        void HandleHotfixRequest(HotfixRequest hotfixQuery)
         {
             Dictionary<ulong, int> hotfixes = Global.DB2Mgr.GetHotfixData();
 
-            HotfixQueryResponse hotfixQueryResponse = new HotfixQueryResponse();
+            HotfixResponse hotfixQueryResponse = new HotfixResponse();
             foreach (ulong hotfixId in hotfixQuery.Hotfixes)
             {
                 int hotfix = hotfixes.LookupByKey(hotfixId);
@@ -75,7 +75,7 @@ namespace Game
                 {
                     var storage = Global.DB2Mgr.GetStorage(MathFunctions.Pair64_HiPart(hotfixId));
 
-                    HotfixQueryResponse.HotfixData hotfixData = new HotfixQueryResponse.HotfixData();
+                    HotfixResponse.HotfixData hotfixData = new HotfixResponse.HotfixData();
                     hotfixData.ID = hotfixId;
                     hotfixData.RecordID = hotfix;
                     if (storage.HasRecord((uint)hotfixData.RecordID))
diff --git a/Source/Game/Handlers/ToyHandler.cs b/Source/Game/Handlers/ToyHandler.cs
index 9b866b43f..d769c0132 100644
--- a/Source/Game/Handlers/ToyHandler.cs
+++ b/Source/Game/Handlers/ToyHandler.cs
@@ -55,11 +55,12 @@ namespace Game
         [WorldPacketHandler(ClientOpcodes.UseToy)]
         void HandleUseToy(UseToy packet)
         {
-            ItemTemplate item = Global.ObjectMgr.GetItemTemplate(packet.ItemID);
+            uint itemId = packet.Cast.Misc[0];
+            ItemTemplate item = Global.ObjectMgr.GetItemTemplate(itemId);
             if (item == null)
                 return;
 
-            if (!_collectionMgr.HasToy(packet.ItemID))
+            if (!_collectionMgr.HasToy(itemId))
                 return;
 
             var effect = item.Effects.Find(eff => { return packet.Cast.SpellID == eff.SpellID; });
@@ -69,7 +70,7 @@ namespace Game
             SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(packet.Cast.SpellID);
             if (spellInfo == null)
             {
-                Log.outError(LogFilter.Network, "HandleUseToy: unknown spell id: {0} used by Toy Item entry {1}", packet.Cast.SpellID, packet.ItemID);
+                Log.outError(LogFilter.Network, "HandleUseToy: unknown spell id: {0} used by Toy Item entry {1}", packet.Cast.SpellID, itemId);
                 return;
             }
 
@@ -86,7 +87,7 @@ namespace Game
             SendPacket(spellPrepare);
 
             spell.m_fromClient = true;
-            spell.m_castItemEntry = packet.ItemID;
+            spell.m_castItemEntry = itemId;
             spell.m_misc.Data0 = packet.Cast.Misc[0];
             spell.m_misc.Data1 = packet.Cast.Misc[1];
             spell.m_castFlagsEx |= SpellCastFlagsEx.UseToySpell;
diff --git a/Source/Game/Network/Packets/HotfixPackets.cs b/Source/Game/Network/Packets/HotfixPackets.cs
index 4fbb4326b..df5c23b65 100644
--- a/Source/Game/Network/Packets/HotfixPackets.cs
+++ b/Source/Game/Network/Packets/HotfixPackets.cs
@@ -76,9 +76,9 @@ namespace Game.Network.Packets
         public ByteBuffer Data = new ByteBuffer();
     }
 
-    class HotfixList : ServerPacket
+    class AvailableHotfixes : ServerPacket
     {
-        public HotfixList(int hotfixCacheVersion, Dictionary<ulong, int> hotfixes) : base(ServerOpcodes.HotfixList)
+        public AvailableHotfixes(int hotfixCacheVersion, Dictionary<ulong, int> hotfixes) : base(ServerOpcodes.AvailableHotfixes)
         {
             HotfixCacheVersion = hotfixCacheVersion;
             Hotfixes = hotfixes;
@@ -97,9 +97,9 @@ namespace Game.Network.Packets
         public Dictionary<ulong, int> Hotfixes = new Dictionary<ulong, int>();
     }
 
-    class HotfixQuery : ClientPacket
+    class HotfixRequest : ClientPacket
     {
-        public HotfixQuery(WorldPacket packet) : base(packet) { }
+        public HotfixRequest(WorldPacket packet) : base(packet) { }
 
         public override void Read()
         {
@@ -114,9 +114,9 @@ namespace Game.Network.Packets
         public List<ulong> Hotfixes = new List<ulong>();
     }
 
-    class HotfixQueryResponse : ServerPacket
+    class HotfixResponse : ServerPacket
     {
-        public HotfixQueryResponse() : base(ServerOpcodes.HotfixQueryResponse) { }
+        public HotfixResponse() : base(ServerOpcodes.HotfixResponse) { }
 
         public override void Write()
         {
diff --git a/Source/Game/Network/Packets/LFGPackets.cs b/Source/Game/Network/Packets/LFGPackets.cs
index 5f2385dc6..092defaa5 100644
--- a/Source/Game/Network/Packets/LFGPackets.cs
+++ b/Source/Game/Network/Packets/LFGPackets.cs
@@ -359,6 +359,7 @@ namespace Game.Network.Packets
             _worldPacket.WriteUInt32(Slot);
             _worldPacket.WriteUInt8(State);
             _worldPacket.WriteUInt32(CompletedMask);
+            _worldPacket.WriteUInt32(EncounterMask);
             _worldPacket.WriteUInt32(Players.Count);
             _worldPacket.WriteUInt8(Unused);
             _worldPacket.WriteBit(ValidCompletedMask);
@@ -376,6 +377,7 @@ namespace Game.Network.Packets
         public uint Slot;
         public byte State;
         public uint CompletedMask;
+        public uint EncounterMask;
         public byte Unused;
         public bool ValidCompletedMask;
         public bool ProposalSilent;
diff --git a/Source/Game/Network/Packets/MovementPackets.cs b/Source/Game/Network/Packets/MovementPackets.cs
index 0f31883af..e53cd3357 100644
--- a/Source/Game/Network/Packets/MovementPackets.cs
+++ b/Source/Game/Network/Packets/MovementPackets.cs
@@ -477,6 +477,7 @@ namespace Game.Network.Packets
         }
 
         public int MapID = -1;
+        public Position OldMapPosition;
         public Optional<ShipTransferPending> Ship;
         public Optional<int> TransferSpellID;
 
diff --git a/Source/Game/Network/Packets/SpellPackets.cs b/Source/Game/Network/Packets/SpellPackets.cs
index 1c58c7b5f..3ba40125c 100644
--- a/Source/Game/Network/Packets/SpellPackets.cs
+++ b/Source/Game/Network/Packets/SpellPackets.cs
@@ -1605,7 +1605,7 @@ namespace Game.Network.Packets
             Immunities.Write(data);
             Predict.Write(data);
 
-            data.WriteBits(CastFlagsEx, 22);
+            data.WriteBits(CastFlagsEx, 23);
             data.WriteBits(HitTargets.Count, 16);
             data.WriteBits(MissTargets.Count, 16);
             data.WriteBits(MissStatus.Count, 16);
diff --git a/Source/Game/Network/Packets/SystemPackets.cs b/Source/Game/Network/Packets/SystemPackets.cs
index 782782d16..4696eeb67 100644
--- a/Source/Game/Network/Packets/SystemPackets.cs
+++ b/Source/Game/Network/Packets/SystemPackets.cs
@@ -46,6 +46,8 @@ namespace Game.Network.Packets
             _worldPacket.WriteUInt32(TokenRedeemIndex);
             _worldPacket.WriteInt64(TokenBalanceAmount);
 
+            _worldPacket.WriteUInt32(BpayStoreProductDeliveryDelay);
+
             _worldPacket.WriteBit(VoiceEnabled);
             _worldPacket.WriteBit(EuropaTicketSystemStatus.HasValue);
             _worldPacket.WriteBit(ScrollOfResurrectionEnabled);
@@ -141,6 +143,7 @@ namespace Game.Network.Packets
         public uint TokenPollTimeSeconds;
         public uint TokenRedeemIndex;
         public long TokenBalanceAmount;
+        public uint BpayStoreProductDeliveryDelay;
         public bool ItemRestorationButtonEnabled;
         public bool CharUndeleteEnabled; // Implemented
         public bool BpayStoreDisabledByParentalControls;
@@ -231,11 +234,15 @@ namespace Game.Network.Packets
             _worldPacket.WriteBit(false); // not accessed in handler
             _worldPacket.WriteBit(TrialBoostEnabled);
             _worldPacket.WriteBit(TokenBalanceEnabled);
+            _worldPacket.WriteBit(LiveRegionCharacterListEnabled);
+            _worldPacket.WriteBit(LiveRegionCharacterCopyEnabled);
+            _worldPacket.WriteBit(LiveRegionAccountCopyEnabled);
             _worldPacket.FlushBits();
 
             _worldPacket.WriteInt32(TokenPollTimeSeconds);
             _worldPacket.WriteInt32(TokenRedeemIndex);
             _worldPacket.WriteInt64(TokenBalanceAmount);
+            _worldPacket.WriteUInt32(BpayStoreProductDeliveryDelay);
         }
 
         public bool BpayStoreAvailable; // NYI
@@ -250,9 +257,13 @@ namespace Game.Network.Packets
         public bool CompetitiveModeEnabled; // NYI
         public bool TrialBoostEnabled; // NYI
         public bool TokenBalanceEnabled; // NYI
+        public bool LiveRegionCharacterListEnabled; // NYI
+        public bool LiveRegionCharacterCopyEnabled; // NYI
+        public bool LiveRegionAccountCopyEnabled; // NYI
         public int TokenPollTimeSeconds;     // NYI
         public int TokenRedeemIndex;     // NYI
         public long TokenBalanceAmount;     // NYI
+        public uint BpayStoreProductDeliveryDelay;     // NYI
     }
 
     public class MOTD : ServerPacket
diff --git a/Source/Game/Network/Packets/TaxiPackets.cs b/Source/Game/Network/Packets/TaxiPackets.cs
index 4241f13e8..7e233a4e3 100644
--- a/Source/Game/Network/Packets/TaxiPackets.cs
+++ b/Source/Game/Network/Packets/TaxiPackets.cs
@@ -57,7 +57,8 @@ namespace Game.Network.Packets
             _worldPacket.WriteBit(WindowInfo.HasValue);
             _worldPacket.FlushBits();
 
-            _worldPacket.WriteInt32(Nodes.Length);
+            _worldPacket.WriteUInt32(CanLandNodes.Length);
+            _worldPacket.WriteUInt32(CanUseNodes.Length);
 
             if (WindowInfo.HasValue)
             {
@@ -65,12 +66,16 @@ namespace Game.Network.Packets
                 _worldPacket.WriteUInt32(WindowInfo.Value.CurrentNode);
             }
 
-            foreach (var node in Nodes)
+            foreach (var node in CanLandNodes)
+                _worldPacket.WriteUInt8(node);
+
+            foreach (var node in CanUseNodes)
                 _worldPacket.WriteUInt8(node);
         }
 
         public Optional<ShowTaxiNodesWindowInfo> WindowInfo;
-        public byte[] Nodes = null;
+        public byte[] CanLandNodes = null; // Nodes known by player
+        public byte[] CanUseNodes = null; // Nodes available for use - this can temporarily disable a known node
     }
 
     class EnableTaxiNode : ClientPacket
diff --git a/Source/Game/Network/Packets/ToyPackets.cs b/Source/Game/Network/Packets/ToyPackets.cs
index fe4904d5d..7d7ff580f 100644
--- a/Source/Game/Network/Packets/ToyPackets.cs
+++ b/Source/Game/Network/Packets/ToyPackets.cs
@@ -39,12 +39,10 @@ namespace Game.Network.Packets
 
         public override void Read()
         {
-            ItemID = _worldPacket.ReadUInt32();
             Cast.Read(_worldPacket);
         }
 
         public SpellCastRequest Cast = new SpellCastRequest();
-        public uint ItemID;
     }
 
     class AccountToysUpdate : ServerPacket
diff --git a/Source/Game/Network/WorldSocket.cs b/Source/Game/Network/WorldSocket.cs
index 31dcf6955..1d2534237 100644
--- a/Source/Game/Network/WorldSocket.cs
+++ b/Source/Game/Network/WorldSocket.cs
@@ -36,6 +36,10 @@ namespace Game.Network
         static byte[] SessionKeySeed = { 0x58, 0xCB, 0xCF, 0x40, 0xFE, 0x2E, 0xCE, 0xA6, 0x5A, 0x90, 0xB8, 0x01, 0x68, 0x6C, 0x28, 0x0B };
         static byte[] ContinuedSessionSeed = { 0x16, 0xAD, 0x0C, 0xD4, 0x46, 0xF9, 0x4F, 0xB2, 0xEF, 0x7D, 0xEA, 0x2A, 0x17, 0x66, 0x4D, 0x2F };
 
+        static uint[] ClientTypeSeed_Win = { 0x15E29B46, 0xD030E52E, 0x8BB823BD, 0x2EE440F4 };
+        static uint[] ClientTypeSeed_Wn64 = { 0xA4DEB5FC, 0x2F09587E, 0x86C96622, 0x98162415 };
+        static uint[] ClientTypeSeed_Mc64 = { 0xA69C3979, 0x92260A02, 0x75F80969, 0xBA56132D };
+
         public WorldSocket(Socket socket) : base(socket)
         {
             _connectType = ConnectionType.Realm;
@@ -379,7 +383,19 @@ namespace Game.Network
             // For hook purposes, we get Remoteaddress at this point.
             string address = GetRemoteIpAddress().ToString();
 
-            HmacSha256 hmac = new HmacSha256(account.game.SessionKey);
+            Sha256 digestKeyHash = new Sha256();
+            digestKeyHash.Process(account.game.SessionKey, account.game.SessionKey.Length);
+
+            uint[] clientSeed = ClientTypeSeed_Win;
+            if (account.game.OS == "Wn64")
+                clientSeed = ClientTypeSeed_Wn64;
+            else if (account.game.OS == "Mc64")
+                clientSeed = ClientTypeSeed_Mc64;
+
+            byte[] byteArray = new byte[clientSeed.Length * 4];
+            Buffer.BlockCopy(clientSeed, 0, byteArray, 0, clientSeed.Length * 4);
+
+            HmacSha256 hmac = new HmacSha256(digestKeyHash.Digest);
             hmac.Process(authSession.LocalChallenge, authSession.LocalChallenge.Count);
             hmac.Process(_serverChallenge, 16);
             hmac.Finish(AuthCheckSeed, 16);
@@ -392,7 +408,10 @@ namespace Game.Network
                 return;
             }
 
-            HmacSha256 sessionKeyHmac = new HmacSha256(account.game.SessionKey);
+            Sha256 keyData = new Sha256();
+            keyData.Finish(account.game.SessionKey, account.game.SessionKey.Length);
+
+            HmacSha256 sessionKeyHmac = new HmacSha256(keyData.Digest);
             sessionKeyHmac.Process(_serverChallenge, 16);
             sessionKeyHmac.Process(authSession.LocalChallenge, authSession.LocalChallenge.Count);
             sessionKeyHmac.Finish(SessionKeySeed, 16);
diff --git a/Source/Game/Server/WorldSession.cs b/Source/Game/Server/WorldSession.cs
index 63a43c49c..09d39a726 100644
--- a/Source/Game/Server/WorldSession.cs
+++ b/Source/Game/Server/WorldSession.cs
@@ -712,7 +712,7 @@ namespace Game
             SendSetTimeZoneInformation();
             SendFeatureSystemStatusGlueScreen();
             SendClientCacheVersion(WorldConfig.GetUIntValue(WorldCfg.ClientCacheVersion));
-            SendHotfixList(WorldConfig.GetIntValue(WorldCfg.HotfixCacheVersion));
+            SendAvailableHotfixes(WorldConfig.GetIntValue(WorldCfg.HotfixCacheVersion));
             SendTutorialsData();
 
             SQLResult result = holder.GetResult(AccountInfoQueryLoad.GlobalRealmCharacterCounts);