diff --git a/Source/Framework/Constants/Network/Opcodes.cs b/Source/Framework/Constants/Network/Opcodes.cs index e59237bfa..190349192 100644 --- a/Source/Framework/Constants/Network/Opcodes.cs +++ b/Source/Framework/Constants/Network/Opcodes.cs @@ -40,22 +40,24 @@ namespace Framework.Constants AssignEquipmentSetSpec = 0x320b, AttackStop = 0x3259, AttackSwing = 0x3258, + AuctionableTokenSell = 0x36e6, + AuctionableTokenSellAtMarketPrice = 0x36e7, AuctionBrowseQuery = 0x34d0, AuctionCancelCommoditiesPurchase = 0x34d8, AuctionConfirmCommoditiesPurchase = 0x34d7, + AuctionGetCommodityQuote = 0x34d6, AuctionHelloRequest = 0x34cb, - AuctionListBidderItems = 0x34d4, + AuctionListBiddedItems = 0x34d4, AuctionListBucketsByBucketKeys = 0x34d5, AuctionListItemsByBucketKey = 0x34d1, AuctionListItemsByItemId = 0x34d2, - AuctionListOwnerItems = 0x34d3, + AuctionListOwnedItems = 0x34d3, AuctionPlaceBid = 0x34cf, AuctionRemoveItem = 0x34cd, AuctionReplicateItems = 0x34ce, AuctionSellCommodity = 0x34d9, AuctionSellItem = 0x34cc, AuctionSetFavoriteItem = 0x3732, - AuctionStartCommoditiesPurchase = 0x34d6, AuthContinuedSession = 0x3766, AuthSession = 0x3765, AutobankItem = 0x3996, @@ -80,7 +82,6 @@ namespace Framework.Constants BattlemasterJoinSkirmish = 0x352a, BattlenetChallengeResponse = 0x36d1, BattlenetRequest = 0x36f5, - BattlenetRequestRealmListTicket = 0x36fa, BattlePayAckFailedResponse = 0x36cb, BattlePayCancelOpenCheckout = 0x3712, BattlePayConfirmPurchaseResponse = 0x36ca, @@ -90,14 +91,10 @@ namespace Framework.Constants BattlePayOpenCheckout = 0x370c, BattlePayQueryClassTrialBoostResult = 0x36c4, BattlePayRequestCharacterBoostUnrevoke = 0x36c2, - BattlePayRequestCurrentVasTransferQueues = 0x3709, BattlePayRequestPriceInfo = 0x3708, - BattlePayRequestVasCharacterQueueTime = 0x370a, - BattlePayStartPurchase = 0x36f1, + BattlePayStartPurchase = 0x36c9, BattlePayStartVasPurchase = 0x36f2, BattlePayTrialBoostCharacter = 0x36c3, - BattlePayValidateBnetVasTransfer = 0x370b, - BattlePayVasPurchaseComplete = 0x36f0, BattlePetClearFanfare = 0x312c, BattlePetDeletePet = 0x3623, BattlePetDeletePetCheat = 0x3624, @@ -121,8 +118,6 @@ namespace Framework.Constants BuyBankSlot = 0x34b4, BuyItem = 0x34a3, BuyReagentBank = 0x34b5, - BuyWowTokenConfirm = 0x36ea, - BuyWowTokenStart = 0x36e9, CageBattlePet = 0x31f2, CalendarAddEvent = 0x367d, CalendarCommunityFilter = 0x3671, @@ -151,13 +146,14 @@ namespace Framework.Constants CancelTempEnchantment = 0x34fa, CancelTrade = 0x315c, CanDuel = 0x3662, - CanRedeemWowTokenForBalance = 0x3707, + CanRedeemTokenForBalance = 0x3707, CastSpell = 0x329f, ChallengeModeRequestLeaders = 0x3090, ChallengeModeRequestMapStats = 0x308f, ChangeBagSlotFlag = 0x3328, ChangeBankBagSlotFlag = 0x3329, ChangeMonumentAppearance = 0x330a, + ChangeRealmTicket = 0x36fa, ChangeSubGroup = 0x364c, CharacterRenameRequest = 0x36bf, CharCustomize = 0x3690, @@ -199,7 +195,6 @@ namespace Framework.Constants ChatReportFiltered = 0x37cc, ChatReportIgnored = 0x37cb, ChatUnregisterAllAddonPrefixes = 0x37ce, - CheckWowTokenVeteranEligibility = 0x36e8, ChoiceResponse = 0x32a4, ClearNewAppearance = 0x312f, ClearRaidMarker = 0x31a5, @@ -225,14 +220,22 @@ namespace Framework.Constants CommentatorGetPlayerCooldowns = 0x35f3, CommentatorGetPlayerInfo = 0x35f2, CommentatorStartWargame = 0x35ef, + CommerceTokenGetCount = 0x36e4, + CommerceTokenGetLog = 0x36ee, + CommerceTokenGetMarketPrice = 0x36e5, Complaint = 0x366c, CompleteCinematic = 0x354f, CompleteMovie = 0x34e5, ConfirmArtifactRespec = 0x31aa, ConfirmRespecWipe = 0x320d, ConnectToFailed = 0x35d4, + ConsumableTokenBuy = 0x36e9, + ConsumableTokenBuyAtMarketPrice = 0x36ea, + ConsumableTokenCanVeteranBuy = 0x36e8, + ConsumableTokenRedeem = 0x36ec, + ConsumableTokenRedeemConfirmation = 0x36ed, ContributionContribute = 0x355f, - ContributionGetState = 0x3560, + ContributionLastUpdateRequest = 0x3560, ConversationLineStarted = 0x3550, ConvertRaid = 0x364e, CreateCharacter = 0x3643, @@ -261,10 +264,10 @@ namespace Framework.Constants DuelResponse = 0x34ea, EjectPassenger = 0x323f, Emote = 0x354b, - EnableEncryptionAck = 0x3767, EnableNagle = 0x376b, EnableTaxiNode = 0x34a9, EngineSurvey = 0x36e2, + EnterEncryptedModeAck = 0x3767, EnumCharacters = 0x35e8, EnumCharactersDeletedByClient = 0x36dc, FarSight = 0x34f0, @@ -307,6 +310,8 @@ namespace Framework.Constants GetRemainingGameTime = 0x36eb, GetTrophyList = 0x3307, GetUndeleteCharacterCooldownStatus = 0x36de, + GetVasAccountCharacterList = 0x36f0, + GetVasTransferTargetRealmList = 0x36f1, GmTicketAcknowledgeSurvey = 0x3694, GmTicketGetCaseStatus = 0x3693, GmTicketGetSystemStatus = 0x3692, @@ -580,8 +585,6 @@ namespace Framework.Constants ReadyCheckResponse = 0x3634, ReadItem = 0x3327, ReclaimCorpse = 0x34e3, - RedeemWowTokenConfirm = 0x36ed, - RedeemWowTokenStart = 0x36ec, RemoveNewItem = 0x334f, RemoveRafRecruit = 0x3724, ReorderCharacters = 0x35e9, @@ -623,7 +626,6 @@ namespace Framework.Constants RequestVehiclePrevSeat = 0x323b, RequestVehicleSwitchSeat = 0x323d, RequestWorldQuestUpdate = 0x334d, - RequestWowTokenMarketPrice = 0x36e5, ResetChallengeMode = 0x3205, ResetChallengeModeCheat = 0x3206, ResetInstances = 0x3668, @@ -638,11 +640,10 @@ namespace Framework.Constants SceneTriggerEvent = 0x3223, SelfRes = 0x353b, SellItem = 0x34a2, - SellWowTokenConfirm = 0x36e7, - SellWowTokenStart = 0x36e6, SendContactList = 0x36cd, SendMail = 0x35fa, SendTextEmote = 0x3488, + ServerTimeOffsetRequest = 0x369c, SetAchievementsHidden = 0x3228, SetActionBarToggles = 0x353c, SetActionButton = 0x3635, @@ -732,7 +733,6 @@ namespace Framework.Constants TwitterConnect = 0x3127, TwitterDisconnect = 0x312b, TwitterPost = 0x3332, - UiTimeRequest = 0x369c, UnacceptTrade = 0x315b, UndeleteCharacter = 0x36dd, UnlearnSkill = 0x34ed, @@ -745,14 +745,15 @@ namespace Framework.Constants UpdateRaidTarget = 0x3650, UpdateSpellVisual = 0x32a0, UpdateVasPurchaseStates = 0x36f3, - UpdateWowTokenAuctionableList = 0x36ee, - UpdateWowTokenCount = 0x36e4, UpgradeGarrison = 0x32c0, UsedFollow = 0x3186, UseCritterItem = 0x3244, UseEquipmentSet = 0x3995, UseItem = 0x329b, UseToy = 0x329d, + VasCheckTransferOk = 0x370b, + VasGetQueueMinutes = 0x370a, + VasGetServiceStatus = 0x3709, ViolenceLevel = 0x3184, VoiceChatJoinChannel = 0x370f, VoiceChatLogin = 0x370e, @@ -773,51 +774,63 @@ namespace Framework.Constants AccountCriteriaUpdate = 0x28c5, AccountDataTimes = 0x274f, AccountMountUpdate = 0x25c4, - AccountToysUpdate = 0x25c5, + AccountToyUpdate = 0x25c5, + AccountTransmogSetFavoritesUpdate = 0x25c8, + AccountTransmogUpdate = 0x25c7, AchievementDeleted = 0x2727, AchievementEarned = 0x2663, + ActivateEssenceFailed = 0x2872, ActivateTaxiReply = 0x26ac, ActiveGlyphs = 0x2c53, + AddonListRequest = 0x2662, AddBattlenetFriendResponse = 0x265d, AddItemPassive = 0x25c0, AddLossOfControl = 0x269c, AddRunePower = 0x26eb, AdjustSplineDuration = 0x25e9, - AdventureMapPoiQueryResponse = 0x2842, + AdventureMapOpenNpc = 0x2838, AeLootTargets = 0x262f, AeLootTargetAck = 0x2630, AiReaction = 0x26e8, + AlliedRaceDetails = 0x283e, AllAccountCriteria = 0x2571, AllAchievementData = 0x2570, AllGuildAchievements = 0x29b8, + ApplyMountEquipmentResult = 0x28b5, ArchaeologySurveryCast = 0x2588, - AreaPoiUpdate = 0x284f, + AreaPoiUpdateResponse = 0x284f, AreaSpiritHealerTime = 0x2786, AreaTriggerDenied = 0x26a3, + AreaTriggerForceSetPositionAndFacing = 0x2642, AreaTriggerNoCorpse = 0x275b, - AreaTriggerPlayVisualEvent = 0x2641, + AreaTriggerPlaySpellVisual = 0x2641, AreaTriggerRePath = 0x263f, AreaTriggerReShape = 0x2644, - ArenaCrowdControlSpells = 0x2652, + AreaTriggerSetVisualAnim = 0x2640, + AreaTriggerUnattach = 0x2643, + ArenaCrowdControlSpellResult = 0x2652, ArenaPrepOpponentSpecializations = 0x2668, - ArtifactForgeOpened = 0x27e8, - ArtifactRespecConfirm = 0x27eb, - ArtifactTraitsRefunded = 0x27ec, + ArtifactEndgamePowersRefunded = 0x27ec, + ArtifactForgeError = 0x27ea, + ArtifactRespecPrompt = 0x27eb, ArtifactXpGain = 0x2830, AttackerStateUpdate = 0x27d5, AttackStart = 0x2670, AttackStop = 0x2671, AttackSwingError = 0x2739, AttackSwingLandedLog = 0x273a, + AuctionableTokenAuctionSold = 0x281e, + AuctionableTokenSellAtMarketPriceResponse = 0x281d, + AuctionableTokenSellConfirmRequired = 0x281c, AuctionClosedNotification = 0x2731, AuctionCommandResult = 0x272e, - AuctionCommodityQuote = 0x28c3, - AuctionFavoriteItems = 0x28cc, + AuctionFavoriteList = 0x28cc, + AuctionGetCommodityQuoteResult = 0x28c3, AuctionHelloResponse = 0x272c, - AuctionListBidderItemsResult = 0x28c2, + AuctionListBiddedItemsResult = 0x28c2, AuctionListBucketsResult = 0x28bf, AuctionListItemsResult = 0x28c0, - AuctionListOwnerItemsResult = 0x28c1, + AuctionListOwnedItemsResult = 0x28c1, AuctionOutbidNotification = 0x2730, AuctionOwnerBidNotification = 0x2732, AuctionReplicateResponse = 0x272d, @@ -825,17 +838,13 @@ namespace Framework.Constants AuraPointsDepleted = 0x2c23, AuraUpdate = 0x2c22, AuthChallenge = 0x3048, - AuthError = 0x256c, + AuthFailed = 0x256c, AuthResponse = 0x256d, AvailableHotfixes = 0x25a3, - AzeriteEmpoweredItemEquippedStatusChanged = 0x2871, - AzeriteEmpoweredItemRespecOpen = 0x283b, - AzeriteEssenceForgeClose = 0x2874, - AzeriteEssenceForgeOpened = 0x2873, - AzeriteEssenceSelectionResult = 0x2872, - AzeriteXpGain = 0x2870, - BanReason = 0x26b8, + AzeriteRespecNpc = 0x283b, + BagCleanupFinished = 0x2826, BarberShopResult = 0x26f1, + BatchPresenceSubscription = 0x28a4, BattlefieldList = 0x2596, BattlefieldPortDenied = 0x259c, BattlefieldStatusActive = 0x2592, @@ -853,38 +862,27 @@ namespace Framework.Constants BattlenetChallengeAbort = 0x27d4, BattlenetChallengeStart = 0x27d3, BattlenetNotification = 0x284a, - BattlenetRealmListTicket = 0x284c, BattlenetResponse = 0x2849, - BattlenetSetSessionState = 0x284b, - BattlenetUpdateSessionKey = 0x286a, + BattleNetConnectionStatus = 0x284b, BattlePayAckFailed = 0x27ce, BattlePayBattlePetDelivered = 0x27c2, - BattlePayBundlePriceUpdate = 0x285d, + BattlePayCollectionItemDelivered = 0x27c3, BattlePayConfirmPurchase = 0x27cd, BattlePayDeliveryEnded = 0x27c0, BattlePayDeliveryStarted = 0x27bf, + BattlePayDistributionUnrevoked = 0x27bd, BattlePayDistributionUpdate = 0x27be, BattlePayGetDistributionListResponse = 0x27bc, BattlePayGetProductListResponse = 0x27ba, BattlePayGetPurchaseListResponse = 0x27bb, BattlePayMountDelivered = 0x27c1, - BattlePayOpenCheckoutResult = 0x2863, BattlePayPurchaseUpdate = 0x27cc, + BattlePayStartCheckout = 0x2869, BattlePayStartDistributionAssignToTargetResponse = 0x27ca, BattlePayStartPurchaseResponse = 0x27c9, - BattlePaySubscriptionChanged = 0x286c, - BattlePayToyDelivered = 0x27c3, - BattlePayVasBnetTransferValidationResult = 0x2861, - BattlePayVasBoostConsumed = 0x27bd, - BattlePayVasCharacterList = 0x2833, - BattlePayVasCharacterQueueStatus = 0x285f, + BattlePayValidatePurchaseResponse = 0x285d, BattlePayVasGuildFollowInfo = 0x29e7, BattlePayVasGuildMasterList = 0x29e6, - BattlePayVasPurchaseComplete = 0x2836, - BattlePayVasPurchaseList = 0x2837, - BattlePayVasPurchaseStarted = 0x2835, - BattlePayVasRealmList = 0x2834, - BattlePayVasTransferQueueStatus = 0x285e, BattlePetsHealed = 0x260b, BattlePetCageDateError = 0x26a6, BattlePetDeleted = 0x2608, @@ -893,9 +891,9 @@ namespace Framework.Constants BattlePetJournalLockAcquired = 0x2605, BattlePetJournalLockDenied = 0x2606, BattlePetLicenseChanged = 0x260c, - BattlePetMaxCountChanged = 0x2603, BattlePetRestored = 0x260a, BattlePetRevoked = 0x2609, + BattlePetSetMaxPets = 0x2603, BattlePetTrapLevel = 0x2602, BattlePetUpdates = 0x2601, BinderConfirm = 0x273f, @@ -906,28 +904,29 @@ namespace Framework.Constants BlackMarketRequestItemsResult = 0x2647, BlackMarketWon = 0x264a, BonusRollEmpty = 0x2665, - BonusRollFailed = 0x2877, - BossKillCredit = 0x27c8, + BossKill = 0x27c8, BreakTarget = 0x266f, BroadcastAchievement = 0x2bbc, + BroadcastSummonCast = 0x28a8, + BroadcastSummonResponse = 0x28a9, BuyFailed = 0x26fa, BuySucceeded = 0x26f9, CacheInfo = 0x2749, CacheVersion = 0x2748, CalendarClearPendingAction = 0x26cc, CalendarCommandResult = 0x26cd, - CalendarEventInitialInvites = 0x26bc, - CalendarEventInvite = 0x26bd, - CalendarEventInviteAlert = 0x26c1, - CalendarEventInviteModeratorStatus = 0x26c0, - CalendarEventInviteNotes = 0x26c6, - CalendarEventInviteNotesAlert = 0x26c7, - CalendarEventInviteRemoved = 0x26be, - CalendarEventInviteRemovedAlert = 0x26c3, - CalendarEventInviteStatus = 0x26bf, - CalendarEventInviteStatusAlert = 0x26c2, + CalendarCommunityInvite = 0x26bc, CalendarEventRemovedAlert = 0x26c4, CalendarEventUpdatedAlert = 0x26c5, + CalendarInviteAdded = 0x26bd, + CalendarInviteAlert = 0x26c1, + CalendarInviteModeratorStatus = 0x26c0, + CalendarInviteNotes = 0x26c6, + CalendarInviteNotesAlert = 0x26c7, + CalendarInviteRemoved = 0x26be, + CalendarInviteRemovedAlert = 0x26c3, + CalendarInviteStatus = 0x26bf, + CalendarInviteStatusAlert = 0x26c2, CalendarRaidLockoutAdded = 0x26c8, CalendarRaidLockoutRemoved = 0x26c9, CalendarRaidLockoutUpdated = 0x26ca, @@ -942,36 +941,31 @@ namespace Framework.Constants CancelSpellVisual = 0x2c44, CancelSpellVisualKit = 0x2c48, CanDuelResult = 0x267a, + CanRedeemTokenForBalanceResponse = 0x285c, + CapturePointRemoved = 0x2599, CastFailed = 0x2c56, CategoryCooldown = 0x2c16, - ChallengeModeAffixes = 0x2625, - ChallengeModeAllMapStats = 0x2624, ChallengeModeComplete = 0x2622, - ChallengeModeNewPlayerRecord = 0x2628, - ChallengeModeNewPlayerSeasonRecord = 0x2629, ChallengeModeRequestLeadersResult = 0x2626, ChallengeModeReset = 0x2621, - ChallengeModeRewards = 0x2623, ChallengeModeStart = 0x261f, ChallengeModeUpdateDeathCount = 0x2620, ChangePlayerDifficultyResult = 0x273b, + ChangeRealmTicketResponse = 0x284c, ChannelList = 0x2bc3, ChannelNotify = 0x2bc0, ChannelNotifyJoined = 0x2bc1, ChannelNotifyLeft = 0x2bc2, - CharacterClassTrialCreate = 0x2806, - CharacterInventoryOverflowWarning = 0x286b, - CharacterItemFixup = 0x285a, + CharacterCheckUpgradeResult = 0x2806, CharacterLoginFailed = 0x274a, CharacterObjectTestResponse = 0x27d2, CharacterRenameResult = 0x27ac, - CharacterUpgradeComplete = 0x2805, - CharacterUpgradeQueued = 0x2804, - CharacterUpgradeSpellTierSet = 0x25f6, + CharacterUpgradeAborted = 0x2805, + CharacterUpgradeComplete = 0x2804, + CharacterUpgradeManualUnrevokeResult = 0x2807, CharacterUpgradeStarted = 0x2803, - CharacterUpgradeUnrevokeResult = 0x2807, - CharCustomize = 0x2722, - CharCustomizeFailed = 0x2721, + CharCustomizeFailure = 0x2721, + CharCustomizeSuccess = 0x2722, CharFactionChangeResult = 0x27f0, Chat = 0x2bad, ChatAutoResponded = 0x2bb8, @@ -986,31 +980,45 @@ namespace Framework.Constants ChatServerMessage = 0x2bc4, CheatIgnoreDimishingReturns = 0x2c12, CheckWargameEntry = 0x25a0, + ClaimRafRewardResponse = 0x28b9, ClearAllSpellCharges = 0x2c27, ClearBossEmotes = 0x25ce, ClearCooldown = 0x26ed, ClearCooldowns = 0x2c26, ClearLossOfControl = 0x269e, + ClearResurrect = 0x2580, ClearSpellCharges = 0x2c28, ClearTarget = 0x26e4, - ClubFinderApplicantsList = 0x28ae, - ClubFinderApplications = 0x28af, - ClubFinderApplicationsChanged = 0x28b0, - ClubFinderClubsData = 0x28b2, - ClubFinderClubsList = 0x28ad, - ClubFinderCommandResult = 0x28b1, + CloseArtifactForge = 0x27e9, + CloseHeartForge = 0x2874, + ClubFinderErrorMessage = 0x28b1, + ClubFinderGetClubPostingIdsResponse = 0x28b4, + ClubFinderLookupClubPostingsList = 0x28b2, + ClubFinderResponseCharacterApplicationList = 0x28af, + ClubFinderResponsePostRecruitmentMessage = 0x28b3, + ClubFinderUpdateApplications = 0x28b0, CoinRemoved = 0x262e, CombatEventFailed = 0x2672, CommentatorMapInfo = 0x274c, CommentatorPlayerInfo = 0x274d, CommentatorStateChanged = 0x274b, + CommerceTokenGetCountResponse = 0x2819, + CommerceTokenGetLogResponse = 0x2825, + CommerceTokenGetMarketPriceResponse = 0x281b, + CommerceTokenUpdate = 0x281a, ComplaintResult = 0x26db, CompleteShipmentResponse = 0x27e4, + ConfirmPartyInvite = 0x285b, ConnectTo = 0x304d, ConquestFormulaConstants = 0x27cf, ConsoleWrite = 0x2655, + ConsumableTokenBuyAtMarketPriceResponse = 0x2821, + ConsumableTokenBuyChoiceRequired = 0x2820, + ConsumableTokenCanVeteranBuyResponse = 0x281f, + ConsumableTokenRedeemConfirmRequired = 0x2823, + ConsumableTokenRedeemResponse = 0x2824, ContactList = 0x27d0, - ContributionCollectorState = 0x2862, + ContributionLastUpdateResponse = 0x2862, ControlUpdate = 0x2667, CooldownCheat = 0x277f, CooldownEvent = 0x26ec, @@ -1027,11 +1035,13 @@ namespace Framework.Constants DamageCalcLog = 0x280e, DbReply = 0x25a2, DeathReleaseLoc = 0x2710, + DebugMenuManagerFullUpdate = 0x2680, DefenseMessage = 0x2bb6, DeleteChar = 0x2745, DestroyArenaUnit = 0x2788, DestructibleBuildingDamage = 0x2738, DifferentInstanceFromParty = 0x258c, + DisconnectReason = 0x2832, DisenchantCredit = 0x25bd, Dismount = 0x26e3, DismountResult = 0x257c, @@ -1041,31 +1051,33 @@ namespace Framework.Constants DisplayPromotion = 0x266b, DisplayQuestPopup = 0x2a9d, DisplayToast = 0x263b, + DisplayWorldText = 0x2831, DontAutoPushSpellsToActionBar = 0x25f8, DropNewConnection = 0x304c, + DuelArranged = 0x2674, DuelComplete = 0x2678, DuelCountdown = 0x2677, DuelInBounds = 0x2676, - DuelOpponentSelected = 0x2674, DuelOutOfBounds = 0x2675, DuelRequested = 0x2673, DuelWinner = 0x2679, DurabilityDamageDeath = 0x278d, Emote = 0x280f, EnableBarberShop = 0x26f0, - EnableEncryption = 0x3049, EnchantmentLog = 0x2758, EncounterEnd = 0x27c7, EncounterStart = 0x27c6, - Entitlements = 0x28c8, - EntitlementNotification = 0x28c9, + EndLightningStorm = 0x26d7, + EnterEncryptedMode = 0x3049, EnumCharactersResult = 0x2584, + EnumVasPurchaseStatesResponse = 0x2837, EnvironmentalDamageLog = 0x2c21, EquipmentSetId = 0x26e5, ExpectedSpamRecords = 0x2bb1, ExplorationExperience = 0x27a9, FactionBonusInfo = 0x276a, FailedPlayerCondition = 0x25e3, + FailedQuestTurnIn = 0x2858, FeatureSystemStatus = 0x25d2, FeatureSystemStatusGlueScreen = 0x25d3, FeignDeathResisted = 0x278b, @@ -1076,16 +1088,15 @@ namespace Framework.Constants ForceAnim = 0x2798, ForceObjectRelink = 0x266a, FriendStatus = 0x27d1, - GameEventDebugInitialize = 0x2680, GameObjectActivateAnimKit = 0x25d7, + GameObjectBase = 0x2875, GameObjectCustomAnim = 0x25d8, GameObjectDespawn = 0x25d9, - GameObjectMultiTransition = 0x2875, GameObjectPlaySpellVisual = 0x2c4b, GameObjectPlaySpellVisualKit = 0x2c4a, GameObjectResetState = 0x2762, - GameObjectSetState = 0x2848, - GameObjectUiAction = 0x275f, + GameObjectSetStateLocal = 0x2848, + GameObjectUILink = 0x275f, GameSpeedSet = 0x26b0, GameTimeSet = 0x2751, GameTimeUpdate = 0x2750, @@ -1107,7 +1118,6 @@ namespace Framework.Constants GarrisonFollowerChangedStatus = 0x2915, GarrisonFollowerChangedXp = 0x2912, GarrisonIsUpgradeableResult = 0x2929, - GarrisonLandingPageShipmentInfo = 0x27e6, GarrisonLearnBlueprintResult = 0x28f7, GarrisonLearnSpecializationResult = 0x28f5, GarrisonListFollowersCheatResult = 0x2905, @@ -1138,12 +1148,18 @@ namespace Framework.Constants GarrisonUnlearnBlueprintResult = 0x28f8, GarrisonUpgradeResult = 0x28fd, GenerateRandomCharacterNameResult = 0x2585, + GenerateSsoTokenResponse = 0x2863, GetAccountCharacterListResult = 0x27aa, GetDisplayedTrophyListResponse = 0x2928, GetGarrisonInfoResult = 0x28f0, + GetLandingPageShipmentsResponse = 0x27e6, + GetRemainingGameTimeResponse = 0x2822, + GetSelectedTrophyIdResponse = 0x280b, GetShipmentsOfTypeResponse = 0x27e5, GetShipmentInfoResponse = 0x27e1, GetTrophyListResponse = 0x280a, + GetVasAccountCharacterListResult = 0x2833, + GetVasTransferTargetRealmListResult = 0x2834, GmPlayerInfo = 0x277e, GmRequestPlayerInfo = 0x25ef, GmTicketCaseStatus = 0x26d2, @@ -1154,9 +1170,9 @@ namespace Framework.Constants GossipPoi = 0x27de, GossipTextUpdate = 0x2a98, GroupActionThrottled = 0x259e, + GroupAutoKick = 0x27dc, GroupDecline = 0x27d9, GroupDestroyed = 0x27db, - GroupInviteConfirmation = 0x285b, GroupNewLeader = 0x264d, GroupUninvite = 0x27da, GuildAchievementDeleted = 0x29c5, @@ -1214,10 +1230,8 @@ namespace Framework.Constants GuildSendRankChange = 0x29b9, HealthUpdate = 0x2706, HighestThreatUpdate = 0x2717, + HotfixConnect = 0x25a5, HotfixMessage = 0x25a4, - HotfixResponse = 0x25a5, - IncomingSummonCompleted = 0x28a9, - IncomingSummonPending = 0x28a8, InitializeFactions = 0x2769, InitialSetup = 0x2581, InitWorldStates = 0x278e, @@ -1232,10 +1246,10 @@ namespace Framework.Constants InstanceEncounterObjectiveStart = 0x27f8, InstanceEncounterObjectiveUpdate = 0x27fd, InstanceEncounterPhaseShiftChanged = 0x2801, - InstanceEncounterSetAllowingRelease = 0x27fc, - InstanceEncounterSetSuppressingRelease = 0x27fb, InstanceEncounterStart = 0x27fa, InstanceEncounterTimerStart = 0x27f7, + InstanceEncounterUpdateAllowReleaseInProgress = 0x27fc, + InstanceEncounterUpdateSuppressRelease = 0x27fb, InstanceGroupSizeChanged = 0x273c, InstanceInfo = 0x2654, InstanceReset = 0x26b5, @@ -1245,25 +1259,26 @@ namespace Framework.Constants InvalidatePlayer = 0x26da, InvalidPromotionCode = 0x2799, InventoryChangeFailure = 0x2767, - IslandAzeriteXpGain = 0x27a6, - IslandCompleted = 0x27a7, - IslandOpenQueueNpc = 0x283d, + InventoryFixupComplete = 0x285a, + InventoryFullOverflow = 0x286b, + IslandsMissionNpc = 0x283d, + IslandAzeriteGain = 0x27a6, + IslandComplete = 0x27a7, IsQuestCompleteResponse = 0x2a83, ItemChanged = 0x2729, ItemCooldown = 0x280d, ItemEnchantTimeUpdate = 0x279b, ItemExpirePurchaseRefund = 0x25b3, - ItemInteractionOpen = 0x283c, - ItemInteractionResult = 0x28ce, + ItemInteractionComplete = 0x28ce, ItemPurchaseRefundResult = 0x25b1, ItemPushResult = 0x263a, ItemTimeUpdate = 0x279a, - KickReason = 0x2832, + KickReason = 0x26b8, LearnedSpells = 0x2c4d, - LearnPvpTalentsFailed = 0x25eb, - LearnTalentsFailed = 0x25ea, + LearnPvpTalentFailed = 0x25eb, + LearnTalentFailed = 0x25ea, + LegacyLootRules = 0x2876, LevelLinkingResult = 0x28b7, - LevelUpdate = 0x2589, LevelUpInfo = 0x2728, LfgBootPlayer = 0x2a35, LfgDisabled = 0x2a33, @@ -1272,7 +1287,6 @@ namespace Framework.Constants LfgListApplicantListUpdate = 0x2a2b, LfgListApplicationStatusUpdate = 0x2a28, LfgListApplyToGroupResult = 0x2a29, - LfgListInitAutoDelist = 0x28cf, LfgListJoinResult = 0x2a1d, LfgListSearchResults = 0x2a1e, LfgListSearchResultsUpdate = 0x2a2c, @@ -1299,14 +1313,11 @@ namespace Framework.Constants LfGuildCommandResult = 0x29d0, LfGuildPost = 0x29cd, LfGuildRecruits = 0x29cf, - LightningStormEnd = 0x26d7, - LightningStormStart = 0x26d6, LiveRegionAccountRestoreResult = 0x27b8, LiveRegionCharacterCopyResult = 0x27b6, LiveRegionGetAccountCharacterListResult = 0x27ab, LoadCufProfiles = 0x25cf, LoadEquipmentSet = 0x2753, - LoadSelectedTrophyResult = 0x280b, LoginSetTimeSpeed = 0x2752, LoginVerifyWorld = 0x25ae, LogoutCancelAck = 0x26b4, @@ -1314,7 +1325,6 @@ namespace Framework.Constants LogoutResponse = 0x26b2, LogXpGain = 0x2724, LootAllPassed = 0x2638, - LootLegacyRulesInEffect = 0x2876, LootList = 0x2787, LootMoneyNotify = 0x2633, LootRelease = 0x2632, @@ -1329,8 +1339,6 @@ namespace Framework.Constants MailListResult = 0x279c, MailQueryNextTimeResult = 0x279d, MapObjectivesInit = 0x27a5, - MapObjectiveAdd = 0x2598, - MapObjectiveRemove = 0x2599, MapObjEvents = 0x25da, MasterLootCandidateList = 0x2636, MessageBox = 0x2576, @@ -1338,13 +1346,10 @@ namespace Framework.Constants MirrorImageComponentedData = 0x2c14, MirrorImageCreatureData = 0x2c13, MissileCancel = 0x25db, - ModifyChargeRecoverySpeed = 0x27af, ModifyCooldown = 0x27ad, - ModifyCooldownRecoverySpeed = 0x27ae, - ModifyPartyRange = 0x278a, Motd = 0x2baf, - MountEquipmentApplyResult = 0x28b5, MountResult = 0x257b, + MovementEnforcementAlert = 0x28a5, MoveApplyMovementForce = 0x2de1, MoveDisableCollision = 0x2ddd, MoveDisableDoubleJump = 0x2dcb, @@ -1429,6 +1434,11 @@ namespace Framework.Constants MoveUpdateTeleport = 0x2daf, MoveUpdateTurnRate = 0x2dab, MoveUpdateWalkSpeed = 0x2da6, + MythicPlusAllMapStats = 0x2624, + MythicPlusCurrentAffixes = 0x2625, + MythicPlusNewSeasonRecord = 0x2629, + MythicPlusNewWeekRecord = 0x2628, + MythicPlusWeeklyRewardResponse = 0x2623, NeutralPlayerFactionSelectResult = 0x25f3, NewTaxiPath = 0x26ad, NewWorld = 0x25ad, @@ -1439,19 +1449,20 @@ namespace Framework.Constants OfferPetitionError = 0x26e9, OnCancelExpectedRideVehicleAura = 0x2725, OnMonsterMove = 0x2da2, - OpenAlliedRaceDetailsGiver = 0x283e, + OpenArtifactForge = 0x27e8, OpenContainer = 0x2768, + OpenHeartForge = 0x2873, OpenLfgDungeonFinder = 0x2a31, OpenShipmentNpcFromGossip = 0x27e0, OpenShipmentNpcResult = 0x27e2, - OpenTransmogrifier = 0x283a, OverrideLight = 0x26ef, PageText = 0x275e, PartyCommandResult = 0x27dd, PartyInvite = 0x25d0, PartyKillLog = 0x27a1, - PartyMemberState = 0x279f, - PartyMemberStateUpdate = 0x279e, + PartyMemberFullState = 0x279f, + PartyMemberPartialState = 0x279e, + PartyNotifyLfgLeaderChange = 0x28cf, PartyUpdate = 0x260d, PauseMirrorTimer = 0x2755, PendingRaidLock = 0x2736, @@ -1486,6 +1497,7 @@ namespace Framework.Constants PetLearnedSpells = 0x2c4f, PetMode = 0x258b, PetNameInvalid = 0x26f7, + PetNewlyTamed = 0x2589, PetSlotUpdated = 0x258a, PetSpellsMessage = 0x2c25, PetStableList = 0x25ab, @@ -1494,10 +1506,17 @@ namespace Framework.Constants PetUnlearnedSpells = 0x2c50, PhaseShiftChange = 0x2578, PlayedTime = 0x2713, + PlayerAzeriteItemEquippedStatusChanged = 0x2871, + PlayerAzeriteItemGains = 0x2870, + PlayerBonusRollFailed = 0x2877, PlayerBound = 0x257e, + PlayerConditionResult = 0x2843, + PlayerIsAdventureMapPoiValid = 0x2842, PlayerSaveGuildEmblem = 0x29f9, PlayerSkinned = 0x278c, PlayerTabardVendorActivate = 0x27a0, + PlayerTutorialHighlightSpell = 0x2847, + PlayerTutorialUnhighlightSpell = 0x2846, PlayMusic = 0x27b2, PlayObjectSound = 0x27b3, PlayOneShotAnimKit = 0x2776, @@ -1510,17 +1529,18 @@ namespace Framework.Constants PlayTimeWarning = 0x2740, Pong = 0x304e, PowerUpdate = 0x2707, + PreloadChildMap = 0x2579, + PrepopulateNameCache = 0x28aa, PreRessurect = 0x27b0, PrintNotification = 0x25e2, ProcResist = 0x27a2, PushSpellToActionBar = 0x2c51, PvpCredit = 0x271f, - PvpLogData = 0x25b4, - PvpMatchEnd = 0x28a7, - PvpMatchInit = 0x28ac, + PvpMatchComplete = 0x28a7, + PvpMatchInitialize = 0x28ac, PvpMatchStart = 0x28a6, + PvpMatchStatistics = 0x25b4, PvpOptionsEnabled = 0x25b7, - PvpSeason = 0x25d4, QueryBattlePetNameResponse = 0x270e, QueryCommunityNameResponse = 0x270a, QueryCreatureResponse = 0x2704, @@ -1535,7 +1555,6 @@ namespace Framework.Constants QueryPlayerNameResponse = 0x2709, QueryQuestInfoResponse = 0x2a95, QueryTimeResponse = 0x2723, - QueryTreasurePickerResponse = 0x284d, QuestCompletionNpcResponse = 0x2a81, QuestConfirmAccept = 0x2a8e, QuestForceRemoved = 0x2a9b, @@ -1545,17 +1564,18 @@ namespace Framework.Constants QuestGiverQuestDetails = 0x2a91, QuestGiverQuestFailed = 0x2a85, QuestGiverQuestListMessage = 0x2a99, - QuestGiverQuestTurnInFailure = 0x2858, QuestGiverRequestItems = 0x2a92, QuestGiverStatus = 0x2a9a, QuestGiverStatusMultiple = 0x2a90, + QuestLinesForMapResponse = 0x2aa1, QuestLogFull = 0x2a86, QuestPoiChanged = 0x2a9f, QuestPoiQueryResponse = 0x2a9c, QuestPushResult = 0x2a8f, - QuestSessionMemberConfirm = 0x28bb, - QuestSessionMemberStartResponse = 0x28bc, - QuestSessionNotification = 0x28ba, + QuestSessionInfoResponse = 0x28ca, + QuestSessionReadyCheck = 0x28bb, + QuestSessionReadyCheckResponse = 0x28bc, + QuestSessionResult = 0x28ba, QuestSpawnTrackingUpdate = 0x2a9e, QuestUpdateAddCredit = 0x2a8b, QuestUpdateAddCreditSimple = 0x2a8c, @@ -1564,34 +1584,33 @@ namespace Framework.Constants QuestUpdateCompleteBySpell = 0x2a87, QuestUpdateFailed = 0x2a89, QuestUpdateFailedTimer = 0x2a8a, - QuickJoinConfirmRequestInvite = 0x28ca, + QueueSummaryUpdate = 0x2859, RafAccountInfo = 0x28b8, - RafActivity = 0x28c6, - RafInfoUpdate = 0x28b9, + RafActivityStateChanged = 0x28c6, RaidDifficultySet = 0x27f1, RaidGroupOnly = 0x27f3, RaidInstanceMessage = 0x2bb4, RaidMarkersChanged = 0x25ba, RandomRoll = 0x2650, - RatedBattlefieldInfo = 0x25a8, + RatedPvpInfo = 0x25a8, ReadyCheckCompleted = 0x2610, ReadyCheckResponse = 0x260f, ReadyCheckStarted = 0x260e, ReadItemResultFailed = 0x27ed, ReadItemResultOk = 0x27e7, - RealmLookupInformation = 0x2812, + RealmLookupInfo = 0x2812, RealmQueryResponse = 0x26ee, - ReferAFriendFailure = 0x26f4, + ReattachResurrect = 0x2792, + RecruitAFriendFailure = 0x26f4, RefreshComponent = 0x267c, RefreshSpellHistory = 0x2c2c, RemoveItemPassive = 0x25c1, RemoveLossOfControl = 0x269d, ReplaceTrophyResponse = 0x2809, ReportPvpPlayerAfkResult = 0x26e2, - RequestAddonList = 0x2662, RequestCemeteryListResponse = 0x259f, - RequestPvpBrawlInfoResponse = 0x25d6, RequestPvpRewardsResponse = 0x25d5, + RequestScheduledPvpInfoResponse = 0x25d6, ResearchComplete = 0x2587, ResetCompressionContext = 0x304f, ResetFailedNotify = 0x26ea, @@ -1599,24 +1618,26 @@ namespace Framework.Constants ResetWeeklyCurrency = 0x2575, RespecWipeConfirm = 0x262a, RespondInspectAchievements = 0x2572, + RestrictedAccountWarning = 0x25cc, ResumeCast = 0x2c3b, ResumeCastBar = 0x2c3e, ResumeComms = 0x304b, ResumeToken = 0x25bf, - ResurrectClearData = 0x2580, ResurrectRequest = 0x257f, ResyncRunes = 0x2743, + ReturnApplicantList = 0x28ae, + ReturnRecruitingClubs = 0x28ad, RoleChangedInform = 0x258e, RoleChosen = 0x2a39, RolePollInform = 0x258f, RuneRegenDebug = 0x25c9, - ScenarioBoot = 0x27ee, ScenarioCompleted = 0x282f, ScenarioPois = 0x2653, ScenarioProgressUpdate = 0x264c, - ScenarioSetShouldShowCriteria = 0x2841, - ScenarioSpellUpdate = 0x2840, + ScenarioShowCriteria = 0x2841, ScenarioState = 0x264b, + ScenarioUiUpdate = 0x2840, + ScenarioVacate = 0x27ee, SceneObjectEvent = 0x25f9, SceneObjectPetBattleFinalRound = 0x25fe, SceneObjectPetBattleFinished = 0x25ff, @@ -1625,6 +1646,7 @@ namespace Framework.Constants SceneObjectPetBattleReplacementsMade = 0x25fd, SceneObjectPetBattleRoundResult = 0x25fc, ScriptCast = 0x2c55, + SeasonInfo = 0x25d4, SellResponse = 0x26f8, SendItemPassives = 0x25c2, SendKnownSpells = 0x2c2a, @@ -1635,11 +1657,13 @@ namespace Framework.Constants SendUnlearnSpells = 0x2c2e, ServerFirstAchievements = 0x266d, ServerTime = 0x26b1, + ServerTimeOffset = 0x2759, SetupCurrency = 0x2573, SetupResearchHistory = 0x2586, SetAiAnimKit = 0x2775, SetAllTaskProgress = 0x27d7, SetAnimTier = 0x2779, + SetChrUpgradeTier = 0x25f6, SetCurrency = 0x2574, SetDfFastLaunchResult = 0x2a2e, SetDungeonDifficulty = 0x26d3, @@ -1659,20 +1683,18 @@ namespace Framework.Constants SetPlayerDeclinedNamesResult = 0x2712, SetPlayHoverAnim = 0x25cd, SetProficiency = 0x277a, + SetQuestReplayCooldownOverride = 0x28be, SetSpellCharges = 0x2c29, SetTaskComplete = 0x27d8, SetTimeZoneInformation = 0x26a5, SetVehicleRecId = 0x2735, - ShowAdventureMap = 0x2838, ShowBank = 0x26ae, ShowMailbox = 0x27ef, ShowNeutralPlayerFactionSelectUi = 0x25f2, ShowTaxiNodes = 0x2700, ShowTradeSkillResponse = 0x27b9, - SocketGems = 0x276c, SocketGemsFailure = 0x276d, - SortBagsResult = 0x2826, - SpecializationChanged = 0x25ee, + SocketGemsSuccess = 0x276c, SpecialMountAnim = 0x26ce, SpecInvoluntarilyChanged = 0x275d, SpellAbsorbLog = 0x2c1f, @@ -1699,10 +1721,12 @@ namespace Framework.Constants SpellPeriodicAuraLog = 0x2c1b, SpellPrepare = 0x2c38, SpellStart = 0x2c3a, + SpellVisualLoadScreen = 0x25e5, SpiritHealerConfirm = 0x275a, StandStateUpdate = 0x2760, StartElapsedTimer = 0x261c, StartElapsedTimers = 0x261e, + StartLightningStorm = 0x26d6, StartLootRoll = 0x2634, StartMirrorTimer = 0x2754, StartTimer = 0x25bc, @@ -1716,6 +1740,7 @@ namespace Framework.Constants SupercededSpells = 0x2c4c, SuspendComms = 0x304a, SuspendToken = 0x25be, + SyncWowEntitlements = 0x28c8, TalentsInvoluntarilyReset = 0x275c, TaxiNodeStatus = 0x26ab, TextEmote = 0x26a9, @@ -1735,28 +1760,33 @@ namespace Framework.Constants TrainerList = 0x271d, TransferAborted = 0x2746, TransferPending = 0x25e6, - TransmogCollectionUpdate = 0x25c7, - TransmogSetCollectionUpdate = 0x25c8, + TransmogrifyNpc = 0x283a, + TreasurePickerResponse = 0x284d, TriggerCinematic = 0x2810, TriggerMovie = 0x26fe, TurnInPetitionResult = 0x2795, TutorialFlags = 0x2802, - TutorialHighlightSpell = 0x2847, - TutorialUnhighlightSpell = 0x2846, TwitterStatus = 0x2ffd, - UiTime = 0x2759, + UiHealingRangeModified = 0x278a, + UiItemInteractionNpc = 0x283c, UndeleteCharacterResponse = 0x2813, UndeleteCooldownStatusResponse = 0x2814, UnlearnedSpells = 0x2c4e, + UnloadChildMap = 0x257a, UpdateAccountData = 0x274e, UpdateActionButtons = 0x25f7, + UpdateBnetSessionKey = 0x286a, + UpdateCapturePoint = 0x2598, UpdateCelestialBody = 0x2866, UpdateCharacterFlags = 0x2808, + UpdateChargeCategoryCooldown = 0x27af, + UpdateCooldown = 0x27ae, UpdateExpansionLevel = 0x2666, UpdateGameTimeState = 0x286d, UpdateInstanceOwnership = 0x26d8, UpdateLastInstance = 0x26b7, UpdateObject = 0x2811, + UpdatePrimarySpec = 0x25ee, UpdateTalentData = 0x25ed, UpdateTaskProgress = 0x27d6, UpdateWeeklySpellUsage = 0x2c19, @@ -1765,8 +1795,15 @@ namespace Framework.Constants UserlistRemove = 0x2bba, UserlistUpdate = 0x2bbb, UseEquipmentSetResult = 0x2796, + VasCheckTransferOkResponse = 0x2861, + VasGetQueueMinutesResponse = 0x285f, + VasGetServiceStatusResponse = 0x285e, + VasPurchaseComplete = 0x2836, + VasPurchaseStateUpdate = 0x2835, VendorInventory = 0x25cb, VignetteUpdate = 0x27b7, + VoiceChannelInfoResponse = 0x2865, + VoiceLoginResponse = 0x2864, VoidItemSwapResponse = 0x25e0, VoidStorageContents = 0x25dd, VoidStorageFailed = 0x25dc, @@ -1774,31 +1811,20 @@ namespace Framework.Constants VoidTransferResult = 0x25df, WaitQueueFinish = 0x256f, WaitQueueUpdate = 0x256e, - WardenData = 0x2577, - WarfrontCompleted = 0x27a8, + Warden3Data = 0x2577, + Warden3Disabled = 0x2868, + Warden3Enabled = 0x2867, + WarfrontComplete = 0x27a8, WargameRequestSuccessfullySentToOpponent = 0x25b5, Weather = 0x26d5, WeeklySpellUsage = 0x2c18, Who = 0x2bae, WhoIs = 0x26d4, - WorldMapInteraction = 0x2839, - WorldQuestUpdate = 0x284e, + WillBeKickedForAddedSubscriptionTime = 0x286c, + WorldMapOpenNpc = 0x2839, + WorldQuestUpdateResponse = 0x284e, WorldServerInfo = 0x25c3, - WorldText = 0x2831, - WowTokenAuctionSold = 0x281e, - WowTokenBuyRequestConfirmation = 0x2820, - WowTokenBuyResultConfirmation = 0x2821, - WowTokenCanRedeemForBalanceResult = 0x285c, - WowTokenCanVeteranBuyResult = 0x281f, - WowTokenDistributionGlueUpdate = 0x2819, - WowTokenDistributionUpdate = 0x281a, - WowTokenMarketPriceResponse = 0x281b, - WowTokenRedeemGameTimeUpdated = 0x2822, - WowTokenRedeemRequestConfirmation = 0x2823, - WowTokenRedeemResult = 0x2824, - WowTokenSellRequestConfirmation = 0x281c, - WowTokenSellResultConfirmation = 0x281d, - WowTokenUpdateAuctionableListResponse = 0x2825, + WowEntitlementNotification = 0x28c9, XpGainAborted = 0x25e1, XpGainEnabled = 0x27f2, ZoneUnderAttack = 0x2bb5, diff --git a/Source/Game/Arenas/Arena.cs b/Source/Game/Arenas/Arena.cs index e4dff6a96..2ad3cedfc 100644 --- a/Source/Game/Arenas/Arena.cs +++ b/Source/Game/Arenas/Arena.cs @@ -95,7 +95,7 @@ namespace Game.Arenas CheckWinConditions(); } - public override void BuildPvPLogDataPacket(out PVPLogData pvpLogData) + public override void BuildPvPLogDataPacket(out PVPMatchStatistics pvpLogData) { base.BuildPvPLogDataPacket(out pvpLogData); diff --git a/Source/Game/Arenas/ArenaScore.cs b/Source/Game/Arenas/ArenaScore.cs index b85392d84..d99e32dea 100644 --- a/Source/Game/Arenas/ArenaScore.cs +++ b/Source/Game/Arenas/ArenaScore.cs @@ -29,7 +29,7 @@ namespace Game.Arenas TeamId = (int)(team == Team.Alliance ? BattlegroundTeamId.Alliance : BattlegroundTeamId.Horde); } - public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { base.BuildPvPLogPlayerDataPacket(out playerData); diff --git a/Source/Game/AuctionHouse/AuctionManager.cs b/Source/Game/AuctionHouse/AuctionManager.cs index fb3852c78..f0348db28 100644 --- a/Source/Game/AuctionHouse/AuctionManager.cs +++ b/Source/Game/AuctionHouse/AuctionManager.cs @@ -988,7 +988,7 @@ namespace Game listBucketsResult.HasMoreResults = false; } - public void BuildListBidderItems(AuctionListBidderItemsResult listBidderItemsResult, Player player, uint offset, AuctionSortDef[] sorts, int sortCount) + public void BuildListBiddedItems(AuctionListBiddedItemsResult listBidderItemsResult, Player player, uint offset, AuctionSortDef[] sorts, int sortCount) { // always full list List auctions = new List(); @@ -1068,7 +1068,7 @@ namespace Game listItemsResult.HasMoreResults = builder.HasMoreResults(); } - public void BuildListOwnerItems(AuctionListOwnerItemsResult listOwnerItemsResult, Player player, uint offset, AuctionSortDef[] sorts, int sortCount) + public void BuildListOwnedItems(AuctionListOwnedItemsResult listOwnerItemsResult, Player player, uint offset, AuctionSortDef[] sorts, int sortCount) { // always full list List auctions = new List(); diff --git a/Source/Game/BattleGrounds/BattleGround.cs b/Source/Game/BattleGrounds/BattleGround.cs index 158c2da3b..6ed11ce4b 100644 --- a/Source/Game/BattleGrounds/BattleGround.cs +++ b/Source/Game/BattleGrounds/BattleGround.cs @@ -691,12 +691,12 @@ namespace Game.BattleGrounds //we must set it this way, because end time is sent in packet! SetRemainingTime(BattlegroundConst.AutocloseBattleground); - PVPMatchEnd pvpMatchEnd = new PVPMatchEnd(); - pvpMatchEnd.Winner = (byte)GetWinner(); - pvpMatchEnd.Duration = (int)Math.Max(0, (GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds); - pvpMatchEnd.LogData.HasValue = true; - BuildPvPLogDataPacket(out pvpMatchEnd.LogData.Value); - pvpMatchEnd.Write(); + PVPMatchComplete pvpMatchComplete = new PVPMatchComplete(); + pvpMatchComplete.Winner = (byte)GetWinner(); + pvpMatchComplete.Duration = (int)Math.Max(0, (GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds); + pvpMatchComplete.LogData.HasValue = true; + BuildPvPLogDataPacket(out pvpMatchComplete.LogData.Value); + pvpMatchComplete.Write(); foreach (var pair in m_Players) { @@ -793,7 +793,7 @@ namespace Game.BattleGrounds BlockMovement(player); - player.SendPacket(pvpMatchEnd); + player.SendPacket(pvpMatchComplete); player.UpdateCriteria(CriteriaTypes.CompleteBattleground, player.GetMapId()); } @@ -993,20 +993,20 @@ namespace Game.BattleGrounds playerJoined.Guid = player.GetGUID(); SendPacketToTeam(team, playerJoined, player); - PVPMatchInit pvpMatchState = new PVPMatchInit(); - pvpMatchState.MapID = GetMapId(); + PVPMatchInitialize pvpMatchInitialize = new PVPMatchInitialize(); + pvpMatchInitialize.MapID = GetMapId(); switch (GetStatus()) { case BattlegroundStatus.None: case BattlegroundStatus.WaitQueue: - pvpMatchState.State = PVPMatchInit.MatchState.Inactive; + pvpMatchInitialize.State = PVPMatchInitialize.MatchState.Inactive; break; case BattlegroundStatus.WaitJoin: case BattlegroundStatus.InProgress: - pvpMatchState.State = PVPMatchInit.MatchState.InProgress; + pvpMatchInitialize.State = PVPMatchInitialize.MatchState.InProgress; break; case BattlegroundStatus.WaitLeave: - pvpMatchState.State = PVPMatchInit.MatchState.Complete; + pvpMatchInitialize.State = PVPMatchInitialize.MatchState.Complete; break; default: break; @@ -1014,15 +1014,15 @@ namespace Game.BattleGrounds if (GetElapsedTime() >= (int)BattlegroundStartTimeIntervals.Delay2m) { - pvpMatchState.Duration = (int)(GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds; - pvpMatchState.StartTime = GameTime.GetGameTime() - pvpMatchState.Duration; + pvpMatchInitialize.Duration = (int)(GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds; + pvpMatchInitialize.StartTime = GameTime.GetGameTime() - pvpMatchInitialize.Duration; } - pvpMatchState.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BattlegroundTeamId.Horde : BattlegroundTeamId.Alliance); - pvpMatchState.BattlemasterListID = (uint)GetTypeID(); - pvpMatchState.Registered = false; - pvpMatchState.AffectsRating = IsRated(); + pvpMatchInitialize.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BattlegroundTeamId.Horde : BattlegroundTeamId.Alliance); + pvpMatchInitialize.BattlemasterListID = (uint)GetTypeID(); + pvpMatchInitialize.Registered = false; + pvpMatchInitialize.AffectsRating = IsRated(); - player.SendPacket(pvpMatchState); + player.SendPacket(pvpMatchInitialize); player.RemoveAurasByType(AuraType.Mounted); @@ -1238,13 +1238,13 @@ namespace Game.BattleGrounds return GetPlayersSize() < GetMaxPlayers(); } - public virtual void BuildPvPLogDataPacket(out PVPLogData pvpLogData) + public virtual void BuildPvPLogDataPacket(out PVPMatchStatistics pvpLogData) { - pvpLogData = new PVPLogData(); + pvpLogData = new PVPMatchStatistics(); foreach (var score in PlayerScores) { - PVPLogData.PVPMatchPlayerStatistics playerData; + PVPMatchStatistics.PVPMatchPlayerStatistics playerData; score.Value.BuildPvPLogPlayerDataPacket(out playerData); @@ -1704,9 +1704,9 @@ namespace Game.BattleGrounds BlockMovement(player); - PVPLogDataMessage pvpLogData = new PVPLogDataMessage(); - BuildPvPLogDataPacket(out pvpLogData.Data); - player.SendPacket(pvpLogData); + PVPMatchStatisticsMessage pvpMatchStatistics = new PVPMatchStatisticsMessage(); + BuildPvPLogDataPacket(out pvpMatchStatistics.Data); + player.SendPacket(pvpMatchStatistics); } public uint GetAlivePlayersCountByTeam(Team Team) diff --git a/Source/Game/BattleGrounds/BattleGroundScore.cs b/Source/Game/BattleGrounds/BattleGroundScore.cs index de0877bff..5e939dad7 100644 --- a/Source/Game/BattleGrounds/BattleGroundScore.cs +++ b/Source/Game/BattleGrounds/BattleGroundScore.cs @@ -57,9 +57,9 @@ namespace Game.BattleGrounds } } - public virtual void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public virtual void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { - playerData = new PVPLogData.PVPMatchPlayerStatistics(); + playerData = new PVPMatchStatistics.PVPMatchPlayerStatistics(); playerData.PlayerGUID = PlayerGuid; playerData.Kills = KillingBlows; playerData.Faction = (byte)TeamId; diff --git a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs index ed0cbfea2..b9083d0fe 100644 --- a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs +++ b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs @@ -833,12 +833,12 @@ namespace Game.BattleGrounds.Zones } } - public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { base.BuildPvPLogPlayerDataPacket(out playerData); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.AssaultBase, BasesAssaulted)); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.DefendBase, BasesDefended)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)ABObjectives.AssaultBase, BasesAssaulted)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)ABObjectives.DefendBase, BasesDefended)); } public override uint GetAttr1() { return BasesAssaulted; } diff --git a/Source/Game/BattleGrounds/Zones/EyeofStorm.cs b/Source/Game/BattleGrounds/Zones/EyeofStorm.cs index 7836eaccc..1e28694b5 100644 --- a/Source/Game/BattleGrounds/Zones/EyeofStorm.cs +++ b/Source/Game/BattleGrounds/Zones/EyeofStorm.cs @@ -1033,11 +1033,11 @@ namespace Game.BattleGrounds.Zones } } - public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { base.BuildPvPLogPlayerDataPacket(out playerData); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)EotSMisc.ObjectiveCaptureFlag, FlagCaptures)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)EotSMisc.ObjectiveCaptureFlag, FlagCaptures)); } public override uint GetAttr1() { return FlagCaptures; } diff --git a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs index 75317459b..607e5a8cc 100644 --- a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs +++ b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs @@ -1172,12 +1172,12 @@ namespace Game.BattleGrounds.Zones } } - public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { base.BuildPvPLogPlayerDataPacket(out playerData); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.DemolishersDestroyed, DemolishersDestroyed)); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.GatesDestroyed, GatesDestroyed)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)SAObjectives.DemolishersDestroyed, DemolishersDestroyed)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)SAObjectives.GatesDestroyed, GatesDestroyed)); } public override uint GetAttr1() { return DemolishersDestroyed; } diff --git a/Source/Game/BattleGrounds/Zones/WarsongGluch.cs b/Source/Game/BattleGrounds/Zones/WarsongGluch.cs index 31c98739a..9213a6dbe 100644 --- a/Source/Game/BattleGrounds/Zones/WarsongGluch.cs +++ b/Source/Game/BattleGrounds/Zones/WarsongGluch.cs @@ -964,12 +964,12 @@ namespace Game.BattleGrounds.Zones } } - public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData) + public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData) { base.BuildPvPLogPlayerDataPacket(out playerData); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.CaptureFlag, FlagCaptures)); - playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.ReturnFlag, FlagReturns)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat(WSObjectives.CaptureFlag, FlagCaptures)); + playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat(WSObjectives.ReturnFlag, FlagReturns)); } public override uint GetAttr1() { return FlagCaptures; } diff --git a/Source/Game/Calendar/CalendarManager.cs b/Source/Game/Calendar/CalendarManager.cs index a9eb5f97c..9f1978227 100644 --- a/Source/Game/Calendar/CalendarManager.cs +++ b/Source/Game/Calendar/CalendarManager.cs @@ -399,7 +399,7 @@ namespace Game uint level = player ? player.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(invitee); - SCalendarEventInvite packet = new SCalendarEventInvite(); + CalendarInviteAdded packet = new CalendarInviteAdded(); packet.EventID = calendarEvent != null ? calendarEvent.EventId : 0; packet.InviteGuid = invitee; packet.InviteID = calendarEvent != null ? invite.InviteId : 0; @@ -441,7 +441,7 @@ namespace Game public void SendCalendarEventStatus(CalendarEvent calendarEvent, CalendarInvite invite) { - CalendarEventInviteStatus packet = new CalendarEventInviteStatus(); + CalendarInviteStatusPacket packet = new CalendarInviteStatusPacket(); packet.ClearPending = true; // FIXME packet.Date = calendarEvent.Date; packet.EventID = calendarEvent.EventId; @@ -465,7 +465,7 @@ namespace Game void SendCalendarEventInviteRemove(CalendarEvent calendarEvent, CalendarInvite invite, uint flags) { - CalendarEventInviteRemoved packet = new CalendarEventInviteRemoved(); + CalendarInviteRemoved packet = new CalendarInviteRemoved(); packet.ClearPending = true; // FIXME packet.EventID = calendarEvent.EventId; packet.Flags = flags; @@ -476,7 +476,7 @@ namespace Game public void SendCalendarEventModeratorStatusAlert(CalendarEvent calendarEvent, CalendarInvite invite) { - CalendarEventInviteModeratorStatus packet = new CalendarEventInviteModeratorStatus(); + CalendarInviteModeratorStatus packet = new CalendarInviteModeratorStatus(); packet.ClearPending = true; // FIXME packet.EventID = calendarEvent.EventId; packet.InviteGuid = invite.InviteeGuid; @@ -487,7 +487,7 @@ namespace Game void SendCalendarEventInviteAlert(CalendarEvent calendarEvent, CalendarInvite invite) { - CalendarEventInviteAlert packet = new CalendarEventInviteAlert(); + CalendarInviteAlert packet = new CalendarInviteAlert(); packet.Date = calendarEvent.Date; packet.EventID = calendarEvent.EventId; packet.EventName = calendarEvent.Title; @@ -569,7 +569,7 @@ namespace Game Player player = Global.ObjAccessor.FindPlayer(guid); if (player) { - CalendarEventInviteRemovedAlert packet = new CalendarEventInviteRemovedAlert(); + CalendarInviteRemovedAlert packet = new CalendarInviteRemovedAlert(); packet.Date = calendarEvent.Date; packet.EventID = calendarEvent.EventId; packet.Flags = calendarEvent.Flags; diff --git a/Source/Game/DataStorage/AreaTriggerDataStorage.cs b/Source/Game/DataStorage/AreaTriggerDataStorage.cs index 6fadf5c65..664de105c 100644 --- a/Source/Game/DataStorage/AreaTriggerDataStorage.cs +++ b/Source/Game/DataStorage/AreaTriggerDataStorage.cs @@ -213,41 +213,41 @@ namespace Game.DataStorage continue; } - AreaTriggerCircularMovementInfo circularMovementInfo = new AreaTriggerCircularMovementInfo(); + AreaTriggerOrbitInfo orbitInfo = new AreaTriggerOrbitInfo(); - circularMovementInfo.StartDelay = circularMovementInfos.Read(1); - circularMovementInfo.Radius = circularMovementInfos.Read(2); - if (!float.IsInfinity(circularMovementInfo.Radius)) + orbitInfo.StartDelay = circularMovementInfos.Read(1); + orbitInfo.Radius = circularMovementInfos.Read(2); + if (!float.IsInfinity(orbitInfo.Radius)) { - Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid Radius ({circularMovementInfo.Radius}), set to 0!"); - circularMovementInfo.Radius = 0.0f; + Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid Radius ({orbitInfo.Radius}), set to 0!"); + orbitInfo.Radius = 0.0f; } - circularMovementInfo.BlendFromRadius = circularMovementInfos.Read(3); - if (!float.IsInfinity(circularMovementInfo.BlendFromRadius)) + orbitInfo.BlendFromRadius = circularMovementInfos.Read(3); + if (!float.IsInfinity(orbitInfo.BlendFromRadius)) { - Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid BlendFromRadius ({circularMovementInfo.BlendFromRadius}), set to 0!"); - circularMovementInfo.BlendFromRadius = 0.0f; + Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid BlendFromRadius ({orbitInfo.BlendFromRadius}), set to 0!"); + orbitInfo.BlendFromRadius = 0.0f; } - circularMovementInfo.InitialAngle = circularMovementInfos.Read(4); - if (!float.IsInfinity(circularMovementInfo.InitialAngle)) + orbitInfo.InitialAngle = circularMovementInfos.Read(4); + if (!float.IsInfinity(orbitInfo.InitialAngle)) { - Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid InitialAngle ({circularMovementInfo.InitialAngle}), set to 0!"); - circularMovementInfo.InitialAngle = 0.0f; + Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid InitialAngle ({orbitInfo.InitialAngle}), set to 0!"); + orbitInfo.InitialAngle = 0.0f; } - circularMovementInfo.ZOffset = circularMovementInfos.Read(5); - if (!float.IsInfinity(circularMovementInfo.ZOffset)) + orbitInfo.ZOffset = circularMovementInfos.Read(5); + if (!float.IsInfinity(orbitInfo.ZOffset)) { - Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid ZOffset ({circularMovementInfo.ZOffset}), set to 0!"); - circularMovementInfo.ZOffset = 0.0f; + Log.outError(LogFilter.Sql, $"Table `spell_areatrigger_circular` has listed areatrigger (MiscId: {spellMiscId}) with invalid ZOffset ({orbitInfo.ZOffset}), set to 0!"); + orbitInfo.ZOffset = 0.0f; } - circularMovementInfo.CounterClockwise = circularMovementInfos.Read(6); - circularMovementInfo.CanLoop = circularMovementInfos.Read(7); + orbitInfo.CounterClockwise = circularMovementInfos.Read(6); + orbitInfo.CanLoop = circularMovementInfos.Read(7); - atSpellMisc.CircularMovementInfo = circularMovementInfo; + atSpellMisc.OrbitInfo = orbitInfo; } while (circularMovementInfos.NextRow()); } diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index f37638bd5..b395a8a69 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -157,13 +157,13 @@ namespace Game.Entities if (GetTemplate().HasFlag(AreaTriggerFlags.HasCircularMovement)) { - AreaTriggerCircularMovementInfo cmi = GetMiscTemplate().CircularMovementInfo; + AreaTriggerOrbitInfo cmi = GetMiscTemplate().OrbitInfo; if (target && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) cmi.PathTarget.Set(target.GetGUID()); else cmi.Center.Set(new Vector3(pos.posX, pos.posY, pos.posZ)); - InitCircularMovement(cmi, timeToTarget); + InitOrbit(cmi, timeToTarget); } else if (GetMiscTemplate().HasSplines()) { @@ -186,8 +186,8 @@ namespace Game.Entities AI_Initialize(); // Relocate areatriggers with circular movement again - if (HasCircularMovement()) - Relocate(CalculateCircularMovementPosition()); + if (HasOrbit()) + Relocate(CalculateOrbitPosition()); if (!GetMap().AddToMap(this)) { // Returning false will cause the object to be deleted - remove from transport @@ -208,10 +208,10 @@ namespace Game.Entities base.Update(diff); _timeSinceCreated += diff; - // "If" order matter here, Circular Movement > Attached > Splines - if (HasCircularMovement()) + // "If" order matter here, Orbit > Attached > Splines + if (HasOrbit()) { - UpdateCircularMovementPosition(diff); + UpdateOrbitPosition(diff); } else if(GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) { @@ -657,7 +657,7 @@ namespace Game.Entities _reachedDestination = false; } - void InitCircularMovement(AreaTriggerCircularMovementInfo cmi, uint timeToTarget) + void InitOrbit(AreaTriggerOrbitInfo cmi, uint timeToTarget) { // Circular movement requires either a center position or an attached unit Cypher.Assert(cmi.Center.HasValue || cmi.PathTarget.HasValue); @@ -666,51 +666,51 @@ namespace Game.Entities SetUpdateFieldValue(m_values.ModifyValue(m_areaTriggerData).ModifyValue(m_areaTriggerData.TimeToTarget), timeToTarget); m_areaTriggerData.ClearChanged(m_areaTriggerData.TimeToTarget); - _circularMovementInfo.Set(cmi); + _orbitInfo.Set(cmi); - _circularMovementInfo.Value.TimeToTarget = timeToTarget; - _circularMovementInfo.Value.ElapsedTimeForMovement = 0; + _orbitInfo.Value.TimeToTarget = timeToTarget; + _orbitInfo.Value.ElapsedTimeForMovement = 0; if (IsInWorld) { AreaTriggerRePath reshape = new AreaTriggerRePath(); reshape.TriggerGUID = GetGUID(); - reshape.AreaTriggerCircularMovement = _circularMovementInfo; + reshape.AreaTriggerOrbit = _orbitInfo; SendMessageToSet(reshape, true); } } - public bool HasCircularMovement() + public bool HasOrbit() { - return _circularMovementInfo.HasValue; + return _orbitInfo.HasValue; } - Position GetCircularMovementCenterPosition() + Position GetOrbitCenterPosition() { - if (!_circularMovementInfo.HasValue) + if (!_orbitInfo.HasValue) return null; - if (_circularMovementInfo.Value.PathTarget.HasValue) + if (_orbitInfo.Value.PathTarget.HasValue) { - WorldObject center = Global.ObjAccessor.GetWorldObject(this, _circularMovementInfo.Value.PathTarget.Value); + WorldObject center = Global.ObjAccessor.GetWorldObject(this, _orbitInfo.Value.PathTarget.Value); if (center) return center; } - if (_circularMovementInfo.Value.Center.HasValue) - return new Position(_circularMovementInfo.Value.Center.Value); + if (_orbitInfo.Value.Center.HasValue) + return new Position(_orbitInfo.Value.Center.Value); return null; } - Position CalculateCircularMovementPosition() + Position CalculateOrbitPosition() { - Position centerPos = GetCircularMovementCenterPosition(); + Position centerPos = GetOrbitCenterPosition(); if (centerPos == null) return GetPosition(); - AreaTriggerCircularMovementInfo cmi = _circularMovementInfo.Value; + AreaTriggerOrbitInfo cmi = _orbitInfo.Value; // AreaTrigger make exactly "Duration / TimeToTarget" loops during his life time float pathProgress = (float)cmi.ElapsedTimeForMovement / cmi.TimeToTarget; @@ -741,14 +741,14 @@ namespace Game.Entities return new Position(x, y, z, angle); } - void UpdateCircularMovementPosition(uint diff) + void UpdateOrbitPosition(uint diff) { - if (_circularMovementInfo.Value.StartDelay > GetElapsedTimeForMovement()) + if (_orbitInfo.Value.StartDelay > GetElapsedTimeForMovement()) return; - _circularMovementInfo.Value.ElapsedTimeForMovement = (int)(GetElapsedTimeForMovement() - _circularMovementInfo.Value.StartDelay); + _orbitInfo.Value.ElapsedTimeForMovement = (int)(GetElapsedTimeForMovement() - _orbitInfo.Value.StartDelay); - Position pos = CalculateCircularMovementPosition(); + Position pos = CalculateOrbitPosition(); GetMap().AreaTriggerRelocation(this, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()); @@ -939,7 +939,7 @@ namespace Game.Entities public Spline GetSpline() { return _spline; } public uint GetElapsedTimeForMovement() { return GetTimeSinceCreated(); } // @todo: research the right value, in sniffs both timers are nearly identical - public Optional GetCircularMovementInfo() { return _circularMovementInfo; } + public Optional GetCircularMovementInfo() { return _orbitInfo; } AreaTriggerFieldData m_areaTriggerData; @@ -962,7 +962,7 @@ namespace Game.Entities int _lastSplineIndex; uint _movementTime; - Optional _circularMovementInfo; + Optional _orbitInfo; AreaTriggerMiscTemplate _areaTriggerMiscTemplate; List _insideUnits = new List(); diff --git a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs index 6d789426d..e90a8ae2b 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs @@ -138,7 +138,7 @@ namespace Game.Entities } } - public struct AreaTriggerCircularMovementInfo + public struct AreaTriggerOrbitInfo { public void Write(WorldPacket data) { @@ -265,7 +265,7 @@ namespace Game.Entities public AreaTriggerScaleInfo OverrideScale = new AreaTriggerScaleInfo(); public AreaTriggerScaleInfo ExtraScale = new AreaTriggerScaleInfo(); - public AreaTriggerCircularMovementInfo CircularMovementInfo; + public AreaTriggerOrbitInfo OrbitInfo; public AreaTriggerTemplate Template; public List SplinePoints = new List(); diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index bdd19529b..468024e3f 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -1942,10 +1942,10 @@ namespace Game.Entities return; } - ArtifactForgeOpened artifactForgeOpened = new ArtifactForgeOpened(); - artifactForgeOpened.ArtifactGUID = item.GetGUID(); - artifactForgeOpened.ForgeGUID = GetGUID(); - player.SendPacket(artifactForgeOpened); + OpenArtifactForge openArtifactForge = new OpenArtifactForge(); + openArtifactForge.ArtifactGUID = item.GetGUID(); + openArtifactForge.ForgeGUID = GetGUID(); + player.SendPacket(openArtifactForge); break; } case 2: // Heart Forge @@ -1954,9 +1954,9 @@ namespace Game.Entities if (!item) return; - AzeriteEssenceForgeOpened azeriteEssenceForgeOpened = new AzeriteEssenceForgeOpened(); - azeriteEssenceForgeOpened.ForgeGUID = GetGUID(); - player.SendPacket(azeriteEssenceForgeOpened); + OpenHeartForge openHeartForge = new OpenHeartForge(); + openHeartForge.ForgeGUID = GetGUID(); + player.SendPacket(openHeartForge); break; } default: @@ -1970,10 +1970,10 @@ namespace Game.Entities if (!player) return; - GameObjectUIAction gameObjectUIAction = new GameObjectUIAction(); - gameObjectUIAction.ObjectGUID = GetGUID(); - gameObjectUIAction.UILink = (int)GetGoInfo().UILink.UILinkType; - player.SendPacket(gameObjectUIAction); + GameObjectUILink gameObjectUILink = new GameObjectUILink(); + gameObjectUILink.ObjectGUID = GetGUID(); + gameObjectUILink.UILink = (int)GetGoInfo().UILink.UILinkType; + player.SendPacket(gameObjectUILink); return; } default: diff --git a/Source/Game/Entities/Item/AzeriteItem.cs b/Source/Game/Entities/Item/AzeriteItem.cs index 42a686978..8a9f9ac65 100644 --- a/Source/Game/Entities/Item/AzeriteItem.cs +++ b/Source/Game/Entities/Item/AzeriteItem.cs @@ -293,7 +293,7 @@ namespace Game.Entities SetState(ItemUpdateState.Changed, owner); } - AzeriteXpGain xpGain = new AzeriteXpGain(); + PlayerAzeriteItemGains xpGain = new PlayerAzeriteItemGains(); xpGain.ItemGUID = GetGUID(); xpGain.XP = xp; owner.SendPacket(xpGain); diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index 9a92612d5..d5ed57fd8 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -1116,7 +1116,7 @@ namespace Game.Entities public void SendUpdateSockets() { - SocketGemsResult socketGems = new SocketGemsResult(); + SocketGemsSuccess socketGems = new SocketGemsSuccess(); socketGems.Item = GetGUID(); GetOwner().SendPacket(socketGems); diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs index 53a9dfcc9..86efd0b15 100644 --- a/Source/Game/Entities/Object/WorldObject.cs +++ b/Source/Game/Entities/Object/WorldObject.cs @@ -466,7 +466,7 @@ namespace Game.Entities bool hasAreaTriggerPolygon = areaTriggerTemplate.IsPolygon(); bool hasAreaTriggerCylinder = areaTriggerTemplate.IsCylinder(); bool hasAreaTriggerSpline = areaTrigger.HasSplines(); - bool hasCircularMovement = areaTrigger.HasCircularMovement(); + bool hasOrbit = areaTrigger.HasOrbit(); data.WriteBit(hasAbsoluteOrientation); data.WriteBit(hasDynamicShape); @@ -488,7 +488,7 @@ namespace Game.Entities data.WriteBit(hasAreaTriggerPolygon); data.WriteBit(hasAreaTriggerCylinder); data.WriteBit(hasAreaTriggerSpline); - data.WriteBit(hasCircularMovement); + data.WriteBit(hasOrbit); if (hasUnk3) data.WriteBit(0); @@ -571,7 +571,7 @@ namespace Game.Entities data.WriteFloat(areaTriggerTemplate.CylinderDatas.LocationZOffsetTarget); } - if (hasCircularMovement) + if (hasOrbit) areaTrigger.GetCircularMovementInfo().Value.Write(data); } diff --git a/Source/Game/Entities/Player/CollectionManager.cs b/Source/Game/Entities/Player/CollectionManager.cs index a3f3f0030..b2e41dfa8 100644 --- a/Source/Game/Entities/Player/CollectionManager.cs +++ b/Source/Game/Entities/Player/CollectionManager.cs @@ -809,23 +809,23 @@ namespace Game.Entities _favoriteAppearances[itemModifiedAppearanceId] = apperanceState; - TransmogCollectionUpdate transmogCollectionUpdate = new TransmogCollectionUpdate(); - transmogCollectionUpdate.IsFullUpdate = false; - transmogCollectionUpdate.IsSetFavorite = apply; - transmogCollectionUpdate.FavoriteAppearances.Add(itemModifiedAppearanceId); + AccountTransmogUpdate accountTransmogUpdate = new AccountTransmogUpdate(); + accountTransmogUpdate.IsFullUpdate = false; + accountTransmogUpdate.IsSetFavorite = apply; + accountTransmogUpdate.FavoriteAppearances.Add(itemModifiedAppearanceId); - _owner.SendPacket(transmogCollectionUpdate); + _owner.SendPacket(accountTransmogUpdate); } public void SendFavoriteAppearances() { - TransmogCollectionUpdate transmogCollectionUpdate = new TransmogCollectionUpdate(); - transmogCollectionUpdate.IsFullUpdate = true; + AccountTransmogUpdate accountTransmogUpdate = new AccountTransmogUpdate(); + accountTransmogUpdate.IsFullUpdate = true; foreach (var pair in _favoriteAppearances) if (pair.Value != FavoriteAppearanceState.Removed) - transmogCollectionUpdate.FavoriteAppearances.Add(pair.Key); + accountTransmogUpdate.FavoriteAppearances.Add(pair.Key); - _owner.SendPacket(transmogCollectionUpdate); + _owner.SendPacket(accountTransmogUpdate); } public void AddTransmogSet(uint transmogSetId) diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index 6c83d8356..7f992b575 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -6202,7 +6202,7 @@ namespace Game.Entities DB.Characters.CommitTransaction(trans); - SendPacket(new CharacterInventoryOverflowWarning()); + SendPacket(new InventoryFullOverflow()); } } diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index e21e43a55..ac088d8b3 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -5651,10 +5651,10 @@ namespace Game.Entities SendPacket(mountUpdate); // SMSG_ACCOUNT_TOYS_UPDATE - AccountToysUpdate toysUpdate = new AccountToysUpdate(); - toysUpdate.IsFullUpdate = true; - toysUpdate.Toys = GetSession().GetCollectionMgr().GetAccountToys(); - SendPacket(toysUpdate); + AccountToyUpdate toyUpdate = new AccountToyUpdate(); + toyUpdate.IsFullUpdate = true; + toyUpdate.Toys = GetSession().GetCollectionMgr().GetAccountToys(); + SendPacket(toyUpdate); // SMSG_ACCOUNT_HEIRLOOM_UPDATE AccountHeirloomUpdate heirloomUpdate = new AccountHeirloomUpdate(); diff --git a/Source/Game/Groups/Group.cs b/Source/Game/Groups/Group.cs index 2a90e3765..5ec4470cd 100644 --- a/Source/Game/Groups/Group.cs +++ b/Source/Game/Groups/Group.cs @@ -1466,7 +1466,7 @@ namespace Game.Groups if (!player || !player.IsInWorld) return; - PartyMemberState packet = new PartyMemberState(); + PartyMemberFullState packet = new PartyMemberFullState(); packet.Initialize(player); for (GroupReference refe = GetFirstMember(); refe != null; refe = refe.Next()) diff --git a/Source/Game/Guilds/Guild.cs b/Source/Game/Guilds/Guild.cs index c82b16ecd..2131078dd 100644 --- a/Source/Game/Guilds/Guild.cs +++ b/Source/Game/Guilds/Guild.cs @@ -1489,7 +1489,7 @@ namespace Game.Guilds public void MassInviteToEvent(WorldSession session, uint minLevel, uint maxLevel, uint minRank) { - CalendarEventInitialInvites packet = new CalendarEventInitialInvites(); + CalendarCommunityInvite packet = new CalendarCommunityInvite(); foreach (var member in m_members.Values) { diff --git a/Source/Game/Handlers/AuctionHandler.cs b/Source/Game/Handlers/AuctionHandler.cs index e7f6fb45c..3b0027e34 100644 --- a/Source/Game/Handlers/AuctionHandler.cs +++ b/Source/Game/Handlers/AuctionHandler.cs @@ -20,7 +20,6 @@ using Framework.Database; using Framework.Dynamic; using Game.DataStorage; using Game.Entities; -using Game.Mails; using Game.Networking; using Game.Networking.Packets; using System; @@ -165,17 +164,17 @@ namespace Game SendAuctionHello(hello.Guid, unit); } - [WorldPacketHandler(ClientOpcodes.AuctionListBidderItems)] - void HandleAuctionListBidderItems(AuctionListBidderItems listBidderItems) + [WorldPacketHandler(ClientOpcodes.AuctionListBiddedItems)] + void HandleAuctionListBiddedItems(AuctionListBiddedItems listBiddedItems) { - AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, listBidderItems.TaintedBy.HasValue); + AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, listBiddedItems.TaintedBy.HasValue); if (throttle.Throttled) return; - Creature creature = GetPlayer().GetNPCIfCanInteractWith(listBidderItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); + Creature creature = GetPlayer().GetNPCIfCanInteractWith(listBiddedItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); if (!creature) { - Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListBidderItems - {listBidderItems.Auctioneer} not found or you can't interact with him."); + Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListBidderItems - {listBiddedItems.Auctioneer} not found or you can't interact with him."); return; } @@ -185,10 +184,10 @@ namespace Game AuctionHouseObject auctionHouse = Global.AuctionHouseMgr.GetAuctionsMap(creature.GetFaction()); - AuctionListBidderItemsResult result = new AuctionListBidderItemsResult(); + AuctionListBiddedItemsResult result = new AuctionListBiddedItemsResult(); Player player = GetPlayer(); - auctionHouse.BuildListBidderItems(result, player, listBidderItems.Offset, listBidderItems.Sorts, listBidderItems.Sorts.Count); + auctionHouse.BuildListBiddedItems(result, player, listBiddedItems.Offset, listBiddedItems.Sorts, listBiddedItems.Sorts.Count); result.DesiredDelay = (uint)throttle.DelayUntilNext.TotalSeconds; SendPacket(result); } @@ -288,17 +287,17 @@ namespace Game SendPacket(listItemsResult); } - [WorldPacketHandler(ClientOpcodes.AuctionListOwnerItems)] - void HandleAuctionListOwnerItems(AuctionListOwnerItems listOwnerItems) + [WorldPacketHandler(ClientOpcodes.AuctionListOwnedItems)] + void HandleAuctionListOwnedItems(AuctionListOwnedItems listOwnedItems) { - AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, listOwnerItems.TaintedBy.HasValue); + AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, listOwnedItems.TaintedBy.HasValue); if (throttle.Throttled) return; - Creature creature = GetPlayer().GetNPCIfCanInteractWith(listOwnerItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); + Creature creature = GetPlayer().GetNPCIfCanInteractWith(listOwnedItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); if (!creature) { - Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListOwnerItems - {listOwnerItems.Auctioneer} not found or you can't interact with him."); + Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListOwnerItems - {listOwnedItems.Auctioneer} not found or you can't interact with him."); return; } @@ -308,9 +307,9 @@ namespace Game AuctionHouseObject auctionHouse = Global.AuctionHouseMgr.GetAuctionsMap(creature.GetFaction()); - AuctionListOwnerItemsResult result = new AuctionListOwnerItemsResult(); + AuctionListOwnedItemsResult result = new AuctionListOwnedItemsResult(); - auctionHouse.BuildListOwnerItems(result, _player, listOwnerItems.Offset, listOwnerItems.Sorts, listOwnerItems.Sorts.Count); + auctionHouse.BuildListOwnedItems(result, _player, listOwnedItems.Offset, listOwnedItems.Sorts, listOwnedItems.Sorts.Count); result.DesiredDelay = (uint)throttle.DelayUntilNext.TotalSeconds; SendPacket(result); } @@ -925,17 +924,17 @@ namespace Game DB.Characters.CommitTransaction(trans); } - [WorldPacketHandler(ClientOpcodes.AuctionStartCommoditiesPurchase)] - void HandleAuctionStartCommoditiesPurchase(AuctionStartCommoditiesPurchase startCommoditiesPurchase) + [WorldPacketHandler(ClientOpcodes.AuctionGetCommodityQuote)] + void HandleAuctionGetCommodityQuote(AuctionGetCommodityQuote getCommodityQuote) { - AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, startCommoditiesPurchase.TaintedBy.HasValue, AuctionCommand.PlaceBid); + AuctionThrottleResult throttle = Global.AuctionHouseMgr.CheckThrottle(_player, getCommodityQuote.TaintedBy.HasValue, AuctionCommand.PlaceBid); if (throttle.Throttled) return; - Creature creature = GetPlayer().GetNPCIfCanInteractWith(startCommoditiesPurchase.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); + Creature creature = GetPlayer().GetNPCIfCanInteractWith(getCommodityQuote.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); if (!creature) { - Log.outError(LogFilter.Network, "WORLD: HandleAuctionStartCommoditiesPurchase - {startCommoditiesPurchase.Auctioneer.ToString()} not found or you can't interact with him."); + Log.outError(LogFilter.Network, $"WORLD: HandleAuctionStartCommoditiesPurchase - {getCommodityQuote.Auctioneer} not found or you can't interact with him."); return; } @@ -945,19 +944,19 @@ namespace Game AuctionHouseObject auctionHouse = Global.AuctionHouseMgr.GetAuctionsMap(creature.GetFaction()); - AuctionCommodityQuote auctionCommodityQuote = new AuctionCommodityQuote(); + AuctionGetCommodityQuoteResult commodityQuoteResult = new AuctionGetCommodityQuoteResult(); - CommodityQuote quote = auctionHouse.CreateCommodityQuote(_player, (uint)startCommoditiesPurchase.ItemID, startCommoditiesPurchase.Quantity); + CommodityQuote quote = auctionHouse.CreateCommodityQuote(_player, (uint)getCommodityQuote.ItemID, getCommodityQuote.Quantity); if (quote != null) { - auctionCommodityQuote.TotalPrice.Set(quote.TotalPrice); - auctionCommodityQuote.Quantity.Set(quote.Quantity); - auctionCommodityQuote.QuoteDuration.Set((int)(quote.ValidTo - GameTime.GetGameTimeSteadyPoint()).TotalMilliseconds); + commodityQuoteResult.TotalPrice.Set(quote.TotalPrice); + commodityQuoteResult.Quantity.Set(quote.Quantity); + commodityQuoteResult.QuoteDuration.Set((int)(quote.ValidTo - GameTime.GetGameTimeSteadyPoint()).TotalMilliseconds); } - auctionCommodityQuote.DesiredDelay = (uint)throttle.DelayUntilNext.TotalSeconds; + commodityQuoteResult.DesiredDelay = (uint)throttle.DelayUntilNext.TotalSeconds; - SendPacket(auctionCommodityQuote); + SendPacket(commodityQuoteResult); } public void SendAuctionHello(ObjectGuid guid, Creature unit) diff --git a/Source/Game/Handlers/AzeriteHandler.cs b/Source/Game/Handlers/AzeriteHandler.cs index 828629a47..27c0c5c32 100644 --- a/Source/Game/Handlers/AzeriteHandler.cs +++ b/Source/Game/Handlers/AzeriteHandler.cs @@ -62,7 +62,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.AzeriteEssenceActivateEssence)] void HandleAzeriteEssenceActivateEssence(AzeriteEssenceActivateEssence azeriteEssenceActivateEssence) { - AzeriteEssenceSelectionResult activateEssenceResult = new AzeriteEssenceSelectionResult(); + ActivateEssenceFailed activateEssenceResult = new ActivateEssenceFailed(); activateEssenceResult.AzeriteEssenceID = azeriteEssenceActivateEssence.AzeriteEssenceID; Item item = _player.GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.InEquipment); diff --git a/Source/Game/Handlers/BattleGroundHandler.cs b/Source/Game/Handlers/BattleGroundHandler.cs index d2417cb44..5281ecf06 100644 --- a/Source/Game/Handlers/BattleGroundHandler.cs +++ b/Source/Game/Handlers/BattleGroundHandler.cs @@ -221,9 +221,9 @@ namespace Game if (bg.IsArena()) return; - PVPLogDataMessage pvpLogData = new PVPLogDataMessage(); - bg.BuildPvPLogDataPacket(out pvpLogData.Data); - SendPacket(pvpLogData); + PVPMatchStatisticsMessage pvpMatchStatistics = new PVPMatchStatisticsMessage(); + bg.BuildPvPLogDataPacket(out pvpMatchStatistics.Data); + SendPacket(pvpMatchStatistics); } [WorldPacketHandler(ClientOpcodes.BattlefieldList)] @@ -581,8 +581,8 @@ namespace Game [WorldPacketHandler(ClientOpcodes.RequestRatedBattlefieldInfo)] void HandleRequestRatedBattlefieldInfo(RequestRatedBattlefieldInfo packet) { - RatedBattlefieldInfo ratedBattlefieldInfo = new RatedBattlefieldInfo(); - SendPacket(ratedBattlefieldInfo); + RatedPvpInfo ratedPvpInfo = new RatedPvpInfo(); + SendPacket(ratedPvpInfo); } [WorldPacketHandler(ClientOpcodes.GetPvpOptionsEnabled, Processing = PacketProcessing.Inplace)] diff --git a/Source/Game/Handlers/BattlenetHandler.cs b/Source/Game/Handlers/BattlenetHandler.cs index 219644312..8b8c56429 100644 --- a/Source/Game/Handlers/BattlenetHandler.cs +++ b/Source/Game/Handlers/BattlenetHandler.cs @@ -31,13 +31,13 @@ namespace Game Global.ServiceMgr.Dispatch(this, request.Method.GetServiceHash(), request.Method.Token, request.Method.GetMethodId(), new CodedInputStream(request.Data)); } - [WorldPacketHandler(ClientOpcodes.BattlenetRequestRealmListTicket, Status = SessionStatus.Authed)] - void HandleBattlenetRequestRealmListTicket(RequestRealmListTicket requestRealmListTicket) + [WorldPacketHandler(ClientOpcodes.ChangeRealmTicket, Status = SessionStatus.Authed)] + void HandleBattlenetChangeRealmTicket(ChangeRealmTicket changeRealmTicket) { - SetRealmListSecret(requestRealmListTicket.Secret); + SetRealmListSecret(changeRealmTicket.Secret); - RealmListTicket realmListTicket = new RealmListTicket(); - realmListTicket.Token = requestRealmListTicket.Token; + ChangeRealmTicketResponse realmListTicket = new ChangeRealmTicketResponse(); + realmListTicket.Token = changeRealmTicket.Token; realmListTicket.Allow = true; realmListTicket.Ticket = new Framework.IO.ByteBuffer(); realmListTicket.Ticket.WriteCString("WorldserverRealmListTicket"); diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index 39376782e..5687aee94 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -692,13 +692,13 @@ namespace Game // Send PVPSeason { - PVPSeason season = new PVPSeason(); - season.PreviousSeason = (WorldConfig.GetIntValue(WorldCfg.ArenaSeasonId) - (WorldConfig.GetBoolValue(WorldCfg.ArenaSeasonInProgress) ? 1 : 0)); + SeasonInfo seasonInfo = new SeasonInfo(); + seasonInfo.PreviousSeason = (WorldConfig.GetIntValue(WorldCfg.ArenaSeasonId) - (WorldConfig.GetBoolValue(WorldCfg.ArenaSeasonInProgress) ? 1 : 0)); if (WorldConfig.GetBoolValue(WorldCfg.ArenaSeasonInProgress)) - season.CurrentSeason = WorldConfig.GetIntValue(WorldCfg.ArenaSeasonId); + seasonInfo.CurrentSeason = WorldConfig.GetIntValue(WorldCfg.ArenaSeasonId); - SendPacket(season); + SendPacket(seasonInfo); } SQLResult resultGuild = holder.GetResult(PlayerLoginQueryLoad.Guild); @@ -792,7 +792,7 @@ namespace Game stmt.AddValue(0, pCurrChar.GetGUID().GetCounter()); GetQueryProcessor().AddCallback(DB.Characters.AsyncQuery(stmt)).WithCallback(favoriteAuctionResult => { - AuctionFavoriteItems favoriteItems = new AuctionFavoriteItems(); + AuctionFavoriteList favoriteItems = new AuctionFavoriteList(); if (!favoriteAuctionResult.IsEmpty()) { do @@ -2432,12 +2432,12 @@ namespace Game { if (result == ResponseCodes.Success) { - CharCustomizeResponse response = new CharCustomizeResponse(customizeInfo); + CharCustomizeSuccess response = new CharCustomizeSuccess(customizeInfo); SendPacket(response); } else { - CharCustomizeFailed failed = new CharCustomizeFailed(); + CharCustomizeFailure failed = new CharCustomizeFailure(); failed.Result = (byte)result; failed.CharGUID = customizeInfo.CharGUID; SendPacket(failed); diff --git a/Source/Game/Handlers/GroupHandler.cs b/Source/Game/Handlers/GroupHandler.cs index c436e7439..7a1ff7f89 100644 --- a/Source/Game/Handlers/GroupHandler.cs +++ b/Source/Game/Handlers/GroupHandler.cs @@ -586,7 +586,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.RequestPartyMemberStats)] void HandleRequestPartyMemberStats(RequestPartyMemberStats packet) { - PartyMemberState partyMemberStats = new PartyMemberState(); + PartyMemberFullState partyMemberStats = new PartyMemberFullState(); Player player = Global.ObjAccessor.FindConnectedPlayer(packet.TargetGUID); if (!player) diff --git a/Source/Game/Handlers/HotfixHandler.cs b/Source/Game/Handlers/HotfixHandler.cs index 394b3ce06..360974b8f 100644 --- a/Source/Game/Handlers/HotfixHandler.cs +++ b/Source/Game/Handlers/HotfixHandler.cs @@ -67,14 +67,14 @@ namespace Game { var hotfixes = Global.DB2Mgr.GetHotfixData(); - HotfixResponse hotfixQueryResponse = new HotfixResponse(); + HotfixConnect hotfixQueryResponse = new HotfixConnect(); foreach (HotfixRecord hotfixRecord in hotfixQuery.Hotfixes) { if (hotfixes.Contains(hotfixRecord)) { var storage = Global.DB2Mgr.GetStorage(hotfixRecord.TableHash); - HotfixResponse.HotfixData hotfixData = new HotfixResponse.HotfixData(); + HotfixConnect.HotfixData hotfixData = new HotfixConnect.HotfixData(); hotfixData.Record = hotfixRecord; if (storage != null && storage.HasRecord((uint)hotfixRecord.RecordID)) { diff --git a/Source/Game/Handlers/ItemHandler.cs b/Source/Game/Handlers/ItemHandler.cs index 74e6ac4bb..450443127 100644 --- a/Source/Game/Handlers/ItemHandler.cs +++ b/Source/Game/Handlers/ItemHandler.cs @@ -1072,7 +1072,7 @@ namespace Game { // TODO: Implement sorting // Placeholder to prevent completely locking out bags clientside - SendPacket(new SortBagsResult()); + SendPacket(new BagCleanupFinished()); } [WorldPacketHandler(ClientOpcodes.SortBankBags)] @@ -1080,7 +1080,7 @@ namespace Game { // TODO: Implement sorting // Placeholder to prevent completely locking out bags clientside - SendPacket(new SortBagsResult()); + SendPacket(new BagCleanupFinished()); } [WorldPacketHandler(ClientOpcodes.SortReagentBankBags)] @@ -1088,7 +1088,7 @@ namespace Game { // TODO: Implement sorting // Placeholder to prevent completely locking out bags clientside - SendPacket(new SortBagsResult()); + SendPacket(new BagCleanupFinished()); } [WorldPacketHandler(ClientOpcodes.RemoveNewItem)] diff --git a/Source/Game/Handlers/QuestHandler.cs b/Source/Game/Handlers/QuestHandler.cs index 6f46cf76d..7729d2f94 100644 --- a/Source/Game/Handlers/QuestHandler.cs +++ b/Source/Game/Handlers/QuestHandler.cs @@ -648,7 +648,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.RequestWorldQuestUpdate)] void HandleRequestWorldQuestUpdate(RequestWorldQuestUpdate packet) { - WorldQuestUpdate response = new WorldQuestUpdate(); + WorldQuestUpdateResponse response = new WorldQuestUpdateResponse(); // @todo: 7.x Has to be implemented //response.WorldQuestUpdates.push_back(WorldPackets::Quest::WorldQuestUpdateInfo(lastUpdate, questID, timer, variableID, value)); diff --git a/Source/Game/Handlers/SkillHandler.cs b/Source/Game/Handlers/SkillHandler.cs index 85f9d8a7d..009bfc9bd 100644 --- a/Source/Game/Handlers/SkillHandler.cs +++ b/Source/Game/Handlers/SkillHandler.cs @@ -29,24 +29,24 @@ namespace Game [WorldPacketHandler(ClientOpcodes.LearnTalents)] void HandleLearnTalents(LearnTalents packet) { - LearnTalentsFailed learnTalentsFailed = new LearnTalentsFailed(); + LearnTalentFailed learnTalentFailed = new LearnTalentFailed(); bool anythingLearned = false; foreach (uint talentId in packet.Talents) { - TalentLearnResult result = _player.LearnTalent(talentId, ref learnTalentsFailed.SpellID); + TalentLearnResult result = _player.LearnTalent(talentId, ref learnTalentFailed.SpellID); if (result != 0) { - if (learnTalentsFailed.Reason == 0) - learnTalentsFailed.Reason = (uint)result; + if (learnTalentFailed.Reason == 0) + learnTalentFailed.Reason = (uint)result; - learnTalentsFailed.Talents.Add((ushort)talentId); + learnTalentFailed.Talents.Add((ushort)talentId); } else anythingLearned = true; } - if (learnTalentsFailed.Reason != 0) - SendPacket(learnTalentsFailed); + if (learnTalentFailed.Reason != 0) + SendPacket(learnTalentFailed); if (anythingLearned) GetPlayer().SendTalentsInfoData(); @@ -55,24 +55,24 @@ namespace Game [WorldPacketHandler(ClientOpcodes.LearnPvpTalents)] void HandleLearnPvpTalents(LearnPvpTalents packet) { - LearnPvpTalentsFailed learnPvpTalentsFailed = new LearnPvpTalentsFailed(); + LearnPvpTalentFailed learnPvpTalentFailed = new LearnPvpTalentFailed(); bool anythingLearned = false; foreach (var pvpTalent in packet.Talents) { - TalentLearnResult result = _player.LearnPvpTalent(pvpTalent.PvPTalentID, pvpTalent.Slot, ref learnPvpTalentsFailed.SpellID); + TalentLearnResult result = _player.LearnPvpTalent(pvpTalent.PvPTalentID, pvpTalent.Slot, ref learnPvpTalentFailed.SpellID); if (result != 0) { - if (learnPvpTalentsFailed.Reason == 0) - learnPvpTalentsFailed.Reason = (uint)result; + if (learnPvpTalentFailed.Reason == 0) + learnPvpTalentFailed.Reason = (uint)result; - learnPvpTalentsFailed.Talents.Add(pvpTalent); + learnPvpTalentFailed.Talents.Add(pvpTalent); } else anythingLearned = true; } - if (learnPvpTalentsFailed.Reason != 0) - SendPacket(learnPvpTalentsFailed); + if (learnPvpTalentFailed.Reason != 0) + SendPacket(learnPvpTalentFailed); if (anythingLearned) _player.SendTalentsInfoData(); diff --git a/Source/Game/Handlers/TimeHandler.cs b/Source/Game/Handlers/TimeHandler.cs index a66eb07b9..ebd64dd37 100644 --- a/Source/Game/Handlers/TimeHandler.cs +++ b/Source/Game/Handlers/TimeHandler.cs @@ -24,10 +24,10 @@ namespace Game { public partial class WorldSession { - [WorldPacketHandler(ClientOpcodes.UiTimeRequest, Status = SessionStatus.Authed, Processing = PacketProcessing.Inplace)] - void HandleUITimeRequest(UITimeRequest packet) + [WorldPacketHandler(ClientOpcodes.ServerTimeOffsetRequest, Status = SessionStatus.Authed, Processing = PacketProcessing.Inplace)] + void HandleServerTimeOffsetRequest(ServerTimeOffsetRequest packet) { - UITime response = new UITime(); + ServerTimeOffset response = new ServerTimeOffset(); response.Time = (uint)Time.UnixTime; SendPacket(response); } diff --git a/Source/Game/Handlers/TokenHandler.cs b/Source/Game/Handlers/TokenHandler.cs index 7930521cb..f476beba3 100644 --- a/Source/Game/Handlers/TokenHandler.cs +++ b/Source/Game/Handlers/TokenHandler.cs @@ -23,26 +23,26 @@ namespace Game { public partial class WorldSession { - [WorldPacketHandler(ClientOpcodes.UpdateWowTokenAuctionableList)] - void HandleUpdateListedAuctionableTokens(UpdateListedAuctionableTokens updateListedAuctionableTokens) + [WorldPacketHandler(ClientOpcodes.CommerceTokenGetLog)] + void HandleCommerceTokenGetLog(CommerceTokenGetLog commerceTokenGetLog) { - UpdateListedAuctionableTokensResponse response = new UpdateListedAuctionableTokensResponse(); + CommerceTokenGetLogResponse response = new CommerceTokenGetLogResponse(); // @todo: fix 6.x implementation - response.UnkInt = updateListedAuctionableTokens.UnkInt; + response.UnkInt = commerceTokenGetLog.UnkInt; response.Result = TokenResult.Success; SendPacket(response); } - [WorldPacketHandler(ClientOpcodes.RequestWowTokenMarketPrice)] - void HandleRequestWowTokenMarketPrice(RequestWowTokenMarketPrice requestWowTokenMarketPrice) + [WorldPacketHandler(ClientOpcodes.CommerceTokenGetMarketPrice)] + void HandleCommerceTokenGetMarketPrice(CommerceTokenGetMarketPrice commerceTokenGetMarketPrice) { - WowTokenMarketPriceResponse response = new WowTokenMarketPriceResponse(); + CommerceTokenGetMarketPriceResponse response = new CommerceTokenGetMarketPriceResponse(); // @todo: 6.x fix implementation response.CurrentMarketPrice = 300000000; - response.UnkInt = requestWowTokenMarketPrice.UnkInt; + response.UnkInt = commerceTokenGetMarketPrice.UnkInt; response.Result = TokenResult.Success; //packet.ReadUInt32("UnkInt32"); diff --git a/Source/Game/Handlers/TransmogrificationHandler.cs b/Source/Game/Handlers/TransmogrificationHandler.cs index 825df2710..3cf8aaeb7 100644 --- a/Source/Game/Handlers/TransmogrificationHandler.cs +++ b/Source/Game/Handlers/TransmogrificationHandler.cs @@ -294,7 +294,7 @@ namespace Game public void SendOpenTransmogrifier(ObjectGuid guid) { - SendPacket(new OpenTransmogrifier(guid)); + SendPacket(new TransmogrifyNPC(guid)); } } } diff --git a/Source/Game/Maps/Instances/InstanceScript.cs b/Source/Game/Maps/Instances/InstanceScript.cs index e26641a53..dcc4b1516 100644 --- a/Source/Game/Maps/Instances/InstanceScript.cs +++ b/Source/Game/Maps/Instances/InstanceScript.cs @@ -727,7 +727,7 @@ namespace Game.Maps void SendBossKillCredit(uint encounterId) { - BossKillCredit bossKillCreditMessage = new BossKillCredit(); + BossKill bossKillCreditMessage = new BossKill(); bossKillCreditMessage.DungeonEncounterID = encounterId; instance.SendToPlayers(bossKillCreditMessage); diff --git a/Source/Game/Networking/Packets/AreaTriggerPackets.cs b/Source/Game/Networking/Packets/AreaTriggerPackets.cs index 59f5d306e..de20e7dc0 100644 --- a/Source/Game/Networking/Packets/AreaTriggerPackets.cs +++ b/Source/Game/Networking/Packets/AreaTriggerPackets.cs @@ -71,18 +71,18 @@ namespace Game.Networking.Packets _worldPacket.WritePackedGuid(TriggerGUID); _worldPacket.WriteBit(AreaTriggerSpline.HasValue); - _worldPacket.WriteBit(AreaTriggerCircularMovement.HasValue); + _worldPacket.WriteBit(AreaTriggerOrbit.HasValue); _worldPacket.FlushBits(); if (AreaTriggerSpline.HasValue) AreaTriggerSpline.Value.Write(_worldPacket); - if (AreaTriggerCircularMovement.HasValue) - AreaTriggerCircularMovement.Value.Write(_worldPacket); + if (AreaTriggerOrbit.HasValue) + AreaTriggerOrbit.Value.Write(_worldPacket); } public Optional AreaTriggerSpline; - public Optional AreaTriggerCircularMovement; + public Optional AreaTriggerOrbit; public ObjectGuid TriggerGUID; } diff --git a/Source/Game/Networking/Packets/ArtifactPackets.cs b/Source/Game/Networking/Packets/ArtifactPackets.cs index e28eeb2b8..40e76b908 100644 --- a/Source/Game/Networking/Packets/ArtifactPackets.cs +++ b/Source/Game/Networking/Packets/ArtifactPackets.cs @@ -81,9 +81,9 @@ namespace Game.Networking.Packets public ObjectGuid NpcGUID; } - class ArtifactForgeOpened : ServerPacket + class OpenArtifactForge : ServerPacket { - public ArtifactForgeOpened() : base(ServerOpcodes.ArtifactForgeOpened) { } + public OpenArtifactForge() : base(ServerOpcodes.OpenArtifactForge) { } public override void Write() { @@ -95,9 +95,9 @@ namespace Game.Networking.Packets public ObjectGuid ForgeGUID; } - class ArtifactRespecConfirm : ServerPacket + class ArtifactRespecPrompt : ServerPacket { - public ArtifactRespecConfirm() : base(ServerOpcodes.ArtifactRespecConfirm) { } + public ArtifactRespecPrompt() : base(ServerOpcodes.ArtifactRespecPrompt) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/AuctionHousePackets.cs b/Source/Game/Networking/Packets/AuctionHousePackets.cs index 56f7068cb..897e92848 100644 --- a/Source/Game/Networking/Packets/AuctionHousePackets.cs +++ b/Source/Game/Networking/Packets/AuctionHousePackets.cs @@ -119,7 +119,7 @@ namespace Game.Networking.Packets } } - class AuctionListBidderItems : ClientPacket + class AuctionListBiddedItems : ClientPacket { public ObjectGuid Auctioneer; public uint Offset; @@ -127,7 +127,7 @@ namespace Game.Networking.Packets public Array Sorts = new Array(2); public Optional TaintedBy; - public AuctionListBidderItems(WorldPacket packet) : base(packet) { } + public AuctionListBiddedItems(WorldPacket packet) : base(packet) { } public override void Read() { @@ -237,14 +237,14 @@ namespace Game.Networking.Packets } } - class AuctionListOwnerItems : ClientPacket + class AuctionListOwnedItems : ClientPacket { public ObjectGuid Auctioneer; public uint Offset; public Optional TaintedBy; public Array Sorts = new Array(2); - public AuctionListOwnerItems(WorldPacket packet) : base(packet) { } + public AuctionListOwnedItems(WorldPacket packet) : base(packet) { } public override void Read() { @@ -396,14 +396,14 @@ namespace Game.Networking.Packets } } - class AuctionStartCommoditiesPurchase : ClientPacket + class AuctionGetCommodityQuote : ClientPacket { public ObjectGuid Auctioneer; public int ItemID; public uint Quantity; public Optional TaintedBy; - public AuctionStartCommoditiesPurchase(WorldPacket packet) : base(packet) { } + public AuctionGetCommodityQuote(WorldPacket packet) : base(packet) { } public override void Read() { @@ -460,7 +460,7 @@ namespace Game.Networking.Packets } } - class AuctionCommodityQuote : ServerPacket + class AuctionGetCommodityQuoteResult : ServerPacket { public Optional TotalPrice; public Optional Quantity; @@ -468,7 +468,7 @@ namespace Game.Networking.Packets public int Unknown830; public uint DesiredDelay; - public AuctionCommodityQuote() : base(ServerOpcodes.AuctionCommodityQuote) { } + public AuctionGetCommodityQuoteResult() : base(ServerOpcodes.AuctionGetCommodityQuoteResult) { } public override void Write() { @@ -504,13 +504,13 @@ namespace Game.Networking.Packets } } - public class AuctionListBidderItemsResult : ServerPacket + public class AuctionListBiddedItemsResult : ServerPacket { public List Items = new List(); public uint DesiredDelay; public bool HasMoreResults; - public AuctionListBidderItemsResult() : base(ServerOpcodes.AuctionListBidderItemsResult) { } + public AuctionListBiddedItemsResult() : base(ServerOpcodes.AuctionListBiddedItemsResult) { } public override void Write() { @@ -550,12 +550,12 @@ namespace Game.Networking.Packets } } - class AuctionFavoriteItems : ServerPacket + class AuctionFavoriteList : ServerPacket { public uint DesiredDelay; public List Items = new List(); - public AuctionFavoriteItems() : base(ServerOpcodes.AuctionFavoriteItems) { } + public AuctionFavoriteList() : base(ServerOpcodes.AuctionFavoriteList) { } public override void Write() { @@ -597,14 +597,14 @@ namespace Game.Networking.Packets } } - public class AuctionListOwnerItemsResult : ServerPacket + public class AuctionListOwnedItemsResult : ServerPacket { public List Items = new List(); public List SoldItems = new List(); public uint DesiredDelay; public bool HasMoreResults; - public AuctionListOwnerItemsResult() : base(ServerOpcodes.AuctionListOwnerItemsResult) { } + public AuctionListOwnedItemsResult() : base(ServerOpcodes.AuctionListOwnedItemsResult) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/AuthenticationPackets.cs b/Source/Game/Networking/Packets/AuthenticationPackets.cs index 517b015dd..123caeb3a 100644 --- a/Source/Game/Networking/Packets/AuthenticationPackets.cs +++ b/Source/Game/Networking/Packets/AuthenticationPackets.cs @@ -365,14 +365,14 @@ namespace Game.Networking.Packets byte Con; } - class EnableEncryption : ServerPacket + class EnterEncryptedMode : ServerPacket { byte[] EncryptionKey; bool Enabled; static byte[] EnableEncryptionSeed = { 0x90, 0x9C, 0xD0, 0x50, 0x5A, 0x2C, 0x14, 0xDD, 0x5C, 0x2C, 0xC0, 0x64, 0x14, 0xF3, 0xFE, 0xC9 }; - public EnableEncryption(byte[] encryptionKey, bool enabled) : base(ServerOpcodes.EnableEncryption) + public EnterEncryptedMode(byte[] encryptionKey, bool enabled) : base(ServerOpcodes.EnterEncryptedMode) { EncryptionKey = encryptionKey; Enabled = enabled; diff --git a/Source/Game/Networking/Packets/AzeritePackets.cs b/Source/Game/Networking/Packets/AzeritePackets.cs index 8ffe85881..19dae1a58 100644 --- a/Source/Game/Networking/Packets/AzeritePackets.cs +++ b/Source/Game/Networking/Packets/AzeritePackets.cs @@ -21,9 +21,9 @@ using Framework.Dynamic; namespace Game.Networking.Packets { - class AzeriteXpGain : ServerPacket + class PlayerAzeriteItemGains : ServerPacket { - public AzeriteXpGain() : base(ServerOpcodes.AzeriteXpGain) { } + public PlayerAzeriteItemGains() : base(ServerOpcodes.PlayerAzeriteItemGains) { } public override void Write() { @@ -35,9 +35,9 @@ namespace Game.Networking.Packets public ulong XP; } - class AzeriteEssenceForgeOpened : ServerPacket + class OpenHeartForge : ServerPacket { - public AzeriteEssenceForgeOpened() : base(ServerOpcodes.AzeriteEssenceForgeOpened) { } + public OpenHeartForge() : base(ServerOpcodes.OpenHeartForge) { } public override void Write() { @@ -47,9 +47,9 @@ namespace Game.Networking.Packets public ObjectGuid ForgeGUID; } - class AzeriteEssenceForgeClose : ServerPacket + class CloseHeartForge : ServerPacket { - public AzeriteEssenceForgeClose() : base(ServerOpcodes.AzeriteEssenceForgeClose) { } + public CloseHeartForge() : base(ServerOpcodes.CloseHeartForge) { } public override void Write() { } } @@ -80,9 +80,9 @@ namespace Game.Networking.Packets public byte Slot; } - class AzeriteEssenceSelectionResult : ServerPacket + class ActivateEssenceFailed : ServerPacket { - public AzeriteEssenceSelectionResult() : base(ServerOpcodes.AzeriteEssenceSelectionResult) { } + public ActivateEssenceFailed() : base(ServerOpcodes.ActivateEssenceFailed) { } public override void Write() { @@ -130,9 +130,9 @@ namespace Game.Networking.Packets public byte Slot; } - class AzeriteEmpoweredItemEquippedStatusChanged : ServerPacket + class PlayerAzeriteItemEquippedStatusChanged : ServerPacket { - public AzeriteEmpoweredItemEquippedStatusChanged() : base(ServerOpcodes.AzeriteEmpoweredItemEquippedStatusChanged) { } + public PlayerAzeriteItemEquippedStatusChanged() : base(ServerOpcodes.PlayerAzeriteItemEquippedStatusChanged) { } public override void Write() { @@ -143,9 +143,9 @@ namespace Game.Networking.Packets public bool IsHeartEquipped; } - class AzeriteEmpoweredItemRespecOpen : ServerPacket + class AzeriteRespecNPC : ServerPacket { - public AzeriteEmpoweredItemRespecOpen(ObjectGuid npcGuid) : base(ServerOpcodes.AzeriteEmpoweredItemRespecOpen) + public AzeriteRespecNPC(ObjectGuid npcGuid) : base(ServerOpcodes.AzeriteRespecNpc) { NpcGUID = npcGuid; } diff --git a/Source/Game/Networking/Packets/BattleGroundPackets.cs b/Source/Game/Networking/Packets/BattleGroundPackets.cs index 6d486592e..eefb1f146 100644 --- a/Source/Game/Networking/Packets/BattleGroundPackets.cs +++ b/Source/Game/Networking/Packets/BattleGroundPackets.cs @@ -24,9 +24,9 @@ using System.Collections.Generic; namespace Game.Networking.Packets { - public class PVPSeason : ServerPacket + public class SeasonInfo : ServerPacket { - public PVPSeason() : base(ServerOpcodes.PvpSeason) { } + public SeasonInfo() : base(ServerOpcodes.SeasonInfo) { } public override void Write() { @@ -80,16 +80,16 @@ namespace Game.Networking.Packets public override void Read() { } } - public class PVPLogDataMessage : ServerPacket + public class PVPMatchStatisticsMessage : ServerPacket { - public PVPLogDataMessage() : base(ServerOpcodes.PvpLogData, ConnectionType.Instance) { } + public PVPMatchStatisticsMessage() : base(ServerOpcodes.PvpMatchStatistics, ConnectionType.Instance) { } public override void Write() { Data.Write(_worldPacket); } - public PVPLogData Data; + public PVPMatchStatistics Data; } public class BattlefieldStatusNone : ServerPacket @@ -442,9 +442,9 @@ namespace Game.Networking.Packets public override void Read() { } } - class RatedBattlefieldInfo : ServerPacket + class RatedPvpInfo : ServerPacket { - public RatedBattlefieldInfo() : base(ServerOpcodes.RatedBattlefieldInfo) { } + public RatedPvpInfo() : base(ServerOpcodes.RatedPvpInfo) { } public override void Write() { @@ -455,9 +455,9 @@ namespace Game.Networking.Packets BracketInfo[] Bracket = new BracketInfo[6]; } - class PVPMatchInit : ServerPacket + class PVPMatchInitialize : ServerPacket { - public PVPMatchInit() : base(ServerOpcodes.PvpMatchInit, ConnectionType.Instance) { } + public PVPMatchInitialize() : base(ServerOpcodes.PvpMatchInitialize, ConnectionType.Instance) { } public override void Write() { @@ -489,9 +489,9 @@ namespace Game.Networking.Packets public bool AffectsRating; } - class PVPMatchEnd : ServerPacket + class PVPMatchComplete : ServerPacket { - public PVPMatchEnd() : base(ServerOpcodes.PvpMatchEnd, ConnectionType.Instance) { } + public PVPMatchComplete() : base(ServerOpcodes.PvpMatchComplete, ConnectionType.Instance) { } public override void Write() { @@ -506,7 +506,7 @@ namespace Game.Networking.Packets public byte Winner; public int Duration; - public Optional LogData; + public Optional LogData; } //Structs @@ -547,7 +547,7 @@ namespace Game.Networking.Packets } } - public class PVPLogData + public class PVPMatchStatistics { public List Statistics = new List(); public Optional Ratings; diff --git a/Source/Game/Networking/Packets/BattlenetPackets.cs b/Source/Game/Networking/Packets/BattlenetPackets.cs index 65eca35f8..b25468df6 100644 --- a/Source/Game/Networking/Packets/BattlenetPackets.cs +++ b/Source/Game/Networking/Packets/BattlenetPackets.cs @@ -53,9 +53,9 @@ namespace Game.Networking.Packets public ByteBuffer Data = new ByteBuffer(); } - class SetSessionState : ServerPacket + class ConnectionStatus : ServerPacket { - public SetSessionState() : base(ServerOpcodes.BattlenetSetSessionState) { } + public ConnectionStatus() : base(ServerOpcodes.BattleNetConnectionStatus) { } public override void Write() { @@ -68,9 +68,9 @@ namespace Game.Networking.Packets public bool SuppressNotification; } - class RealmListTicket : ServerPacket + class ChangeRealmTicketResponse : ServerPacket { - public RealmListTicket() : base(ServerOpcodes.BattlenetRealmListTicket) { } + public ChangeRealmTicketResponse() : base(ServerOpcodes.ChangeRealmTicketResponse) { } public override void Write() { @@ -101,9 +101,9 @@ namespace Game.Networking.Packets public byte[] Data; } - class RequestRealmListTicket : ClientPacket + class ChangeRealmTicket : ClientPacket { - public RequestRealmListTicket(WorldPacket packet) : base(packet) { } + public ChangeRealmTicket(WorldPacket packet) : base(packet) { } public override void Read() { diff --git a/Source/Game/Networking/Packets/CalendarPackets.cs b/Source/Game/Networking/Packets/CalendarPackets.cs index 0cbcf98b2..64a381936 100644 --- a/Source/Game/Networking/Packets/CalendarPackets.cs +++ b/Source/Game/Networking/Packets/CalendarPackets.cs @@ -124,9 +124,9 @@ namespace Game.Networking.Packets public long Date; } - class SCalendarEventInvite : ServerPacket + class CalendarInviteAdded : ServerPacket { - public SCalendarEventInvite() : base(ServerOpcodes.CalendarEventInvite) { } + public CalendarInviteAdded() : base(ServerOpcodes.CalendarInviteAdded) { } public override void Write() { @@ -221,9 +221,9 @@ namespace Game.Networking.Packets public List Invites = new List(); } - class CalendarEventInviteAlert : ServerPacket + class CalendarInviteAlert : ServerPacket { - public CalendarEventInviteAlert() : base(ServerOpcodes.CalendarEventInviteAlert) { } + public CalendarInviteAlert() : base(ServerOpcodes.CalendarInviteAlert) { } public override void Write() { @@ -301,9 +301,9 @@ namespace Game.Networking.Packets public CalendarInviteStatus Status; } - class CalendarEventInviteStatus : ServerPacket + class CalendarInviteStatusPacket : ServerPacket { - public CalendarEventInviteStatus() : base(ServerOpcodes.CalendarEventInviteStatus) { } + public CalendarInviteStatusPacket() : base(ServerOpcodes.CalendarInviteStatus) { } public override void Write() { @@ -327,9 +327,9 @@ namespace Game.Networking.Packets public ObjectGuid InviteGuid; } - class CalendarEventInviteRemoved : ServerPacket + class CalendarInviteRemoved : ServerPacket { - public CalendarEventInviteRemoved() : base(ServerOpcodes.CalendarEventInviteRemoved) { } + public CalendarInviteRemoved() : base(ServerOpcodes.CalendarInviteRemoved) { } public override void Write() { @@ -347,9 +347,9 @@ namespace Game.Networking.Packets public bool ClearPending; } - class CalendarEventInviteModeratorStatus : ServerPacket + class CalendarInviteModeratorStatus : ServerPacket { - public CalendarEventInviteModeratorStatus() : base(ServerOpcodes.CalendarEventInviteModeratorStatus) { } + public CalendarInviteModeratorStatus() : base(ServerOpcodes.CalendarInviteModeratorStatus) { } public override void Write() { @@ -367,9 +367,9 @@ namespace Game.Networking.Packets public bool ClearPending; } - class CalendarEventInviteRemovedAlert : ServerPacket + class CalendarInviteRemovedAlert : ServerPacket { - public CalendarEventInviteRemovedAlert() : base(ServerOpcodes.CalendarEventInviteRemovedAlert) { } + public CalendarInviteRemovedAlert() : base(ServerOpcodes.CalendarInviteRemovedAlert) { } public override void Write() { @@ -639,9 +639,9 @@ namespace Game.Networking.Packets public int NewTimeRemaining; } - class CalendarEventInitialInvites : ServerPacket + class CalendarCommunityInvite : ServerPacket { - public CalendarEventInitialInvites() : base(ServerOpcodes.CalendarEventInitialInvites) { } + public CalendarCommunityInvite() : base(ServerOpcodes.CalendarCommunityInvite) { } public override void Write() { @@ -656,9 +656,9 @@ namespace Game.Networking.Packets public List Invites = new List(); } - class CalendarEventInviteStatusAlert : ServerPacket + class CalendarInviteStatusAlert : ServerPacket { - public CalendarEventInviteStatusAlert() : base(ServerOpcodes.CalendarEventInviteStatusAlert) { } + public CalendarInviteStatusAlert() : base(ServerOpcodes.CalendarInviteStatusAlert) { } public override void Write() { @@ -674,9 +674,9 @@ namespace Game.Networking.Packets public byte Status; } - class CalendarEventInviteNotesAlert : ServerPacket + class CalendarInviteNotesAlert : ServerPacket { - public CalendarEventInviteNotesAlert(ulong eventID, string notes) : base(ServerOpcodes.CalendarEventInviteNotesAlert) + public CalendarInviteNotesAlert(ulong eventID, string notes) : base(ServerOpcodes.CalendarInviteNotesAlert) { EventID = eventID; Notes = notes; @@ -695,9 +695,9 @@ namespace Game.Networking.Packets public string Notes; } - class CalendarEventInviteNotes : ServerPacket + class CalendarInviteNotes : ServerPacket { - public CalendarEventInviteNotes() : base(ServerOpcodes.CalendarEventInviteNotes) { } + public CalendarInviteNotes() : base(ServerOpcodes.CalendarInviteNotes) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/CharacterPackets.cs b/Source/Game/Networking/Packets/CharacterPackets.cs index 9b11cb6df..e43f08c35 100644 --- a/Source/Game/Networking/Packets/CharacterPackets.cs +++ b/Source/Game/Networking/Packets/CharacterPackets.cs @@ -969,9 +969,9 @@ namespace Game.Networking.Packets public uint FactionIndex; } - class CharCustomizeResponse : ServerPacket + class CharCustomizeSuccess : ServerPacket { - public CharCustomizeResponse(CharCustomizeInfo customizeInfo) : base(ServerOpcodes.CharCustomize) + public CharCustomizeSuccess(CharCustomizeInfo customizeInfo) : base(ServerOpcodes.CharCustomizeSuccess) { CharGUID = customizeInfo.CharGUID; SexID = (byte)customizeInfo.SexID; @@ -1010,9 +1010,9 @@ namespace Game.Networking.Packets public Array CustomDisplay = new Array(PlayerConst.CustomDisplaySize); } - class CharCustomizeFailed : ServerPacket + class CharCustomizeFailure : ServerPacket { - public CharCustomizeFailed() : base(ServerOpcodes.CharCustomizeFailed) { } + public CharCustomizeFailure() : base(ServerOpcodes.CharCustomizeFailure) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/GameObjectPackets.cs b/Source/Game/Networking/Packets/GameObjectPackets.cs index 3c16636ba..ae60cc7a4 100644 --- a/Source/Game/Networking/Packets/GameObjectPackets.cs +++ b/Source/Game/Networking/Packets/GameObjectPackets.cs @@ -136,9 +136,9 @@ namespace Game.Networking.Packets public bool PlayAsDespawn; } - class GameObjectUIAction : ServerPacket + class GameObjectUILink : ServerPacket { - public GameObjectUIAction() : base(ServerOpcodes.GameObjectUiAction, ConnectionType.Instance) { } + public GameObjectUILink() : base(ServerOpcodes.GameObjectUILink, ConnectionType.Instance) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/HotfixPackets.cs b/Source/Game/Networking/Packets/HotfixPackets.cs index d1749daf1..6f060507f 100644 --- a/Source/Game/Networking/Packets/HotfixPackets.cs +++ b/Source/Game/Networking/Packets/HotfixPackets.cs @@ -122,9 +122,9 @@ namespace Game.Networking.Packets public List Hotfixes = new List(); } - class HotfixResponse : ServerPacket + class HotfixConnect : ServerPacket { - public HotfixResponse() : base(ServerOpcodes.HotfixResponse) { } + public HotfixConnect() : base(ServerOpcodes.HotfixConnect) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/InstancePackets.cs b/Source/Game/Networking/Packets/InstancePackets.cs index 58a892716..8eb1ba29d 100644 --- a/Source/Game/Networking/Packets/InstancePackets.cs +++ b/Source/Game/Networking/Packets/InstancePackets.cs @@ -257,9 +257,9 @@ namespace Game.Networking.Packets public uint CombatResChargeRecovery; } - class BossKillCredit : ServerPacket + class BossKill : ServerPacket { - public BossKillCredit() : base(ServerOpcodes.BossKillCredit, ConnectionType.Instance) { } + public BossKill() : base(ServerOpcodes.BossKill, ConnectionType.Instance) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/ItemPackets.cs b/Source/Game/Networking/Packets/ItemPackets.cs index 1fec0bcdf..d580eb35f 100644 --- a/Source/Game/Networking/Packets/ItemPackets.cs +++ b/Source/Game/Networking/Packets/ItemPackets.cs @@ -618,9 +618,9 @@ namespace Game.Networking.Packets public ObjectGuid[] GemItem = new ObjectGuid[ItemConst.MaxGemSockets]; } - class SocketGemsResult : ServerPacket + class SocketGemsSuccess : ServerPacket { - public SocketGemsResult() : base(ServerOpcodes.SocketGems, ConnectionType.Instance) { } + public SocketGemsSuccess() : base(ServerOpcodes.SocketGemsSuccess, ConnectionType.Instance) { } public override void Write() { @@ -651,9 +651,9 @@ namespace Game.Networking.Packets public override void Read() { } } - class SortBagsResult : ServerPacket + class BagCleanupFinished : ServerPacket { - public SortBagsResult() : base(ServerOpcodes.SortBagsResult, ConnectionType.Instance) { } + public BagCleanupFinished() : base(ServerOpcodes.BagCleanupFinished, ConnectionType.Instance) { } public override void Write() { } } @@ -670,9 +670,9 @@ namespace Game.Networking.Packets public ObjectGuid ItemGuid { get; set; } } - class CharacterInventoryOverflowWarning : ServerPacket + class InventoryFullOverflow : ServerPacket { - public CharacterInventoryOverflowWarning() : base(ServerOpcodes.CharacterInventoryOverflowWarning) { } + public InventoryFullOverflow() : base(ServerOpcodes.InventoryFullOverflow) { } public override void Write() { } } diff --git a/Source/Game/Networking/Packets/MiscPackets.cs b/Source/Game/Networking/Packets/MiscPackets.cs index a4b2111b7..9e63fa089 100644 --- a/Source/Game/Networking/Packets/MiscPackets.cs +++ b/Source/Game/Networking/Packets/MiscPackets.cs @@ -294,16 +294,16 @@ namespace Game.Networking.Packets public uint MovieID; } - public class UITimeRequest : ClientPacket + public class ServerTimeOffsetRequest : ClientPacket { - public UITimeRequest(WorldPacket packet) : base(packet) { } + public ServerTimeOffsetRequest(WorldPacket packet) : base(packet) { } public override void Read() { } } - public class UITime : ServerPacket + public class ServerTimeOffset : ServerPacket { - public UITime() : base(ServerOpcodes.UiTime) { } + public ServerTimeOffset() : base(ServerOpcodes.ServerTimeOffset) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/PartyPackets.cs b/Source/Game/Networking/Packets/PartyPackets.cs index 98a7e3dac..4e48062f0 100644 --- a/Source/Game/Networking/Packets/PartyPackets.cs +++ b/Source/Game/Networking/Packets/PartyPackets.cs @@ -222,9 +222,9 @@ namespace Game.Networking.Packets public ObjectGuid TargetGUID; } - class PartyMemberState : ServerPacket + class PartyMemberFullState : ServerPacket { - public PartyMemberState() : base(ServerOpcodes.PartyMemberState) { } + public PartyMemberFullState() : base(ServerOpcodes.PartyMemberFullState) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/QuestPackets.cs b/Source/Game/Networking/Packets/QuestPackets.cs index aa509e06b..4c3cc605a 100644 --- a/Source/Game/Networking/Packets/QuestPackets.cs +++ b/Source/Game/Networking/Packets/QuestPackets.cs @@ -811,9 +811,9 @@ namespace Game.Networking.Packets public override void Read() { } } - class WorldQuestUpdate : ServerPacket + class WorldQuestUpdateResponse : ServerPacket { - public WorldQuestUpdate() : base(ServerOpcodes.WorldQuestUpdate, ConnectionType.Instance) { } + public WorldQuestUpdateResponse() : base(ServerOpcodes.WorldQuestUpdateResponse, ConnectionType.Instance) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/ReferAFriendPackets.cs b/Source/Game/Networking/Packets/ReferAFriendPackets.cs index 60ab0ee5e..3646c369a 100644 --- a/Source/Game/Networking/Packets/ReferAFriendPackets.cs +++ b/Source/Game/Networking/Packets/ReferAFriendPackets.cs @@ -21,9 +21,9 @@ using System; namespace Game.Networking.Packets { - public class ReferAFriendFailure : ServerPacket + public class RecruitAFriendFailure : ServerPacket { - public ReferAFriendFailure() : base(ServerOpcodes.ReferAFriendFailure) { } + public RecruitAFriendFailure() : base(ServerOpcodes.RecruitAFriendFailure) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/ScenarioPackets.cs b/Source/Game/Networking/Packets/ScenarioPackets.cs index dca1157b7..99acfa461 100644 --- a/Source/Game/Networking/Packets/ScenarioPackets.cs +++ b/Source/Game/Networking/Packets/ScenarioPackets.cs @@ -94,9 +94,9 @@ namespace Game.Networking.Packets public uint ScenarioID; } - class ScenarioBoot : ServerPacket + class ScenarioVacate : ServerPacket { - public ScenarioBoot() : base(ServerOpcodes.ScenarioBoot, ConnectionType.Instance) { } + public ScenarioVacate() : base(ServerOpcodes.ScenarioVacate, ConnectionType.Instance) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/TalentPackets.cs b/Source/Game/Networking/Packets/TalentPackets.cs index d63e30ae4..2cc2ddc0f 100644 --- a/Source/Game/Networking/Packets/TalentPackets.cs +++ b/Source/Game/Networking/Packets/TalentPackets.cs @@ -106,9 +106,9 @@ namespace Game.Networking.Packets public SpecResetType RespecType; } - class LearnTalentsFailed : ServerPacket + class LearnTalentFailed : ServerPacket { - public LearnTalentsFailed() : base(ServerOpcodes.LearnTalentsFailed) { } + public LearnTalentFailed() : base(ServerOpcodes.LearnTalentFailed) { } public override void Write() { @@ -157,9 +157,9 @@ namespace Game.Networking.Packets public Array Talents = new Array(4); } - class LearnPvpTalentsFailed : ServerPacket + class LearnPvpTalentFailed : ServerPacket { - public LearnPvpTalentsFailed() : base(ServerOpcodes.LearnPvpTalentsFailed) { } + public LearnPvpTalentFailed() : base(ServerOpcodes.LearnPvpTalentFailed) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/TokenPackets.cs b/Source/Game/Networking/Packets/TokenPackets.cs index 4eff139b9..ea7e45af4 100644 --- a/Source/Game/Networking/Packets/TokenPackets.cs +++ b/Source/Game/Networking/Packets/TokenPackets.cs @@ -20,9 +20,9 @@ using System.Collections.Generic; namespace Game.Networking.Packets { - class UpdateListedAuctionableTokens : ClientPacket + class CommerceTokenGetLog : ClientPacket { - public UpdateListedAuctionableTokens(WorldPacket packet) : base(packet) { } + public CommerceTokenGetLog(WorldPacket packet) : base(packet) { } public override void Read() { @@ -32,9 +32,9 @@ namespace Game.Networking.Packets public uint UnkInt; } - class UpdateListedAuctionableTokensResponse : ServerPacket + class CommerceTokenGetLogResponse : ServerPacket { - public UpdateListedAuctionableTokensResponse() : base(ServerOpcodes.WowTokenUpdateAuctionableListResponse, ConnectionType.Instance) { } + public CommerceTokenGetLogResponse() : base(ServerOpcodes.CommerceTokenGetLogResponse, ConnectionType.Instance) { } public override void Write() { @@ -66,9 +66,9 @@ namespace Game.Networking.Packets } } - class RequestWowTokenMarketPrice : ClientPacket + class CommerceTokenGetMarketPrice : ClientPacket { - public RequestWowTokenMarketPrice(WorldPacket packet) : base(packet) { } + public CommerceTokenGetMarketPrice(WorldPacket packet) : base(packet) { } public override void Read() { @@ -78,9 +78,9 @@ namespace Game.Networking.Packets public uint UnkInt; } - class WowTokenMarketPriceResponse : ServerPacket + class CommerceTokenGetMarketPriceResponse : ServerPacket { - public WowTokenMarketPriceResponse() : base(ServerOpcodes.WowTokenMarketPriceResponse) { } + public CommerceTokenGetMarketPriceResponse() : base(ServerOpcodes.CommerceTokenGetMarketPriceResponse) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/ToyPackets.cs b/Source/Game/Networking/Packets/ToyPackets.cs index d79c16620..37d8fec91 100644 --- a/Source/Game/Networking/Packets/ToyPackets.cs +++ b/Source/Game/Networking/Packets/ToyPackets.cs @@ -46,9 +46,9 @@ namespace Game.Networking.Packets public SpellCastRequest Cast = new SpellCastRequest(); } - class AccountToysUpdate : ServerPacket + class AccountToyUpdate : ServerPacket { - public AccountToysUpdate() : base(ServerOpcodes.AccountToysUpdate, ConnectionType.Instance) { } + public AccountToyUpdate() : base(ServerOpcodes.AccountToyUpdate, ConnectionType.Instance) { } public override void Write() { diff --git a/Source/Game/Networking/Packets/TransmogrificationPackets.cs b/Source/Game/Networking/Packets/TransmogrificationPackets.cs index 3b1fecfdd..64688aef2 100644 --- a/Source/Game/Networking/Packets/TransmogrificationPackets.cs +++ b/Source/Game/Networking/Packets/TransmogrificationPackets.cs @@ -45,9 +45,9 @@ namespace Game.Networking.Packets public bool CurrentSpecOnly; } - class TransmogCollectionUpdate : ServerPacket + class AccountTransmogUpdate : ServerPacket { - public TransmogCollectionUpdate() : base(ServerOpcodes.TransmogCollectionUpdate) { } + public AccountTransmogUpdate() : base(ServerOpcodes.AccountTransmogUpdate) { } public override void Write() { @@ -69,9 +69,9 @@ namespace Game.Networking.Packets public List NewAppearances = new List(); } - class OpenTransmogrifier : ServerPacket + class TransmogrifyNPC : ServerPacket { - public OpenTransmogrifier(ObjectGuid guid) : base(ServerOpcodes.OpenTransmogrifier, ConnectionType.Instance) + public TransmogrifyNPC(ObjectGuid guid) : base(ServerOpcodes.TransmogrifyNpc, ConnectionType.Instance) { Guid = guid; } diff --git a/Source/Game/Networking/Packets/WardenPackets.cs b/Source/Game/Networking/Packets/WardenPackets.cs index d79f9392f..5deb8d1e3 100644 --- a/Source/Game/Networking/Packets/WardenPackets.cs +++ b/Source/Game/Networking/Packets/WardenPackets.cs @@ -54,9 +54,9 @@ namespace Game.Networking.Packets public ByteBuffer Data; } - class WardenDataServer : ServerPacket + class Warden3DataServer : ServerPacket { - public WardenDataServer() : base(ServerOpcodes.WardenData) { } + public Warden3DataServer() : base(ServerOpcodes.Warden3Data) { } public override void Write() { diff --git a/Source/Game/Networking/WorldSocket.cs b/Source/Game/Networking/WorldSocket.cs index f9601c769..473b02c43 100644 --- a/Source/Game/Networking/WorldSocket.cs +++ b/Source/Game/Networking/WorldSocket.cs @@ -320,8 +320,8 @@ namespace Game.Networking connectToFailed.Read(); HandleConnectToFailed(connectToFailed); break; - case ClientOpcodes.EnableEncryptionAck: - HandleEnableEncryptionAck(); + case ClientOpcodes.EnterEncryptedModeAck: + HandleEnterEncryptedModeAck(); break; default: if (_worldSession == null) @@ -643,7 +643,7 @@ namespace Game.Networking // RBAC must be loaded before adding session to check for skip queue permission _worldSession.GetRBACData().LoadFromDBCallback(result); - SendPacket(new EnableEncryption(_encryptKey, true)); + SendPacket(new EnterEncryptedMode(_encryptKey, true)); } void HandleAuthContinuedSession(AuthContinuedSession authSession) @@ -703,7 +703,7 @@ namespace Game.Networking // only first 16 bytes of the hmac are used Buffer.BlockCopy(encryptKeyGen.Digest, 0, _encryptKey, 0, 16); - SendPacket(new EnableEncryption(_encryptKey, true)); + SendPacket(new EnterEncryptedMode(_encryptKey, true)); AsyncRead(); } @@ -746,7 +746,7 @@ namespace Game.Networking } - void HandleEnableEncryptionAck() + void HandleEnterEncryptedModeAck() { _worldCrypt.Initialize(_encryptKey); if (_connectType == ConnectionType.Realm) diff --git a/Source/Game/Scenarios/Scenario.cs b/Source/Game/Scenarios/Scenario.cs index 6f9600510..4ebb01ad7 100644 --- a/Source/Game/Scenarios/Scenario.cs +++ b/Source/Game/Scenarios/Scenario.cs @@ -331,7 +331,7 @@ namespace Game.Scenarios void SendBootPlayer(Player player) { - ScenarioBoot scenarioBoot = new ScenarioBoot(); + ScenarioVacate scenarioBoot = new ScenarioVacate(); scenarioBoot.ScenarioID = (int)_data.Entry.Id; player.SendPacket(scenarioBoot); } diff --git a/Source/Game/Server/WorldSession.cs b/Source/Game/Server/WorldSession.cs index 49e620685..25e8d06fe 100644 --- a/Source/Game/Server/WorldSession.cs +++ b/Source/Game/Server/WorldSession.cs @@ -756,7 +756,7 @@ namespace Game } while (result.NextRow()); } - SetSessionState bnetConnected = new SetSessionState(); + ConnectionStatus bnetConnected = new ConnectionStatus(); bnetConnected.State = 1; SendPacket(bnetConnected); diff --git a/Source/Game/Warden/Warden.cs b/Source/Game/Warden/Warden.cs index 008fd9d60..2ce5d8b21 100644 --- a/Source/Game/Warden/Warden.cs +++ b/Source/Game/Warden/Warden.cs @@ -60,7 +60,7 @@ namespace Game sizeLeft -= burstSize; pos += (int)burstSize; - WardenDataServer packet = new WardenDataServer(); + Warden3DataServer packet = new Warden3DataServer(); packet.Data = EncryptData(transfer.Write()); _session.SendPacket(packet); } @@ -78,7 +78,7 @@ namespace Game request.ModuleKey = _module.Key; request.Size = _module.CompressedSize; - WardenDataServer packet = new WardenDataServer(); + Warden3DataServer packet = new Warden3DataServer(); packet.Data = EncryptData(request.Write()); _session.SendPacket(packet); } diff --git a/Source/Game/Warden/WardenWin.cs b/Source/Game/Warden/WardenWin.cs index 8bc172290..43555c4c5 100644 --- a/Source/Game/Warden/WardenWin.cs +++ b/Source/Game/Warden/WardenWin.cs @@ -109,7 +109,7 @@ namespace Game Request.Function3_set = 1; Request.CheckSumm3 = BuildChecksum(BitConverter.GetBytes(Request.Unk5), 8); - WardenDataServer packet = new WardenDataServer(); + Warden3DataServer packet = new Warden3DataServer(); packet.Data = EncryptData(Request.Write()); _session.SendPacket(packet); } @@ -123,7 +123,7 @@ namespace Game Request.Command = WardenOpcodes.Smsg_HashRequest; Request.Seed = _seed; - WardenDataServer packet = new WardenDataServer(); + Warden3DataServer packet = new Warden3DataServer(); packet.Data = EncryptData(Request.Write()); _session.SendPacket(packet); } @@ -282,7 +282,7 @@ namespace Game } buffer.WriteUInt8(xorByte); - WardenDataServer packet = new WardenDataServer(); + Warden3DataServer packet = new Warden3DataServer(); packet.Data = EncryptData(buffer.GetData()); _session.SendPacket(packet);