From 708133cb3105decd61834df4235e4a8ae8fabe55 Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:22:55 +0100 Subject: [PATCH 1/8] Removed unreferenced usings --- HermesProxy/Auth/AuthClient.cs | 1 - HermesProxy/Auth/AuthCommand.cs | 8 +------- HermesProxy/Auth/RealmInfo.cs | 5 ----- HermesProxy/BnetServer/Managers/LoginServiceManager.cs | 2 -- .../BnetServer/Networking/BnetRestApiSession.cs | 3 --- HermesProxy/BnetServer/Networking/BnetTcpSession.cs | 1 - HermesProxy/BnetServer/Services/BnetServices.cs | 2 -- .../BnetServer/Services/Services/Authentication.cs | 1 - .../BnetServer/Services/Services/GameUtilities.cs | 1 - HermesProxy/Configuration/Settings.cs | 2 -- HermesProxy/Realm/RealmManager.cs | 1 - HermesProxy/Server.cs | 1 - HermesProxy/VersionChecker.cs | 3 --- HermesProxy/World/Client/LegacyWorldCrypt.cs | 4 ---- .../World/Client/PacketHandlers/ArenaHandler.cs | 2 -- .../World/Client/PacketHandlers/AuctionHandler.cs | 2 -- .../World/Client/PacketHandlers/BattleGroundHandler.cs | 3 --- HermesProxy/World/Client/PacketHandlers/ChatHandler.cs | 4 +--- .../World/Client/PacketHandlers/CombatHandler.cs | 4 +--- HermesProxy/World/Client/PacketHandlers/DuelHandler.cs | 6 +----- .../World/Client/PacketHandlers/GameObjectHandler.cs | 6 +----- .../World/Client/PacketHandlers/GroupHandler.cs | 1 - .../World/Client/PacketHandlers/GuildHandler.cs | 1 - .../World/Client/PacketHandlers/InstanceHandler.cs | 3 --- HermesProxy/World/Client/PacketHandlers/ItemHandler.cs | 4 +--- HermesProxy/World/Client/PacketHandlers/LootHandler.cs | 4 +--- HermesProxy/World/Client/PacketHandlers/MailHandler.cs | 3 --- HermesProxy/World/Client/PacketHandlers/MiscHandler.cs | 5 +---- HermesProxy/World/Client/PacketHandlers/NPCHandler.cs | 4 +--- HermesProxy/World/Client/PacketHandlers/PetHandler.cs | 4 +--- .../World/Client/PacketHandlers/PetitionHandler.cs | 4 +--- .../World/Client/PacketHandlers/QueryHandler.cs | 3 +-- .../World/Client/PacketHandlers/QuestHandler.cs | 3 +-- .../World/Client/PacketHandlers/ReputationHandler.cs | 5 +---- .../World/Client/PacketHandlers/SocialHandler.cs | 4 +--- .../World/Client/PacketHandlers/SystemHandler.cs | 5 +---- HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs | 6 +----- .../World/Client/PacketHandlers/TradeHandler.cs | 5 +---- .../World/Client/PacketHandlers/UpdateHandler.cs | 1 - .../World/Client/PacketHandlers/WorldStateHandler.cs | 4 +--- HermesProxy/World/Client/UpdateField.cs | 4 ---- HermesProxy/World/Client/WorldClient.cs | 1 - HermesProxy/World/Enums/AccountDataType.cs | 8 +------- HermesProxy/World/Enums/ArenaTeamCommand.cs | 8 +------- HermesProxy/World/Enums/ArenaTeamEvent.cs | 8 +------- HermesProxy/World/Enums/AuctionDefines.cs | 8 +------- HermesProxy/World/Enums/AuthResult.cs | 8 +------- HermesProxy/World/Enums/BattlegroundDefines.cs | 8 +------- HermesProxy/World/Enums/ChannelDefines.cs | 4 ---- HermesProxy/World/Enums/ChatMessageType.cs | 8 +------- HermesProxy/World/Enums/CreatureDefines.cs | 8 +------- HermesProxy/World/Enums/Currency.cs | 8 +------- HermesProxy/World/Enums/DB2Hash.cs | 8 +------- HermesProxy/World/Enums/EnchantmentSlot.cs | 8 +------- HermesProxy/World/Enums/GameObjectDynamicFlags.cs | 4 ---- HermesProxy/World/Enums/GossipDefines.cs | 8 +------- HermesProxy/World/Enums/GroupDefines.cs | 4 ---- HermesProxy/World/Enums/GuildDefines.cs | 8 +------- HermesProxy/World/Enums/HitInfo.cs | 4 ---- HermesProxy/World/Enums/HotfixStatus.cs | 8 +------- HermesProxy/World/Enums/InstanceDefines.cs | 10 ++-------- HermesProxy/World/Enums/ItemDefines.cs | 8 +------- HermesProxy/World/Enums/Language.cs | 8 +------- HermesProxy/World/Enums/LootDefines.cs | 8 +------- HermesProxy/World/Enums/MailDefines.cs | 8 +------- HermesProxy/World/Enums/MovementFlags.cs | 4 ---- HermesProxy/World/Enums/MovementFlagsExtra.cs | 4 ---- HermesProxy/World/Enums/NPCFlags.cs | 4 ---- HermesProxy/World/Enums/ObjectType.cs | 8 +------- HermesProxy/World/Enums/ObjectTypeMask.cs | 4 ---- HermesProxy/World/Enums/Opcodes.cs | 4 ---- HermesProxy/World/Enums/PetDefines.cs | 4 ---- HermesProxy/World/Enums/PetFlags.cs | 4 ---- HermesProxy/World/Enums/PlayerDefines.cs | 4 ---- HermesProxy/World/Enums/PowerType.cs | 8 +------- HermesProxy/World/Enums/PvPFlags.cs | 8 +------- HermesProxy/World/Enums/QuestDefines.cs | 4 ---- HermesProxy/World/Enums/QuestFlags.cs | 4 ---- HermesProxy/World/Enums/SocialDefines.cs | 8 +------- HermesProxy/World/Enums/SpeedType.cs | 8 +------- HermesProxy/World/Enums/SpellDefines.cs | 4 ---- HermesProxy/World/Enums/SplineFlags.cs | 4 ---- HermesProxy/World/Enums/SplineType.cs | 8 +------- HermesProxy/World/Enums/TrainerSpellState.cs | 8 +------- HermesProxy/World/Enums/TutorialAction.cs | 8 +------- HermesProxy/World/Enums/UnitDefines.cs | 8 +------- HermesProxy/World/Enums/UnitDynamicFlags.cs | 4 ---- HermesProxy/World/Enums/UnitFlags.cs | 4 ---- HermesProxy/World/Enums/UpdateFieldAttributes.cs | 4 ---- HermesProxy/World/Enums/UpdateFields.cs | 5 ----- HermesProxy/World/Enums/UpdateFlag.cs | 4 ---- HermesProxy/World/Enums/UpdateType.cs | 8 +------- HermesProxy/World/Enums/V1_12_1_5875/Opcode.cs | 8 +------- HermesProxy/World/Enums/V1_12_1_5875/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/V1_14_0_40237/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/V1_14_1_40688/Opcode.cs | 8 +------- HermesProxy/World/Enums/V1_14_1_40688/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/V2_4_3_8606/Opcode.cs | 8 +------- HermesProxy/World/Enums/V2_4_3_8606/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/V2_5_2_39570/Opcode.cs | 8 +------- HermesProxy/World/Enums/V2_5_2_39570/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/V3_3_5_12340/Opcode.cs | 8 +------- HermesProxy/World/Enums/V3_3_5_12340/UpdateFields.cs | 8 +------- HermesProxy/World/Enums/Weather.cs | 8 +------- HermesProxy/World/Enums/WorldStates.cs | 8 +------- HermesProxy/World/GameData.cs | 3 --- HermesProxy/World/Objects/ActivePlayerData.cs | 6 +----- HermesProxy/World/Objects/CharacterCustomizations.cs | 4 ---- HermesProxy/World/Objects/ClassPowerTypes.cs | 5 ----- HermesProxy/World/Objects/ContainerData.cs | 8 +------- HermesProxy/World/Objects/CorpseData.cs | 5 ----- HermesProxy/World/Objects/CreatureTemplate.cs | 4 ---- HermesProxy/World/Objects/DynamicObjectData.cs | 8 +------- HermesProxy/World/Objects/GameObjectData.cs | 9 +-------- HermesProxy/World/Objects/HotfixRecord.cs | 6 ------ HermesProxy/World/Objects/ItemData.cs | 8 +------- HermesProxy/World/Objects/ItemTemplate.cs | 8 +------- HermesProxy/World/Objects/MovementInfo.cs | 4 ---- HermesProxy/World/Objects/ObjectData.cs | 8 +------- HermesProxy/World/Objects/ObjectTypeConverter.cs | 3 --- HermesProxy/World/Objects/PlayerData.cs | 5 ----- HermesProxy/World/Objects/QuestTemplate.cs | 3 --- HermesProxy/World/Objects/ServerSideMovement.cs | 4 ---- HermesProxy/World/Objects/UnitData.cs | 8 +------- HermesProxy/World/Objects/UpdateFieldExtensions.cs | 5 +---- HermesProxy/World/Objects/UpdateFieldsArray.cs | 4 ---- HermesProxy/World/Objects/UpdateMask.cs | 5 ----- .../Objects/Version/V1_14_0_40237/CreateObjectBits.cs | 8 +------- .../Version/V1_14_0_40237/ObjectUpdateBuilder.cs | 5 ----- .../Objects/Version/V1_14_1_40688/CreateObjectBits.cs | 8 +------- .../Version/V1_14_1_40688/ObjectUpdateBuilder.cs | 5 ----- .../Objects/Version/V2_5_2_39570/CreateObjectBits.cs | 8 +------- .../Version/V2_5_2_39570/ObjectUpdateBuilder.cs | 5 ----- HermesProxy/World/Server/AccountDataManager.cs | 1 - .../World/Server/PacketHandlers/ArenaHandler.cs | 7 +------ .../World/Server/PacketHandlers/AuctionHandler.cs | 7 +------ .../World/Server/PacketHandlers/BattlegroundHandler.cs | 7 +------ .../World/Server/PacketHandlers/CharacterHandler.cs | 5 +---- HermesProxy/World/Server/PacketHandlers/ChatHandler.cs | 5 +---- .../World/Server/PacketHandlers/ClientConfigHandler.cs | 7 +------ .../World/Server/PacketHandlers/CombatHandler.cs | 6 +----- HermesProxy/World/Server/PacketHandlers/DuelHandler.cs | 6 +----- .../World/Server/PacketHandlers/GameObjectHandler.cs | 8 +------- .../World/Server/PacketHandlers/GroupHandler.cs | 7 +------ .../World/Server/PacketHandlers/GuildHandler.cs | 6 +----- .../World/Server/PacketHandlers/HotfixHandler.cs | 5 +---- .../World/Server/PacketHandlers/InstanceHandler.cs | 8 +------- HermesProxy/World/Server/PacketHandlers/ItemHandler.cs | 5 +---- HermesProxy/World/Server/PacketHandlers/LootHandler.cs | 5 +---- HermesProxy/World/Server/PacketHandlers/MailHandler.cs | 5 +---- HermesProxy/World/Server/PacketHandlers/MiscHandler.cs | 5 +---- .../World/Server/PacketHandlers/MovementHandler.cs | 6 +----- HermesProxy/World/Server/PacketHandlers/NPCHandler.cs | 5 +---- HermesProxy/World/Server/PacketHandlers/PetHandler.cs | 6 +----- .../World/Server/PacketHandlers/PetitionHandler.cs | 5 +---- .../World/Server/PacketHandlers/QueryHandler.cs | 5 +---- .../World/Server/PacketHandlers/QuestHandler.cs | 4 +--- .../World/Server/PacketHandlers/ReputationPackets.cs | 6 +----- .../World/Server/PacketHandlers/SessionHandler.cs | 8 -------- .../World/Server/PacketHandlers/SocialHandler.cs | 7 +------ .../World/Server/PacketHandlers/SpellHandler.cs | 3 --- HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs | 6 +----- .../World/Server/PacketHandlers/TradeHandler.cs | 6 +----- HermesProxy/World/Server/Packets/AccountDataPackets.cs | 2 -- HermesProxy/World/Server/Packets/ArenaPackets.cs | 3 --- HermesProxy/World/Server/Packets/AuctionPackets.cs | 4 ---- .../World/Server/Packets/BattleGroundPackets.cs | 1 - HermesProxy/World/Server/Packets/CharacterPackets.cs | 1 - HermesProxy/World/Server/Packets/ChatPackets.cs | 2 -- .../World/Server/Packets/ClientConfigPackets.cs | 2 -- HermesProxy/World/Server/Packets/CombatPackets.cs | 2 -- HermesProxy/World/Server/Packets/DuelPackets.cs | 3 --- HermesProxy/World/Server/Packets/GameObjectPackets.cs | 3 --- HermesProxy/World/Server/Packets/GroupPackets.cs | 1 - HermesProxy/World/Server/Packets/GuildPackets.cs | 3 --- HermesProxy/World/Server/Packets/HotfixPackets.cs | 2 -- HermesProxy/World/Server/Packets/InstancePackets.cs | 4 ---- HermesProxy/World/Server/Packets/ItemPackets.cs | 2 -- HermesProxy/World/Server/Packets/LootPackets.cs | 2 -- HermesProxy/World/Server/Packets/MailPackets.cs | 3 --- HermesProxy/World/Server/Packets/MiscPackets.cs | 1 - HermesProxy/World/Server/Packets/MovementPackets.cs | 1 - HermesProxy/World/Server/Packets/NPCPackets.cs | 2 -- HermesProxy/World/Server/Packets/PetPackets.cs | 1 - HermesProxy/World/Server/Packets/PetitionPackets.cs | 3 --- HermesProxy/World/Server/Packets/QuestPackets.cs | 2 -- HermesProxy/World/Server/Packets/ReputationPackets.cs | 2 -- HermesProxy/World/Server/Packets/SocialPackets.cs | 3 --- HermesProxy/World/Server/Packets/TaxiPackets.cs | 3 --- HermesProxy/World/Server/Packets/TradePackets.cs | 3 --- HermesProxy/World/Server/Packets/UpdatePackets.cs | 1 - HermesProxy/World/Server/Packets/WorldStatePackets.cs | 2 -- HermesProxy/World/SniffFile.cs | 4 ---- HermesProxy/World/WowGuid.cs | 3 +-- 194 files changed, 102 insertions(+), 862 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index 4b6cfe23..2749bbba 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text; using System.Net; diff --git a/HermesProxy/Auth/AuthCommand.cs b/HermesProxy/Auth/AuthCommand.cs index cdca5166..5ccdab1e 100644 --- a/HermesProxy/Auth/AuthCommand.cs +++ b/HermesProxy/Auth/AuthCommand.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.Auth +namespace HermesProxy.Auth { // ReSharper disable InconsistentNaming public enum AuthCommand : byte diff --git a/HermesProxy/Auth/RealmInfo.cs b/HermesProxy/Auth/RealmInfo.cs index 7beaa9a6..0a21a98b 100644 --- a/HermesProxy/Auth/RealmInfo.cs +++ b/HermesProxy/Auth/RealmInfo.cs @@ -1,9 +1,4 @@ using Framework.Constants; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.Auth { diff --git a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs index c5a0b180..029f4336 100644 --- a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs +++ b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs @@ -5,9 +5,7 @@ using Framework.Logging; using Framework.Web; using System; -using System.IO; using System.Net; -using System.Reflection; using System.Security.Cryptography.X509Certificates; namespace BNetServer diff --git a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs index bc35e105..2e669e53 100644 --- a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs @@ -1,14 +1,11 @@ // Copyright (c) CypherCore All rights reserved. // Licensed under the GNU GENERAL PUBLIC LICENSE. See LICENSE file in the project root for full license information. -using Framework.Constants; using Framework.Networking; using Framework.Serialization; using Framework.Web; using System; using System.Net.Sockets; -using System.Security.Cryptography; -using System.Text; using System.Threading.Tasks; using HermesProxy.Auth; using HermesProxy.Enums; diff --git a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs index 7c651492..7facb5e1 100644 --- a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs @@ -9,7 +9,6 @@ using Google.Protobuf; using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Net; using System.Net.Sockets; diff --git a/HermesProxy/BnetServer/Services/BnetServices.cs b/HermesProxy/BnetServer/Services/BnetServices.cs index bb2fd333..e80f1d96 100644 --- a/HermesProxy/BnetServer/Services/BnetServices.cs +++ b/HermesProxy/BnetServer/Services/BnetServices.cs @@ -4,8 +4,6 @@ using System.Net; using System.Reflection; using System.Text; -using System.Threading; -using BNetServer.Networking; using Framework.Constants; using Framework.Logging; using Google.Protobuf; diff --git a/HermesProxy/BnetServer/Services/Services/Authentication.cs b/HermesProxy/BnetServer/Services/Services/Authentication.cs index deb96478..9a8ab113 100644 --- a/HermesProxy/BnetServer/Services/Services/Authentication.cs +++ b/HermesProxy/BnetServer/Services/Services/Authentication.cs @@ -6,7 +6,6 @@ using Bgs.Protocol.Challenge.V1; using Framework.Constants; using Framework.Logging; -using Framework.Realm; using Google.Protobuf; using System; using BNetServer.Networking; diff --git a/HermesProxy/BnetServer/Services/Services/GameUtilities.cs b/HermesProxy/BnetServer/Services/Services/GameUtilities.cs index d31fc5ea..f80a493f 100644 --- a/HermesProxy/BnetServer/Services/Services/GameUtilities.cs +++ b/HermesProxy/BnetServer/Services/Services/GameUtilities.cs @@ -14,7 +14,6 @@ using System.Linq; using System.Text; using Framework.Util; -using HermesProxy.Auth; namespace BNetServer.Services { diff --git a/HermesProxy/Configuration/Settings.cs b/HermesProxy/Configuration/Settings.cs index 28f28d77..0ccb1d25 100644 --- a/HermesProxy/Configuration/Settings.cs +++ b/HermesProxy/Configuration/Settings.cs @@ -1,8 +1,6 @@ using HermesProxy.Enums; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Net; using Framework.Logging; diff --git a/HermesProxy/Realm/RealmManager.cs b/HermesProxy/Realm/RealmManager.cs index 1d035283..3e6d3ea3 100644 --- a/HermesProxy/Realm/RealmManager.cs +++ b/HermesProxy/Realm/RealmManager.cs @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Linq; using System.Net; -using System.Timers; using System.Collections.Concurrent; using System.Text; using Framework.Realm; diff --git a/HermesProxy/Server.cs b/HermesProxy/Server.cs index 4dbd59c0..eb2aaac8 100644 --- a/HermesProxy/Server.cs +++ b/HermesProxy/Server.cs @@ -5,7 +5,6 @@ using HermesProxy.World.Server; using System; using System.Globalization; -using System.Linq; using System.Net; using System.Threading; using BNetServer; diff --git a/HermesProxy/VersionChecker.cs b/HermesProxy/VersionChecker.cs index bee661d6..3654bcaa 100644 --- a/HermesProxy/VersionChecker.cs +++ b/HermesProxy/VersionChecker.cs @@ -6,10 +6,7 @@ using System.Globalization; using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; using Framework.Logging; -using HermesProxy.World.Objects; namespace HermesProxy { diff --git a/HermesProxy/World/Client/LegacyWorldCrypt.cs b/HermesProxy/World/Client/LegacyWorldCrypt.cs index 874b7d91..ffcc3f17 100644 --- a/HermesProxy/World/Client/LegacyWorldCrypt.cs +++ b/HermesProxy/World/Client/LegacyWorldCrypt.cs @@ -1,9 +1,5 @@ using Framework.Cryptography; -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs index 7b306d52..dca3bb90 100644 --- a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs @@ -1,9 +1,7 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; -using System.Collections.Generic; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs index b9f4f4ea..9096ec78 100644 --- a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs @@ -1,9 +1,7 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; -using System.Collections.Generic; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs index ccdf0ed9..984e8f3d 100644 --- a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs @@ -1,10 +1,7 @@ using Framework.Logging; using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; using static HermesProxy.World.Server.Packets.PVPMatchStatisticsMessage; namespace HermesProxy.World.Client diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs index 64348844..e2190cfb 100644 --- a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; using System.Globalization; diff --git a/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs b/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs index af793376..3ae8e227 100644 --- a/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs index 3dd10704..d6ab3e61 100644 --- a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs @@ -1,9 +1,5 @@ -using HermesProxy.Enums; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs index 7bde2d76..d0dac978 100644 --- a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs @@ -1,9 +1,5 @@ -using Framework; -using HermesProxy.Enums; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs index e7193e71..2bc6d8ae 100644 --- a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs @@ -1,6 +1,5 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs index c3f1101a..f4d46500 100644 --- a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs @@ -1,7 +1,6 @@ using Framework.Logging; using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs index f6a6256a..2981586c 100644 --- a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs @@ -1,9 +1,6 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs index bec532f0..3fe38444 100644 --- a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs @@ -1,9 +1,7 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs index 86e4aaac..8b96ddd4 100644 --- a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs index 16ecd669..d5d4d539 100644 --- a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs @@ -1,9 +1,6 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; using static HermesProxy.World.Server.Packets.MailQueryNextTimeResult; namespace HermesProxy.World.Client diff --git a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs index c0bcdaa4..e14f719b 100644 --- a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs @@ -1,9 +1,6 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs index 33a5a493..bc41e6e0 100644 --- a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs @@ -1,8 +1,6 @@ -using Framework; -using Framework.GameMath; +using Framework.GameMath; using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs index 7ba7d634..2ad0c439 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs @@ -1,9 +1,7 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs index 9cea74f1..b0dd2b2c 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; using static HermesProxy.World.Server.Packets.ServerPetitionShowSignatures; diff --git a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs index 135dd433..55620afd 100644 --- a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs @@ -1,5 +1,4 @@ -using Framework; -using Framework.Logging; +using Framework.Logging; using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; diff --git a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs index 75166ded..88872402 100644 --- a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs @@ -1,5 +1,4 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; diff --git a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs index c3865587..e0f875da 100644 --- a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs @@ -1,9 +1,6 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs index a7f3d85d..ba10bc8f 100644 --- a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs b/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs index 6dc1e4df..38ef94bd 100644 --- a/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs @@ -1,9 +1,6 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs b/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs index 30fb8e26..7d91cf4e 100644 --- a/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs @@ -1,9 +1,5 @@ -using Framework; -using HermesProxy.Enums; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs index 6c11deab..319ee4a9 100644 --- a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs @@ -1,9 +1,6 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; using static HermesProxy.World.Server.Packets.TradeUpdated; namespace HermesProxy.World.Client diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index e4316fb8..1ddd224d 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -2,7 +2,6 @@ using Framework.GameMath; using Framework.Logging; -using Framework.Util; using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; diff --git a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs index f969598f..a7579487 100644 --- a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs @@ -1,7 +1,5 @@ -using Framework; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Client/UpdateField.cs b/HermesProxy/World/Client/UpdateField.cs index 9c138c49..6d2426b0 100644 --- a/HermesProxy/World/Client/UpdateField.cs +++ b/HermesProxy/World/Client/UpdateField.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Client/WorldClient.cs b/HermesProxy/World/Client/WorldClient.cs index 2aa480bb..e03b7eb3 100644 --- a/HermesProxy/World/Client/WorldClient.cs +++ b/HermesProxy/World/Client/WorldClient.cs @@ -13,7 +13,6 @@ using HermesProxy.World.Enums; using System.Reflection; using System.Threading.Tasks; -using HermesProxy.World.Server; namespace HermesProxy.World.Client { diff --git a/HermesProxy/World/Enums/AccountDataType.cs b/HermesProxy/World/Enums/AccountDataType.cs index b1d073de..b829cc7d 100644 --- a/HermesProxy/World/Enums/AccountDataType.cs +++ b/HermesProxy/World/Enums/AccountDataType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum AccountDataType { diff --git a/HermesProxy/World/Enums/ArenaTeamCommand.cs b/HermesProxy/World/Enums/ArenaTeamCommand.cs index ae956324..f7228aa5 100644 --- a/HermesProxy/World/Enums/ArenaTeamCommand.cs +++ b/HermesProxy/World/Enums/ArenaTeamCommand.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum ArenaTeamCommandType : uint { diff --git a/HermesProxy/World/Enums/ArenaTeamEvent.cs b/HermesProxy/World/Enums/ArenaTeamEvent.cs index a2f71b94..70b0828b 100644 --- a/HermesProxy/World/Enums/ArenaTeamEvent.cs +++ b/HermesProxy/World/Enums/ArenaTeamEvent.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum ArenaTeamEventLegacy { diff --git a/HermesProxy/World/Enums/AuctionDefines.cs b/HermesProxy/World/Enums/AuctionDefines.cs index 2e240449..007f27ec 100644 --- a/HermesProxy/World/Enums/AuctionDefines.cs +++ b/HermesProxy/World/Enums/AuctionDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum AuctionHouseAction { diff --git a/HermesProxy/World/Enums/AuthResult.cs b/HermesProxy/World/Enums/AuthResult.cs index 60509380..9d413234 100644 --- a/HermesProxy/World/Enums/AuthResult.cs +++ b/HermesProxy/World/Enums/AuthResult.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum AuthResult : byte { diff --git a/HermesProxy/World/Enums/BattlegroundDefines.cs b/HermesProxy/World/Enums/BattlegroundDefines.cs index 2348108c..403b24a1 100644 --- a/HermesProxy/World/Enums/BattlegroundDefines.cs +++ b/HermesProxy/World/Enums/BattlegroundDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum BattlegroundListID : uint { diff --git a/HermesProxy/World/Enums/ChannelDefines.cs b/HermesProxy/World/Enums/ChannelDefines.cs index 82f50d92..55218e13 100644 --- a/HermesProxy/World/Enums/ChannelDefines.cs +++ b/HermesProxy/World/Enums/ChannelDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/ChatMessageType.cs b/HermesProxy/World/Enums/ChatMessageType.cs index 0a89f532..4f27d4bc 100644 --- a/HermesProxy/World/Enums/ChatMessageType.cs +++ b/HermesProxy/World/Enums/ChatMessageType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum ChatMessageTypeVanilla : uint { diff --git a/HermesProxy/World/Enums/CreatureDefines.cs b/HermesProxy/World/Enums/CreatureDefines.cs index 4d0858b9..edf0e9ef 100644 --- a/HermesProxy/World/Enums/CreatureDefines.cs +++ b/HermesProxy/World/Enums/CreatureDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public class CreatureConst { diff --git a/HermesProxy/World/Enums/Currency.cs b/HermesProxy/World/Enums/Currency.cs index e2832728..fc727368 100644 --- a/HermesProxy/World/Enums/Currency.cs +++ b/HermesProxy/World/Enums/Currency.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum Currency : uint { diff --git a/HermesProxy/World/Enums/DB2Hash.cs b/HermesProxy/World/Enums/DB2Hash.cs index 0e7466db..b8e4f24b 100644 --- a/HermesProxy/World/Enums/DB2Hash.cs +++ b/HermesProxy/World/Enums/DB2Hash.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum DB2Hash : uint { diff --git a/HermesProxy/World/Enums/EnchantmentSlot.cs b/HermesProxy/World/Enums/EnchantmentSlot.cs index 0af35f5f..36f81f5d 100644 --- a/HermesProxy/World/Enums/EnchantmentSlot.cs +++ b/HermesProxy/World/Enums/EnchantmentSlot.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { namespace Vanilla { diff --git a/HermesProxy/World/Enums/GameObjectDynamicFlags.cs b/HermesProxy/World/Enums/GameObjectDynamicFlags.cs index 23483f88..7bc1da48 100644 --- a/HermesProxy/World/Enums/GameObjectDynamicFlags.cs +++ b/HermesProxy/World/Enums/GameObjectDynamicFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/GossipDefines.cs b/HermesProxy/World/Enums/GossipDefines.cs index dcf6a234..e1d098d3 100644 --- a/HermesProxy/World/Enums/GossipDefines.cs +++ b/HermesProxy/World/Enums/GossipDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum GossipOption { diff --git a/HermesProxy/World/Enums/GroupDefines.cs b/HermesProxy/World/Enums/GroupDefines.cs index ba961140..fbacc416 100644 --- a/HermesProxy/World/Enums/GroupDefines.cs +++ b/HermesProxy/World/Enums/GroupDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/GuildDefines.cs b/HermesProxy/World/Enums/GuildDefines.cs index f0d3b954..46022cc7 100644 --- a/HermesProxy/World/Enums/GuildDefines.cs +++ b/HermesProxy/World/Enums/GuildDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public class GuildConst { diff --git a/HermesProxy/World/Enums/HitInfo.cs b/HermesProxy/World/Enums/HitInfo.cs index 98cdf572..b43581c1 100644 --- a/HermesProxy/World/Enums/HitInfo.cs +++ b/HermesProxy/World/Enums/HitInfo.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/HotfixStatus.cs b/HermesProxy/World/Enums/HotfixStatus.cs index 01201b0e..ecd20e2a 100644 --- a/HermesProxy/World/Enums/HotfixStatus.cs +++ b/HermesProxy/World/Enums/HotfixStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum HotfixStatus : byte { diff --git a/HermesProxy/World/Enums/InstanceDefines.cs b/HermesProxy/World/Enums/InstanceDefines.cs index 8cfe8571..e0276493 100644 --- a/HermesProxy/World/Enums/InstanceDefines.cs +++ b/HermesProxy/World/Enums/InstanceDefines.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { - public enum RaidGroupReason + public enum RaidGroupReason { None = 0, Lowlevel = 1, // "You are too low level to enter this instance." diff --git a/HermesProxy/World/Enums/ItemDefines.cs b/HermesProxy/World/Enums/ItemDefines.cs index 1b2534da..0b30c931 100644 --- a/HermesProxy/World/Enums/ItemDefines.cs +++ b/HermesProxy/World/Enums/ItemDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public struct ItemConst { diff --git a/HermesProxy/World/Enums/Language.cs b/HermesProxy/World/Enums/Language.cs index e4166e5c..848e36a7 100644 --- a/HermesProxy/World/Enums/Language.cs +++ b/HermesProxy/World/Enums/Language.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum Language : uint { diff --git a/HermesProxy/World/Enums/LootDefines.cs b/HermesProxy/World/Enums/LootDefines.cs index 31e5546e..7c5236d7 100644 --- a/HermesProxy/World/Enums/LootDefines.cs +++ b/HermesProxy/World/Enums/LootDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum LootMethod { diff --git a/HermesProxy/World/Enums/MailDefines.cs b/HermesProxy/World/Enums/MailDefines.cs index 0b3c0e44..48b1a193 100644 --- a/HermesProxy/World/Enums/MailDefines.cs +++ b/HermesProxy/World/Enums/MailDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum MailType { diff --git a/HermesProxy/World/Enums/MovementFlags.cs b/HermesProxy/World/Enums/MovementFlags.cs index 3ae44d86..72681e63 100644 --- a/HermesProxy/World/Enums/MovementFlags.cs +++ b/HermesProxy/World/Enums/MovementFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/MovementFlagsExtra.cs b/HermesProxy/World/Enums/MovementFlagsExtra.cs index 870acdce..ea803520 100644 --- a/HermesProxy/World/Enums/MovementFlagsExtra.cs +++ b/HermesProxy/World/Enums/MovementFlagsExtra.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/NPCFlags.cs b/HermesProxy/World/Enums/NPCFlags.cs index 0694ccae..6a1c5a5f 100644 --- a/HermesProxy/World/Enums/NPCFlags.cs +++ b/HermesProxy/World/Enums/NPCFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/ObjectType.cs b/HermesProxy/World/Enums/ObjectType.cs index adc1c755..c8a95112 100644 --- a/HermesProxy/World/Enums/ObjectType.cs +++ b/HermesProxy/World/Enums/ObjectType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum ObjectType { diff --git a/HermesProxy/World/Enums/ObjectTypeMask.cs b/HermesProxy/World/Enums/ObjectTypeMask.cs index 9b7e634d..5202ccc0 100644 --- a/HermesProxy/World/Enums/ObjectTypeMask.cs +++ b/HermesProxy/World/Enums/ObjectTypeMask.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/Opcodes.cs b/HermesProxy/World/Enums/Opcodes.cs index f36510ec..60c13a87 100644 --- a/HermesProxy/World/Enums/Opcodes.cs +++ b/HermesProxy/World/Enums/Opcodes.cs @@ -1,9 +1,5 @@ using HermesProxy.Enums; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/PetDefines.cs b/HermesProxy/World/Enums/PetDefines.cs index 2f388a6e..3471c104 100644 --- a/HermesProxy/World/Enums/PetDefines.cs +++ b/HermesProxy/World/Enums/PetDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/PetFlags.cs b/HermesProxy/World/Enums/PetFlags.cs index 027114aa..363e96af 100644 --- a/HermesProxy/World/Enums/PetFlags.cs +++ b/HermesProxy/World/Enums/PetFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/PlayerDefines.cs b/HermesProxy/World/Enums/PlayerDefines.cs index 878e7895..039191d0 100644 --- a/HermesProxy/World/Enums/PlayerDefines.cs +++ b/HermesProxy/World/Enums/PlayerDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/PowerType.cs b/HermesProxy/World/Enums/PowerType.cs index fd73fe3e..ec8ee410 100644 --- a/HermesProxy/World/Enums/PowerType.cs +++ b/HermesProxy/World/Enums/PowerType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum PowerType : sbyte { diff --git a/HermesProxy/World/Enums/PvPFlags.cs b/HermesProxy/World/Enums/PvPFlags.cs index a1543171..ec2f3669 100644 --- a/HermesProxy/World/Enums/PvPFlags.cs +++ b/HermesProxy/World/Enums/PvPFlags.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum PvPFlags { diff --git a/HermesProxy/World/Enums/QuestDefines.cs b/HermesProxy/World/Enums/QuestDefines.cs index 99a4b55e..86808922 100644 --- a/HermesProxy/World/Enums/QuestDefines.cs +++ b/HermesProxy/World/Enums/QuestDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/QuestFlags.cs b/HermesProxy/World/Enums/QuestFlags.cs index 3ef6726d..98249bca 100644 --- a/HermesProxy/World/Enums/QuestFlags.cs +++ b/HermesProxy/World/Enums/QuestFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/SocialDefines.cs b/HermesProxy/World/Enums/SocialDefines.cs index 2e0e79cf..956e98f9 100644 --- a/HermesProxy/World/Enums/SocialDefines.cs +++ b/HermesProxy/World/Enums/SocialDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum FriendStatus { diff --git a/HermesProxy/World/Enums/SpeedType.cs b/HermesProxy/World/Enums/SpeedType.cs index c4661356..00565aa9 100644 --- a/HermesProxy/World/Enums/SpeedType.cs +++ b/HermesProxy/World/Enums/SpeedType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum SpeedType { diff --git a/HermesProxy/World/Enums/SpellDefines.cs b/HermesProxy/World/Enums/SpellDefines.cs index e718856d..841a95bb 100644 --- a/HermesProxy/World/Enums/SpellDefines.cs +++ b/HermesProxy/World/Enums/SpellDefines.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/SplineFlags.cs b/HermesProxy/World/Enums/SplineFlags.cs index 6473f3b1..c6a6c63d 100644 --- a/HermesProxy/World/Enums/SplineFlags.cs +++ b/HermesProxy/World/Enums/SplineFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/SplineType.cs b/HermesProxy/World/Enums/SplineType.cs index aa84aa4c..6212d187 100644 --- a/HermesProxy/World/Enums/SplineType.cs +++ b/HermesProxy/World/Enums/SplineType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum SplineTypeLegacy { diff --git a/HermesProxy/World/Enums/TrainerSpellState.cs b/HermesProxy/World/Enums/TrainerSpellState.cs index 10885653..2ce4e90b 100644 --- a/HermesProxy/World/Enums/TrainerSpellState.cs +++ b/HermesProxy/World/Enums/TrainerSpellState.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum TrainerSpellStateLegacy { diff --git a/HermesProxy/World/Enums/TutorialAction.cs b/HermesProxy/World/Enums/TutorialAction.cs index 25b43267..c32a5e2c 100644 --- a/HermesProxy/World/Enums/TutorialAction.cs +++ b/HermesProxy/World/Enums/TutorialAction.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum TutorialAction { diff --git a/HermesProxy/World/Enums/UnitDefines.cs b/HermesProxy/World/Enums/UnitDefines.cs index 4c8a1929..3976bae2 100644 --- a/HermesProxy/World/Enums/UnitDefines.cs +++ b/HermesProxy/World/Enums/UnitDefines.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum Race : byte { diff --git a/HermesProxy/World/Enums/UnitDynamicFlags.cs b/HermesProxy/World/Enums/UnitDynamicFlags.cs index bc4a5b51..afa58a87 100644 --- a/HermesProxy/World/Enums/UnitDynamicFlags.cs +++ b/HermesProxy/World/Enums/UnitDynamicFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/UnitFlags.cs b/HermesProxy/World/Enums/UnitFlags.cs index 48e3bf38..ecd37659 100644 --- a/HermesProxy/World/Enums/UnitFlags.cs +++ b/HermesProxy/World/Enums/UnitFlags.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/UpdateFieldAttributes.cs b/HermesProxy/World/Enums/UpdateFieldAttributes.cs index 53e46c12..b401ee79 100644 --- a/HermesProxy/World/Enums/UpdateFieldAttributes.cs +++ b/HermesProxy/World/Enums/UpdateFieldAttributes.cs @@ -1,9 +1,5 @@ using HermesProxy.Enums; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/UpdateFields.cs b/HermesProxy/World/Enums/UpdateFields.cs index b40c0292..c77cd918 100644 --- a/HermesProxy/World/Enums/UpdateFields.cs +++ b/HermesProxy/World/Enums/UpdateFields.cs @@ -1,9 +1,4 @@ using HermesProxy.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/UpdateFlag.cs b/HermesProxy/World/Enums/UpdateFlag.cs index 0319d95a..e0a351b1 100644 --- a/HermesProxy/World/Enums/UpdateFlag.cs +++ b/HermesProxy/World/Enums/UpdateFlag.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Enums { diff --git a/HermesProxy/World/Enums/UpdateType.cs b/HermesProxy/World/Enums/UpdateType.cs index 41cb1f84..985ef738 100644 --- a/HermesProxy/World/Enums/UpdateType.cs +++ b/HermesProxy/World/Enums/UpdateType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum UpdateTypeLegacy { diff --git a/HermesProxy/World/Enums/V1_12_1_5875/Opcode.cs b/HermesProxy/World/Enums/V1_12_1_5875/Opcode.cs index 6613c64a..ec7c3724 100644 --- a/HermesProxy/World/Enums/V1_12_1_5875/Opcode.cs +++ b/HermesProxy/World/Enums/V1_12_1_5875/Opcode.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V1_12_1_5875 +namespace HermesProxy.World.Enums.V1_12_1_5875 { public enum Opcode : uint { diff --git a/HermesProxy/World/Enums/V1_12_1_5875/UpdateFields.cs b/HermesProxy/World/Enums/V1_12_1_5875/UpdateFields.cs index aa2f1e32..ac178f40 100644 --- a/HermesProxy/World/Enums/V1_12_1_5875/UpdateFields.cs +++ b/HermesProxy/World/Enums/V1_12_1_5875/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V1_12_1_5875 +namespace HermesProxy.World.Enums.V1_12_1_5875 { // ReSharper disable InconsistentNaming // 1.12.1 diff --git a/HermesProxy/World/Enums/V1_14_0_40237/UpdateFields.cs b/HermesProxy/World/Enums/V1_14_0_40237/UpdateFields.cs index 6957ef46..0c01ecd4 100644 --- a/HermesProxy/World/Enums/V1_14_0_40237/UpdateFields.cs +++ b/HermesProxy/World/Enums/V1_14_0_40237/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V1_14_0_40237 +namespace HermesProxy.World.Enums.V1_14_0_40237 { // ReSharper disable InconsistentNaming // 1.14.0.40237 diff --git a/HermesProxy/World/Enums/V1_14_1_40688/Opcode.cs b/HermesProxy/World/Enums/V1_14_1_40688/Opcode.cs index 0d86e5b9..5af8de64 100644 --- a/HermesProxy/World/Enums/V1_14_1_40688/Opcode.cs +++ b/HermesProxy/World/Enums/V1_14_1_40688/Opcode.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V1_14_1_40688 +namespace HermesProxy.World.Enums.V1_14_1_40688 { public enum Opcode : uint { diff --git a/HermesProxy/World/Enums/V1_14_1_40688/UpdateFields.cs b/HermesProxy/World/Enums/V1_14_1_40688/UpdateFields.cs index 07831f23..ac67eae3 100644 --- a/HermesProxy/World/Enums/V1_14_1_40688/UpdateFields.cs +++ b/HermesProxy/World/Enums/V1_14_1_40688/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V1_14_1_40688 +namespace HermesProxy.World.Enums.V1_14_1_40688 { // ReSharper disable InconsistentNaming // 1.14.1.40688 diff --git a/HermesProxy/World/Enums/V2_4_3_8606/Opcode.cs b/HermesProxy/World/Enums/V2_4_3_8606/Opcode.cs index 871f6bf6..2a447ac2 100644 --- a/HermesProxy/World/Enums/V2_4_3_8606/Opcode.cs +++ b/HermesProxy/World/Enums/V2_4_3_8606/Opcode.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V2_4_3_8606 +namespace HermesProxy.World.Enums.V2_4_3_8606 { public enum Opcode : uint { diff --git a/HermesProxy/World/Enums/V2_4_3_8606/UpdateFields.cs b/HermesProxy/World/Enums/V2_4_3_8606/UpdateFields.cs index c6c09241..04c2fa40 100644 --- a/HermesProxy/World/Enums/V2_4_3_8606/UpdateFields.cs +++ b/HermesProxy/World/Enums/V2_4_3_8606/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V2_4_3_8606 +namespace HermesProxy.World.Enums.V2_4_3_8606 { // ReSharper disable InconsistentNaming // 2.4.3 diff --git a/HermesProxy/World/Enums/V2_5_2_39570/Opcode.cs b/HermesProxy/World/Enums/V2_5_2_39570/Opcode.cs index 632ffba2..c3c5830c 100644 --- a/HermesProxy/World/Enums/V2_5_2_39570/Opcode.cs +++ b/HermesProxy/World/Enums/V2_5_2_39570/Opcode.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V2_5_2_39570 +namespace HermesProxy.World.Enums.V2_5_2_39570 { public enum Opcode : uint { diff --git a/HermesProxy/World/Enums/V2_5_2_39570/UpdateFields.cs b/HermesProxy/World/Enums/V2_5_2_39570/UpdateFields.cs index 56993d01..b95ddaa7 100644 --- a/HermesProxy/World/Enums/V2_5_2_39570/UpdateFields.cs +++ b/HermesProxy/World/Enums/V2_5_2_39570/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V2_5_2_39570 +namespace HermesProxy.World.Enums.V2_5_2_39570 { // ReSharper disable InconsistentNaming // 2.5.2.39570 diff --git a/HermesProxy/World/Enums/V3_3_5_12340/Opcode.cs b/HermesProxy/World/Enums/V3_3_5_12340/Opcode.cs index c92ace1d..5bd66a72 100644 --- a/HermesProxy/World/Enums/V3_3_5_12340/Opcode.cs +++ b/HermesProxy/World/Enums/V3_3_5_12340/Opcode.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V3_3_5_12340 +namespace HermesProxy.World.Enums.V3_3_5_12340 { public enum Opcode : uint { diff --git a/HermesProxy/World/Enums/V3_3_5_12340/UpdateFields.cs b/HermesProxy/World/Enums/V3_3_5_12340/UpdateFields.cs index 2006916b..9109c60e 100644 --- a/HermesProxy/World/Enums/V3_3_5_12340/UpdateFields.cs +++ b/HermesProxy/World/Enums/V3_3_5_12340/UpdateFields.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums.V3_3_5_12340 +namespace HermesProxy.World.Enums.V3_3_5_12340 { // ReSharper disable InconsistentNaming // 3.3.5 diff --git a/HermesProxy/World/Enums/Weather.cs b/HermesProxy/World/Enums/Weather.cs index b60710ab..d7fa9c92 100644 --- a/HermesProxy/World/Enums/Weather.cs +++ b/HermesProxy/World/Enums/Weather.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { // Used only in Vanilla public enum WeatherType diff --git a/HermesProxy/World/Enums/WorldStates.cs b/HermesProxy/World/Enums/WorldStates.cs index 887dec74..5fb751b3 100644 --- a/HermesProxy/World/Enums/WorldStates.cs +++ b/HermesProxy/World/Enums/WorldStates.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Enums +namespace HermesProxy.World.Enums { public enum WorldStates : uint { diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index 471bdf1a..12bf8b67 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Framework; using Framework.Logging; using HermesProxy.World.Enums; using HermesProxy.World.Objects; diff --git a/HermesProxy/World/Objects/ActivePlayerData.cs b/HermesProxy/World/Objects/ActivePlayerData.cs index 01e1ce4a..0aa6ddb6 100644 --- a/HermesProxy/World/Objects/ActivePlayerData.cs +++ b/HermesProxy/World/Objects/ActivePlayerData.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/CharacterCustomizations.cs b/HermesProxy/World/Objects/CharacterCustomizations.cs index 544af02a..a4d3a52c 100644 --- a/HermesProxy/World/Objects/CharacterCustomizations.cs +++ b/HermesProxy/World/Objects/CharacterCustomizations.cs @@ -1,10 +1,6 @@ using HermesProxy.World.Server.Packets; using HermesProxy.World.Enums; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/ClassPowerTypes.cs b/HermesProxy/World/Objects/ClassPowerTypes.cs index d2457c87..27fbd173 100644 --- a/HermesProxy/World/Objects/ClassPowerTypes.cs +++ b/HermesProxy/World/Objects/ClassPowerTypes.cs @@ -1,9 +1,4 @@ using HermesProxy.World.Enums; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/ContainerData.cs b/HermesProxy/World/Objects/ContainerData.cs index 40b83949..58b88d19 100644 --- a/HermesProxy/World/Objects/ContainerData.cs +++ b/HermesProxy/World/Objects/ContainerData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class ContainerData { diff --git a/HermesProxy/World/Objects/CorpseData.cs b/HermesProxy/World/Objects/CorpseData.cs index 1cce847b..dcc6be3e 100644 --- a/HermesProxy/World/Objects/CorpseData.cs +++ b/HermesProxy/World/Objects/CorpseData.cs @@ -1,9 +1,4 @@ using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/CreatureTemplate.cs b/HermesProxy/World/Objects/CreatureTemplate.cs index b160e7b1..8eb23bfd 100644 --- a/HermesProxy/World/Objects/CreatureTemplate.cs +++ b/HermesProxy/World/Objects/CreatureTemplate.cs @@ -1,9 +1,5 @@ using Framework.Collections; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using HermesProxy.World.Enums; namespace HermesProxy.World.Objects diff --git a/HermesProxy/World/Objects/DynamicObjectData.cs b/HermesProxy/World/Objects/DynamicObjectData.cs index 647a4e04..89d2d66b 100644 --- a/HermesProxy/World/Objects/DynamicObjectData.cs +++ b/HermesProxy/World/Objects/DynamicObjectData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class DynamicObjectData { diff --git a/HermesProxy/World/Objects/GameObjectData.cs b/HermesProxy/World/Objects/GameObjectData.cs index bec8b797..392af289 100644 --- a/HermesProxy/World/Objects/GameObjectData.cs +++ b/HermesProxy/World/Objects/GameObjectData.cs @@ -1,11 +1,4 @@ -using Framework.GameMath; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class GameObjectData { diff --git a/HermesProxy/World/Objects/HotfixRecord.cs b/HermesProxy/World/Objects/HotfixRecord.cs index 869c2106..100afb15 100644 --- a/HermesProxy/World/Objects/HotfixRecord.cs +++ b/HermesProxy/World/Objects/HotfixRecord.cs @@ -1,11 +1,5 @@ using Framework.IO; using HermesProxy.World.Enums; -using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/ItemData.cs b/HermesProxy/World/Objects/ItemData.cs index fc69ce12..be56a570 100644 --- a/HermesProxy/World/Objects/ItemData.cs +++ b/HermesProxy/World/Objects/ItemData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class ItemEnchantment { diff --git a/HermesProxy/World/Objects/ItemTemplate.cs b/HermesProxy/World/Objects/ItemTemplate.cs index 2913a622..5c71da98 100644 --- a/HermesProxy/World/Objects/ItemTemplate.cs +++ b/HermesProxy/World/Objects/ItemTemplate.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class ItemTemplate { diff --git a/HermesProxy/World/Objects/MovementInfo.cs b/HermesProxy/World/Objects/MovementInfo.cs index 46c2c7cb..1a13219e 100644 --- a/HermesProxy/World/Objects/MovementInfo.cs +++ b/HermesProxy/World/Objects/MovementInfo.cs @@ -2,10 +2,6 @@ using HermesProxy.Enums; using HermesProxy.World.Enums; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/ObjectData.cs b/HermesProxy/World/Objects/ObjectData.cs index 07d5076b..265f721f 100644 --- a/HermesProxy/World/Objects/ObjectData.cs +++ b/HermesProxy/World/Objects/ObjectData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class ObjectData { diff --git a/HermesProxy/World/Objects/ObjectTypeConverter.cs b/HermesProxy/World/Objects/ObjectTypeConverter.cs index 9e94f4c3..5bc3a415 100644 --- a/HermesProxy/World/Objects/ObjectTypeConverter.cs +++ b/HermesProxy/World/Objects/ObjectTypeConverter.cs @@ -1,9 +1,6 @@ using HermesProxy.World.Enums; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/PlayerData.cs b/HermesProxy/World/Objects/PlayerData.cs index 2a980037..5d9a9ea8 100644 --- a/HermesProxy/World/Objects/PlayerData.cs +++ b/HermesProxy/World/Objects/PlayerData.cs @@ -1,9 +1,4 @@ using HermesProxy.World.Server.Packets; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/QuestTemplate.cs b/HermesProxy/World/Objects/QuestTemplate.cs index b8ea683e..3194c728 100644 --- a/HermesProxy/World/Objects/QuestTemplate.cs +++ b/HermesProxy/World/Objects/QuestTemplate.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using HermesProxy.World.Enums; namespace HermesProxy.World.Objects diff --git a/HermesProxy/World/Objects/ServerSideMovement.cs b/HermesProxy/World/Objects/ServerSideMovement.cs index 262a88cf..e95a7e30 100644 --- a/HermesProxy/World/Objects/ServerSideMovement.cs +++ b/HermesProxy/World/Objects/ServerSideMovement.cs @@ -1,10 +1,6 @@ using Framework.GameMath; using HermesProxy.World.Enums; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/UnitData.cs b/HermesProxy/World/Objects/UnitData.cs index f48bd8ac..2b40a630 100644 --- a/HermesProxy/World/Objects/UnitData.cs +++ b/HermesProxy/World/Objects/UnitData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects +namespace HermesProxy.World.Objects { public class UnitChannel { diff --git a/HermesProxy/World/Objects/UpdateFieldExtensions.cs b/HermesProxy/World/Objects/UpdateFieldExtensions.cs index ff327205..ced2ce95 100644 --- a/HermesProxy/World/Objects/UpdateFieldExtensions.cs +++ b/HermesProxy/World/Objects/UpdateFieldExtensions.cs @@ -1,12 +1,9 @@ -using Framework.Util; -using HermesProxy.Enums; +using HermesProxy.Enums; using HermesProxy.World.Client; using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/UpdateFieldsArray.cs b/HermesProxy/World/Objects/UpdateFieldsArray.cs index a7f13529..17e07351 100644 --- a/HermesProxy/World/Objects/UpdateFieldsArray.cs +++ b/HermesProxy/World/Objects/UpdateFieldsArray.cs @@ -3,11 +3,7 @@ using Framework.Logging; using HermesProxy.World.Enums; using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/UpdateMask.cs b/HermesProxy/World/Objects/UpdateMask.cs index e9df84ef..a22c7823 100644 --- a/HermesProxy/World/Objects/UpdateMask.cs +++ b/HermesProxy/World/Objects/UpdateMask.cs @@ -1,11 +1,6 @@ using Framework.IO; using HermesProxy.World.Enums; -using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects { diff --git a/HermesProxy/World/Objects/Version/V1_14_0_40237/CreateObjectBits.cs b/HermesProxy/World/Objects/Version/V1_14_0_40237/CreateObjectBits.cs index 1833241f..a7b142d0 100644 --- a/HermesProxy/World/Objects/Version/V1_14_0_40237/CreateObjectBits.cs +++ b/HermesProxy/World/Objects/Version/V1_14_0_40237/CreateObjectBits.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects.Version.V1_14_0_40237 +namespace HermesProxy.World.Objects.Version.V1_14_0_40237 { public struct CreateObjectBits { diff --git a/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs index 0c8cc368..e1c9caa5 100644 --- a/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs @@ -1,12 +1,7 @@ using Framework.GameMath; -using Framework.IO; using HermesProxy.World.Enums.V1_14_0_40237; using HermesProxy.World.Server.Packets; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects.Version.V1_14_0_40237 { diff --git a/HermesProxy/World/Objects/Version/V1_14_1_40688/CreateObjectBits.cs b/HermesProxy/World/Objects/Version/V1_14_1_40688/CreateObjectBits.cs index 523dcdfe..d90f3225 100644 --- a/HermesProxy/World/Objects/Version/V1_14_1_40688/CreateObjectBits.cs +++ b/HermesProxy/World/Objects/Version/V1_14_1_40688/CreateObjectBits.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects.Version.V1_14_1_40688 +namespace HermesProxy.World.Objects.Version.V1_14_1_40688 { public struct CreateObjectBits { diff --git a/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs index 19afcdce..6e2b035a 100644 --- a/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs @@ -1,12 +1,7 @@ using Framework.GameMath; -using Framework.IO; using HermesProxy.World.Enums.V1_14_1_40688; using HermesProxy.World.Server.Packets; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects.Version.V1_14_1_40688 { diff --git a/HermesProxy/World/Objects/Version/V2_5_2_39570/CreateObjectBits.cs b/HermesProxy/World/Objects/Version/V2_5_2_39570/CreateObjectBits.cs index a628fedd..a9fafa38 100644 --- a/HermesProxy/World/Objects/Version/V2_5_2_39570/CreateObjectBits.cs +++ b/HermesProxy/World/Objects/Version/V2_5_2_39570/CreateObjectBits.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HermesProxy.World.Objects.Version.V2_5_2_39570 +namespace HermesProxy.World.Objects.Version.V2_5_2_39570 { public struct CreateObjectBits { diff --git a/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs index 95743259..38a9764d 100644 --- a/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs @@ -1,12 +1,7 @@ using Framework.GameMath; -using Framework.IO; using HermesProxy.World.Enums.V2_5_2_39570; using HermesProxy.World.Server.Packets; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World.Objects.Version.V2_5_2_39570 { diff --git a/HermesProxy/World/Server/AccountDataManager.cs b/HermesProxy/World/Server/AccountDataManager.cs index ddc40604..fa33f648 100644 --- a/HermesProxy/World/Server/AccountDataManager.cs +++ b/HermesProxy/World/Server/AccountDataManager.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using System.Text.Json; -using System.Threading.Tasks; using Framework; using Framework.Logging; diff --git a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs index 09611fe3..46483503 100644 --- a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs @@ -1,11 +1,6 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs index 96cd3578..6062f9d7 100644 --- a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs @@ -1,11 +1,6 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs b/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs index 28d32eaa..cc93ec7e 100644 --- a/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs @@ -1,11 +1,6 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs index b32f42e0..b3c5f3b7 100644 --- a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs @@ -1,10 +1,7 @@ -using System; -using System.Linq; +using System.Linq; using Framework.Constants; using Framework.Logging; -using HermesProxy.Auth; using HermesProxy.Enums; -using HermesProxy.World; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; diff --git a/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs index 23114e02..4ce663e8 100644 --- a/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs @@ -1,9 +1,6 @@ -using Framework.Constants; -using Framework.Logging; +using Framework.Logging; using HermesProxy.Enums; -using HermesProxy.World; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs b/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs index 94b49992..4c3d741f 100644 --- a/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs @@ -1,10 +1,5 @@ -using BNetServer.Services; -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using Framework.Logging; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs b/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs index f1d9c782..33fdb405 100644 --- a/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs @@ -1,8 +1,4 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs index 1a5c1a90..06dfaa41 100644 --- a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs @@ -1,8 +1,4 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs b/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs index a6618a40..4777e96a 100644 --- a/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs @@ -1,11 +1,5 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs index 09229a25..05c45742 100644 --- a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs @@ -1,11 +1,6 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs index 04cb4f63..0304fcaf 100644 --- a/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs @@ -1,9 +1,5 @@ -using System; -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs index 8d9e455b..18ae5587 100644 --- a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs @@ -1,7 +1,4 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using Framework.Logging; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; diff --git a/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs b/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs index 64effe87..9e5ea0cf 100644 --- a/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs @@ -1,11 +1,5 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs index 47546dd2..ea744c15 100644 --- a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/LootHandler.cs b/HermesProxy/World/Server/PacketHandlers/LootHandler.cs index bc81a9bf..8c7cbf5e 100644 --- a/HermesProxy/World/Server/PacketHandlers/LootHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/LootHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/MailHandler.cs b/HermesProxy/World/Server/PacketHandlers/MailHandler.cs index 23040449..64943669 100644 --- a/HermesProxy/World/Server/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MailHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System.Collections.Generic; using static HermesProxy.World.Server.Packets.SendMail; diff --git a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs index e1c01698..482da59a 100644 --- a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs b/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs index b455660a..631ebaf3 100644 --- a/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs @@ -1,9 +1,5 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs index 7e75b26c..479acc41 100644 --- a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; diff --git a/HermesProxy/World/Server/PacketHandlers/PetHandler.cs b/HermesProxy/World/Server/PacketHandlers/PetHandler.cs index 14eb0dfb..f73ec185 100644 --- a/HermesProxy/World/Server/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/PetHandler.cs @@ -1,10 +1,6 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs index 99cc4ddf..a3b2eb85 100644 --- a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs @@ -1,8 +1,5 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs index 11b68a9c..066f3b97 100644 --- a/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs @@ -1,7 +1,4 @@ -using Framework.Constants; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs index b1f3a619..37eccd4c 100644 --- a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs @@ -1,6 +1,4 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.World; +using Framework.Logging; using HermesProxy.World.Enums; using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; diff --git a/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs b/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs index d9c497b4..80a87354 100644 --- a/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs +++ b/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs @@ -1,8 +1,4 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs index 3b880195..521bc727 100644 --- a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using Bgs.Protocol; -using Bgs.Protocol.GameUtilities.V1; -using BNetServer.Services; using Framework.Constants; using Framework.IO; using Framework.Logging; -using Framework.Serialization; -using Framework.Util; -using Framework.Web; using Google.Protobuf; using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; diff --git a/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs b/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs index 6f388c33..77e1c7ad 100644 --- a/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs @@ -1,11 +1,6 @@ -using Framework.Constants; -using Framework.Logging; -using HermesProxy.Enums; -using HermesProxy.World; +using HermesProxy.Enums; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; -using System; namespace HermesProxy.World.Server { diff --git a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs index 1303f187..8767cfc8 100644 --- a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs @@ -1,9 +1,6 @@ using Framework; -using Framework.Constants; using HermesProxy.Enums; -using HermesProxy.World; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using HermesProxy.World.Server.Packets; using System; using System.Threading; diff --git a/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs b/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs index a35a76b4..82d55fe7 100644 --- a/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs @@ -1,8 +1,4 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs b/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs index 514d226c..1c9bdf64 100644 --- a/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs @@ -1,8 +1,4 @@ -using Framework.Constants; -using HermesProxy.Enums; -using HermesProxy.World; -using HermesProxy.World.Enums; -using HermesProxy.World.Objects; +using HermesProxy.World.Enums; using HermesProxy.World.Server.Packets; namespace HermesProxy.World.Server diff --git a/HermesProxy/World/Server/Packets/AccountDataPackets.cs b/HermesProxy/World/Server/Packets/AccountDataPackets.cs index 92607586..03b315dc 100644 --- a/HermesProxy/World/Server/Packets/AccountDataPackets.cs +++ b/HermesProxy/World/Server/Packets/AccountDataPackets.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Text; -using HermesProxy.Enums; using HermesProxy.World.Enums; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/ArenaPackets.cs b/HermesProxy/World/Server/Packets/ArenaPackets.cs index 3c0308d4..524aa797 100644 --- a/HermesProxy/World/Server/Packets/ArenaPackets.cs +++ b/HermesProxy/World/Server/Packets/ArenaPackets.cs @@ -16,10 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/AuctionPackets.cs b/HermesProxy/World/Server/Packets/AuctionPackets.cs index d98520f8..ae3d4dff 100644 --- a/HermesProxy/World/Server/Packets/AuctionPackets.cs +++ b/HermesProxy/World/Server/Packets/AuctionPackets.cs @@ -16,11 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; -using System; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/BattleGroundPackets.cs b/HermesProxy/World/Server/Packets/BattleGroundPackets.cs index 6f8328d7..77e183d7 100644 --- a/HermesProxy/World/Server/Packets/BattleGroundPackets.cs +++ b/HermesProxy/World/Server/Packets/BattleGroundPackets.cs @@ -19,7 +19,6 @@ using Framework.Constants; using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/CharacterPackets.cs b/HermesProxy/World/Server/Packets/CharacterPackets.cs index 562db01e..200405ab 100644 --- a/HermesProxy/World/Server/Packets/CharacterPackets.cs +++ b/HermesProxy/World/Server/Packets/CharacterPackets.cs @@ -19,7 +19,6 @@ using System; using System.Collections.Generic; using Framework.GameMath; -using HermesProxy.World.Objects; using Framework.Constants; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/ChatPackets.cs b/HermesProxy/World/Server/Packets/ChatPackets.cs index ac9d57cc..c0eb5cf7 100644 --- a/HermesProxy/World/Server/Packets/ChatPackets.cs +++ b/HermesProxy/World/Server/Packets/ChatPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; using System.Linq; diff --git a/HermesProxy/World/Server/Packets/ClientConfigPackets.cs b/HermesProxy/World/Server/Packets/ClientConfigPackets.cs index 5042e60c..292b4774 100644 --- a/HermesProxy/World/Server/Packets/ClientConfigPackets.cs +++ b/HermesProxy/World/Server/Packets/ClientConfigPackets.cs @@ -16,9 +16,7 @@ */ using Framework.Constants; -using Framework.IO; using HermesProxy.World.Enums; -using System.Collections.Generic; namespace HermesProxy.World.Server.Packets { diff --git a/HermesProxy/World/Server/Packets/CombatPackets.cs b/HermesProxy/World/Server/Packets/CombatPackets.cs index dee5107c..37a6a8f7 100644 --- a/HermesProxy/World/Server/Packets/CombatPackets.cs +++ b/HermesProxy/World/Server/Packets/CombatPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/DuelPackets.cs b/HermesProxy/World/Server/Packets/DuelPackets.cs index a5b44e79..2d9c54ba 100644 --- a/HermesProxy/World/Server/Packets/DuelPackets.cs +++ b/HermesProxy/World/Server/Packets/DuelPackets.cs @@ -17,11 +17,8 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; -using System.Collections.Generic; namespace HermesProxy.World.Server.Packets { diff --git a/HermesProxy/World/Server/Packets/GameObjectPackets.cs b/HermesProxy/World/Server/Packets/GameObjectPackets.cs index 9b12a806..f38b08e2 100644 --- a/HermesProxy/World/Server/Packets/GameObjectPackets.cs +++ b/HermesProxy/World/Server/Packets/GameObjectPackets.cs @@ -17,10 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; -using System.Collections.Generic; namespace HermesProxy.World.Server.Packets { diff --git a/HermesProxy/World/Server/Packets/GroupPackets.cs b/HermesProxy/World/Server/Packets/GroupPackets.cs index 3df2a14e..74c7b945 100644 --- a/HermesProxy/World/Server/Packets/GroupPackets.cs +++ b/HermesProxy/World/Server/Packets/GroupPackets.cs @@ -19,7 +19,6 @@ using Framework.Constants; using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/GuildPackets.cs b/HermesProxy/World/Server/Packets/GuildPackets.cs index 46e7e26d..b366503e 100644 --- a/HermesProxy/World/Server/Packets/GuildPackets.cs +++ b/HermesProxy/World/Server/Packets/GuildPackets.cs @@ -16,10 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/HotfixPackets.cs b/HermesProxy/World/Server/Packets/HotfixPackets.cs index 27ca16e7..aee45e27 100644 --- a/HermesProxy/World/Server/Packets/HotfixPackets.cs +++ b/HermesProxy/World/Server/Packets/HotfixPackets.cs @@ -16,8 +16,6 @@ */ -using Framework.Constants; -using Framework.GameMath; using Framework.IO; using HermesProxy.World.Enums; using HermesProxy.World.Objects; diff --git a/HermesProxy/World/Server/Packets/InstancePackets.cs b/HermesProxy/World/Server/Packets/InstancePackets.cs index ebfdb1ec..f27e6c10 100644 --- a/HermesProxy/World/Server/Packets/InstancePackets.cs +++ b/HermesProxy/World/Server/Packets/InstancePackets.cs @@ -16,11 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; -using System; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/ItemPackets.cs b/HermesProxy/World/Server/Packets/ItemPackets.cs index c947caab..4bac3a75 100644 --- a/HermesProxy/World/Server/Packets/ItemPackets.cs +++ b/HermesProxy/World/Server/Packets/ItemPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/LootPackets.cs b/HermesProxy/World/Server/Packets/LootPackets.cs index fb6e6eb1..a72e930a 100644 --- a/HermesProxy/World/Server/Packets/LootPackets.cs +++ b/HermesProxy/World/Server/Packets/LootPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/MailPackets.cs b/HermesProxy/World/Server/Packets/MailPackets.cs index 52f50776..d9cc713c 100644 --- a/HermesProxy/World/Server/Packets/MailPackets.cs +++ b/HermesProxy/World/Server/Packets/MailPackets.cs @@ -16,10 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/MiscPackets.cs b/HermesProxy/World/Server/Packets/MiscPackets.cs index 80d5e2f2..84face97 100644 --- a/HermesProxy/World/Server/Packets/MiscPackets.cs +++ b/HermesProxy/World/Server/Packets/MiscPackets.cs @@ -19,7 +19,6 @@ using Framework.Constants; using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/MovementPackets.cs b/HermesProxy/World/Server/Packets/MovementPackets.cs index 69ced884..108f9e18 100644 --- a/HermesProxy/World/Server/Packets/MovementPackets.cs +++ b/HermesProxy/World/Server/Packets/MovementPackets.cs @@ -20,7 +20,6 @@ using Framework.GameMath; using HermesProxy.World.Enums; using HermesProxy.World.Objects; -using System; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/NPCPackets.cs b/HermesProxy/World/Server/Packets/NPCPackets.cs index c118f094..e6962eda 100644 --- a/HermesProxy/World/Server/Packets/NPCPackets.cs +++ b/HermesProxy/World/Server/Packets/NPCPackets.cs @@ -19,10 +19,8 @@ using Framework.Constants; using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; -using System.Linq; namespace HermesProxy.World.Server.Packets { diff --git a/HermesProxy/World/Server/Packets/PetPackets.cs b/HermesProxy/World/Server/Packets/PetPackets.cs index 8942c29b..c304d074 100644 --- a/HermesProxy/World/Server/Packets/PetPackets.cs +++ b/HermesProxy/World/Server/Packets/PetPackets.cs @@ -19,7 +19,6 @@ using Framework.Constants; using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/PetitionPackets.cs b/HermesProxy/World/Server/Packets/PetitionPackets.cs index baba3792..b13b78a9 100644 --- a/HermesProxy/World/Server/Packets/PetitionPackets.cs +++ b/HermesProxy/World/Server/Packets/PetitionPackets.cs @@ -17,10 +17,7 @@ using Framework.Collections; -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/QuestPackets.cs b/HermesProxy/World/Server/Packets/QuestPackets.cs index a235f9da..a9e156be 100644 --- a/HermesProxy/World/Server/Packets/QuestPackets.cs +++ b/HermesProxy/World/Server/Packets/QuestPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System; using System.Collections.Generic; diff --git a/HermesProxy/World/Server/Packets/ReputationPackets.cs b/HermesProxy/World/Server/Packets/ReputationPackets.cs index c124404d..ba56174a 100644 --- a/HermesProxy/World/Server/Packets/ReputationPackets.cs +++ b/HermesProxy/World/Server/Packets/ReputationPackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/SocialPackets.cs b/HermesProxy/World/Server/Packets/SocialPackets.cs index 5f492957..9f13db75 100644 --- a/HermesProxy/World/Server/Packets/SocialPackets.cs +++ b/HermesProxy/World/Server/Packets/SocialPackets.cs @@ -17,10 +17,7 @@ using System; -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/TaxiPackets.cs b/HermesProxy/World/Server/Packets/TaxiPackets.cs index 1b663c5f..8b340a5f 100644 --- a/HermesProxy/World/Server/Packets/TaxiPackets.cs +++ b/HermesProxy/World/Server/Packets/TaxiPackets.cs @@ -16,10 +16,7 @@ */ -using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/TradePackets.cs b/HermesProxy/World/Server/Packets/TradePackets.cs index 5f4a4cb6..eaaadce4 100644 --- a/HermesProxy/World/Server/Packets/TradePackets.cs +++ b/HermesProxy/World/Server/Packets/TradePackets.cs @@ -17,10 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; -using System; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index 74d9fee2..5f9f43f4 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -17,7 +17,6 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.Enums; using HermesProxy.World.Enums; using HermesProxy.World.Objects; diff --git a/HermesProxy/World/Server/Packets/WorldStatePackets.cs b/HermesProxy/World/Server/Packets/WorldStatePackets.cs index f1e92854..1309774b 100644 --- a/HermesProxy/World/Server/Packets/WorldStatePackets.cs +++ b/HermesProxy/World/Server/Packets/WorldStatePackets.cs @@ -17,9 +17,7 @@ using Framework.Constants; -using Framework.GameMath; using HermesProxy.World.Enums; -using HermesProxy.World.Objects; using System.Collections.Generic; namespace HermesProxy.World.Server.Packets diff --git a/HermesProxy/World/SniffFile.cs b/HermesProxy/World/SniffFile.cs index ce2869bd..aa4a1260 100644 --- a/HermesProxy/World/SniffFile.cs +++ b/HermesProxy/World/SniffFile.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HermesProxy.World { diff --git a/HermesProxy/World/WowGuid.cs b/HermesProxy/World/WowGuid.cs index d9832565..52da9b14 100644 --- a/HermesProxy/World/WowGuid.cs +++ b/HermesProxy/World/WowGuid.cs @@ -1,5 +1,4 @@ -using Framework; -using HermesProxy.World.Enums; +using HermesProxy.World.Enums; using Framework.Logging; namespace HermesProxy.World From 795a4020210a0f5c71afdc03823299ccf2560728 Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:23:58 +0100 Subject: [PATCH 2/8] Simplify type names --- HermesProxy/Auth/AuthClient.cs | 4 +- HermesProxy/VersionChecker.cs | 12 +- .../Client/PacketHandlers/AuctionHandler.cs | 4 +- .../Client/PacketHandlers/ChatHandler.cs | 2 +- .../Client/PacketHandlers/GuildHandler.cs | 4 +- .../Client/PacketHandlers/PetitionHandler.cs | 2 +- .../Client/PacketHandlers/QueryHandler.cs | 4 +- .../PacketHandlers/WorldStateHandler.cs | 2 +- HermesProxy/World/GameData.cs | 712 +++++++++--------- .../World/Server/PacketHandlers/NPCHandler.cs | 2 +- .../Server/PacketHandlers/SpellHandler.cs | 2 +- .../World/Server/Packets/ChatPackets.cs | 4 +- .../World/Server/Packets/UpdatePackets.cs | 4 +- HermesProxy/World/SniffFile.cs | 2 +- 14 files changed, 380 insertions(+), 380 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index 2749bbba..89278b7c 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -228,7 +228,7 @@ private void SendLogonChallenge() ByteBuffer buffer = new ByteBuffer(); buffer.WriteUInt8((byte)AuthCommand.LOGON_CHALLENGE); buffer.WriteUInt8((byte)(LegacyVersion.ExpansionVersion > 1 ? 8 : 3)); - buffer.WriteUInt16((UInt16)(_username.Length + 30)); + buffer.WriteUInt16((ushort)(_username.Length + 30)); buffer.WriteBytes(Encoding.ASCII.GetBytes("WoW")); buffer.WriteUInt8(0); buffer.WriteUInt8(LegacyVersion.ExpansionVersion); @@ -514,7 +514,7 @@ private void HandleRealmList(ByteBuffer packet) string addressAndPort = packet.ReadCString(); string[] strArr = addressAndPort.Split(':'); realmInfo.Address = Dns.GetHostAddresses(strArr[0]).First().ToString(); - realmInfo.Port = UInt16.Parse(strArr[1]); + realmInfo.Port = ushort.Parse(strArr[1]); realmInfo.Population = packet.ReadFloat(); realmInfo.CharacterCount = packet.ReadUInt8(); realmInfo.Timezone = packet.ReadUInt8(); diff --git a/HermesProxy/VersionChecker.cs b/HermesProxy/VersionChecker.cs index 3654bcaa..9b07cd5c 100644 --- a/HermesProxy/VersionChecker.cs +++ b/HermesProxy/VersionChecker.cs @@ -231,14 +231,14 @@ private static byte GetExpansionVersion() string str = VersionString; str = str.Replace("V", ""); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } private static byte GetMajorPatchVersion() { string str = VersionString; str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } private static byte GetMinorPatchVersion() { @@ -246,7 +246,7 @@ private static byte GetMinorPatchVersion() str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } public static bool InVersion(ClientVersionBuild build1, ClientVersionBuild build2) @@ -580,14 +580,14 @@ private static byte GetExpansionVersion() string str = VersionString; str = str.Replace("V", ""); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } private static byte GetMajorPatchVersion() { string str = VersionString; str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } private static byte GetMinorPatchVersion() { @@ -595,7 +595,7 @@ private static byte GetMinorPatchVersion() str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(str.IndexOf('_') + 1); str = str.Substring(0, str.IndexOf("_")); - return (byte)UInt32.Parse(str); + return (byte)uint.Parse(str); } public static bool AddedInVersion(byte expansion, byte major, byte minor) diff --git a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs index 9096ec78..fcc76162 100644 --- a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs @@ -151,7 +151,7 @@ void HandleAuctionOwnerNotification(WorldPacket packet) packet.ReadFloat(); // Time Left string name = GameData.GetItemName(itemId); - if (String.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) { WorldPacket query = new WorldPacket(Opcode.CMSG_ITEM_NAME_QUERY); query.WriteUInt32(itemId); @@ -185,7 +185,7 @@ void HandleAuctionBidderNotification(WorldPacket packet) uint randomPropertyId = packet.ReadUInt32(); string name = GameData.GetItemName(itemId); - if (String.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) { WorldPacket query = new WorldPacket(Opcode.CMSG_ITEM_NAME_QUERY); query.WriteUInt32(itemId); diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs index e2190cfb..6d3e9234 100644 --- a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs @@ -80,7 +80,7 @@ void HandleChannelNotify(WorldPacket packet) } // do not send leave notification for default channels when changing zones - if (String.Equals(GetSession().GameState.LeftChannelName, channelName) || + if (string.Equals(GetSession().GameState.LeftChannelName, channelName) || GameData.GetChatChannelIdFromName(channelName) == 0) SendPacketToClient(left); break; diff --git a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs index f4d46500..0a247696 100644 --- a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs @@ -166,7 +166,7 @@ void HandleGuildEvent(WorldPacket packet) case GuildEventType.BankMoneyUpdate: { GuildEventBankMoneyChanged money = new GuildEventBankMoneyChanged(); - money.Money = (ulong)Int32.Parse(strings[0], System.Globalization.NumberStyles.HexNumber); + money.Money = (ulong)int.Parse(strings[0], System.Globalization.NumberStyles.HexNumber); SendPacketToClient(money); break; } @@ -202,7 +202,7 @@ void HandleQueryGuildInfoResponse(WorldPacket packet) for (uint i = 0; i < 10; i++) { string rankName = packet.ReadCString(); - if (!String.IsNullOrEmpty(rankName)) + if (!string.IsNullOrEmpty(rankName)) { RankInfo rank = new RankInfo(); rank.RankID = i; diff --git a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs index b0dd2b2c..07efb244 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs @@ -111,7 +111,7 @@ void HandlePetitionDecline(WorldPacket packet) { WowGuid128 guid = packet.ReadGuid().To128(GetSession().GameState); string name = GetSession().GameState.GetPlayerName(guid); - if (!String.IsNullOrEmpty(name)) + if (!string.IsNullOrEmpty(name)) { ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"{name} has declined your guild invitation."); SendPacketToClient(chat); diff --git a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs index 55620afd..2dea3628 100644 --- a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs @@ -444,7 +444,7 @@ void HandleQueryNpcTextResponse(WorldPacket packet) const string placeholderGossip = "Greetings $N"; - if (String.IsNullOrEmpty(maleText) && String.IsNullOrEmpty(femaleText) || + if (string.IsNullOrEmpty(maleText) && string.IsNullOrEmpty(femaleText) || maleText == placeholderGossip && femaleText == placeholderGossip && i != 0) response.BroadcastTextID[i] = 0; else @@ -708,7 +708,7 @@ void HandleWhoResponse(WorldPacket packet) player.PlayerData.BnetAccountID = GetSession().GetBnetAccountGuidForPlayer(player.PlayerData.GuidActual); player.PlayerData.VirtualRealmAddress = GetSession().RealmId.GetAddress(); - if (!String.IsNullOrEmpty(player.GuildName)) + if (!string.IsNullOrEmpty(player.GuildName)) { player.GuildGUID = GetSession().GetGuildGuid(player.GuildName); player.GuildVirtualRealmAddress = player.PlayerData.VirtualRealmAddress; diff --git a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs index a7579487..a1d1c373 100644 --- a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs @@ -52,7 +52,7 @@ void HandleInitWorldStates(WorldPacket packet) string oldZoneName = GameData.GetAreaName(GetSession().GameState.CurrentZoneId); string newZoneName = GameData.GetAreaName(states.ZoneID); GetSession().GameState.CurrentZoneId = states.ZoneID; - if (!String.IsNullOrEmpty(oldZoneName) && !String.IsNullOrEmpty(newZoneName)) + if (!string.IsNullOrEmpty(oldZoneName) && !string.IsNullOrEmpty(newZoneName)) { foreach (var channel in GameData.GetChatChannelsWithFlags(ChannelFlags.AutoJoin | ChannelFlags.ZoneBased)) { diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index 12bf8b67..69cfe2a1 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -315,8 +315,8 @@ public static uint GetBroadcastTextId(string maleText, string femaleText, uint l { foreach (var itr in BroadcastTextStore) { - if (((!String.IsNullOrEmpty(maleText) && itr.Value.MaleText == maleText) || - (!String.IsNullOrEmpty(femaleText) && itr.Value.FemaleText == femaleText)) && + if (((!string.IsNullOrEmpty(maleText) && itr.Value.MaleText == maleText) || + (!string.IsNullOrEmpty(femaleText) && itr.Value.FemaleText == femaleText)) && itr.Value.Language == language && Enumerable.SequenceEqual(itr.Value.EmoteDelays, emoteDelays) && Enumerable.SequenceEqual(itr.Value.Emotes, emotes)) @@ -383,16 +383,16 @@ public static void LoadBroadcastTexts() string[] fields = csvParser.ReadFields(); BroadcastText broadcastText = new BroadcastText(); - broadcastText.Entry = UInt32.Parse(fields[0]); + broadcastText.Entry = uint.Parse(fields[0]); broadcastText.MaleText = fields[1].TrimEnd().Replace("\0", "").Replace("~", "\n"); broadcastText.FemaleText = fields[2].TrimEnd().Replace("\0", "").Replace("~", "\n"); - broadcastText.Language = UInt32.Parse(fields[3]); - broadcastText.Emotes[0] = UInt16.Parse(fields[4]); - broadcastText.Emotes[1] = UInt16.Parse(fields[5]); - broadcastText.Emotes[2] = UInt16.Parse(fields[6]); - broadcastText.EmoteDelays[0] = UInt16.Parse(fields[7]); - broadcastText.EmoteDelays[1] = UInt16.Parse(fields[8]); - broadcastText.EmoteDelays[2] = UInt16.Parse(fields[9]); + broadcastText.Language = uint.Parse(fields[3]); + broadcastText.Emotes[0] = ushort.Parse(fields[4]); + broadcastText.Emotes[1] = ushort.Parse(fields[5]); + broadcastText.Emotes[2] = ushort.Parse(fields[6]); + broadcastText.EmoteDelays[0] = ushort.Parse(fields[7]); + broadcastText.EmoteDelays[1] = ushort.Parse(fields[8]); + broadcastText.EmoteDelays[2] = ushort.Parse(fields[9]); BroadcastTextStore.Add(broadcastText.Entry, broadcastText); } } @@ -416,9 +416,9 @@ public static void LoadItemTemplates() string[] fields = csvParser.ReadFields(); ItemDisplayData item = new ItemDisplayData(); - item.Entry = UInt32.Parse(fields[0]); - item.DisplayId = UInt32.Parse(fields[1]); - item.InventoryType = Byte.Parse(fields[2]); + item.Entry = uint.Parse(fields[0]); + item.DisplayId = uint.Parse(fields[1]); + item.InventoryType = byte.Parse(fields[2]); ItemDisplayDataStore.Add(item.Entry, item); } } @@ -442,11 +442,11 @@ public static void LoadBattlegrounds() string[] fields = csvParser.ReadFields(); Battleground bg = new Battleground(); - uint bgId = UInt32.Parse(fields[0]); - bg.IsArena = Byte.Parse(fields[1]) != 0; + uint bgId = uint.Parse(fields[0]); + bg.IsArena = byte.Parse(fields[1]) != 0; for (int i = 0; i < 6; i++) { - uint mapId = UInt32.Parse(fields[2 + i]); + uint mapId = uint.Parse(fields[2 + i]); if (mapId != 0) bg.MapIds.Add(mapId); } @@ -474,8 +474,8 @@ public static void LoadChatChannels() string[] fields = csvParser.ReadFields(); ChatChannel channel = new ChatChannel(); - channel.Id = UInt32.Parse(fields[0]); - channel.Flags = (ChannelFlags)UInt32.Parse(fields[1]); + channel.Id = uint.Parse(fields[0]); + channel.Flags = (ChannelFlags)uint.Parse(fields[1]); channel.Name = fields[2]; ChatChannels.Add(channel.Id, channel); } @@ -499,8 +499,8 @@ public static void LoadItemEnchantVisuals() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint enchantId = UInt32.Parse(fields[0]); - uint visualId = UInt32.Parse(fields[1]); + uint enchantId = uint.Parse(fields[0]); + uint visualId = uint.Parse(fields[1]); ItemEnchantVisuals.Add(enchantId, visualId); } } @@ -523,8 +523,8 @@ public static void LoadSpellVisuals() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); - uint visualId = UInt32.Parse(fields[1]); + uint spellId = uint.Parse(fields[0]); + uint visualId = uint.Parse(fields[1]); SpellVisuals.Add(spellId, visualId); } } @@ -547,8 +547,8 @@ public static void LoadLearnSpells() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint learnSpellId = UInt32.Parse(fields[0]); - uint realSpellId = UInt32.Parse(fields[1]); + uint learnSpellId = uint.Parse(fields[0]); + uint realSpellId = uint.Parse(fields[1]); if (!LearnSpells.ContainsKey(learnSpellId)) LearnSpells.Add(learnSpellId, realSpellId); } @@ -575,8 +575,8 @@ public static void LoadTotemSpells() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); - uint totemSlot = UInt32.Parse(fields[1]); + uint spellId = uint.Parse(fields[0]); + uint totemSlot = uint.Parse(fields[1]); TotemSpells.Add(spellId, totemSlot); } } @@ -602,8 +602,8 @@ public static void LoadGems() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint enchantId = UInt32.Parse(fields[0]); - uint itemId = UInt32.Parse(fields[1]); + uint enchantId = uint.Parse(fields[0]); + uint itemId = uint.Parse(fields[1]); Gems.Add(enchantId, itemId); } } @@ -629,8 +629,8 @@ public static void LoadUnitDisplayScales() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint displayId = UInt32.Parse(fields[0]); - float scale = Single.Parse(fields[1]); + uint displayId = uint.Parse(fields[0]); + float scale = float.Parse(fields[1]); UnitDisplayScales.Add(displayId, scale); } } @@ -653,8 +653,8 @@ public static void LoadTransports() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint entry = UInt32.Parse(fields[0]); - uint period = UInt32.Parse(fields[1]); + uint entry = uint.Parse(fields[0]); + uint period = uint.Parse(fields[1]); TransportPeriods.Add(entry, period); } } @@ -677,7 +677,7 @@ public static void LoadAreaNames() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); + uint id = uint.Parse(fields[0]); string name = fields[1]; AreaNames.Add(id, name); } @@ -704,7 +704,7 @@ public static void LoadDispellSpells() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); + uint spellId = uint.Parse(fields[0]); DispellSpells.Add(spellId); } } @@ -730,7 +730,7 @@ public static void LoadStackableAuras() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); + uint spellId = uint.Parse(fields[0]); StackableAuras.Add(spellId); } } @@ -756,7 +756,7 @@ public static void LoadMountAuras() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); + uint spellId = uint.Parse(fields[0]); MountAuras.Add(spellId); } } @@ -779,7 +779,7 @@ public static void LoadMeleeSpells() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); + uint spellId = uint.Parse(fields[0]); NextMeleeSpells.Add(spellId); } } @@ -802,7 +802,7 @@ public static void LoadAutoRepeatSpells() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint spellId = UInt32.Parse(fields[0]); + uint spellId = uint.Parse(fields[0]); AutoRepeatSpells.Add(spellId); } } @@ -827,10 +827,10 @@ public static void LoadTaxiPaths() string[] fields = csvParser.ReadFields(); TaxiPath taxiPath = new TaxiPath(); - taxiPath.Id = UInt32.Parse(fields[0]); - taxiPath.From = UInt32.Parse(fields[1]); - taxiPath.To = UInt32.Parse(fields[2]); - taxiPath.Cost = Int32.Parse(fields[3]); + taxiPath.Id = uint.Parse(fields[0]); + taxiPath.From = uint.Parse(fields[1]); + taxiPath.To = uint.Parse(fields[2]); + taxiPath.Cost = int.Parse(fields[3]); TaxiPaths.Add(counter, taxiPath); counter++; } @@ -856,8 +856,8 @@ public static void LoadTaxiPathNodesGraph() string[] fields = csvParser.ReadFields(); TaxiNode taxiNode = new TaxiNode(); - taxiNode.Id = UInt32.Parse(fields[0]); - taxiNode.mapId = UInt32.Parse(fields[1]); + taxiNode.Id = uint.Parse(fields[0]); + taxiNode.mapId = uint.Parse(fields[1]); taxiNode.x = float.Parse(fields[2]); taxiNode.y = float.Parse(fields[3]); taxiNode.z = float.Parse(fields[4]); @@ -882,15 +882,15 @@ public static void LoadTaxiPathNodesGraph() string[] fields = csvParser.ReadFields(); TaxiPathNode taxiPathNode = new TaxiPathNode(); - taxiPathNode.Id = UInt32.Parse(fields[0]); - taxiPathNode.pathId = UInt32.Parse(fields[1]); - taxiPathNode.nodeIndex = UInt32.Parse(fields[2]); - taxiPathNode.mapId = UInt32.Parse(fields[3]); + taxiPathNode.Id = uint.Parse(fields[0]); + taxiPathNode.pathId = uint.Parse(fields[1]); + taxiPathNode.nodeIndex = uint.Parse(fields[2]); + taxiPathNode.mapId = uint.Parse(fields[3]); taxiPathNode.x = float.Parse(fields[4]); taxiPathNode.y = float.Parse(fields[5]); taxiPathNode.z = float.Parse(fields[6]); - taxiPathNode.flags = UInt32.Parse(fields[7]); - taxiPathNode.delay = UInt32.Parse(fields[8]); + taxiPathNode.flags = uint.Parse(fields[7]); + taxiPathNode.delay = uint.Parse(fields[8]); TaxiPathNodes.Add(taxiPathNode.Id, taxiPathNode); } } @@ -975,10 +975,10 @@ public static void LoadQuestBits() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint questId = UInt32.Parse(fields[0]); + uint questId = uint.Parse(fields[0]); if (fields[1].StartsWith("-")) continue; // Some bits have a negative index, is this an error from WDBX? - uint uniqueBitFlag = UInt32.Parse(fields[1]); + uint uniqueBitFlag = uint.Parse(fields[1]); QuestBits.Add(questId, uniqueBitFlag); } } @@ -1047,20 +1047,20 @@ public static void LoadAreaTriggerHotfixes() at.PositionX = float.Parse(fields[1]); at.PositionY = float.Parse(fields[2]); at.PositionZ = float.Parse(fields[3]); - at.Id = UInt32.Parse(fields[4]); - at.MapId = UInt16.Parse(fields[5]); - at.PhaseUseFlags = Byte.Parse(fields[6]); - at.PhaseId = UInt16.Parse(fields[7]); - at.PhaseGroupId = UInt16.Parse(fields[8]); + at.Id = uint.Parse(fields[4]); + at.MapId = ushort.Parse(fields[5]); + at.PhaseUseFlags = byte.Parse(fields[6]); + at.PhaseId = ushort.Parse(fields[7]); + at.PhaseGroupId = ushort.Parse(fields[8]); at.Radius = float.Parse(fields[9]); at.BoxLength = float.Parse(fields[10]); at.BoxWidth = float.Parse(fields[11]); at.BoxHeight = float.Parse(fields[12]); at.BoxYaw = float.Parse(fields[13]); - at.ShapeType = Byte.Parse(fields[14]); - at.ShapeId = UInt16.Parse(fields[15]); - at.ActionSetId = UInt16.Parse(fields[16]); - at.Flags = Byte.Parse(fields[17]); + at.ShapeType = byte.Parse(fields[14]); + at.ShapeId = ushort.Parse(fields[15]); + at.ActionSetId = ushort.Parse(fields[16]); + at.Flags = byte.Parse(fields[17]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.AreaTrigger; @@ -1115,14 +1115,14 @@ public static void LoadSkillLineHotfixes() string description = fields[2]; string hordeDisplayName = fields[3]; string neutralDisplayName = fields[4]; - uint id = UInt32.Parse(fields[5]); - byte categoryID = Byte.Parse(fields[6]); - uint spellIconFileID = UInt32.Parse(fields[7]); - byte canLink = Byte.Parse(fields[8]); - uint parentSkillLineID = UInt32.Parse(fields[9]); - uint parentTierIndex = UInt32.Parse(fields[10]); - ushort flags = UInt16.Parse(fields[11]); - uint spellBookSpellID = UInt32.Parse(fields[12]); + uint id = uint.Parse(fields[5]); + byte categoryID = byte.Parse(fields[6]); + uint spellIconFileID = uint.Parse(fields[7]); + byte canLink = byte.Parse(fields[8]); + uint parentSkillLineID = uint.Parse(fields[9]); + uint parentTierIndex = uint.Parse(fields[10]); + ushort flags = ushort.Parse(fields[11]); + uint spellBookSpellID = uint.Parse(fields[12]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SkillLine; @@ -1167,14 +1167,14 @@ public static void LoadSkillRaceClassInfoHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - ulong raceMask = UInt64.Parse(fields[1]); - ushort skillId = UInt16.Parse(fields[2]); - uint classMask = UInt32.Parse(fields[3]); - ushort flags = UInt16.Parse(fields[4]); - byte availability = Byte.Parse(fields[5]); - byte minLevel = Byte.Parse(fields[6]); - ushort skillTierId = UInt16.Parse(fields[7]); + uint id = uint.Parse(fields[0]); + ulong raceMask = ulong.Parse(fields[1]); + ushort skillId = ushort.Parse(fields[2]); + uint classMask = uint.Parse(fields[3]); + ushort flags = ushort.Parse(fields[4]); + byte availability = byte.Parse(fields[5]); + byte minLevel = byte.Parse(fields[6]); + ushort skillTierId = ushort.Parse(fields[7]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SkillRaceClassInfo; @@ -1213,23 +1213,23 @@ public static void LoadSkillLineAbilityHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - ulong raceMask = UInt64.Parse(fields[0]); - uint id = UInt32.Parse(fields[1]); - ushort skillId = UInt16.Parse(fields[2]); - uint spellId = UInt32.Parse(fields[3]); - ushort minSkillLineRank = UInt16.Parse(fields[4]); - uint classMask = UInt32.Parse(fields[5]); - uint supercedesSpellId = UInt32.Parse(fields[6]); - byte acquireMethod = Byte.Parse(fields[7]); - ushort trivialSkillLineRankHigh = UInt16.Parse(fields[8]); - ushort trivialSkillLineRankLow = UInt16.Parse(fields[9]); - byte flags = Byte.Parse(fields[10]); - byte numSkillUps = Byte.Parse(fields[11]); - ushort uniqueBit = UInt16.Parse(fields[12]); - ushort tradeSkillCategoryId = UInt16.Parse(fields[13]); - ushort skillUpSkillLineId = UInt16.Parse(fields[14]); - uint characterPoints1 = UInt32.Parse(fields[15]); - uint characterPoints2 = UInt32.Parse(fields[16]); + ulong raceMask = ulong.Parse(fields[0]); + uint id = uint.Parse(fields[1]); + ushort skillId = ushort.Parse(fields[2]); + uint spellId = uint.Parse(fields[3]); + ushort minSkillLineRank = ushort.Parse(fields[4]); + uint classMask = uint.Parse(fields[5]); + uint supercedesSpellId = uint.Parse(fields[6]); + byte acquireMethod = byte.Parse(fields[7]); + ushort trivialSkillLineRankHigh = ushort.Parse(fields[8]); + ushort trivialSkillLineRankLow = ushort.Parse(fields[9]); + byte flags = byte.Parse(fields[10]); + byte numSkillUps = byte.Parse(fields[11]); + ushort uniqueBit = ushort.Parse(fields[12]); + ushort tradeSkillCategoryId = ushort.Parse(fields[13]); + ushort skillUpSkillLineId = ushort.Parse(fields[14]); + uint characterPoints1 = uint.Parse(fields[15]); + uint characterPoints2 = uint.Parse(fields[16]); HotfixRecord record = new HotfixRecord(); @@ -1279,7 +1279,7 @@ public static void LoadSpellHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); + uint id = uint.Parse(fields[0]); string nameSubText = fields[1]; string description = fields[2]; string auraDescription = fields[3]; @@ -1317,7 +1317,7 @@ public static void LoadSpellNameHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); + uint id = uint.Parse(fields[0]); string name = fields[1]; HotfixRecord record = new HotfixRecord(); @@ -1351,13 +1351,13 @@ public static void LoadSpellLevelsHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - byte difficultyId = Byte.Parse(fields[1]); - ushort baseLevel = UInt16.Parse(fields[2]); - ushort maxLevel = UInt16.Parse(fields[3]); - ushort spellLevel = UInt16.Parse(fields[4]); - byte maxPassiveAuraLevel = Byte.Parse(fields[5]); - uint spellId = UInt32.Parse(fields[6]); + uint id = uint.Parse(fields[0]); + byte difficultyId = byte.Parse(fields[1]); + ushort baseLevel = ushort.Parse(fields[2]); + ushort maxLevel = ushort.Parse(fields[3]); + ushort spellLevel = ushort.Parse(fields[4]); + byte maxPassiveAuraLevel = byte.Parse(fields[5]); + uint spellId = uint.Parse(fields[6]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SpellLevels; @@ -1395,16 +1395,16 @@ public static void LoadSpellAuraOptionsHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - byte difficultyId = Byte.Parse(fields[1]); - uint cumulatievAura = UInt32.Parse(fields[2]); - uint procCategoryRecovery = UInt32.Parse(fields[3]); - byte procChance = Byte.Parse(fields[4]); - uint procCharges = UInt32.Parse(fields[5]); - ushort spellProcsPerMinuteId = UInt16.Parse(fields[6]); - uint procTypeMask0 = UInt32.Parse(fields[7]); - uint procTypeMask1 = UInt32.Parse(fields[8]); - uint spellId = UInt32.Parse(fields[9]); + uint id = uint.Parse(fields[0]); + byte difficultyId = byte.Parse(fields[1]); + uint cumulatievAura = uint.Parse(fields[2]); + uint procCategoryRecovery = uint.Parse(fields[3]); + byte procChance = byte.Parse(fields[4]); + uint procCharges = uint.Parse(fields[5]); + ushort spellProcsPerMinuteId = ushort.Parse(fields[6]); + uint procTypeMask0 = uint.Parse(fields[7]); + uint procTypeMask1 = uint.Parse(fields[8]); + uint spellId = uint.Parse(fields[9]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SpellAuraOptions; @@ -1445,32 +1445,32 @@ public static void LoadSpellMiscHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - byte difficultyId = Byte.Parse(fields[1]); - ushort castingTimeIndex = UInt16.Parse(fields[2]); - ushort durationIndex = UInt16.Parse(fields[3]); - ushort rangeIndex = UInt16.Parse(fields[4]); - byte schoolMask = Byte.Parse(fields[5]); - float speed = Single.Parse(fields[6]); - float launchDelay = Single.Parse(fields[7]); - float minDuration = Single.Parse(fields[8]); - uint spellIconFileDataId = UInt32.Parse(fields[9]); - uint activeIconFileDataId = UInt32.Parse(fields[10]); - uint attributes1 = UInt32.Parse(fields[11]); - uint attributes2 = UInt32.Parse(fields[12]); - uint attributes3 = UInt32.Parse(fields[13]); - uint attributes4 = UInt32.Parse(fields[14]); - uint attributes5 = UInt32.Parse(fields[15]); - uint attributes6 = UInt32.Parse(fields[16]); - uint attributes7 = UInt32.Parse(fields[17]); - uint attributes8 = UInt32.Parse(fields[18]); - uint attributes9 = UInt32.Parse(fields[19]); - uint attributes10 = UInt32.Parse(fields[20]); - uint attributes11 = UInt32.Parse(fields[21]); - uint attributes12 = UInt32.Parse(fields[22]); - uint attributes13 = UInt32.Parse(fields[23]); - uint attributes14 = UInt32.Parse(fields[24]); - uint spellId = UInt32.Parse(fields[25]); + uint id = uint.Parse(fields[0]); + byte difficultyId = byte.Parse(fields[1]); + ushort castingTimeIndex = ushort.Parse(fields[2]); + ushort durationIndex = ushort.Parse(fields[3]); + ushort rangeIndex = ushort.Parse(fields[4]); + byte schoolMask = byte.Parse(fields[5]); + float speed = float.Parse(fields[6]); + float launchDelay = float.Parse(fields[7]); + float minDuration = float.Parse(fields[8]); + uint spellIconFileDataId = uint.Parse(fields[9]); + uint activeIconFileDataId = uint.Parse(fields[10]); + uint attributes1 = uint.Parse(fields[11]); + uint attributes2 = uint.Parse(fields[12]); + uint attributes3 = uint.Parse(fields[13]); + uint attributes4 = uint.Parse(fields[14]); + uint attributes5 = uint.Parse(fields[15]); + uint attributes6 = uint.Parse(fields[16]); + uint attributes7 = uint.Parse(fields[17]); + uint attributes8 = uint.Parse(fields[18]); + uint attributes9 = uint.Parse(fields[19]); + uint attributes10 = uint.Parse(fields[20]); + uint attributes11 = uint.Parse(fields[21]); + uint attributes12 = uint.Parse(fields[22]); + uint attributes13 = uint.Parse(fields[23]); + uint attributes14 = uint.Parse(fields[24]); + uint spellId = uint.Parse(fields[25]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SpellMisc; @@ -1527,42 +1527,42 @@ public static void LoadSpellEffectHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - uint difficultyId = UInt32.Parse(fields[1]); - uint effectIndex = UInt32.Parse(fields[2]); - uint effect = UInt32.Parse(fields[3]); - float effectAmplitude = Single.Parse(fields[4]); - uint effectAttributes = UInt32.Parse(fields[5]); - short effectAura = Int16.Parse(fields[6]); - int effectAuraPeriod = Int32.Parse(fields[7]); - int effectBasePoints = Int32.Parse(fields[8]); - float effectBonusCoefficient = Single.Parse(fields[9]); - float effectChainAmplitude = Single.Parse(fields[10]); - int effectChainTargets = Int32.Parse(fields[11]); - int effectDieSides = Int32.Parse(fields[12]); - int effectItemType = Int32.Parse(fields[13]); - int effectMechanic = Int32.Parse(fields[14]); - float effectPointsPerResource = Single.Parse(fields[15]); - float effectPosFacing = Single.Parse(fields[16]); - float effectRealPointsPerLevel = Single.Parse(fields[17]); - int EffectTriggerSpell = Int32.Parse(fields[18]); - float bonusCoefficientFromAP = Single.Parse(fields[19]); - float pvpMultiplier = Single.Parse(fields[20]); - float coefficient = Single.Parse(fields[21]); - float variance = Single.Parse(fields[22]); - float resourceCoefficient = Single.Parse(fields[23]); - float groupSizeBasePointsCoefficient = Single.Parse(fields[24]); - int effectMiscValue1 = Int32.Parse(fields[25]); - int effectMiscValue2 = Int32.Parse(fields[26]); - uint effectRadiusIndex1 = UInt32.Parse(fields[27]); - uint effectRadiusIndex2 = UInt32.Parse(fields[28]); - int effectSpellClassMask1 = Int32.Parse(fields[29]); - int effectSpellClassMask2 = Int32.Parse(fields[30]); - int effectSpellClassMask3 = Int32.Parse(fields[31]); - int effectSpellClassMask4 = Int32.Parse(fields[32]); - short implicitTarget1 = Int16.Parse(fields[33]); - short implicitTarget2 = Int16.Parse(fields[34]); - uint spellId = UInt32.Parse(fields[35]); + uint id = uint.Parse(fields[0]); + uint difficultyId = uint.Parse(fields[1]); + uint effectIndex = uint.Parse(fields[2]); + uint effect = uint.Parse(fields[3]); + float effectAmplitude = float.Parse(fields[4]); + uint effectAttributes = uint.Parse(fields[5]); + short effectAura = short.Parse(fields[6]); + int effectAuraPeriod = int.Parse(fields[7]); + int effectBasePoints = int.Parse(fields[8]); + float effectBonusCoefficient = float.Parse(fields[9]); + float effectChainAmplitude = float.Parse(fields[10]); + int effectChainTargets = int.Parse(fields[11]); + int effectDieSides = int.Parse(fields[12]); + int effectItemType = int.Parse(fields[13]); + int effectMechanic = int.Parse(fields[14]); + float effectPointsPerResource = float.Parse(fields[15]); + float effectPosFacing = float.Parse(fields[16]); + float effectRealPointsPerLevel = float.Parse(fields[17]); + int EffectTriggerSpell = int.Parse(fields[18]); + float bonusCoefficientFromAP = float.Parse(fields[19]); + float pvpMultiplier = float.Parse(fields[20]); + float coefficient = float.Parse(fields[21]); + float variance = float.Parse(fields[22]); + float resourceCoefficient = float.Parse(fields[23]); + float groupSizeBasePointsCoefficient = float.Parse(fields[24]); + int effectMiscValue1 = int.Parse(fields[25]); + int effectMiscValue2 = int.Parse(fields[26]); + uint effectRadiusIndex1 = uint.Parse(fields[27]); + uint effectRadiusIndex2 = uint.Parse(fields[28]); + int effectSpellClassMask1 = int.Parse(fields[29]); + int effectSpellClassMask2 = int.Parse(fields[30]); + int effectSpellClassMask3 = int.Parse(fields[31]); + int effectSpellClassMask4 = int.Parse(fields[32]); + short implicitTarget1 = short.Parse(fields[33]); + short implicitTarget2 = short.Parse(fields[34]); + uint spellId = uint.Parse(fields[35]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SpellEffect; @@ -1629,19 +1629,19 @@ public static void LoadSpellXSpellVisualHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - byte difficultyId = Byte.Parse(fields[1]); - uint spellVisualId = UInt32.Parse(fields[2]); - float probability = Single.Parse(fields[3]); - byte flags = Byte.Parse(fields[4]); - byte priority = Byte.Parse(fields[5]); - int spellIconFileId = Int32.Parse(fields[6]); - int activeIconFileId = Int32.Parse(fields[7]); - ushort viewerUnitConditionId = UInt16.Parse(fields[8]); - uint viewerPlayerConditionId = UInt32.Parse(fields[9]); - ushort casterUnitConditionId = UInt16.Parse(fields[10]); - uint casterPlayerConditionId = UInt32.Parse(fields[11]); - uint spellId = UInt32.Parse(fields[12]); + uint id = uint.Parse(fields[0]); + byte difficultyId = byte.Parse(fields[1]); + uint spellVisualId = uint.Parse(fields[2]); + float probability = float.Parse(fields[3]); + byte flags = byte.Parse(fields[4]); + byte priority = byte.Parse(fields[5]); + int spellIconFileId = int.Parse(fields[6]); + int activeIconFileId = int.Parse(fields[7]); + ushort viewerUnitConditionId = ushort.Parse(fields[8]); + uint viewerPlayerConditionId = uint.Parse(fields[9]); + ushort casterUnitConditionId = ushort.Parse(fields[10]); + uint casterPlayerConditionId = uint.Parse(fields[11]); + uint spellId = uint.Parse(fields[12]); if (SpellVisuals.ContainsKey(spellId)) SpellVisuals[spellId] = id; @@ -1691,133 +1691,133 @@ public static void LoadItemSparseHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - long allowableRace = Int64.Parse(fields[1]); + uint id = uint.Parse(fields[0]); + long allowableRace = long.Parse(fields[1]); string description = fields[2]; string name4 = fields[3]; string name3 = fields[4]; string name2 = fields[5]; string name1 = fields[6]; - float dmgVariance = Single.Parse(fields[7]); - uint durationInInventory = UInt32.Parse(fields[8]); - float qualityModifier = Single.Parse(fields[9]); - uint bagFamily = UInt32.Parse(fields[10]); - float rangeMod = Single.Parse(fields[11]); - float statPercentageOfSocket1 = Single.Parse(fields[12]); - float statPercentageOfSocket2 = Single.Parse(fields[13]); - float statPercentageOfSocket3 = Single.Parse(fields[14]); - float statPercentageOfSocket4 = Single.Parse(fields[15]); - float statPercentageOfSocket5 = Single.Parse(fields[16]); - float statPercentageOfSocket6 = Single.Parse(fields[17]); - float statPercentageOfSocket7 = Single.Parse(fields[18]); - float statPercentageOfSocket8 = Single.Parse(fields[19]); - float statPercentageOfSocket9 = Single.Parse(fields[20]); - float statPercentageOfSocket10 = Single.Parse(fields[21]); - int statPercentEditor1 = Int32.Parse(fields[22]); - int statPercentEditor2 = Int32.Parse(fields[23]); - int statPercentEditor3 = Int32.Parse(fields[24]); - int statPercentEditor4 = Int32.Parse(fields[25]); - int statPercentEditor5 = Int32.Parse(fields[26]); - int statPercentEditor6 = Int32.Parse(fields[27]); - int statPercentEditor7 = Int32.Parse(fields[28]); - int statPercentEditor8 = Int32.Parse(fields[29]); - int statPercentEditor9 = Int32.Parse(fields[30]); - int statPercentEditor10 = Int32.Parse(fields[31]); - int stackable = Int32.Parse(fields[32]); - int maxCount = Int32.Parse(fields[33]); - uint requiredAbility = UInt32.Parse(fields[34]); - uint sellPrice = UInt32.Parse(fields[35]); - uint buyPrice = UInt32.Parse(fields[36]); - uint vendorStackCount = UInt32.Parse(fields[37]); - float priceVariance = Single.Parse(fields[38]); - float priceRandomValue = Single.Parse(fields[39]); - int flags1 = Int32.Parse(fields[40]); - int flags2 = Int32.Parse(fields[41]); - int flags3 = Int32.Parse(fields[42]); - int flags4 = Int32.Parse(fields[43]); - int oppositeFactionItemId = Int32.Parse(fields[44]); - uint maxDurability = UInt32.Parse(fields[45]); - ushort itemNameDescriptionId = UInt16.Parse(fields[46]); - ushort requiredTransmogHoliday = UInt16.Parse(fields[47]); - ushort requiredHoliday = UInt16.Parse(fields[48]); - ushort limitCategory = UInt16.Parse(fields[49]); - ushort gemProperties = UInt16.Parse(fields[50]); - ushort socketMatchEnchantmentId = UInt16.Parse(fields[51]); - ushort totemCategoryId = UInt16.Parse(fields[52]); - ushort instanceBound = UInt16.Parse(fields[53]); - ushort zoneBound1 = UInt16.Parse(fields[54]); - ushort zoneBound2 = UInt16.Parse(fields[55]); - ushort itemSet = UInt16.Parse(fields[56]); - ushort lockId = UInt16.Parse(fields[57]); - ushort startQuestId = UInt16.Parse(fields[58]); - ushort pageText = UInt16.Parse(fields[59]); - ushort delay = UInt16.Parse(fields[60]); - ushort requiredReputationId = UInt16.Parse(fields[61]); - ushort requiredSkillRank = UInt16.Parse(fields[62]); - ushort requiredSkill = UInt16.Parse(fields[63]); - ushort itemLevel = UInt16.Parse(fields[64]); - short allowableClass = Int16.Parse(fields[65]); - ushort itemRandomSuffixGroupId = UInt16.Parse(fields[66]); - ushort randomProperty = UInt16.Parse(fields[67]); - ushort damageMin1 = UInt16.Parse(fields[68]); - ushort damageMin2 = UInt16.Parse(fields[69]); - ushort damageMin3 = UInt16.Parse(fields[70]); - ushort damageMin4 = UInt16.Parse(fields[71]); - ushort damageMin5 = UInt16.Parse(fields[72]); - ushort damageMax1 = UInt16.Parse(fields[73]); - ushort damageMax2 = UInt16.Parse(fields[74]); - ushort damageMax3 = UInt16.Parse(fields[75]); - ushort damageMax4 = UInt16.Parse(fields[76]); - ushort damageMax5 = UInt16.Parse(fields[77]); - short armor = Int16.Parse(fields[78]); - short holyResistance = Int16.Parse(fields[79]); - short fireResistance = Int16.Parse(fields[80]); - short natureResistance = Int16.Parse(fields[81]); - short frostResistance = Int16.Parse(fields[82]); - short shadowResistance = Int16.Parse(fields[83]); - short arcaneResistance = Int16.Parse(fields[84]); - ushort scalingStatDistributionId = UInt16.Parse(fields[85]); - byte expansionId = Byte.Parse(fields[86]); - byte artifactId = Byte.Parse(fields[87]); - byte spellWeight = Byte.Parse(fields[88]); - byte spellWeightCategory = Byte.Parse(fields[89]); - byte socketType1 = Byte.Parse(fields[90]); - byte socketType2 = Byte.Parse(fields[91]); - byte socketType3 = Byte.Parse(fields[92]); - byte sheatheType = Byte.Parse(fields[93]); - byte material = Byte.Parse(fields[94]); - byte pageMaterial = Byte.Parse(fields[95]); - byte pageLanguage = Byte.Parse(fields[96]); - byte bonding = Byte.Parse(fields[97]); - byte damageType = Byte.Parse(fields[98]); - sbyte statType1 = SByte.Parse(fields[99]); - sbyte statType2 = SByte.Parse(fields[100]); - sbyte statType3 = SByte.Parse(fields[101]); - sbyte statType4 = SByte.Parse(fields[102]); - sbyte statType5 = SByte.Parse(fields[103]); - sbyte statType6 = SByte.Parse(fields[104]); - sbyte statType7 = SByte.Parse(fields[105]); - sbyte statType8 = SByte.Parse(fields[106]); - sbyte statType9 = SByte.Parse(fields[107]); - sbyte statType10 = SByte.Parse(fields[108]); - byte containerSlots = Byte.Parse(fields[109]); - byte requiredReputationRank = Byte.Parse(fields[110]); - byte requiredCityRank = Byte.Parse(fields[111]); - byte requiredHonorRank = Byte.Parse(fields[112]); - byte inventoryType = Byte.Parse(fields[113]); - byte overallQualityId = Byte.Parse(fields[114]); - byte ammoType = Byte.Parse(fields[115]); - sbyte statValue1 = SByte.Parse(fields[116]); - sbyte statValue2 = SByte.Parse(fields[117]); - sbyte statValue3 = SByte.Parse(fields[118]); - sbyte statValue4 = SByte.Parse(fields[119]); - sbyte statValue5 = SByte.Parse(fields[120]); - sbyte statValue6 = SByte.Parse(fields[121]); - sbyte statValue7 = SByte.Parse(fields[122]); - sbyte statValue8 = SByte.Parse(fields[123]); - sbyte statValue9 = SByte.Parse(fields[124]); - sbyte statValue10 = SByte.Parse(fields[125]); - sbyte requiredLevel = SByte.Parse(fields[126]); + float dmgVariance = float.Parse(fields[7]); + uint durationInInventory = uint.Parse(fields[8]); + float qualityModifier = float.Parse(fields[9]); + uint bagFamily = uint.Parse(fields[10]); + float rangeMod = float.Parse(fields[11]); + float statPercentageOfSocket1 = float.Parse(fields[12]); + float statPercentageOfSocket2 = float.Parse(fields[13]); + float statPercentageOfSocket3 = float.Parse(fields[14]); + float statPercentageOfSocket4 = float.Parse(fields[15]); + float statPercentageOfSocket5 = float.Parse(fields[16]); + float statPercentageOfSocket6 = float.Parse(fields[17]); + float statPercentageOfSocket7 = float.Parse(fields[18]); + float statPercentageOfSocket8 = float.Parse(fields[19]); + float statPercentageOfSocket9 = float.Parse(fields[20]); + float statPercentageOfSocket10 = float.Parse(fields[21]); + int statPercentEditor1 = int.Parse(fields[22]); + int statPercentEditor2 = int.Parse(fields[23]); + int statPercentEditor3 = int.Parse(fields[24]); + int statPercentEditor4 = int.Parse(fields[25]); + int statPercentEditor5 = int.Parse(fields[26]); + int statPercentEditor6 = int.Parse(fields[27]); + int statPercentEditor7 = int.Parse(fields[28]); + int statPercentEditor8 = int.Parse(fields[29]); + int statPercentEditor9 = int.Parse(fields[30]); + int statPercentEditor10 = int.Parse(fields[31]); + int stackable = int.Parse(fields[32]); + int maxCount = int.Parse(fields[33]); + uint requiredAbility = uint.Parse(fields[34]); + uint sellPrice = uint.Parse(fields[35]); + uint buyPrice = uint.Parse(fields[36]); + uint vendorStackCount = uint.Parse(fields[37]); + float priceVariance = float.Parse(fields[38]); + float priceRandomValue = float.Parse(fields[39]); + int flags1 = int.Parse(fields[40]); + int flags2 = int.Parse(fields[41]); + int flags3 = int.Parse(fields[42]); + int flags4 = int.Parse(fields[43]); + int oppositeFactionItemId = int.Parse(fields[44]); + uint maxDurability = uint.Parse(fields[45]); + ushort itemNameDescriptionId = ushort.Parse(fields[46]); + ushort requiredTransmogHoliday = ushort.Parse(fields[47]); + ushort requiredHoliday = ushort.Parse(fields[48]); + ushort limitCategory = ushort.Parse(fields[49]); + ushort gemProperties = ushort.Parse(fields[50]); + ushort socketMatchEnchantmentId = ushort.Parse(fields[51]); + ushort totemCategoryId = ushort.Parse(fields[52]); + ushort instanceBound = ushort.Parse(fields[53]); + ushort zoneBound1 = ushort.Parse(fields[54]); + ushort zoneBound2 = ushort.Parse(fields[55]); + ushort itemSet = ushort.Parse(fields[56]); + ushort lockId = ushort.Parse(fields[57]); + ushort startQuestId = ushort.Parse(fields[58]); + ushort pageText = ushort.Parse(fields[59]); + ushort delay = ushort.Parse(fields[60]); + ushort requiredReputationId = ushort.Parse(fields[61]); + ushort requiredSkillRank = ushort.Parse(fields[62]); + ushort requiredSkill = ushort.Parse(fields[63]); + ushort itemLevel = ushort.Parse(fields[64]); + short allowableClass = short.Parse(fields[65]); + ushort itemRandomSuffixGroupId = ushort.Parse(fields[66]); + ushort randomProperty = ushort.Parse(fields[67]); + ushort damageMin1 = ushort.Parse(fields[68]); + ushort damageMin2 = ushort.Parse(fields[69]); + ushort damageMin3 = ushort.Parse(fields[70]); + ushort damageMin4 = ushort.Parse(fields[71]); + ushort damageMin5 = ushort.Parse(fields[72]); + ushort damageMax1 = ushort.Parse(fields[73]); + ushort damageMax2 = ushort.Parse(fields[74]); + ushort damageMax3 = ushort.Parse(fields[75]); + ushort damageMax4 = ushort.Parse(fields[76]); + ushort damageMax5 = ushort.Parse(fields[77]); + short armor = short.Parse(fields[78]); + short holyResistance = short.Parse(fields[79]); + short fireResistance = short.Parse(fields[80]); + short natureResistance = short.Parse(fields[81]); + short frostResistance = short.Parse(fields[82]); + short shadowResistance = short.Parse(fields[83]); + short arcaneResistance = short.Parse(fields[84]); + ushort scalingStatDistributionId = ushort.Parse(fields[85]); + byte expansionId = byte.Parse(fields[86]); + byte artifactId = byte.Parse(fields[87]); + byte spellWeight = byte.Parse(fields[88]); + byte spellWeightCategory = byte.Parse(fields[89]); + byte socketType1 = byte.Parse(fields[90]); + byte socketType2 = byte.Parse(fields[91]); + byte socketType3 = byte.Parse(fields[92]); + byte sheatheType = byte.Parse(fields[93]); + byte material = byte.Parse(fields[94]); + byte pageMaterial = byte.Parse(fields[95]); + byte pageLanguage = byte.Parse(fields[96]); + byte bonding = byte.Parse(fields[97]); + byte damageType = byte.Parse(fields[98]); + sbyte statType1 = sbyte.Parse(fields[99]); + sbyte statType2 = sbyte.Parse(fields[100]); + sbyte statType3 = sbyte.Parse(fields[101]); + sbyte statType4 = sbyte.Parse(fields[102]); + sbyte statType5 = sbyte.Parse(fields[103]); + sbyte statType6 = sbyte.Parse(fields[104]); + sbyte statType7 = sbyte.Parse(fields[105]); + sbyte statType8 = sbyte.Parse(fields[106]); + sbyte statType9 = sbyte.Parse(fields[107]); + sbyte statType10 = sbyte.Parse(fields[108]); + byte containerSlots = byte.Parse(fields[109]); + byte requiredReputationRank = byte.Parse(fields[110]); + byte requiredCityRank = byte.Parse(fields[111]); + byte requiredHonorRank = byte.Parse(fields[112]); + byte inventoryType = byte.Parse(fields[113]); + byte overallQualityId = byte.Parse(fields[114]); + byte ammoType = byte.Parse(fields[115]); + sbyte statValue1 = sbyte.Parse(fields[116]); + sbyte statValue2 = sbyte.Parse(fields[117]); + sbyte statValue3 = sbyte.Parse(fields[118]); + sbyte statValue4 = sbyte.Parse(fields[119]); + sbyte statValue5 = sbyte.Parse(fields[120]); + sbyte statValue6 = sbyte.Parse(fields[121]); + sbyte statValue7 = sbyte.Parse(fields[122]); + sbyte statValue8 = sbyte.Parse(fields[123]); + sbyte statValue9 = sbyte.Parse(fields[124]); + sbyte statValue10 = sbyte.Parse(fields[125]); + sbyte requiredLevel = sbyte.Parse(fields[126]); HotfixRecord record = new HotfixRecord(); record.Status = HotfixStatus.Valid; @@ -1975,33 +1975,33 @@ public static void LoadCreatureDisplayInfoHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - ushort modelId = UInt16.Parse(fields[1]); - ushort soundId = UInt16.Parse(fields[2]); - sbyte sizeClass = SByte.Parse(fields[3]); - float creatureModelScale = Single.Parse(fields[4]); - byte creatureModelAlpha = Byte.Parse(fields[5]); - byte bloodId = Byte.Parse(fields[6]); - int extendedDisplayInfoId = Int32.Parse(fields[7]); - ushort nPCSoundId = UInt16.Parse(fields[8]); - ushort particleColorId = UInt16.Parse(fields[9]); - int portraitCreatureDisplayInfoId = Int32.Parse(fields[10]); - int portraitTextureFileDataId = Int32.Parse(fields[11]); - ushort objectEffectPackageId = UInt16.Parse(fields[12]); - ushort animReplacementSetId = UInt16.Parse(fields[13]); - byte flags = Byte.Parse(fields[14]); - int stateSpellVisualKitId = Int32.Parse(fields[15]); - float playerOverrideScale = Single.Parse(fields[16]); - float petInstanceScale = Single.Parse(fields[17]); - sbyte unarmedWeaponType = SByte.Parse(fields[18]); - int mountPoofSpellVisualKitId = Int32.Parse(fields[19]); - int dissolveEffectId = Int32.Parse(fields[20]); - sbyte gender = SByte.Parse(fields[21]); - int dissolveOutEffectId = Int32.Parse(fields[22]); - sbyte creatureModelMinLod = SByte.Parse(fields[23]); - int textureVariationFileDataId1 = Int32.Parse(fields[24]); - int textureVariationFileDataId2 = Int32.Parse(fields[25]); - int textureVariationFileDataId3 = Int32.Parse(fields[26]); + uint id = uint.Parse(fields[0]); + ushort modelId = ushort.Parse(fields[1]); + ushort soundId = ushort.Parse(fields[2]); + sbyte sizeClass = sbyte.Parse(fields[3]); + float creatureModelScale = float.Parse(fields[4]); + byte creatureModelAlpha = byte.Parse(fields[5]); + byte bloodId = byte.Parse(fields[6]); + int extendedDisplayInfoId = int.Parse(fields[7]); + ushort nPCSoundId = ushort.Parse(fields[8]); + ushort particleColorId = ushort.Parse(fields[9]); + int portraitCreatureDisplayInfoId = int.Parse(fields[10]); + int portraitTextureFileDataId = int.Parse(fields[11]); + ushort objectEffectPackageId = ushort.Parse(fields[12]); + ushort animReplacementSetId = ushort.Parse(fields[13]); + byte flags = byte.Parse(fields[14]); + int stateSpellVisualKitId = int.Parse(fields[15]); + float playerOverrideScale = float.Parse(fields[16]); + float petInstanceScale = float.Parse(fields[17]); + sbyte unarmedWeaponType = sbyte.Parse(fields[18]); + int mountPoofSpellVisualKitId = int.Parse(fields[19]); + int dissolveEffectId = int.Parse(fields[20]); + sbyte gender = sbyte.Parse(fields[21]); + int dissolveOutEffectId = int.Parse(fields[22]); + sbyte creatureModelMinLod = sbyte.Parse(fields[23]); + int textureVariationFileDataId1 = int.Parse(fields[24]); + int textureVariationFileDataId2 = int.Parse(fields[25]); + int textureVariationFileDataId3 = int.Parse(fields[26]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.CreatureDisplayInfo; @@ -2060,21 +2060,21 @@ public static void LoadCreatureDisplayInfoExtraHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - sbyte displayRaceId = SByte.Parse(fields[1]); - sbyte displaySexId = SByte.Parse(fields[2]); - sbyte displayClassId = SByte.Parse(fields[3]); - sbyte skinId = SByte.Parse(fields[4]); - sbyte faceId = SByte.Parse(fields[5]); - sbyte hairStyleId = SByte.Parse(fields[6]); - sbyte hairColorId = SByte.Parse(fields[7]); - sbyte facialHairId = SByte.Parse(fields[8]); - sbyte flags = SByte.Parse(fields[9]); - int bakeMaterialResourcesId = Int32.Parse(fields[10]); - int hDBakeMaterialResourcesId = Int32.Parse(fields[11]); - byte customDisplayOption1 = Byte.Parse(fields[12]); - byte customDisplayOption2 = Byte.Parse(fields[13]); - byte customDisplayOption3 = Byte.Parse(fields[14]); + uint id = uint.Parse(fields[0]); + sbyte displayRaceId = sbyte.Parse(fields[1]); + sbyte displaySexId = sbyte.Parse(fields[2]); + sbyte displayClassId = sbyte.Parse(fields[3]); + sbyte skinId = sbyte.Parse(fields[4]); + sbyte faceId = sbyte.Parse(fields[5]); + sbyte hairStyleId = sbyte.Parse(fields[6]); + sbyte hairColorId = sbyte.Parse(fields[7]); + sbyte facialHairId = sbyte.Parse(fields[8]); + sbyte flags = sbyte.Parse(fields[9]); + int bakeMaterialResourcesId = int.Parse(fields[10]); + int hDBakeMaterialResourcesId = int.Parse(fields[11]); + byte customDisplayOption1 = byte.Parse(fields[12]); + byte customDisplayOption2 = byte.Parse(fields[13]); + byte customDisplayOption3 = byte.Parse(fields[14]); HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.CreatureDisplayInfoExtra; @@ -2121,10 +2121,10 @@ public static void LoadCreatureDisplayInfoOptionHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - uint id = UInt32.Parse(fields[0]); - int chrCustomizationOptionId = Int32.Parse(fields[1]); - int chrCustomizationChoiceId = Int32.Parse(fields[2]); - int creatureDisplayInfoExtraId = Int32.Parse(fields[3]); + uint id = uint.Parse(fields[0]); + int chrCustomizationOptionId = int.Parse(fields[1]); + int chrCustomizationChoiceId = int.Parse(fields[2]); + int creatureDisplayInfoExtraId = int.Parse(fields[3]); HotfixRecord record = new HotfixRecord(); record.Status = HotfixStatus.Valid; diff --git a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs index 479acc41..cfee861b 100644 --- a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs @@ -32,7 +32,7 @@ void HandleGossipSelectOption(GossipSelectOption gossip) if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteUInt32(gossip.GossipID); packet.WriteUInt32(gossip.GossipIndex); - if (!String.IsNullOrEmpty(gossip.PromotionCode)) + if (!string.IsNullOrEmpty(gossip.PromotionCode)) packet.WriteCString(gossip.PromotionCode); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs index 8767cfc8..a631d348 100644 --- a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs @@ -37,7 +37,7 @@ SpellCastTargetFlags ConvertSpellTargetFlags(SpellTargetData target) targetFlags |= SpellCastTargetFlags.SourceLocation; if (target.DstLocation != null) targetFlags |= SpellCastTargetFlags.DestLocation; - if (!String.IsNullOrEmpty(target.Name)) + if (!string.IsNullOrEmpty(target.Name)) targetFlags |= SpellCastTargetFlags.String; return targetFlags; } diff --git a/HermesProxy/World/Server/Packets/ChatPackets.cs b/HermesProxy/World/Server/Packets/ChatPackets.cs index c0eb5cf7..1cb73a3c 100644 --- a/HermesProxy/World/Server/Packets/ChatPackets.cs +++ b/HermesProxy/World/Server/Packets/ChatPackets.cs @@ -299,7 +299,7 @@ public ChatPkt(GlobalSessionData globalSession, ChatMessageTypeModern chatType, Prefix = addonPrefix; SenderGUID = sender != null ? sender : WowGuid128.Empty; - if (String.IsNullOrEmpty(senderName) && sender != null) + if (string.IsNullOrEmpty(senderName) && sender != null) SenderName = globalSession.GameState.GetPlayerName(sender); else SenderName = senderName; @@ -309,7 +309,7 @@ public ChatPkt(GlobalSessionData globalSession, ChatMessageTypeModern chatType, PartyGUID = WowGuid128.Empty; TargetGUID = receiver != null ? receiver : WowGuid128.Empty; - if (String.IsNullOrEmpty(receiverName) && receiver != null) + if (string.IsNullOrEmpty(receiverName) && receiver != null) TargetName = globalSession.GameState.GetPlayerName(receiver); else TargetName = receiverName; diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index 5f9f43f4..89deb3e6 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -151,11 +151,11 @@ public void InitializePlaceholders() if (GameObjectData.Level == null) GameObjectData.Level = (int)period; if (ObjectData.DynamicFlags == null) - ObjectData.DynamicFlags = (((uint)(((float)(CreateData.MoveInfo.TransportPathTimer % period) / (float)period) * System.UInt16.MaxValue)) << 16); + ObjectData.DynamicFlags = (((uint)(((float)(CreateData.MoveInfo.TransportPathTimer % period) / (float)period) * ushort.MaxValue)) << 16); GameObjectData.Flags = 1048616; } else if (ObjectData.DynamicFlags == null) - ObjectData.DynamicFlags = ((CreateData.MoveInfo.TransportPathTimer % System.UInt16.MaxValue) << 16); + ObjectData.DynamicFlags = ((CreateData.MoveInfo.TransportPathTimer % ushort.MaxValue) << 16); } } if (CorpseData != null) diff --git a/HermesProxy/World/SniffFile.cs b/HermesProxy/World/SniffFile.cs index aa4a1260..876f99bf 100644 --- a/HermesProxy/World/SniffFile.cs +++ b/HermesProxy/World/SniffFile.cs @@ -26,7 +26,7 @@ public void WriteHeader() _fileWriter.Write('P'); _fileWriter.Write('K'); _fileWriter.Write('T'); - UInt16 sniffVersion = 0x201; + ushort sniffVersion = 0x201; _fileWriter.Write(sniffVersion); _fileWriter.Write(_gameVersion); From 733d3e695911f3e22aeeef1074b3151077c878c6 Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:30:51 +0100 Subject: [PATCH 3/8] Removed trailing whitespaces Please install: https://marketplace.visualstudio.com/items?itemName=MadsKristensen.TrailingWhitespaceVisualizer --- HermesProxy/Auth/AuthClient.cs | 4 ++-- HermesProxy/Auth/AuthResult.cs | 2 +- .../Managers/LoginServiceManager.cs | 4 ++-- .../Networking/BnetRestApiSession.cs | 2 +- .../Networking/BnetServerCertificate.cs | 2 +- .../BnetServer/Networking/BnetTcpSession.cs | 6 ++--- .../BnetServer/Services/BnetServices.cs | 4 ++-- .../Services/Services/Authentication.cs | 2 +- HermesProxy/Configuration/Configuration.cs | 2 +- HermesProxy/Configuration/Settings.cs | 4 ++-- HermesProxy/GlobalSessionData.cs | 10 ++++----- HermesProxy/Realm/Realm.cs | 2 +- HermesProxy/Realm/RealmConst.cs | 2 +- HermesProxy/Realm/RealmId.cs | 2 +- HermesProxy/Realm/RealmManager.cs | 4 ++-- .../PacketHandlers/BattleGroundHandler.cs | 2 +- .../Client/PacketHandlers/ChatHandler.cs | 2 +- .../Client/PacketHandlers/GroupHandler.cs | 6 ++--- .../Client/PacketHandlers/GuildHandler.cs | 6 ++--- .../Client/PacketHandlers/ItemHandler.cs | 4 ++-- .../Client/PacketHandlers/MailHandler.cs | 2 +- .../Client/PacketHandlers/MiscHandler.cs | 2 +- .../World/Client/PacketHandlers/PetHandler.cs | 2 +- .../Client/PacketHandlers/PetitionHandler.cs | 2 +- .../Client/PacketHandlers/UpdateHandler.cs | 22 +++++++++---------- .../PacketHandlers/WorldStateHandler.cs | 2 +- .../World/Enums/BattlegroundDefines.cs | 2 +- HermesProxy/World/Enums/EnchantmentSlot.cs | 2 +- HermesProxy/World/Enums/PlayerDefines.cs | 2 +- HermesProxy/World/GameData.cs | 8 +++---- .../World/Objects/CharacterCustomizations.cs | 14 ++++++------ HermesProxy/World/Objects/MovementInfo.cs | 4 ++-- .../World/Objects/UpdateFieldsArray.cs | 2 +- .../V1_14_0_40237/ObjectUpdateBuilder.cs | 4 ++-- .../V1_14_1_40688/ObjectUpdateBuilder.cs | 4 ++-- .../V2_5_2_39570/ObjectUpdateBuilder.cs | 4 ++-- HermesProxy/World/Packet.cs | 2 +- .../World/Server/AccountDataManager.cs | 10 ++++----- .../World/Server/CurrentPlayerStorage.cs | 6 ++--- .../Server/PacketHandlers/AuctionHandler.cs | 2 +- .../Server/PacketHandlers/PetitionHandler.cs | 2 +- .../Server/PacketHandlers/QuestHandler.cs | 4 ++-- .../Server/PacketHandlers/SessionHandler.cs | 2 +- .../Server/PacketHandlers/SpellHandler.cs | 6 ++--- .../Server/Packets/AccountDataPackets.cs | 2 +- .../World/Server/Packets/ArenaPackets.cs | 2 +- .../World/Server/Packets/AuctionPackets.cs | 2 +- .../Server/Packets/AuthenticationPackets.cs | 2 +- .../Server/Packets/BattleGroundPackets.cs | 2 +- .../World/Server/Packets/CharacterPackets.cs | 6 ++--- .../World/Server/Packets/ChatPackets.cs | 2 +- .../Server/Packets/ClientConfigPackets.cs | 2 +- .../World/Server/Packets/CombatPackets.cs | 2 +- .../World/Server/Packets/DuelPackets.cs | 2 +- .../World/Server/Packets/GameObjectPackets.cs | 2 +- .../World/Server/Packets/GroupPackets.cs | 2 +- .../World/Server/Packets/GuildPackets.cs | 2 +- .../World/Server/Packets/HotfixPackets.cs | 2 +- .../World/Server/Packets/InstancePackets.cs | 2 +- .../World/Server/Packets/ItemPackets.cs | 4 ++-- .../World/Server/Packets/LootPackets.cs | 2 +- .../World/Server/Packets/MailPackets.cs | 2 +- .../World/Server/Packets/MiscPackets.cs | 6 ++--- .../World/Server/Packets/MovementPackets.cs | 4 ++-- .../World/Server/Packets/NPCPackets.cs | 2 +- .../World/Server/Packets/PetPackets.cs | 2 +- .../World/Server/Packets/PetitionPackets.cs | 2 +- .../World/Server/Packets/QueryPackets.cs | 2 +- .../World/Server/Packets/QuestPackets.cs | 2 +- .../World/Server/Packets/ReputationPackets.cs | 2 +- .../World/Server/Packets/SessionPackets.cs | 2 +- .../World/Server/Packets/SocialPackets.cs | 2 +- .../World/Server/Packets/SpellPackets.cs | 4 ++-- .../World/Server/Packets/SystemPackets.cs | 6 ++--- .../World/Server/Packets/TaxiPackets.cs | 2 +- .../World/Server/Packets/TradePackets.cs | 2 +- .../World/Server/Packets/UpdatePackets.cs | 8 +++---- .../World/Server/Packets/WorldStatePackets.cs | 2 +- HermesProxy/World/Server/WorldSocket.cs | 8 +++---- .../World/Server/WorldSocketManager.cs | 2 +- 80 files changed, 143 insertions(+), 143 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index 89278b7c..5576c8d0 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -31,7 +31,7 @@ public partial class AuthClient TaskCompletionSource _hasRealmlist; byte[] _passwordHash; BigInteger _key; - byte[] _m2; + byte[] _m2; string _username; string _locale; @@ -103,7 +103,7 @@ private void SetAuthResponse(AuthResult response) { _response.TrySetResult(response); } - + public void Disconnect() { if (!IsConnected()) diff --git a/HermesProxy/Auth/AuthResult.cs b/HermesProxy/Auth/AuthResult.cs index 319243f9..e499b635 100644 --- a/HermesProxy/Auth/AuthResult.cs +++ b/HermesProxy/Auth/AuthResult.cs @@ -36,7 +36,7 @@ public enum AuthResult : byte FAIL_UNLOCKABLE_LOCK = 0x19, // Your account has been locked but can be unlocked. FAIL_CONVERSION_REQUIRE = 0x20, // This account needs to be converted to a Battle.net account. Please [Click Here] or go to: to begin conversion. FAIL_DISCONNECTED = 0xFF, - + // HermesProxy internal variables FAIL_INTERNAL_ERROR = 0xFE, // Internal error FAIL_WRONG_MODERN_VER = 0xFD, // Modern client is using unsupported version diff --git a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs index 029f4336..4203a2e9 100644 --- a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs +++ b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs @@ -17,7 +17,7 @@ public class LoginServiceManager : Singleton IPEndPoint localAddress; X509Certificate2 certificate; - LoginServiceManager() + LoginServiceManager() { formInputs = new FormInputs(); } @@ -48,7 +48,7 @@ public void Initialize() } localAddress = new IPEndPoint(address, port); - // set up form inputs + // set up form inputs formInputs.Type = "LOGIN_FORM"; var input = new FormInput(); diff --git a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs index 2e669e53..bbbfac6c 100644 --- a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs @@ -49,7 +49,7 @@ public bool RequestRouter(HttpHeader httpRequest) string path = httpRequest.Path.Substring(BNET_SERVER_BASE_PATH.Length); string[] pathElements = path.Split('/'); - switch (pathElements[0], httpRequest.Method) + switch (pathElements[0], httpRequest.Method) { case ("login", "GET"): SendResponse(HttpCode.Ok, LoginServiceManager.Instance.GetFormInput()); diff --git a/HermesProxy/BnetServer/Networking/BnetServerCertificate.cs b/HermesProxy/BnetServer/Networking/BnetServerCertificate.cs index 5215e686..3042d8ec 100644 --- a/HermesProxy/BnetServer/Networking/BnetServerCertificate.cs +++ b/HermesProxy/BnetServer/Networking/BnetServerCertificate.cs @@ -23,6 +23,6 @@ static BnetServerCertificate() byte[] bytes = ms.ToArray(); Certificate = new X509Certificate2(bytes); } - } + } } } diff --git a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs index 7facb5e1..5b320627 100644 --- a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs @@ -44,12 +44,12 @@ public override bool Update() } private List _currentBuffer = new List(); - + public override async Task ReadHandler(byte[] data, int receivedLength) { if (!IsOpen()) return; - + _currentBuffer.AddRange(data.Take(receivedLength)); await ProcessCurrentBuffer(); @@ -125,7 +125,7 @@ public byte[] GetHeaderSize(Header header) } public class AccountInfo - { + { public uint Id; public WowGuid128 BnetAccountGuid => WowGuid128.Create(HighGuidType703.BNetAccount, Id); public string Login; diff --git a/HermesProxy/BnetServer/Services/BnetServices.cs b/HermesProxy/BnetServer/Services/BnetServices.cs index e80f1d96..dfaa40f0 100644 --- a/HermesProxy/BnetServer/Services/BnetServices.cs +++ b/HermesProxy/BnetServer/Services/BnetServices.cs @@ -59,7 +59,7 @@ private void ServiceLog(LogType type, string message) StringBuilder prefix = new StringBuilder(); prefix.Append($"[{_connectionPath}]"); prefix.Append($"[{GetRemoteIpEndPoint()}"); - + if (GetSession() != null) { if (GetSession().AccountInfo != null && !GetSession().AccountInfo.Login.IsEmpty()) @@ -68,7 +68,7 @@ private void ServiceLog(LogType type, string message) if (GetSession().GameAccountInfo != null) prefix.Append(", Game account: " + GetSession().GameAccountInfo.Name); } - + prefix.Append(']'); Log.Print(type, $"{prefix} {message}"); diff --git a/HermesProxy/BnetServer/Services/Services/Authentication.cs b/HermesProxy/BnetServer/Services/Services/Authentication.cs index 9a8ab113..b15cf9e4 100644 --- a/HermesProxy/BnetServer/Services/Services/Authentication.cs +++ b/HermesProxy/BnetServer/Services/Services/Authentication.cs @@ -44,7 +44,7 @@ BattlenetRpcErrorCode HandleLogon(LogonRequest logonRequest, NoData response) var endpoint = LoginServiceManager.Instance.GetAddressForClient(GetRemoteIpEndPoint().Address); ChallengeExternalRequest externalChallenge = new(); - externalChallenge.PayloadType = "web_auth_url"; + externalChallenge.PayloadType = "web_auth_url"; externalChallenge.Payload = ByteString.CopyFromUtf8($"https://{endpoint.Address}:{endpoint.Port}/bnetserver/login/{logonRequest.Platform}/{logonRequest.ApplicationVersion}/{logonRequest.Locale}/"); SendRequest(OriginalHash.ChallengeListener, 3, externalChallenge); diff --git a/HermesProxy/Configuration/Configuration.cs b/HermesProxy/Configuration/Configuration.cs index b780a23f..c776eb5d 100644 --- a/HermesProxy/Configuration/Configuration.cs +++ b/HermesProxy/Configuration/Configuration.cs @@ -9,7 +9,7 @@ namespace Framework { public class Configuration - { + { private const string DEFAULT_CONFIG_FILE = "HermesProxy.config"; private readonly KeyValueConfigurationCollection _settingsCollection; diff --git a/HermesProxy/Configuration/Settings.cs b/HermesProxy/Configuration/Settings.cs index 0ccb1d25..af4c54d5 100644 --- a/HermesProxy/Configuration/Settings.cs +++ b/HermesProxy/Configuration/Settings.cs @@ -29,13 +29,13 @@ public static class Settings public static bool VerifyConfig() { - + if (ClientSeed.Length != 16) { Log.Print(LogType.Server, "ClientSeed must have byte length of 16 (32 characters)"); return false; } - + if (!IsValidPortNumber(RestPort)) { Log.Print(LogType.Server, $"Specified battle.net port ({RestPort}) out of allowed range (1-65535)"); diff --git a/HermesProxy/GlobalSessionData.cs b/HermesProxy/GlobalSessionData.cs index ad9a5783..b531b947 100644 --- a/HermesProxy/GlobalSessionData.cs +++ b/HermesProxy/GlobalSessionData.cs @@ -105,7 +105,7 @@ public class GameSessionData private GameSessionData() { - + } public static GameSessionData CreateNewGameSessionData(GlobalSessionData globalSession) @@ -114,7 +114,7 @@ public static GameSessionData CreateNewGameSessionData(GlobalSessionData globalS self.CurrentPlayerStorage = new CurrentPlayerStorage(globalSession); return self; } - + public uint GetCurrentGroupSize() { var group = GetCurrentGroup(); @@ -486,7 +486,7 @@ public WowGuid128 GetPetGuidByNumber(uint petNumber) { ObjectCacheMutex.ReleaseMutex(); return itr.Key; - } + } } ObjectCacheMutex.ReleaseMutex(); return null; @@ -722,7 +722,7 @@ public class GlobalSessionData public string OS; public uint Build; public GameSessionData GameState; - + public RealmId RealmId; public RealmManager RealmManager = new(); public Realm? Realm => RealmManager.GetRealm(RealmId); @@ -743,7 +743,7 @@ public GlobalSessionData() { GameState = GameSessionData.CreateNewGameSessionData(this); } - + public void StoreGuildRankNames(uint guildId, List ranks) { if (GuildRanks.ContainsKey(guildId)) diff --git a/HermesProxy/Realm/Realm.cs b/HermesProxy/Realm/Realm.cs index 6791a983..09c8b54f 100644 --- a/HermesProxy/Realm/Realm.cs +++ b/HermesProxy/Realm/Realm.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/Realm/RealmConst.cs b/HermesProxy/Realm/RealmConst.cs index ac12394a..d35af8f0 100644 --- a/HermesProxy/Realm/RealmConst.cs +++ b/HermesProxy/Realm/RealmConst.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/Realm/RealmId.cs b/HermesProxy/Realm/RealmId.cs index 2114b367..ffb63d08 100644 --- a/HermesProxy/Realm/RealmId.cs +++ b/HermesProxy/Realm/RealmId.cs @@ -6,7 +6,7 @@ namespace Framework.Realm { public struct RealmId : IEquatable - { + { public uint Index { get; set; } public byte Region { get; set; } public byte Site { get; set; } diff --git a/HermesProxy/Realm/RealmManager.cs b/HermesProxy/Realm/RealmManager.cs index 3e6d3ea3..b1a1cf55 100644 --- a/HermesProxy/Realm/RealmManager.cs +++ b/HermesProxy/Realm/RealmManager.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -58,7 +58,7 @@ void LoadBuildInfo() public void Close() { - + } void UpdateRealm(Realm realm) diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs index 984e8f3d..1027e13f 100644 --- a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs @@ -76,7 +76,7 @@ void HandleBattlefieldListWotLK(WorldPacket packet) } SendPacketToClient(bglist); } - + [PacketHandler(Opcode.SMSG_BATTLEFIELD_STATUS, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleBattlefieldStatusVanilla(WorldPacket packet) { diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs index 6d3e9234..796518c3 100644 --- a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs @@ -346,7 +346,7 @@ public void SendMessageChatVanilla(ChatMessageTypeVanilla type, uint lang, strin { return; // was handled by us } - + WorldPacket packet = new WorldPacket(Opcode.CMSG_MESSAGECHAT); packet.WriteUInt32((uint)type); packet.WriteUInt32(lang); diff --git a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs index 2bc6d8ae..d78ce84e 100644 --- a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs @@ -344,7 +344,7 @@ void HandleRaidTargetUpdate(WorldPacket packet) update.ChangedBy = packet.ReadGuid().To128(GetSession().GameState); else update.ChangedBy = GetSession().GameState.CurrentPlayerGuid; - + update.Symbol = packet.ReadInt8(); update.Target = packet.ReadGuid().To128(GetSession().GameState); SendPacketToClient(update); @@ -469,7 +469,7 @@ void HandlePartyMemberStats(WorldPacket packet) state.Pet = new PartyMemberPetStats(); state.Pet.NewPetGuid = packet.ReadGuid().To128(GetSession().GameState); } - + if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetName)) { @@ -737,7 +737,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) state.PartyType[0] = 1; state.PartyType[1] = 0; } - + state.MemberGuid = packet.ReadPackedGuid().To128(GetSession().GameState); var updateFlags = (GroupUpdateFlagVanilla)packet.ReadUInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs index 0a247696..673c98c4 100644 --- a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs @@ -298,7 +298,7 @@ void HandleGuildRoster(WorldPacket packet) } SendPacketToClient(ranks); } - + for (var i = 0; i < membersCount; i++) { @@ -428,7 +428,7 @@ void HandleGuildBankQueryResults(WorldPacket packet) itemInfo.SocketEnchant.Add(gem); } } - } + } } result.ItemInfo.Add(itemInfo); } @@ -460,7 +460,7 @@ void HandleGuildBankLongQuery(WorldPacket packet) GuildBankLogEntry logEntry = new GuildBankLogEntry(); logEntry.EntryType = packet.ReadInt8(); logEntry.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); - + if (result.Tab != maxTabs) { logEntry.ItemID = packet.ReadInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs index 3fe38444..ea3af8c8 100644 --- a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs @@ -34,7 +34,7 @@ void HandleItemPushResult(WorldPacket packet) bool fromNPC = packet.ReadUInt32() == 1; item.Created = packet.ReadUInt32() == 1; bool showInChat = packet.ReadUInt32() == 1; - + if (fromNPC && !item.Created) { item.DisplayText = ItemPushResult.DisplayType.Received; @@ -84,7 +84,7 @@ void HandleItemPushResult(WorldPacket packet) item.ItemGUID = GetSession().GameState.GetInventorySlotItem(item.SlotInBag).To128(GetSession().GameState); else item.ItemGUID = WowGuid128.Empty; - + SendPacketToClient(item); } [PacketHandler(Opcode.SMSG_READ_ITEM_RESULT_OK)] diff --git a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs index d5d4d539..88ad8332 100644 --- a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs @@ -115,7 +115,7 @@ void HandleMailListResult(WorldPacket packet) { mailItem.AttachID = 1; mail.Attachments.Add(mailItem); - } + } } mail.SentMoney = packet.ReadUInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs index e14f719b..4473cbfb 100644 --- a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs @@ -139,7 +139,7 @@ void HandleAreaTriggerMessage(WorldPacket packet) void HandleCorpseQuery(WorldPacket packet) { CorpseLocation corpse = new(); - + corpse.Valid = packet.ReadBool(); if (!corpse.Valid) { diff --git a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs index 2ad0c439..3eef57d0 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs @@ -58,7 +58,7 @@ void HandlePetSpellsMessage(WorldPacket packet) spells.Cooldowns.Add(cooldown); } - + SendPacketToClient(spells); } diff --git a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs index 07efb244..715c9e66 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs @@ -19,7 +19,7 @@ void HandlePetitionShowList(WorldPacket packet) for (var i = 0; i < count; i++) { PetitionEntry petition = new PetitionEntry(); - petition.Index = packet.ReadUInt32(); + petition.Index = packet.ReadUInt32(); petition.CharterEntry = packet.ReadUInt32(); packet.ReadUInt32(); // Charter Display petition.CharterCost = packet.ReadUInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index 1ddd224d..e3a4e238 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -140,7 +140,7 @@ void HandleUpdateObject(WorldPacket packet) } else Log.Print(LogType.Error, $"Broken create1 without position for {guid}"); - + break; } case UpdateTypeLegacy.CreateObject2: @@ -743,7 +743,7 @@ private Dictionary ReadValuesUpdateBlock(WorldPacket packet, r else dict[start + k] = fieldData[k]; } - } + } } return dict; @@ -885,7 +885,7 @@ void ReadMovementUpdateBlock(WorldPacket packet, WowGuid guid, ObjectUpdate upda monsterMove.SplineTime = packet.ReadUInt32(); monsterMove.SplineTimeFull = packet.ReadUInt32(); monsterMove.SplineId = packet.ReadUInt32(); - + if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_0_9767)) { packet.ReadFloat(); // Spline Duration Multiplier @@ -1439,7 +1439,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u { if (updateMaskArray[UNIT_FIELD_POWER1 + i]) { - if (powerUpdate != null && + if (powerUpdate != null && (guid == GetSession().GameState.CurrentPlayerGuid || guid == GetSession().GameState.CurrentPetGuid)) powerUpdate.Powers.Add(new PowerUpdatePower(updates[UNIT_FIELD_POWER1 + i].Int32Value, (byte)i)); @@ -1455,7 +1455,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u classId = GetSession().GameState.GetUnitClass(guid.To128(GetSession().GameState)); powerSlot = ClassPowerTypes.GetPowerSlotForClass(classId, (PowerType)i); } - + if (powerSlot >= 0) updateData.UnitData.Power[powerSlot] = updates[UNIT_FIELD_POWER1 + i].Int32Value; } @@ -2047,7 +2047,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u int PLAYER_FIELD_BANK_SLOT_1 = LegacyVersion.GetUpdateField(PlayerField.PLAYER_FIELD_BANK_SLOT_1); if (PLAYER_FIELD_BANK_SLOT_1 >= 0) { - int bankSlots = LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) ? 28 : 24; // 2.0.0.5965 Alpha + int bankSlots = LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) ? 28 : 24; // 2.0.0.5965 Alpha for (int i = 0; i < bankSlots; i++) { if (updateMaskArray[PLAYER_FIELD_BANK_SLOT_1 + i * 2]) @@ -2057,7 +2057,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u int PLAYER_FIELD_BANKBAG_SLOT_1 = LegacyVersion.GetUpdateField(PlayerField.PLAYER_FIELD_BANKBAG_SLOT_1); if (PLAYER_FIELD_BANKBAG_SLOT_1 >= 0) { - int bankBagSlots = LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) ? 7 : 6; // 2.0.0.5965 Alpha + int bankBagSlots = LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) ? 7 : 6; // 2.0.0.5965 Alpha for (int i = 0; i < bankBagSlots; i++) { if (updateMaskArray[PLAYER_FIELD_BANKBAG_SLOT_1 + i * 2]) @@ -2133,7 +2133,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u sexId = cache.SexId; } } - + if (raceId != Race.None && sexId != Gender.None) { var customizations = CharacterCustomizations.ConvertLegacyCustomizationsToModern(raceId, sexId, (byte)skin, (byte)face, (byte)hairStyle, (byte)hairColor, (byte)facialHair); @@ -2432,7 +2432,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u } else updateData.ActivePlayerData.GrantableLevels = (byte)((updates[PLAYER_FIELD_BYTES].UInt32Value >> 8) & 0xFF); - + updateData.ActivePlayerData.MultiActionBars = (byte)((updates[PLAYER_FIELD_BYTES].UInt32Value >> 16) & 0xFF); updateData.ActivePlayerData.LifetimeMaxRank = (byte)((updates[PLAYER_FIELD_BYTES].UInt32Value >> 24) & 0xFF); } @@ -2572,7 +2572,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u for (int i = 0; i < 3; i++) { int startOffset = PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + i * sizePerEntry; - + if (updateMaskArray[startOffset + teamIdOffset] && guid == GetSession().GameState.CurrentPlayerGuid) { @@ -2595,7 +2595,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u SendPacketToClient(response); } } - + /* if (updateMaskArray[startOffset + teamMemberOffset]) { diff --git a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs index a1d1c373..17b072d5 100644 --- a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs @@ -76,7 +76,7 @@ void HandleUpdateWorldState(WorldPacket packet) WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); GetSession().GameState.HasWsgAllyFlagCarrier = update.Value == 2; - } + } else if (update.VariableID == (uint)WorldStates.WsgFlagStateHorde) { WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); diff --git a/HermesProxy/World/Enums/BattlegroundDefines.cs b/HermesProxy/World/Enums/BattlegroundDefines.cs index 403b24a1..ff8d1c5a 100644 --- a/HermesProxy/World/Enums/BattlegroundDefines.cs +++ b/HermesProxy/World/Enums/BattlegroundDefines.cs @@ -13,7 +13,7 @@ public enum BattlegroundMapID : uint WarsongGulch = 489, ArathiBasin = 529, } - + public enum BattleGroundStatus : uint { None = 0, // first status, should mean bg is not instance diff --git a/HermesProxy/World/Enums/EnchantmentSlot.cs b/HermesProxy/World/Enums/EnchantmentSlot.cs index 36f81f5d..30bd5668 100644 --- a/HermesProxy/World/Enums/EnchantmentSlot.cs +++ b/HermesProxy/World/Enums/EnchantmentSlot.cs @@ -79,7 +79,7 @@ public static class EnchantmentSlot public static int Max = 13; } } - + public enum EnchantmentOffset { diff --git a/HermesProxy/World/Enums/PlayerDefines.cs b/HermesProxy/World/Enums/PlayerDefines.cs index 039191d0..641f20a7 100644 --- a/HermesProxy/World/Enums/PlayerDefines.cs +++ b/HermesProxy/World/Enums/PlayerDefines.cs @@ -917,7 +917,7 @@ public struct InventorySlots public const byte DefaultSize = 16; } } - + public struct EquipmentSlot { diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index 69cfe2a1..7cd5b6af 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -115,7 +115,7 @@ public static QuestObjective GetQuestObjectiveForItem(uint entry) return result; } - + public static void StoreCreatureTemplate(uint entry, CreatureTemplate template) { if (CreatureTemplates.ContainsKey(entry)) @@ -983,7 +983,7 @@ public static void LoadQuestBits() } } } - + #endregion #region HotFixes // Stores @@ -1021,7 +1021,7 @@ public static void LoadHotfixes() LoadCreatureDisplayInfoExtraHotfixes(); LoadCreatureDisplayInfoOptionHotfixes(); } - + public static void LoadAreaTriggerHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"AreaTrigger{ModernVersion.ExpansionVersion}.csv"); @@ -1123,7 +1123,7 @@ public static void LoadSkillLineHotfixes() uint parentTierIndex = uint.Parse(fields[10]); ushort flags = ushort.Parse(fields[11]); uint spellBookSpellID = uint.Parse(fields[12]); - + HotfixRecord record = new HotfixRecord(); record.TableHash = DB2Hash.SkillLine; record.HotfixId = HotfixSkillLineBegin + counter; diff --git a/HermesProxy/World/Objects/CharacterCustomizations.cs b/HermesProxy/World/Objects/CharacterCustomizations.cs index a4d3a52c..969d8638 100644 --- a/HermesProxy/World/Objects/CharacterCustomizations.cs +++ b/HermesProxy/World/Objects/CharacterCustomizations.cs @@ -2557,7 +2557,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega { case LegacyCustomizationOption.Skin: return 19; // Orc Male - Skin Color - case LegacyCustomizationOption.Face: + case LegacyCustomizationOption.Face: return 20; // Orc Male - Face case LegacyCustomizationOption.HairStyle: return 21; // Orc Male - Hair Style @@ -2620,7 +2620,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.NightElf: { if (gender == Gender.Male) @@ -2656,7 +2656,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.Undead: { if (gender == Gender.Male) @@ -2728,7 +2728,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.Gnome: { if (gender == Gender.Male) @@ -2800,7 +2800,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.Goblin: { if (gender == Gender.Male) @@ -2858,7 +2858,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.Draenei: { if (gender == Gender.Male) @@ -2894,7 +2894,7 @@ public static uint GetModernCustomizationOption(Race raceId, Gender gender, Lega } } return 0; - } + } case Race.FelOrc: { if (gender == Gender.Male) diff --git a/HermesProxy/World/Objects/MovementInfo.cs b/HermesProxy/World/Objects/MovementInfo.cs index 1a13219e..1f126a03 100644 --- a/HermesProxy/World/Objects/MovementInfo.cs +++ b/HermesProxy/World/Objects/MovementInfo.cs @@ -178,7 +178,7 @@ public void WriteMovementInfoLegacy(WorldPacket data) else flags |= (uint)MovementFlagVanilla.OnTransport; } - + data.WriteUInt32(flags); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -385,7 +385,7 @@ public void WriteMovementInfoModern(WorldPacket data, WowGuid128 guid) data.WriteBits(moveInfo.Flags, 30); data.WriteBits(moveInfo.FlagsExtra, 18); } - + data.WriteBit(moveInfo.TransportGuid != null); // HasTransport data.WriteBit(hasFall); // HasFall data.WriteBit(HasSplineData); // HasSpline - marks that the unit uses spline movement diff --git a/HermesProxy/World/Objects/UpdateFieldsArray.cs b/HermesProxy/World/Objects/UpdateFieldsArray.cs index 17e07351..fbb55674 100644 --- a/HermesProxy/World/Objects/UpdateFieldsArray.cs +++ b/HermesProxy/World/Objects/UpdateFieldsArray.cs @@ -280,7 +280,7 @@ public void SetUpdateField(int index, uint[] values, DynamicFieldChangeType chan { arrayMask.ValueCount = values.Length; arrayMask.SetCount(values.Length); - } + } for (var v = 0; v < values.Length; ++v) { diff --git a/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs index e1c9caa5..80912467 100644 --- a/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V1_14_0_40237/ObjectUpdateBuilder.cs @@ -655,7 +655,7 @@ public static void WriteCreateObjectSplineDataBlock(ServerSideMovement moveSplin data.WriteUInt32(moveSpline.spell_effect_extra.Value.ProgressCurveId); data.WriteUInt32(moveSpline.spell_effect_extra.Value.ParabolicCurveId); } - + if (moveSpline.splineflags.HasFlag(SplineFlag.Parabolic)) { data.WriteFloat(moveSpline.vertical_acceleration); @@ -1147,7 +1147,7 @@ public void WriteValuesToArray() if (playerData.QuestLog[i].EndTime != null) m_fields.SetUpdateField(startIndex + i * sizePerEntry + 2 + 12, (uint)playerData.QuestLog[i].EndTime); if (playerData.QuestLog[i].AcceptTime != null) - m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); + m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); } } for (int i = 0; i < 19; i++) diff --git a/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs index 6e2b035a..5eb44a0f 100644 --- a/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V1_14_1_40688/ObjectUpdateBuilder.cs @@ -655,7 +655,7 @@ public static void WriteCreateObjectSplineDataBlock(ServerSideMovement moveSplin data.WriteUInt32(moveSpline.spell_effect_extra.Value.ProgressCurveId); data.WriteUInt32(moveSpline.spell_effect_extra.Value.ParabolicCurveId); } - + if (moveSpline.splineflags.HasFlag(SplineFlag.Parabolic)) { data.WriteFloat(moveSpline.vertical_acceleration); @@ -1147,7 +1147,7 @@ public void WriteValuesToArray() if (playerData.QuestLog[i].EndTime != null) m_fields.SetUpdateField(startIndex + i * sizePerEntry + 2 + 12, (uint)playerData.QuestLog[i].EndTime); if (playerData.QuestLog[i].AcceptTime != null) - m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); + m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); } } for (int i = 0; i < 19; i++) diff --git a/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs b/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs index 38a9764d..f250e9e8 100644 --- a/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs +++ b/HermesProxy/World/Objects/Version/V2_5_2_39570/ObjectUpdateBuilder.cs @@ -655,7 +655,7 @@ public static void WriteCreateObjectSplineDataBlock(ServerSideMovement moveSplin data.WriteUInt32(moveSpline.spell_effect_extra.Value.ProgressCurveId); data.WriteUInt32(moveSpline.spell_effect_extra.Value.ParabolicCurveId); } - + if (moveSpline.splineflags.HasFlag(SplineFlag.Parabolic)) { data.WriteFloat(moveSpline.vertical_acceleration); @@ -1147,7 +1147,7 @@ public void WriteValuesToArray() if (playerData.QuestLog[i].EndTime != null) m_fields.SetUpdateField(startIndex + i * sizePerEntry + 2 + 12, (uint)playerData.QuestLog[i].EndTime); if (playerData.QuestLog[i].AcceptTime != null) - m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); + m_fields.SetUpdateField(startIndex + i * sizePerEntry + 3 + 12, (uint)playerData.QuestLog[i].AcceptTime); } } for (int i = 0; i < 19; i++) diff --git a/HermesProxy/World/Packet.cs b/HermesProxy/World/Packet.cs index b16e4130..1c14b08b 100644 --- a/HermesProxy/World/Packet.cs +++ b/HermesProxy/World/Packet.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/AccountDataManager.cs b/HermesProxy/World/Server/AccountDataManager.cs index fa33f648..2d1af98e 100644 --- a/HermesProxy/World/Server/AccountDataManager.cs +++ b/HermesProxy/World/Server/AccountDataManager.cs @@ -37,7 +37,7 @@ private string GetAccountCharacterMetaDataDirectory(string realm, string charact return path; } - + public AccountMetaDataManager(string accountName) { _accountName = accountName; @@ -59,7 +59,7 @@ public AccountMetaDataManager(string accountName) Log.Print(LogType.Error, $"Invalid split size in 'GetLastSelectedCharacter' for account '{_accountName}'"); return null; } - + return (content[0], content[1], ulong.Parse(content[3]), long.Parse(content[2])); } @@ -137,7 +137,7 @@ public PlayerSettings.InternalStorage LoadCharacterSettingsStorage(string realmN return loadedJson; } } - + public class AccountData { public WowGuid128 Guid; @@ -151,7 +151,7 @@ public class AccountDataManager public AccountData[] Data; string _accountName; string _realmName; - + public AccountDataManager(string accountName, string realmName) { _accountName = accountName; @@ -234,7 +234,7 @@ public AccountData LoadData(WowGuid128 guid, uint type) } } } - + return data; } diff --git a/HermesProxy/World/Server/CurrentPlayerStorage.cs b/HermesProxy/World/Server/CurrentPlayerStorage.cs index 831e7e30..73da9221 100644 --- a/HermesProxy/World/Server/CurrentPlayerStorage.cs +++ b/HermesProxy/World/Server/CurrentPlayerStorage.cs @@ -68,7 +68,7 @@ private void Save() { Session.AccountMetaDataMgr.SaveCharacterSettingsStorage(Session.GameState.CurrentPlayerInfo.Realm.Name, Session.GameState.CurrentPlayerInfo.Name, _internalStorage); } - + public class InternalStorage { // A JSON encoder / decoder is used to store the settings @@ -136,7 +136,7 @@ public void Reload() _cachedQuestCompleted[idx] |= ((ulong)1) << bitIdx; } } - + private void SendSingleUpdateToClient(uint questBit, bool isSet) { int idx = (int)(((questBit - 1) >> 6)); @@ -146,7 +146,7 @@ private void SendSingleUpdateToClient(uint questBit, bool isSet) _cachedQuestCompleted[idx] |= ((ulong)1) << bitIdx; else _cachedQuestCompleted[idx] &= ~(((ulong)1) << bitIdx); - + ObjectUpdate updateData = new ObjectUpdate(Session.GameState.CurrentPlayerGuid, UpdateTypeModern.Values, Session); updateData.ActivePlayerData.QuestCompleted[idx] = _cachedQuestCompleted[idx]; diff --git a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs index 6062f9d7..d0d50635 100644 --- a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs @@ -92,7 +92,7 @@ int ModernToLegacyInventorySlotType(uint modernInventoryFlag) if (modernInventoryFlag == uint.MaxValue) return -1; - + for (int i = 0; i < 32; i++) { if ((modernInventoryFlag & (1 << i)) > 0) diff --git a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs index a3b2eb85..5be01cf1 100644 --- a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs @@ -44,7 +44,7 @@ void HandlePetitionBuy(PetitionBuy petition) packet.WriteUInt16(0); packet.WriteUInt8(0); } - + packet.WriteUInt32(petition.Index); packet.WriteUInt32(0); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs index 37eccd4c..83965e19 100644 --- a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs @@ -62,7 +62,7 @@ void HandleQuestGiverStatusMultipleQuery(QuestGiverStatusMultipleQuery query) GetSession().GameState.ObjectCacheMutex.WaitOne(); foreach (var obj in GetSession().GameState.ObjectCacheModern) { - if (obj.Key.GetObjectType() == ObjectType.Unit && + if (obj.Key.GetObjectType() == ObjectType.Unit && obj.Value.GetUpdateField(UNIT_NPC_FLAGS).HasAnyFlag(NPCFlags.QuestGiver)) npcGuids.Add(obj.Key); } @@ -121,7 +121,7 @@ void HandleQuestGiverChooseReward(QuestGiverChooseReward quest) } } } - + WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_CHOOSE_REWARD); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); diff --git a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs index 521bc727..29a5cde3 100644 --- a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs @@ -15,7 +15,7 @@ void HandleChangeRealmTicket(ChangeRealmTicket request) { ChangeRealmTicketResponse response = new(); response.Token = request.Token; - + if (GetSession().AuthClient.Reconnect() != AuthResult.SUCCESS) { response.Allow = false; diff --git a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs index a631d348..3b108047 100644 --- a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs @@ -98,7 +98,7 @@ public void SendCastRequestFailed(ClientCastRequest castRequest, bool isPet) failed.Reason = (uint)SpellCastResultClassic.SpellInProgress; failed.CastID = castRequest.ServerGUID; SendPacket(failed); - } + } } [PacketHandler(Opcode.CMSG_CAST_SPELL)] void HandleCastSpell(CastSpell cast) @@ -116,7 +116,7 @@ void HandleCastSpell(CastSpell cast) castRequest.SpellId = cast.Cast.SpellID; castRequest.SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID; castRequest.ClientGUID = cast.Cast.CastID; - + if (GetSession().GameState.CurrentClientSpecialCast != null) { castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, 10000 + cast.Cast.CastID.GetCounter()); @@ -133,7 +133,7 @@ void HandleCastSpell(CastSpell cast) SendPacket(prepare); GetSession().GameState.CurrentClientSpecialCast = castRequest; - } + } } else { diff --git a/HermesProxy/World/Server/Packets/AccountDataPackets.cs b/HermesProxy/World/Server/Packets/AccountDataPackets.cs index 03b315dc..4b275ee1 100644 --- a/HermesProxy/World/Server/Packets/AccountDataPackets.cs +++ b/HermesProxy/World/Server/Packets/AccountDataPackets.cs @@ -63,7 +63,7 @@ public override void Write() { _worldPacket.WriteUInt32(Token); _worldPacket.WriteUInt32((uint) CharacterList.Count); - + _worldPacket.ResetBitPos(); _worldPacket.WriteBit(false); // unknown bit diff --git a/HermesProxy/World/Server/Packets/ArenaPackets.cs b/HermesProxy/World/Server/Packets/ArenaPackets.cs index 524aa797..c7251dd5 100644 --- a/HermesProxy/World/Server/Packets/ArenaPackets.cs +++ b/HermesProxy/World/Server/Packets/ArenaPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/AuctionPackets.cs b/HermesProxy/World/Server/Packets/AuctionPackets.cs index ae3d4dff..0c0e3bf3 100644 --- a/HermesProxy/World/Server/Packets/AuctionPackets.cs +++ b/HermesProxy/World/Server/Packets/AuctionPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/AuthenticationPackets.cs b/HermesProxy/World/Server/Packets/AuthenticationPackets.cs index 759ff62e..ae4fcbe6 100644 --- a/HermesProxy/World/Server/Packets/AuthenticationPackets.cs +++ b/HermesProxy/World/Server/Packets/AuthenticationPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/BattleGroundPackets.cs b/HermesProxy/World/Server/Packets/BattleGroundPackets.cs index 77e183d7..1af88510 100644 --- a/HermesProxy/World/Server/Packets/BattleGroundPackets.cs +++ b/HermesProxy/World/Server/Packets/BattleGroundPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/CharacterPackets.cs b/HermesProxy/World/Server/Packets/CharacterPackets.cs index 200405ab..379c7517 100644 --- a/HermesProxy/World/Server/Packets/CharacterPackets.cs +++ b/HermesProxy/World/Server/Packets/CharacterPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -132,7 +132,7 @@ public void Write(WorldPacket data) foreach (string str in MailSenders) data.WriteBits(str.GetByteCount() + 1, 6); - + data.FlushBits(); foreach (string str in MailSenders) @@ -1039,7 +1039,7 @@ public GenerateRandomCharacterNameResult() : base(Opcode.SMSG_GENERATE_RANDOM_CH public override void Write() { _worldPacket.WriteBool(Success); - + _worldPacket.WriteBits(Name.Length, 6); _worldPacket.WriteString(Name); } diff --git a/HermesProxy/World/Server/Packets/ChatPackets.cs b/HermesProxy/World/Server/Packets/ChatPackets.cs index 1cb73a3c..85a494e8 100644 --- a/HermesProxy/World/Server/Packets/ChatPackets.cs +++ b/HermesProxy/World/Server/Packets/ChatPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/ClientConfigPackets.cs b/HermesProxy/World/Server/Packets/ClientConfigPackets.cs index 292b4774..a0f07949 100644 --- a/HermesProxy/World/Server/Packets/ClientConfigPackets.cs +++ b/HermesProxy/World/Server/Packets/ClientConfigPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/CombatPackets.cs b/HermesProxy/World/Server/Packets/CombatPackets.cs index 37a6a8f7..ca740003 100644 --- a/HermesProxy/World/Server/Packets/CombatPackets.cs +++ b/HermesProxy/World/Server/Packets/CombatPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/DuelPackets.cs b/HermesProxy/World/Server/Packets/DuelPackets.cs index 2d9c54ba..77671e02 100644 --- a/HermesProxy/World/Server/Packets/DuelPackets.cs +++ b/HermesProxy/World/Server/Packets/DuelPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/GameObjectPackets.cs b/HermesProxy/World/Server/Packets/GameObjectPackets.cs index f38b08e2..7bf302f4 100644 --- a/HermesProxy/World/Server/Packets/GameObjectPackets.cs +++ b/HermesProxy/World/Server/Packets/GameObjectPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/GroupPackets.cs b/HermesProxy/World/Server/Packets/GroupPackets.cs index 74c7b945..83550fc3 100644 --- a/HermesProxy/World/Server/Packets/GroupPackets.cs +++ b/HermesProxy/World/Server/Packets/GroupPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/GuildPackets.cs b/HermesProxy/World/Server/Packets/GuildPackets.cs index b366503e..91cca774 100644 --- a/HermesProxy/World/Server/Packets/GuildPackets.cs +++ b/HermesProxy/World/Server/Packets/GuildPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/HotfixPackets.cs b/HermesProxy/World/Server/Packets/HotfixPackets.cs index aee45e27..01daad2b 100644 --- a/HermesProxy/World/Server/Packets/HotfixPackets.cs +++ b/HermesProxy/World/Server/Packets/HotfixPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/InstancePackets.cs b/HermesProxy/World/Server/Packets/InstancePackets.cs index f27e6c10..a14cd0dd 100644 --- a/HermesProxy/World/Server/Packets/InstancePackets.cs +++ b/HermesProxy/World/Server/Packets/InstancePackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/ItemPackets.cs b/HermesProxy/World/Server/Packets/ItemPackets.cs index 4bac3a75..cc0a7323 100644 --- a/HermesProxy/World/Server/Packets/ItemPackets.cs +++ b/HermesProxy/World/Server/Packets/ItemPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -698,7 +698,7 @@ public override void Read() ItemBag = _worldPacket.ReadUInt8(); ItemSlot = _worldPacket.ReadUInt8(); } - + public byte GiftBag { get; set; } public byte GiftSlot { get; set; } public byte ItemBag { get; set; } diff --git a/HermesProxy/World/Server/Packets/LootPackets.cs b/HermesProxy/World/Server/Packets/LootPackets.cs index a72e930a..b4ea068d 100644 --- a/HermesProxy/World/Server/Packets/LootPackets.cs +++ b/HermesProxy/World/Server/Packets/LootPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/MailPackets.cs b/HermesProxy/World/Server/Packets/MailPackets.cs index d9cc713c..9792a373 100644 --- a/HermesProxy/World/Server/Packets/MailPackets.cs +++ b/HermesProxy/World/Server/Packets/MailPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/MiscPackets.cs b/HermesProxy/World/Server/Packets/MiscPackets.cs index 84face97..949fe3d8 100644 --- a/HermesProxy/World/Server/Packets/MiscPackets.cs +++ b/HermesProxy/World/Server/Packets/MiscPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -155,12 +155,12 @@ public struct Record { public uint Type; public uint Quantity; - public uint? WeeklyQuantity; // Currency count obtained this Week. + public uint? WeeklyQuantity; // Currency count obtained this Week. public uint? MaxWeeklyQuantity; // Weekly Currency cap. public uint? TrackedQuantity; public int? MaxQuantity; public int? Unused901; - public byte Flags; // 0 = none, + public byte Flags; // 0 = none, } } diff --git a/HermesProxy/World/Server/Packets/MovementPackets.cs b/HermesProxy/World/Server/Packets/MovementPackets.cs index 108f9e18..885711f0 100644 --- a/HermesProxy/World/Server/Packets/MovementPackets.cs +++ b/HermesProxy/World/Server/Packets/MovementPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -428,7 +428,7 @@ public override void Write() _worldPacket.WriteUInt32(MountDisplayID); _worldPacket.WriteInt32(ScaleDuration); } - + public WowGuid128 MoverGUID; public uint SequenceIndex = 1; public float Height = 1.0f; diff --git a/HermesProxy/World/Server/Packets/NPCPackets.cs b/HermesProxy/World/Server/Packets/NPCPackets.cs index e6962eda..fac3545b 100644 --- a/HermesProxy/World/Server/Packets/NPCPackets.cs +++ b/HermesProxy/World/Server/Packets/NPCPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/PetPackets.cs b/HermesProxy/World/Server/Packets/PetPackets.cs index c304d074..e2e6daea 100644 --- a/HermesProxy/World/Server/Packets/PetPackets.cs +++ b/HermesProxy/World/Server/Packets/PetPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/PetitionPackets.cs b/HermesProxy/World/Server/Packets/PetitionPackets.cs index b13b78a9..d0209b25 100644 --- a/HermesProxy/World/Server/Packets/PetitionPackets.cs +++ b/HermesProxy/World/Server/Packets/PetitionPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/QueryPackets.cs b/HermesProxy/World/Server/Packets/QueryPackets.cs index 5c8cf418..2ad8281d 100644 --- a/HermesProxy/World/Server/Packets/QueryPackets.cs +++ b/HermesProxy/World/Server/Packets/QueryPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/QuestPackets.cs b/HermesProxy/World/Server/Packets/QuestPackets.cs index a9e156be..eae9d3ba 100644 --- a/HermesProxy/World/Server/Packets/QuestPackets.cs +++ b/HermesProxy/World/Server/Packets/QuestPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/ReputationPackets.cs b/HermesProxy/World/Server/Packets/ReputationPackets.cs index ba56174a..d6663765 100644 --- a/HermesProxy/World/Server/Packets/ReputationPackets.cs +++ b/HermesProxy/World/Server/Packets/ReputationPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/SessionPackets.cs b/HermesProxy/World/Server/Packets/SessionPackets.cs index 7d5b2f7f..699e1606 100644 --- a/HermesProxy/World/Server/Packets/SessionPackets.cs +++ b/HermesProxy/World/Server/Packets/SessionPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/SocialPackets.cs b/HermesProxy/World/Server/Packets/SocialPackets.cs index 9f13db75..442211eb 100644 --- a/HermesProxy/World/Server/Packets/SocialPackets.cs +++ b/HermesProxy/World/Server/Packets/SocialPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/SpellPackets.cs b/HermesProxy/World/Server/Packets/SpellPackets.cs index d2381597..fca42392 100644 --- a/HermesProxy/World/Server/Packets/SpellPackets.cs +++ b/HermesProxy/World/Server/Packets/SpellPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -238,7 +238,7 @@ public override void Write() public class AuraUpdate : ServerPacket { - public AuraUpdate(WowGuid128 guid, bool all) : base(Opcode.SMSG_AURA_UPDATE, ConnectionType.Instance) + public AuraUpdate(WowGuid128 guid, bool all) : base(Opcode.SMSG_AURA_UPDATE, ConnectionType.Instance) { UnitGUID = guid; UpdateAll = all; diff --git a/HermesProxy/World/Server/Packets/SystemPackets.cs b/HermesProxy/World/Server/Packets/SystemPackets.cs index 6828771a..bfd6c1a6 100644 --- a/HermesProxy/World/Server/Packets/SystemPackets.cs +++ b/HermesProxy/World/Server/Packets/SystemPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -125,7 +125,7 @@ public override void Write() _worldPacket.WriteBit(BattlegroundsEnabled); _worldPacket.WriteBit(RaceClassExpansionLevels != null); } - + _worldPacket.FlushBits(); { @@ -371,7 +371,7 @@ public override void Write() public EuropaTicketConfig EuropaTicketSystemStatus; public List LiveRegionCharacterCopySourceRegions = new(); public uint TokenPollTimeSeconds; // NYI - public long TokenBalanceAmount; // NYI + public long TokenBalanceAmount; // NYI public int MaxCharactersPerRealm; public uint BpayStoreProductDeliveryDelay; // NYI public int ActiveCharacterUpgradeBoostType; // NYI diff --git a/HermesProxy/World/Server/Packets/TaxiPackets.cs b/HermesProxy/World/Server/Packets/TaxiPackets.cs index 8b340a5f..317fa912 100644 --- a/HermesProxy/World/Server/Packets/TaxiPackets.cs +++ b/HermesProxy/World/Server/Packets/TaxiPackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/TradePackets.cs b/HermesProxy/World/Server/Packets/TradePackets.cs index eaaadce4..d1315d59 100644 --- a/HermesProxy/World/Server/Packets/TradePackets.cs +++ b/HermesProxy/World/Server/Packets/TradePackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index 89deb3e6..ade0fdf9 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -262,7 +262,7 @@ public void InitializePlaceholders() } } } - + public class UpdateObject : ServerPacket { public UpdateObject(GameSessionData gameState) : base(Opcode.SMSG_UPDATE_OBJECT, ConnectionType.Instance) @@ -318,8 +318,8 @@ public override void Write() default: throw new System.ArgumentOutOfRangeException("No object update builder defined for current build."); } - } - + } + var bytes = data.GetData(); buffer.WriteInt32(bytes.Length); buffer.WriteBytes(bytes); diff --git a/HermesProxy/World/Server/Packets/WorldStatePackets.cs b/HermesProxy/World/Server/Packets/WorldStatePackets.cs index 1309774b..927848a5 100644 --- a/HermesProxy/World/Server/Packets/WorldStatePackets.cs +++ b/HermesProxy/World/Server/Packets/WorldStatePackets.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/HermesProxy/World/Server/WorldSocket.cs b/HermesProxy/World/Server/WorldSocket.cs index ccd98089..02fcbcc3 100644 --- a/HermesProxy/World/Server/WorldSocket.cs +++ b/HermesProxy/World/Server/WorldSocket.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -615,7 +615,7 @@ public void SendConnectToInstance(ConnectToSerial serial) { IPAddress externalIp = IPAddress.Parse(Framework.Settings.ExternalAddress); IPEndPoint instanceAddress = new IPEndPoint(externalIp, Framework.Settings.InstancePort); - + _instanceConnectKey.AccountId = GetSession().AccountInfo.Id; _instanceConnectKey.connectionType = ConnectionType.Instance; _instanceConnectKey.Key = RandomHelper.URand(0, 0x7FFFFFFF); @@ -1084,10 +1084,10 @@ public void Invoke(WorldSocket session, WorldPacket packet) static Action CreateDelegate(MethodInfo method) where P1 : ClientPacket { - // create first delegate. It is not fine because its + // create first delegate. It is not fine because its // signature contains unknown types T and P1 Action d = (Action)method.CreateDelegate(typeof(Action)); - // create another delegate having necessary signature. + // create another delegate having necessary signature. // It encapsulates first delegate with a closure return delegate (WorldSocket target, ClientPacket p) { d(target, (P1)p); }; } diff --git a/HermesProxy/World/Server/WorldSocketManager.cs b/HermesProxy/World/Server/WorldSocketManager.cs index 490d2e02..e0c0d7bc 100644 --- a/HermesProxy/World/Server/WorldSocketManager.cs +++ b/HermesProxy/World/Server/WorldSocketManager.cs @@ -1,6 +1,6 @@ /* * Copyright (C) 2012-2020 CypherCore - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or From a866b3449aee7a7334ea804b91ec209a26aa0e6d Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:35:05 +0100 Subject: [PATCH 4/8] Add readonly specifier in front of class fields --- HermesProxy/Auth/AuthClient.cs | 3 +-- .../Managers/LoginServiceManager.cs | 4 +--- .../BnetServer/Networking/BnetTcpSession.cs | 2 +- .../BnetServer/Services/BnetServices.cs | 2 +- HermesProxy/Realm/Realm.cs | 2 +- HermesProxy/Realm/RealmManager.cs | 6 +++--- HermesProxy/World/Client/WorldClient.cs | 2 +- HermesProxy/World/HighGuid.cs | 2 +- .../World/Objects/UpdateFieldsArray.cs | 9 +++++---- HermesProxy/World/Packet.cs | 4 ++-- .../World/Server/AccountDataManager.cs | 4 ++-- .../Server/Packets/AuthenticationPackets.cs | 8 ++++---- .../World/Server/Packets/CombatPackets.cs | 10 +++++----- .../World/Server/Packets/SpellPackets.cs | 8 ++++---- .../World/Server/Packets/UpdatePackets.cs | 2 +- .../World/Server/Packets/WorldStatePackets.cs | 3 +-- HermesProxy/World/Server/WorldSocket.cs | 19 +++++++++---------- HermesProxy/World/SniffFile.cs | 7 ++++--- 18 files changed, 47 insertions(+), 50 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index 5576c8d0..be72c601 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -24,8 +24,7 @@ public partial class AuthClient // Debugger.Log(0, "TraceMe", $"{b}"); #endif }; - - GlobalSessionData _globalSession; + readonly GlobalSessionData _globalSession; Socket _clientSocket; TaskCompletionSource _response; TaskCompletionSource _hasRealmlist; diff --git a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs index 4203a2e9..5ca6fe76 100644 --- a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs +++ b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs @@ -6,16 +6,14 @@ using Framework.Web; using System; using System.Net; -using System.Security.Cryptography.X509Certificates; namespace BNetServer { public class LoginServiceManager : Singleton { - FormInputs formInputs; + readonly FormInputs formInputs; IPEndPoint externalAddress; IPEndPoint localAddress; - X509Certificate2 certificate; LoginServiceManager() { diff --git a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs index 5b320627..9a99b002 100644 --- a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs @@ -43,7 +43,7 @@ public override bool Update() return true; } - private List _currentBuffer = new List(); + private readonly List _currentBuffer = new List(); public override async Task ReadHandler(byte[] data, int receivedLength) { diff --git a/HermesProxy/BnetServer/Services/BnetServices.cs b/HermesProxy/BnetServer/Services/BnetServices.cs index dfaa40f0..ef60c6af 100644 --- a/HermesProxy/BnetServer/Services/BnetServices.cs +++ b/HermesProxy/BnetServer/Services/BnetServices.cs @@ -14,7 +14,7 @@ namespace BNetServer.Services public partial class BnetServices { private static uint _serverInvokedRequestToken = 0; - private Dictionary /*callbackHandler*/> _callbackHandlers = new(); + private readonly Dictionary /*callbackHandler*/> _callbackHandlers = new(); private GlobalSessionData _globalSession; private readonly byte[] _clientSecret = new byte[32]; diff --git a/HermesProxy/Realm/Realm.cs b/HermesProxy/Realm/Realm.cs index 09c8b54f..605f57aa 100644 --- a/HermesProxy/Realm/Realm.cs +++ b/HermesProxy/Realm/Realm.cs @@ -49,7 +49,7 @@ public uint GetConfigId() return ConfigIdByType[Type]; } - uint[] ConfigIdByType = + readonly uint[] ConfigIdByType = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }; diff --git a/HermesProxy/Realm/RealmManager.cs b/HermesProxy/Realm/RealmManager.cs index b1a1cf55..adc4e5dc 100644 --- a/HermesProxy/Realm/RealmManager.cs +++ b/HermesProxy/Realm/RealmManager.cs @@ -305,9 +305,9 @@ public BattlenetRpcErrorCode JoinRealm(GlobalSessionData globalSession, uint rea public ICollection GetRealms() { return _realms.Values; } List GetSubRegions() { return _subRegions; } - List _builds = new List(); - ConcurrentDictionary _realms = new ConcurrentDictionary(); - List _subRegions = new List(); + readonly List _builds = new List(); + readonly ConcurrentDictionary _realms = new ConcurrentDictionary(); + readonly List _subRegions = new List(); } public class RealmBuildInfo diff --git a/HermesProxy/World/Client/WorldClient.cs b/HermesProxy/World/Client/WorldClient.cs index e03b7eb3..9bbf1ad4 100644 --- a/HermesProxy/World/Client/WorldClient.cs +++ b/HermesProxy/World/Client/WorldClient.cs @@ -25,7 +25,7 @@ public partial class WorldClient LegacyWorldCrypt _worldCrypt; Dictionary> _packetHandlers; GlobalSessionData _globalSession; - System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); + readonly System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); // packet order is not always the same as new client, sometimes we need to delay packet until another one Dictionary> _delayedPacketsToServer; diff --git a/HermesProxy/World/HighGuid.cs b/HermesProxy/World/HighGuid.cs index 31f175c1..573f33e4 100644 --- a/HermesProxy/World/HighGuid.cs +++ b/HermesProxy/World/HighGuid.cs @@ -17,7 +17,7 @@ public HighGuidType GetHighGuidType() public class HighGuidLegacy : HighGuid { - HighGuidTypeLegacy high; + readonly HighGuidTypeLegacy high; static readonly Dictionary HighLegacyToHighType = new Dictionary { diff --git a/HermesProxy/World/Objects/UpdateFieldsArray.cs b/HermesProxy/World/Objects/UpdateFieldsArray.cs index fbb55674..668e9899 100644 --- a/HermesProxy/World/Objects/UpdateFieldsArray.cs +++ b/HermesProxy/World/Objects/UpdateFieldsArray.cs @@ -258,10 +258,11 @@ public DynamicUpdateFieldsArray(uint size, UpdateTypeModern updateType) m_updateMask = new UpdateMask(size); m_fieldBuffer = new(); } - uint ValuesCount; - UpdateTypeModern m_updateType; - UpdateMask m_updateMask; - ByteBuffer m_fieldBuffer; + + readonly uint ValuesCount; + readonly UpdateTypeModern m_updateType; + readonly UpdateMask m_updateMask; + readonly ByteBuffer m_fieldBuffer; public void WriteToPacket(ByteBuffer buffer) { diff --git a/HermesProxy/World/Packet.cs b/HermesProxy/World/Packet.cs index 1c14b08b..20f7fea5 100644 --- a/HermesProxy/World/Packet.cs +++ b/HermesProxy/World/Packet.cs @@ -130,7 +130,7 @@ public void WritePacketData() public ConnectionType GetConnection() { return connectionType; } byte[] buffer; - ConnectionType connectionType; + readonly ConnectionType connectionType; protected WorldPacket _worldPacket; } @@ -314,7 +314,7 @@ public Opcode GetUniversalOpcode(bool isModern) public long GetReceivedTime() { return m_receivedTime; } public void SetReceiveTime(long receivedTime) { m_receivedTime = receivedTime; } - uint opcode; + readonly uint opcode; long m_receivedTime; } diff --git a/HermesProxy/World/Server/AccountDataManager.cs b/HermesProxy/World/Server/AccountDataManager.cs index 2d1af98e..cc882c06 100644 --- a/HermesProxy/World/Server/AccountDataManager.cs +++ b/HermesProxy/World/Server/AccountDataManager.cs @@ -149,8 +149,8 @@ public class AccountData public class AccountDataManager { public AccountData[] Data; - string _accountName; - string _realmName; + readonly string _accountName; + readonly string _realmName; public AccountDataManager(string accountName, string realmName) { diff --git a/HermesProxy/World/Server/Packets/AuthenticationPackets.cs b/HermesProxy/World/Server/Packets/AuthenticationPackets.cs index ae4fcbe6..8df863d8 100644 --- a/HermesProxy/World/Server/Packets/AuthenticationPackets.cs +++ b/HermesProxy/World/Server/Packets/AuthenticationPackets.cs @@ -52,7 +52,7 @@ public override void Write() _worldPacket.WriteUInt32(Serial); } - uint Serial; + readonly uint Serial; } class AuthChallenge : ServerPacket @@ -413,10 +413,10 @@ public override void Read() class EnterEncryptedMode : ServerPacket { - byte[] EncryptionKey; - bool Enabled; + readonly byte[] EncryptionKey; + readonly bool Enabled; - static byte[] EnableEncryptionSeed = { 0x90, 0x9C, 0xD0, 0x50, 0x5A, 0x2C, 0x14, 0xDD, 0x5C, 0x2C, 0xC0, 0x64, 0x14, 0xF3, 0xFE, 0xC9 }; + static readonly byte[] EnableEncryptionSeed = { 0x90, 0x9C, 0xD0, 0x50, 0x5A, 0x2C, 0x14, 0xDD, 0x5C, 0x2C, 0xC0, 0x64, 0x14, 0xF3, 0xFE, 0xC9 }; public EnterEncryptedMode(byte[] encryptionKey, bool enabled) : base(Opcode.SMSG_ENTER_ENCRYPTED_MODE) { diff --git a/HermesProxy/World/Server/Packets/CombatPackets.cs b/HermesProxy/World/Server/Packets/CombatPackets.cs index ca740003..70829e0d 100644 --- a/HermesProxy/World/Server/Packets/CombatPackets.cs +++ b/HermesProxy/World/Server/Packets/CombatPackets.cs @@ -218,11 +218,11 @@ public void Write(WorldPacket data) } } - long Health; - int AttackPower; - int SpellPower; - uint Armor; - List PowerData = new(); + readonly long Health; + readonly int AttackPower; + readonly int SpellPower; + readonly uint Armor; + readonly List PowerData = new(); } public struct SpellLogPowerData diff --git a/HermesProxy/World/Server/Packets/SpellPackets.cs b/HermesProxy/World/Server/Packets/SpellPackets.cs index fca42392..b8878073 100644 --- a/HermesProxy/World/Server/Packets/SpellPackets.cs +++ b/HermesProxy/World/Server/Packets/SpellPackets.cs @@ -170,8 +170,8 @@ public void Write(WorldPacket data) public int CategoryRecoveryTime; public float ModRate = 1.0f; public bool OnHold; - uint? unused622_1; // This field is not used for anything in the client in 6.2.2.20444 - uint? unused622_2; // This field is not used for anything in the client in 6.2.2.20444 + readonly uint? unused622_1; // This field is not used for anything in the client in 6.2.2.20444 + readonly uint? unused622_2; // This field is not used for anything in the client in 6.2.2.20444 } public class SendSpellCharges : ServerPacket @@ -325,11 +325,11 @@ public void Write(WorldPacket data) public ushort CastLevel = 1; public byte Applications = 1; public int ContentTuningID; - ContentTuningParams ContentTuning; + readonly ContentTuningParams ContentTuning; public WowGuid128 CastUnit; public int? Duration; public int? Remaining; - float? TimeMod; + readonly float? TimeMod; public List Points = new(); public List EstimatedPoints = new(); } diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index ade0fdf9..4c64029c 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -328,7 +328,7 @@ public override void Write() _worldPacket.WriteBytes(Data); } - GameSessionData _gameState; + readonly GameSessionData _gameState; public uint NumObjUpdates; public ushort MapID; public byte[] Data; diff --git a/HermesProxy/World/Server/Packets/WorldStatePackets.cs b/HermesProxy/World/Server/Packets/WorldStatePackets.cs index 927848a5..5f9d3bfc 100644 --- a/HermesProxy/World/Server/Packets/WorldStatePackets.cs +++ b/HermesProxy/World/Server/Packets/WorldStatePackets.cs @@ -150,8 +150,7 @@ public void AddClassicStates() public uint ZoneID; public uint AreaID; public uint MapID; - - List Worldstates = new(); + readonly List Worldstates = new(); struct WorldStateInfo { diff --git a/HermesProxy/World/Server/WorldSocket.cs b/HermesProxy/World/Server/WorldSocket.cs index 02fcbcc3..26200060 100644 --- a/HermesProxy/World/Server/WorldSocket.cs +++ b/HermesProxy/World/Server/WorldSocket.cs @@ -49,24 +49,23 @@ public partial class WorldSocket : SocketBase, BnetServices.INetwork static readonly byte[] EncryptionKeySeed = { 0xE9, 0x75, 0x3C, 0x50, 0x90, 0x93, 0x61, 0xDA, 0x3B, 0x07, 0xEE, 0xFA, 0xFF, 0x9D, 0x41, 0xB8 }; static readonly int HeaderSize = 16; - - SocketBuffer _headerBuffer; - SocketBuffer _packetBuffer; + readonly SocketBuffer _headerBuffer; + readonly SocketBuffer _packetBuffer; ConnectionType _connectType; ulong _key; byte[] _serverChallenge; - WorldCrypt _worldCrypt; + readonly WorldCrypt _worldCrypt; byte[] _sessionKey; - byte[] _encryptKey; + readonly byte[] _encryptKey; ConnectToKey _instanceConnectKey; RealmId _realmId; ZLib.z_stream _compressionStream; - ConcurrentDictionary _clientPacketTable = new(); + readonly ConcurrentDictionary _clientPacketTable = new(); GlobalSessionData _globalSession; - System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); + readonly System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); private BnetServices.ServiceManager _bnetRpc; @@ -653,7 +652,7 @@ public override void Write() _worldPacket.WriteUInt8((byte)Code); } - LoginFailureReason Code; + readonly LoginFailureReason Code; } public void AbortLogin(LoginFailureReason reason) { @@ -1092,8 +1091,8 @@ static Action CreateDelegate(MethodInfo method) w return delegate (WorldSocket target, ClientPacket p) { d(target, (P1)p); }; } - Action methodCaller; - Type packetType; + readonly Action methodCaller; + readonly Type packetType; } public void SendRpcMessage(uint serviceId, OriginalHash service, uint methodId, uint token, BattlenetRpcErrorCode status, IMessage? message) diff --git a/HermesProxy/World/SniffFile.cs b/HermesProxy/World/SniffFile.cs index 876f99bf..80098458 100644 --- a/HermesProxy/World/SniffFile.cs +++ b/HermesProxy/World/SniffFile.cs @@ -17,9 +17,10 @@ public SniffFile(string fileName, ushort build) _fileWriter = new BinaryWriter(File.Open(path, FileMode.Create)); _gameVersion = build; } - BinaryWriter _fileWriter; - ushort _gameVersion; - System.Threading.Mutex _mutex = new System.Threading.Mutex(); + + readonly BinaryWriter _fileWriter; + readonly ushort _gameVersion; + readonly System.Threading.Mutex _mutex = new System.Threading.Mutex(); public void WriteHeader() { From f6b56a636a444c4bff30a6008cbf7aad1b13e8ed Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:36:11 +0100 Subject: [PATCH 5/8] Simplify object initialization --- HermesProxy/Auth/AuthClient.cs | 6 +- .../Managers/LoginServiceManager.cs | 34 +- .../Networking/BnetRestApiSession.cs | 13 +- .../BnetServer/Networking/BnetTcpSession.cs | 14 +- .../BnetServer/Services/Services/Account.cs | 38 +- .../Services/Services/Authentication.cs | 30 +- .../Services/Services/Connection.cs | 14 +- .../Services/Services/GameUtilities.cs | 8 +- HermesProxy/GlobalSessionData.cs | 6 +- HermesProxy/Realm/RealmManager.cs | 52 ++- .../Client/PacketHandlers/ArenaHandler.cs | 24 +- .../Client/PacketHandlers/AuctionHandler.cs | 36 +- .../PacketHandlers/BattleGroundHandler.cs | 194 ++++++---- .../Client/PacketHandlers/CharacterHandler.cs | 184 +++++---- .../Client/PacketHandlers/ChatHandler.cs | 68 ++-- .../Client/PacketHandlers/CombatHandler.cs | 86 +++-- .../Client/PacketHandlers/DuelHandler.cs | 34 +- .../PacketHandlers/GameObjectHandler.cs | 20 +- .../Client/PacketHandlers/GroupHandler.cs | 310 ++++++++++------ .../Client/PacketHandlers/GuildHandler.cs | 234 +++++++----- .../Client/PacketHandlers/InstanceHandler.cs | 48 ++- .../Client/PacketHandlers/ItemHandler.cs | 100 +++-- .../Client/PacketHandlers/LootHandler.cs | 72 ++-- .../Client/PacketHandlers/MailHandler.cs | 56 +-- .../Client/PacketHandlers/MiscHandler.cs | 141 ++++--- .../Client/PacketHandlers/MovementHandler.cs | 178 +++++---- .../World/Client/PacketHandlers/NPCHandler.cs | 84 +++-- .../World/Client/PacketHandlers/PetHandler.cs | 44 ++- .../Client/PacketHandlers/PetitionHandler.cs | 74 ++-- .../Client/PacketHandlers/QueryHandler.cs | 126 ++++--- .../Client/PacketHandlers/QuestHandler.cs | 104 ++++-- .../PacketHandlers/ReputationHandler.cs | 22 +- .../Client/PacketHandlers/SocialHandler.cs | 48 ++- .../Client/PacketHandlers/SpellHandler.cs | 351 +++++++++++------- .../Client/PacketHandlers/TaxiHandler.cs | 20 +- .../Client/PacketHandlers/TradeHandler.cs | 20 +- .../Client/PacketHandlers/UpdateHandler.cs | 134 ++++--- .../PacketHandlers/WorldStateHandler.cs | 14 +- HermesProxy/World/Client/WorldClient.cs | 9 +- HermesProxy/World/GameData.cs | 262 +++++++------ HermesProxy/World/Objects/MovementInfo.cs | 68 ++-- .../World/Objects/UpdateFieldsArray.cs | 12 +- .../PacketHandlers/AccountDataHandler.cs | 6 +- .../Server/PacketHandlers/ArenaHandler.cs | 32 +- .../Server/PacketHandlers/CharacterHandler.cs | 15 +- .../PacketHandlers/ClientConfigHandler.cs | 12 +- .../Server/PacketHandlers/DuelHandler.cs | 8 +- .../Server/PacketHandlers/GroupHandler.cs | 10 +- .../Server/PacketHandlers/HotfixHandler.cs | 22 +- .../Server/PacketHandlers/ItemHandler.cs | 6 +- .../Server/PacketHandlers/MiscHandler.cs | 14 +- .../Server/PacketHandlers/QuestHandler.cs | 8 +- .../Server/PacketHandlers/SessionHandler.cs | 6 +- .../Server/PacketHandlers/SpellHandler.cs | 94 +++-- .../World/Server/Packets/AuctionPackets.cs | 22 +- .../World/Server/Packets/LootPackets.cs | 8 +- .../World/Server/Packets/MiscPackets.cs | 8 +- HermesProxy/World/Server/WorldSocket.cs | 213 +++++++---- 58 files changed, 2383 insertions(+), 1493 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index be72c601..94d7e590 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -495,8 +495,10 @@ private void HandleRealmList(ByteBuffer packet) for (ushort i = 0; i < realmsCount; i++) { - RealmInfo realmInfo = new RealmInfo(); - realmInfo.ID = i; + RealmInfo realmInfo = new RealmInfo + { + ID = i + }; if (Settings.ServerBuild < ClientVersionBuild.V2_0_3_6299) { diff --git a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs index 5ca6fe76..9030bed3 100644 --- a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs +++ b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs @@ -49,24 +49,30 @@ public void Initialize() // set up form inputs formInputs.Type = "LOGIN_FORM"; - var input = new FormInput(); - input.Id = "account_name"; - input.Type = "text"; - input.Label = "E-mail"; - input.MaxLength = 320; + var input = new FormInput + { + Id = "account_name", + Type = "text", + Label = "E-mail", + MaxLength = 320 + }; formInputs.Inputs.Add(input); - input = new FormInput(); - input.Id = "password"; - input.Type = "password"; - input.Label = "Password"; - input.MaxLength = 16; + input = new FormInput + { + Id = "password", + Type = "password", + Label = "Password", + MaxLength = 16 + }; formInputs.Inputs.Add(input); - input = new FormInput(); - input.Id = "log_in_submit"; - input.Type = "submit"; - input.Label = "Log In"; + input = new FormInput + { + Id = "log_in_submit", + Type = "submit", + Label = "Log In" + }; formInputs.Inputs.Add(input); } diff --git a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs index bbbfac6c..d15838b1 100644 --- a/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetRestApiSession.cs @@ -69,12 +69,13 @@ public Task HandleLoginRequest(string[] pathElements, HttpHeader request) if (loginForm == null) return SendEmptyResponse(HttpCode.InternalServerError); - HermesProxy.GlobalSessionData globalSession = new(); - - // Format: "login/$platform/$build/$locale/" - globalSession.OS = pathElements[1]; - globalSession.Build = uint.Parse(pathElements[2]); - globalSession.Locale = pathElements[3]; + HermesProxy.GlobalSessionData globalSession = new() + { + // Format: "login/$platform/$build/$locale/" + OS = pathElements[1], + Build = uint.Parse(pathElements[2]), + Locale = pathElements[3] + }; // Should never happen. Session.HandleLogon checks version already if (Framework.Settings.ClientBuild != (ClientVersionBuild) globalSession.Build) diff --git a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs index 9a99b002..256c0427 100644 --- a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs @@ -92,12 +92,14 @@ private Task ProcessCurrentBuffer() public void SendRpcMessage(uint serviceId, OriginalHash service, uint methodId, uint token, BattlenetRpcErrorCode status, IMessage? message) { - Header header = new(); - header.Token = token; - header.Status = (uint)status; - header.ServiceId = serviceId; - header.ServiceHash = (uint)service; - header.MethodId = methodId; + Header header = new() + { + Token = token, + Status = (uint)status, + ServiceId = serviceId, + ServiceHash = (uint)service, + MethodId = methodId + }; if (message != null) header.Size = (uint)message.CalculateSize(); diff --git a/HermesProxy/BnetServer/Services/Services/Account.cs b/HermesProxy/BnetServer/Services/Services/Account.cs index 71505f58..6261ec15 100644 --- a/HermesProxy/BnetServer/Services/Services/Account.cs +++ b/HermesProxy/BnetServer/Services/Services/Account.cs @@ -14,14 +14,20 @@ BattlenetRpcErrorCode HandleGetAccountState(GetAccountStateRequest request, GetA { if (request.Options.FieldPrivacyInfo) { - response.State = new AccountState(); - response.State.PrivacyInfo = new PrivacyInfo(); - response.State.PrivacyInfo.IsUsingRid = false; - response.State.PrivacyInfo.IsVisibleForViewFriends = false; - response.State.PrivacyInfo.IsHiddenFromFriendFinder = true; + response.State = new AccountState + { + PrivacyInfo = new PrivacyInfo + { + IsUsingRid = false, + IsVisibleForViewFriends = false, + IsHiddenFromFriendFinder = true + } + }; - response.Tags = new AccountFieldTags(); - response.Tags.PrivacyInfoTag = 0xD7CA834D; + response.Tags = new AccountFieldTags + { + PrivacyInfoTag = 0xD7CA834D + }; } return BattlenetRpcErrorCode.Ok; @@ -35,14 +41,20 @@ BattlenetRpcErrorCode HandleGetGameAccountState(GetGameAccountStateRequest reque var gameAccountInfo = GetSession().AccountInfo.GameAccounts.LookupByKey(request.GameAccountId.Low); if (gameAccountInfo != null) { - response.State = new GameAccountState(); - response.State.GameLevelInfo = new GameLevelInfo(); - response.State.GameLevelInfo.Name = gameAccountInfo.DisplayName; - response.State.GameLevelInfo.Program = 0x576f57; // "WoW" in Hex + response.State = new GameAccountState + { + GameLevelInfo = new GameLevelInfo + { + Name = gameAccountInfo.DisplayName, + Program = 0x576f57 // "WoW" in Hex + } + }; } - response.Tags = new GameAccountFieldTags(); - response.Tags.GameLevelInfoTag = 0x5C46D483; + response.Tags = new GameAccountFieldTags + { + GameLevelInfoTag = 0x5C46D483 + }; } if (request.Options.FieldGameStatus) diff --git a/HermesProxy/BnetServer/Services/Services/Authentication.cs b/HermesProxy/BnetServer/Services/Services/Authentication.cs index b15cf9e4..566ea7ca 100644 --- a/HermesProxy/BnetServer/Services/Services/Authentication.cs +++ b/HermesProxy/BnetServer/Services/Services/Authentication.cs @@ -43,9 +43,11 @@ BattlenetRpcErrorCode HandleLogon(LogonRequest logonRequest, NoData response) var endpoint = LoginServiceManager.Instance.GetAddressForClient(GetRemoteIpEndPoint().Address); - ChallengeExternalRequest externalChallenge = new(); - externalChallenge.PayloadType = "web_auth_url"; - externalChallenge.Payload = ByteString.CopyFromUtf8($"https://{endpoint.Address}:{endpoint.Port}/bnetserver/login/{logonRequest.Platform}/{logonRequest.ApplicationVersion}/{logonRequest.Locale}/"); + ChallengeExternalRequest externalChallenge = new() + { + PayloadType = "web_auth_url", + Payload = ByteString.CopyFromUtf8($"https://{endpoint.Address}:{endpoint.Port}/bnetserver/login/{logonRequest.Platform}/{logonRequest.ApplicationVersion}/{logonRequest.Locale}/") + }; SendRequest(OriginalHash.ChallengeListener, 3, externalChallenge); return BattlenetRpcErrorCode.Ok; @@ -79,16 +81,22 @@ BattlenetRpcErrorCode HandleVerifyWebCredentials(VerifyWebCredentialsRequest ver } } - LogonResult logonResult = new(); - logonResult.ErrorCode = 0; - logonResult.AccountId = new EntityId(); - logonResult.AccountId.Low = tmpSession.AccountInfo.Id; - logonResult.AccountId.High = 0x100000000000000; // Some magic high guid? + LogonResult logonResult = new() + { + ErrorCode = 0, + AccountId = new EntityId + { + Low = tmpSession.AccountInfo.Id, + High = 0x100000000000000 // Some magic high guid? + } + }; foreach (var gameAccount in tmpSession.AccountInfo.GameAccounts.Values) { - EntityId gameAccountId = new(); - gameAccountId.Low = gameAccount.Id; - gameAccountId.High = 0x200000200576F51; // Some magic high guid? When using HighGuid of 703 client disconnects + EntityId gameAccountId = new() + { + Low = gameAccount.Id, + High = 0x200000200576F51 // Some magic high guid? When using HighGuid of 703 client disconnects + }; logonResult.GameAccountId.Add(gameAccountId); } diff --git a/HermesProxy/BnetServer/Services/Services/Connection.cs b/HermesProxy/BnetServer/Services/Services/Connection.cs index 7420552f..67c4fa0d 100644 --- a/HermesProxy/BnetServer/Services/Services/Connection.cs +++ b/HermesProxy/BnetServer/Services/Services/Connection.cs @@ -16,9 +16,11 @@ BattlenetRpcErrorCode HandleConnect(ConnectRequest request, ConnectResponse resp if (request.ClientId != null) response.ClientId.MergeFrom(request.ClientId); - response.ServerId = new ProcessId(); - response.ServerId.Label = (uint)Environment.ProcessId; - response.ServerId.Epoch = (uint)Time.UnixTime; + response.ServerId = new ProcessId + { + Label = (uint)Environment.ProcessId, + Epoch = (uint)Time.UnixTime + }; response.ServerTime = (ulong)Time.UnixTimeMilliseconds; response.UseBindlessRpc = request.UseBindlessRpc; @@ -38,8 +40,10 @@ BattlenetRpcErrorCode HandleRequestDisconnect(DisconnectRequest request) if (GetSession() != null && GetSession().AuthClient != null) GetSession().AuthClient.Disconnect(); - var disconnectNotification = new DisconnectNotification(); - disconnectNotification.ErrorCode = request.ErrorCode; + var disconnectNotification = new DisconnectNotification + { + ErrorCode = request.ErrorCode + }; SendRequest(OriginalHash.ConnectionService, 4, disconnectNotification); CloseSocket(); diff --git a/HermesProxy/BnetServer/Services/Services/GameUtilities.cs b/HermesProxy/BnetServer/Services/Services/GameUtilities.cs index f80a493f..24ae67c9 100644 --- a/HermesProxy/BnetServer/Services/Services/GameUtilities.cs +++ b/HermesProxy/BnetServer/Services/Services/GameUtilities.cs @@ -166,9 +166,11 @@ BattlenetRpcErrorCode GetRealmList(Dictionary Params, ClientRes var realmCharacterCounts = new RealmCharacterCountList(); foreach (var realm in GetSession().RealmManager.GetRealms()) { - var countEntry = new RealmCharacterCountEntry(); - countEntry.WowRealmAddress = (int) realm.Id.GetAddress(); - countEntry.Count = realm.CharacterCount; + var countEntry = new RealmCharacterCountEntry + { + WowRealmAddress = (int)realm.Id.GetAddress(), + Count = realm.CharacterCount + }; realmCharacterCounts.Counts.Add(countEntry); } diff --git a/HermesProxy/GlobalSessionData.cs b/HermesProxy/GlobalSessionData.cs index b531b947..46d3c2f1 100644 --- a/HermesProxy/GlobalSessionData.cs +++ b/HermesProxy/GlobalSessionData.cs @@ -110,8 +110,10 @@ private GameSessionData() public static GameSessionData CreateNewGameSessionData(GlobalSessionData globalSession) { - var self = new GameSessionData(); - self.CurrentPlayerStorage = new CurrentPlayerStorage(globalSession); + var self = new GameSessionData + { + CurrentPlayerStorage = new CurrentPlayerStorage(globalSession) + }; return self; } diff --git a/HermesProxy/Realm/RealmManager.cs b/HermesProxy/Realm/RealmManager.cs index adc4e5dc..64419dec 100644 --- a/HermesProxy/Realm/RealmManager.cs +++ b/HermesProxy/Realm/RealmManager.cs @@ -39,10 +39,12 @@ public RealmManager() { void LoadBuildInfo() { - RealmBuildInfo build = new RealmBuildInfo(); - build.MajorVersion = ModernVersion.ExpansionVersion; - build.MinorVersion = ModernVersion.MajorVersion; - build.BugfixVersion = ModernVersion.MinorVersion; + RealmBuildInfo build = new RealmBuildInfo + { + MajorVersion = ModernVersion.ExpansionVersion, + MinorVersion = ModernVersion.MajorVersion, + BugfixVersion = ModernVersion.MinorVersion + }; string hotfixVersion = ""; if (!hotfixVersion.IsEmpty() && hotfixVersion.Length < build.HotfixVersion.Length) @@ -77,11 +79,13 @@ public void AddRealm(uint id, string name, string externalAddress, ushort port, foreach (var p in _realms) existingRealms[p.Key] = p.Value.Name; - var realm = new Realm(); - realm.Name = name; - realm.ExternalAddress = IPAddress.Parse(externalAddress); + var realm = new Realm + { + Name = name, + ExternalAddress = IPAddress.Parse(externalAddress), - realm.Port = port; + Port = port + }; RealmType realmType = type; if (realmType == RealmType.FFAPVP) realmType = RealmType.PVP; @@ -168,8 +172,10 @@ public void WriteSubRegions(Bgs.Protocol.GameUtilities.V1.GetAllValuesForAttribu { foreach (string subRegion in GetSubRegions()) { - var variant = new Bgs.Protocol.Variant(); - variant.StringValue = subRegion; + var variant = new Bgs.Protocol.Variant + { + StringValue = subRegion + }; response.AttributeValue.Add(variant); } } @@ -181,11 +187,13 @@ public byte[] GetCompressdRealmEntryJSON(Realm realm, uint build) { if (!realm.Flags.HasAnyFlag(RealmFlags.Offline) && realm.Build == build) { - var realmEntry = new RealmEntry(); - realmEntry.WowRealmAddress = (int)realm.Id.GetAddress(); - realmEntry.CfgTimezonesID = 1; - realmEntry.PopulationState = Math.Max((int)realm.PopulationLevel, 1); - realmEntry.CfgCategoriesID = realm.Timezone; + var realmEntry = new RealmEntry + { + WowRealmAddress = (int)realm.Id.GetAddress(), + CfgTimezonesID = 1, + PopulationState = Math.Max((int)realm.PopulationLevel, 1), + CfgCategoriesID = realm.Timezone + }; ClientVersion version = new ClientVersion(); RealmBuildInfo buildInfo = GetBuildInfo(realm.Build); @@ -276,12 +284,16 @@ public BattlenetRpcErrorCode JoinRealm(GlobalSessionData globalSession, uint rea return BattlenetRpcErrorCode.UserServerNotPermittedOnRealm; RealmListServerIPAddresses serverAddresses = new RealmListServerIPAddresses(); - AddressFamily addressFamily = new AddressFamily(); - addressFamily.Id = 1; + AddressFamily addressFamily = new AddressFamily + { + Id = 1 + }; - var address = new Address(); - address.Ip = realm.GetAddressForClient(clientAddress).Address.ToString(); - address.Port = Framework.Settings.RealmPort; + var address = new Address + { + Ip = realm.GetAddressForClient(clientAddress).Address.ToString(), + Port = Framework.Settings.RealmPort + }; addressFamily.Addresses.Add(address); serverAddresses.Families.Add(addressFamily); diff --git a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs index dca3bb90..68dfd111 100644 --- a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs @@ -50,8 +50,10 @@ void HandleArenaTeamStats(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_ROSTER)] void HandleArenaTeamRoster(WorldPacket packet) { - ArenaTeamRosterResponse arena = new ArenaTeamRosterResponse(); - arena.TeamId = packet.ReadUInt32(); + ArenaTeamRosterResponse arena = new ArenaTeamRosterResponse + { + TeamId = packet.ReadUInt32() + }; var hiddenRating = false; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_8_9464)) @@ -131,10 +133,12 @@ void HandleArenaTeamEvent(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_COMMAND_RESULT)] void HandleArenaTeamCommandResult(WorldPacket packet) { - ArenaTeamCommandResult arena = new ArenaTeamCommandResult(); - arena.Action = (ArenaTeamCommandType)packet.ReadUInt32(); - arena.TeamName = packet.ReadCString(); - arena.PlayerName = packet.ReadCString(); + ArenaTeamCommandResult arena = new ArenaTeamCommandResult + { + Action = (ArenaTeamCommandType)packet.ReadUInt32(), + TeamName = packet.ReadCString(), + PlayerName = packet.ReadCString() + }; var errorType = (ArenaTeamCommandErrorLegacy)packet.ReadUInt32(); arena.Error = (ArenaTeamCommandErrorModern)Enum.Parse(typeof(ArenaTeamCommandErrorModern), errorType.ToString()); SendPacketToClient(arena); @@ -143,9 +147,11 @@ void HandleArenaTeamCommandResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_INVITE)] void HandleArenaTeamInvite(WorldPacket packet) { - ArenaTeamInvite arena = new ArenaTeamInvite(); - arena.PlayerName = packet.ReadCString(); - arena.TeamName = packet.ReadCString(); + ArenaTeamInvite arena = new ArenaTeamInvite + { + PlayerName = packet.ReadCString(), + TeamName = packet.ReadCString() + }; arena.PlayerGuid = GetSession().GameState.GetPlayerGuidByName(arena.PlayerName); if (arena.PlayerGuid == null) arena.PlayerGuid = WowGuid128.Empty; diff --git a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs index fcc76162..daeb537f 100644 --- a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs @@ -11,8 +11,10 @@ public partial class WorldClient [PacketHandler(Opcode.MSG_AUCTION_HELLO)] void HandleAuctionHello(WorldPacket packet) { - AuctionHelloResponse auction = new AuctionHelloResponse(); - auction.Guid = packet.ReadGuid().To128(GetSession().GameState); + AuctionHelloResponse auction = new AuctionHelloResponse + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = auction.Guid; auction.AuctionHouseID = packet.ReadUInt32(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_3_0_10958)) @@ -28,10 +30,14 @@ void HandleAuctionHello(WorldPacket packet) AuctionItem ReadAuctionItem(WorldPacket packet) { - AuctionItem item = new AuctionItem(); - item.AuctionID = packet.ReadUInt32(); - item.Item = new(); - item.Item.ItemID = packet.ReadUInt32(); + AuctionItem item = new AuctionItem + { + AuctionID = packet.ReadUInt32(), + Item = new() + { + ItemID = packet.ReadUInt32() + } + }; byte enchantmentCount; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -43,9 +49,11 @@ AuctionItem ReadAuctionItem(WorldPacket packet) for (byte j = 0; j < enchantmentCount; ++j) { - ItemEnchantData enchant = new ItemEnchantData(); - enchant.Slot = j; - enchant.ID = packet.ReadUInt32(); + ItemEnchantData enchant = new ItemEnchantData + { + Slot = j, + ID = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { enchant.Expiration = packet.ReadUInt32(); @@ -115,10 +123,12 @@ void HandleAuctionListItemsResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_AUCTION_COMMAND_RESULT)] void HandleAuctionCommandResult(WorldPacket packet) { - AuctionCommandResult auction = new AuctionCommandResult(); - auction.AuctionID = packet.ReadUInt32(); - auction.Command = (AuctionHouseAction)packet.ReadUInt32(); - auction.ErrorCode = (AuctionHouseError)packet.ReadUInt32(); + AuctionCommandResult auction = new AuctionCommandResult + { + AuctionID = packet.ReadUInt32(), + Command = (AuctionHouseAction)packet.ReadUInt32(), + ErrorCode = (AuctionHouseError)packet.ReadUInt32() + }; switch (auction.ErrorCode) { case AuctionHouseError.Ok: diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs index 1027e13f..44e85534 100644 --- a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs @@ -12,8 +12,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleBattlefieldListVanilla(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList(); - bglist.BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState); + BattlefieldList bglist = new BattlefieldList + { + BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = bglist.BattlemasterGuid; bglist.BattlemasterListID = GameData.GetBattlegroundIdFromMapId(packet.ReadUInt32()); packet.ReadUInt8(); // bracket id @@ -29,8 +31,10 @@ void HandleBattlefieldListVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.V2_0_1_6180, ClientVersionBuild.V3_0_2_9056)] void HandleBattlefieldListTBC(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList(); - bglist.BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState); + BattlefieldList bglist = new BattlefieldList + { + BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = bglist.BattlemasterGuid; bglist.BattlemasterListID = packet.ReadUInt32(); packet.ReadUInt8(); // bracket id @@ -46,8 +50,10 @@ void HandleBattlefieldListTBC(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.V3_0_2_9056)] void HandleBattlefieldListWotLK(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList(); - bglist.BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState); + BattlefieldList bglist = new BattlefieldList + { + BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = bglist.BattlemasterGuid; bglist.PvpAnywhere = packet.ReadBool(); // from UI bglist.BattlemasterListID = packet.ReadUInt32(); @@ -98,33 +104,41 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) { case BattleGroundStatus.WaitQueue: { - BattlefieldStatusQueued queue = new BattlefieldStatusQueued(); - queue.Hdr = hdr; - queue.AverageWaitTime = packet.ReadUInt32(); - queue.WaitTime = packet.ReadUInt32(); + BattlefieldStatusQueued queue = new BattlefieldStatusQueued + { + Hdr = hdr, + AverageWaitTime = packet.ReadUInt32(), + WaitTime = packet.ReadUInt32() + }; SendPacketToClient(queue); break; } case BattleGroundStatus.WaitJoin: { - BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation(); - confirm.Hdr = hdr; - confirm.Mapid = mapId; - confirm.Timeout = packet.ReadUInt32(); + BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation + { + Hdr = hdr, + Mapid = mapId, + Timeout = packet.ReadUInt32() + }; SendPacketToClient(confirm); break; } case BattleGroundStatus.InProgress: { - BattlefieldStatusActive active = new BattlefieldStatusActive(); - active.Hdr = hdr; - active.Mapid = mapId; - active.ShutdownTimer = packet.ReadUInt32(); - active.StartTimer = packet.ReadUInt32(); + BattlefieldStatusActive active = new BattlefieldStatusActive + { + Hdr = hdr, + Mapid = mapId, + ShutdownTimer = packet.ReadUInt32(), + StartTimer = packet.ReadUInt32() + }; if (active.ShutdownTimer == 0) { - BattlegroundInit init = new BattlegroundInit(); - init.Milliseconds = 1154756799; + BattlegroundInit init = new BattlegroundInit + { + Milliseconds = 1154756799 + }; SendPacketToClient(init); } SendPacketToClient(active); @@ -147,22 +161,26 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) var bgGroup = GetSession().GameState.CurrentGroups[1]; if (bgGroup != null) { - PartyUpdate party = new PartyUpdate(); - party.SequenceNum = GetSession().GameState.GroupUpdateCounter++; - party.PartyFlags = GroupFlags.FakeRaid | GroupFlags.Destroyed; - party.PartyIndex = 1; - party.PartyGUID = bgGroup.PartyGUID; - party.LeaderGUID = WowGuid128.Empty; - party.MyIndex = -1; + PartyUpdate party = new PartyUpdate + { + SequenceNum = GetSession().GameState.GroupUpdateCounter++, + PartyFlags = GroupFlags.FakeRaid | GroupFlags.Destroyed, + PartyIndex = 1, + PartyGUID = bgGroup.PartyGUID, + LeaderGUID = WowGuid128.Empty, + MyIndex = -1 + }; GetSession().GameState.CurrentGroups[1] = null; SendPacketToClient(party); } } - BattlefieldStatusFailed failed = new BattlefieldStatusFailed(); - failed.Ticket = hdr.Ticket; - failed.Reason = 30; - failed.BattlefieldListId = GameData.GetBattlegroundIdFromMapId(queuedMapId); + BattlefieldStatusFailed failed = new BattlefieldStatusFailed + { + Ticket = hdr.Ticket, + Reason = 30, + BattlefieldListId = GameData.GetBattlegroundIdFromMapId(queuedMapId) + }; SendPacketToClient(failed); GetSession().GameState.BattleFieldQueueTimes.Remove(hdr.Ticket.Id); } @@ -200,18 +218,22 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) { case BattleGroundStatus.WaitQueue: { - BattlefieldStatusQueued queue = new BattlefieldStatusQueued(); - queue.Hdr = hdr; - queue.AverageWaitTime = packet.ReadUInt32(); - queue.WaitTime = packet.ReadUInt32(); + BattlefieldStatusQueued queue = new BattlefieldStatusQueued + { + Hdr = hdr, + AverageWaitTime = packet.ReadUInt32(), + WaitTime = packet.ReadUInt32() + }; SendPacketToClient(queue); break; } case BattleGroundStatus.WaitJoin: { - BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation(); - confirm.Hdr = hdr; - confirm.Mapid = packet.ReadUInt32(); + BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation + { + Hdr = hdr, + Mapid = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_3_5_12213)) packet.ReadUInt64(); // unk confirm.Timeout = packet.ReadUInt32(); @@ -220,9 +242,11 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) } case BattleGroundStatus.InProgress: { - BattlefieldStatusActive active = new BattlefieldStatusActive(); - active.Hdr = hdr; - active.Mapid = packet.ReadUInt32(); + BattlefieldStatusActive active = new BattlefieldStatusActive + { + Hdr = hdr, + Mapid = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_3_5_12213)) packet.ReadUInt64(); // unk active.ShutdownTimer = packet.ReadUInt32(); @@ -230,8 +254,10 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) active.ArenaFaction = packet.ReadUInt8(); if (active.ShutdownTimer == 0) { - BattlegroundInit init = new BattlegroundInit(); - init.Milliseconds = 1154756799; + BattlegroundInit init = new BattlegroundInit + { + Milliseconds = 1154756799 + }; SendPacketToClient(init); } SendPacketToClient(active); @@ -246,10 +272,12 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) } else { - BattlefieldStatusFailed failed = new BattlefieldStatusFailed(); - failed.Ticket = hdr.Ticket; - failed.Reason = 30; - failed.BattlefieldListId = GetSession().GameState.GetBattleFieldQueueType(hdr.Ticket.Id); + BattlefieldStatusFailed failed = new BattlefieldStatusFailed + { + Ticket = hdr.Ticket, + Reason = 30, + BattlefieldListId = GetSession().GameState.GetBattleFieldQueueType(hdr.Ticket.Id) + }; SendPacketToClient(failed); GetSession().GameState.BattleFieldQueueTimes.Remove(hdr.Ticket.Id); } @@ -266,14 +294,18 @@ void HandlePvPLogDataVanilla(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics(); - player.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); - player.Rank = packet.ReadInt32(); - player.Kills = packet.ReadUInt32(); - player.Honor = new(); - player.Honor.HonorKills = packet.ReadUInt32(); - player.Honor.Deaths = packet.ReadUInt32(); - player.Honor.ContributionPoints = packet.ReadUInt32(); + PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics + { + PlayerGUID = packet.ReadGuid().To128(GetSession().GameState), + Rank = packet.ReadInt32(), + Kills = packet.ReadUInt32(), + Honor = new() + { + HonorKills = packet.ReadUInt32(), + Deaths = packet.ReadUInt32(), + ContributionPoints = packet.ReadUInt32() + } + }; int statsCount = packet.ReadInt32(); for (int j = 0; j < statsCount; j++) @@ -328,16 +360,20 @@ void HandlePvPLogDataTBC(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics(); - player.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); - player.Kills = packet.ReadUInt32(); + PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics + { + PlayerGUID = packet.ReadGuid().To128(GetSession().GameState), + Kills = packet.ReadUInt32() + }; if (pvp.ArenaTeams == null) { - player.Honor = new(); - player.Honor.HonorKills = packet.ReadUInt32(); - player.Honor.Deaths = packet.ReadUInt32(); - player.Honor.ContributionPoints = packet.ReadUInt32(); + player.Honor = new() + { + HonorKills = packet.ReadUInt32(), + Deaths = packet.ReadUInt32(), + ContributionPoints = packet.ReadUInt32() + }; } else { @@ -375,9 +411,11 @@ void HandlePvPLogDataTBC(WorldPacket packet) BattlegroundPlayerPosition ReadBattlegroundPlayerPosition(WorldPacket packet) { - BattlegroundPlayerPosition position = new BattlegroundPlayerPosition(); - position.Guid = packet.ReadGuid().To128(GetSession().GameState); - position.Pos = packet.ReadVector2(); + BattlegroundPlayerPosition position = new BattlegroundPlayerPosition + { + Guid = packet.ReadGuid().To128(GetSession().GameState), + Pos = packet.ReadVector2() + }; return position; } @@ -450,27 +488,33 @@ void HandleBattlegroundPlayerPositionsTBC(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEGROUND_PLAYER_LEFT)] void HandleBattlegroundPlayerLeftOrJoined(WorldPacket packet) { - BattlegroundPlayerLeftOrJoined player = new BattlegroundPlayerLeftOrJoined(packet.GetUniversalOpcode(false)); - player.Guid = packet.ReadGuid().To128(GetSession().GameState); + BattlegroundPlayerLeftOrJoined player = new BattlegroundPlayerLeftOrJoined(packet.GetUniversalOpcode(false)) + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(player); } [PacketHandler(Opcode.SMSG_AREA_SPIRIT_HEALER_TIME)] void HandleAreaSpiritHealerTime(WorldPacket packet) { - AreaSpiritHealerTime healer = new AreaSpiritHealerTime(); - healer.HealerGuid = packet.ReadGuid().To128(GetSession().GameState); - healer.TimeLeft = packet.ReadUInt32(); + AreaSpiritHealerTime healer = new AreaSpiritHealerTime + { + HealerGuid = packet.ReadGuid().To128(GetSession().GameState), + TimeLeft = packet.ReadUInt32() + }; SendPacketToClient(healer); } [PacketHandler(Opcode.SMSG_PVP_CREDIT)] void HandlePvPCredit(WorldPacket packet) { - PvPCredit credit = new PvPCredit(); - credit.OriginalHonor = packet.ReadInt32(); - credit.Target = packet.ReadGuid().To128(GetSession().GameState); - credit.Rank = packet.ReadUInt32(); + PvPCredit credit = new PvPCredit + { + OriginalHonor = packet.ReadInt32(), + Target = packet.ReadGuid().To128(GetSession().GameState), + Rank = packet.ReadUInt32() + }; SendPacketToClient(credit); } diff --git a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs index b016c3ff..8b2ec59f 100644 --- a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs @@ -13,13 +13,15 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_ENUM_CHARACTERS_RESULT)] void HandleEnumCharactersResult(WorldPacket packet) { - EnumCharactersResult charEnum = new(); - charEnum.Success = true; - charEnum.IsDeletedCharacters = false; - charEnum.IsNewPlayerRestrictionSkipped = false; - charEnum.IsNewPlayerRestricted = false; - charEnum.IsNewPlayer = true; - charEnum.IsAlliedRacesCreationAllowed = false; + EnumCharactersResult charEnum = new() + { + Success = true, + IsDeletedCharacters = false, + IsNewPlayerRestrictionSkipped = false, + IsNewPlayerRestricted = false, + IsNewPlayer = true, + IsAlliedRacesCreationAllowed = false + }; GetSession().GameState.OwnCharacters.Clear(); @@ -134,8 +136,10 @@ void HandleCreateChar(WorldPacket packet) { byte result = packet.ReadUInt8(); - CreateChar createChar = new CreateChar(); - createChar.Guid = new WowGuid128(); + CreateChar createChar = new CreateChar + { + Guid = new WowGuid128() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { Enums.TBC.ResponseCodes legacyCode = (Enums.TBC.ResponseCodes)result; @@ -229,8 +233,10 @@ void HandleQueryPlayerNameResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGIN_VERIFY_WORLD)] void HandleLoginVerifyWorld(WorldPacket packet) { - LoginVerifyWorld verify = new LoginVerifyWorld(); - verify.MapID = packet.ReadUInt32(); + LoginVerifyWorld verify = new LoginVerifyWorld + { + MapID = packet.ReadUInt32() + }; GetSession().GameState.CurrentMapId = verify.MapID; verify.Pos.X = packet.ReadFloat(); verify.Pos.Y = packet.ReadFloat(); @@ -251,20 +257,26 @@ void HandleLoginVerifyWorld(WorldPacket packet) SetAllTaskProgress tasks = new(); SendPacketToClient(tasks); - InitialSetup setup = new(); - setup.ServerExpansionLevel = (byte)(LegacyVersion.ExpansionVersion - 1); + InitialSetup setup = new() + { + ServerExpansionLevel = (byte)(LegacyVersion.ExpansionVersion - 1) + }; SendPacketToClient(setup); - LoadCUFProfiles cuf = new(); - cuf.Data = GetSession().AccountDataMgr.LoadCUFProfiles(); + LoadCUFProfiles cuf = new() + { + Data = GetSession().AccountDataMgr.LoadCUFProfiles() + }; SendPacketToClient(cuf); } [PacketHandler(Opcode.SMSG_CHARACTER_LOGIN_FAILED)] void HandleCharacterLoginFailed(WorldPacket packet) { - CharacterLoginFailed failed = new CharacterLoginFailed(); - failed.Code = (Framework.Constants.LoginFailureReason)packet.ReadUInt8(); + CharacterLoginFailed failed = new CharacterLoginFailed + { + Code = (Framework.Constants.LoginFailureReason)packet.ReadUInt8() + }; SendPacketToClient(failed); GetSession().GameState.IsInWorld = false; @@ -303,9 +315,11 @@ void HandleUpdateActionButtons(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGOUT_RESPONSE)] void HandleLogoutResponse(WorldPacket packet) { - LogoutResponse logout = new LogoutResponse(); - logout.LogoutResult = packet.ReadInt32(); - logout.Instant = packet.ReadBool(); + LogoutResponse logout = new LogoutResponse + { + LogoutResult = packet.ReadInt32(), + Instant = packet.ReadBool() + }; SendPacketToClient(logout); } @@ -330,10 +344,12 @@ void HandleLogoutCancelAck(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOG_XP_GAIN)] void HandleLogXPGain(WorldPacket packet) { - LogXPGain log = new(); - log.Victim = packet.ReadGuid().To128(GetSession().GameState); - log.Original = packet.ReadInt32(); - log.Reason = (PlayerLogXPReason)packet.ReadUInt8(); + LogXPGain log = new() + { + Victim = packet.ReadGuid().To128(GetSession().GameState), + Original = packet.ReadInt32(), + Reason = (PlayerLogXPReason)packet.ReadUInt8() + }; if (log.Reason == PlayerLogXPReason.Kill) { log.Amount = packet.ReadInt32(); @@ -347,9 +363,11 @@ void HandleLogXPGain(WorldPacket packet) [PacketHandler(Opcode.SMSG_PLAYED_TIME)] void HandlePlayedTime(WorldPacket packet) { - PlayedTime played = new(); - played.TotalTime = packet.ReadUInt32(); - played.LevelTime = packet.ReadUInt32(); + PlayedTime played = new() + { + TotalTime = packet.ReadUInt32(), + LevelTime = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) played.TriggerEvent = packet.ReadBool(); else @@ -360,9 +378,11 @@ void HandlePlayedTime(WorldPacket packet) [PacketHandler(Opcode.SMSG_LEVEL_UP_INFO)] void HandleLevelUpInfo(WorldPacket packet) { - LevelUpInfo info = new LevelUpInfo(); - info.Level = packet.ReadInt32(); - info.HealthDelta = packet.ReadInt32(); + LevelUpInfo info = new LevelUpInfo + { + Level = packet.ReadInt32(), + HealthDelta = packet.ReadInt32() + }; for (var i = 0; i < LegacyVersion.GetPowersCount(); i++) info.PowerDelta[i] = packet.ReadInt32(); @@ -421,8 +441,10 @@ void HandleInspectResult(WorldPacket packet) uint itemId = updates[PLAYER_VISIBLE_ITEM_1_0 + i * offset].UInt32Value; if (itemId != 0) { - InspectItemData itemData = new InspectItemData(); - itemData.Index = i; + InspectItemData itemData = new InspectItemData + { + Index = i + }; itemData.Item.ItemID = itemId; inspect.DisplayInfo.Items.Add(itemData); } @@ -440,8 +462,10 @@ void HandleInspectResult(WorldPacket packet) uint itemId = updates[PLAYER_VISIBLE_ITEM_1_ENTRYID + i * offset].UInt32Value; if (itemId != 0) { - InspectItemData itemData = new InspectItemData(); - itemData.Index = i; + InspectItemData itemData = new InspectItemData + { + Index = i + }; itemData.Item.ItemID = itemId; inspect.DisplayInfo.Items.Add(itemData); } @@ -451,8 +475,10 @@ void HandleInspectResult(WorldPacket packet) int PLAYER_GUILDID = LegacyVersion.GetUpdateField(PlayerField.PLAYER_GUILDID); if (PLAYER_GUILDID >= 0 && updates.ContainsKey(PLAYER_GUILDID)) { - inspect.GuildData = new InspectGuildData(); - inspect.GuildData.GuildGUID = WowGuid128.Create(HighGuidType703.Guild, updates[PLAYER_GUILDID].UInt32Value); + inspect.GuildData = new InspectGuildData + { + GuildGUID = WowGuid128.Create(HighGuidType703.Guild, updates[PLAYER_GUILDID].UInt32Value) + }; } int PLAYER_FIELD_BYTES = LegacyVersion.GetUpdateField(PlayerField.PLAYER_FIELD_BYTES); if (PLAYER_FIELD_BYTES >= 0 && updates.ContainsKey(PLAYER_FIELD_BYTES)) @@ -499,33 +525,37 @@ void HandleInspectHonorStatsVanilla(WorldPacket packet) if (ModernVersion.ExpansionVersion == 1) { - InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic(); - inspect.PlayerGUID = playerGuid; - inspect.LifetimeHighestRank = lifetimeHighestRank; - inspect.TodayHonorableKills = todayHonorableKills; - inspect.TodayDishonorableKills = todayDishonorableKills; - inspect.YesterdayHonorableKills = yesterdayHonorableKills; - inspect.YesterdayDishonorableKills = yesterdayDishonorableKills; - inspect.LastWeekHonorableKills = lastWeekHonorableKills; - inspect.LastWeekDishonorableKills = lastWeekDishonorableKills; - inspect.ThisWeekHonorableKills = thisWeekHonorableKills; - inspect.ThisWeekDishonorableKills = thisWeekDishonorableKills; - inspect.LifetimeHonorableKills = lifetimeHonorableKills; - inspect.LifetimeDishonorableKills = lifetimeDishonorableKills; - inspect.YesterdayHonor = yesterdayHonor; - inspect.LastWeekHonor = lastWeekHonor; - inspect.ThisWeekHonor = thisWeekHonor; - inspect.Standing = standing; - inspect.RankProgress = rankProgress; + InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic + { + PlayerGUID = playerGuid, + LifetimeHighestRank = lifetimeHighestRank, + TodayHonorableKills = todayHonorableKills, + TodayDishonorableKills = todayDishonorableKills, + YesterdayHonorableKills = yesterdayHonorableKills, + YesterdayDishonorableKills = yesterdayDishonorableKills, + LastWeekHonorableKills = lastWeekHonorableKills, + LastWeekDishonorableKills = lastWeekDishonorableKills, + ThisWeekHonorableKills = thisWeekHonorableKills, + ThisWeekDishonorableKills = thisWeekDishonorableKills, + LifetimeHonorableKills = lifetimeHonorableKills, + LifetimeDishonorableKills = lifetimeDishonorableKills, + YesterdayHonor = yesterdayHonor, + LastWeekHonor = lastWeekHonor, + ThisWeekHonor = thisWeekHonor, + Standing = standing, + RankProgress = rankProgress + }; SendPacketToClient(inspect); } else { - InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC(); - inspect.PlayerGUID = playerGuid; - inspect.LifetimeHighestRank = lifetimeHighestRank; - inspect.YesterdayHonorableKills = yesterdayHonorableKills; - inspect.LifetimeHonorableKills = (ushort)lifetimeHonorableKills; + InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC + { + PlayerGUID = playerGuid, + LifetimeHighestRank = lifetimeHighestRank, + YesterdayHonorableKills = yesterdayHonorableKills, + LifetimeHonorableKills = (ushort)lifetimeHonorableKills + }; SendPacketToClient(inspect); } } @@ -543,23 +573,27 @@ void HandleInspectHonorStatsTBC(WorldPacket packet) if (ModernVersion.ExpansionVersion == 1) { - InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic(); - inspect.PlayerGUID = playerGuid; - inspect.LifetimeHighestRank = lifetimeHighestRank; - inspect.TodayHonorableKills = todayHonorableKills; - inspect.YesterdayHonorableKills = yesterdayHonorableKills; - inspect.LifetimeHonorableKills = lifetimeHonorableKills; - inspect.YesterdayHonor = yesterdayHonor; - inspect.LastWeekHonor = todayHonor; + InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic + { + PlayerGUID = playerGuid, + LifetimeHighestRank = lifetimeHighestRank, + TodayHonorableKills = todayHonorableKills, + YesterdayHonorableKills = yesterdayHonorableKills, + LifetimeHonorableKills = lifetimeHonorableKills, + YesterdayHonor = yesterdayHonor, + LastWeekHonor = todayHonor + }; SendPacketToClient(inspect); } else { - InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC(); - inspect.PlayerGUID = playerGuid; - inspect.LifetimeHighestRank = lifetimeHighestRank; - inspect.YesterdayHonorableKills = yesterdayHonorableKills; - inspect.LifetimeHonorableKills = (ushort)lifetimeHonorableKills; + InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC + { + PlayerGUID = playerGuid, + LifetimeHighestRank = lifetimeHighestRank, + YesterdayHonorableKills = yesterdayHonorableKills, + LifetimeHonorableKills = (ushort)lifetimeHonorableKills + }; SendPacketToClient(inspect); } } @@ -567,8 +601,10 @@ void HandleInspectHonorStatsTBC(WorldPacket packet) [PacketHandler(Opcode.MSG_INSPECT_ARENA_TEAMS)] void HandleInspectArenaTeams(WorldPacket packet) { - InspectPvP inspect = new InspectPvP(); - inspect.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); + InspectPvP inspect = new InspectPvP + { + PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) + }; ArenaTeamInspectData team = new ArenaTeamInspectData(); byte slot = packet.ReadUInt8(); uint teamId = packet.ReadUInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs index 796518c3..67664ea6 100644 --- a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs @@ -55,19 +55,23 @@ void HandleChannelNotify(WorldPacket packet) GetSession().GameState.SetChannelId(channelName, channelId); - ChannelNotifyJoined joined = new ChannelNotifyJoined(); - joined.Channel = channelName; - joined.ChannelFlags = flags; - joined.ChatChannelID = channelId; - joined.ChannelGUID = WowGuid128.Create(HighGuidType703.ChatChannel, (uint)GetSession().GameState.CurrentMapId, (uint)GetSession().GameState.CurrentZoneId, (ulong)channelId); + ChannelNotifyJoined joined = new ChannelNotifyJoined + { + Channel = channelName, + ChannelFlags = flags, + ChatChannelID = channelId, + ChannelGUID = WowGuid128.Create(HighGuidType703.ChatChannel, (uint)GetSession().GameState.CurrentMapId, (uint)GetSession().GameState.CurrentZoneId, (ulong)channelId) + }; SendPacketToClient(joined); break; } case ChatNotify.YouLeft: { - ChannelNotifyLeft left = new ChannelNotifyLeft(); - left.Channel = channelName; + ChannelNotifyLeft left = new ChannelNotifyLeft + { + Channel = channelName + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { left.ChatChannelID = packet.ReadInt32(); @@ -144,10 +148,12 @@ void HandleChannelList(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - ChannelPlayer member = new ChannelPlayer(); - member.Guid = packet.ReadGuid().To128(GetSession().GameState); - member.VirtualRealmAddress = GetSession().RealmId.GetAddress(); - member.Flags = packet.ReadUInt8(); + ChannelPlayer member = new ChannelPlayer + { + Guid = packet.ReadGuid().To128(GetSession().GameState), + VirtualRealmAddress = GetSession().RealmId.GetAddress(), + Flags = packet.ReadUInt8() + }; list.Members.Add(member); } SendPacketToClient(list); @@ -461,17 +467,21 @@ public void SendMessageChatWotLK(ChatMessageTypeWotLK type, uint lang, string ms [PacketHandler(Opcode.SMSG_EMOTE)] void HandleEmote(WorldPacket packet) { - EmoteMessage emote = new EmoteMessage(); - emote.EmoteID = packet.ReadUInt32(); - emote.Guid = packet.ReadGuid().To128(GetSession().GameState); + EmoteMessage emote = new EmoteMessage + { + EmoteID = packet.ReadUInt32(), + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(emote); } [PacketHandler(Opcode.SMSG_TEXT_EMOTE)] void HandleTextEmote(WorldPacket packet) { - STextEmote emote = new STextEmote(); - emote.SourceGUID = packet.ReadGuid().To128(GetSession().GameState); + STextEmote emote = new STextEmote + { + SourceGUID = packet.ReadGuid().To128(GetSession().GameState) + }; emote.SourceAccountGUID = GetSession().GetGameAccountGuidForPlayer(emote.SourceGUID); emote.EmoteID = packet.ReadInt32(); emote.SoundIndex = packet.ReadInt32(); @@ -485,24 +495,30 @@ void HandleTextEmote(WorldPacket packet) [PacketHandler(Opcode.SMSG_PRINT_NOTIFICATION)] void HandlePrintNotification(WorldPacket packet) { - PrintNotification notify = new PrintNotification(); - notify.NotifyText = packet.ReadCString(); + PrintNotification notify = new PrintNotification + { + NotifyText = packet.ReadCString() + }; SendPacketToClient(notify); } [PacketHandler(Opcode.SMSG_CHAT_PLAYER_NOTFOUND)] void HandleChatPlayerNotFound(WorldPacket packet) { - ChatPlayerNotfound error = new ChatPlayerNotfound(); - error.Name = packet.ReadCString(); + ChatPlayerNotfound error = new ChatPlayerNotfound + { + Name = packet.ReadCString() + }; SendPacketToClient(error); } [PacketHandler(Opcode.SMSG_DEFENSE_MESSAGE)] void HandleDefenseMessage(WorldPacket packet) { - DefenseMessage message = new DefenseMessage(); - message.ZoneID = packet.ReadUInt32(); + DefenseMessage message = new DefenseMessage + { + ZoneID = packet.ReadUInt32() + }; packet.ReadUInt32(); // message length message.MessageText = packet.ReadCString(); SendPacketToClient(message); @@ -511,9 +527,11 @@ void HandleDefenseMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_CHAT_SERVER_MESSAGE)] void HandleChatServerMessage(WorldPacket packet) { - ChatServerMessage message = new ChatServerMessage(); - message.MessageID = packet.ReadInt32(); - message.StringParam = packet.ReadCString(); + ChatServerMessage message = new ChatServerMessage + { + MessageID = packet.ReadInt32(), + StringParam = packet.ReadCString() + }; SendPacketToClient(message); } diff --git a/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs b/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs index 3ae8e227..8e7dd5ed 100644 --- a/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/CombatHandler.cs @@ -11,18 +11,22 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_ATTACK_START)] void HandleAttackStart(WorldPacket packet) { - SAttackStart attack = new(); - attack.Attacker = packet.ReadGuid().To128(GetSession().GameState); - attack.Victim = packet.ReadGuid().To128(GetSession().GameState); + SAttackStart attack = new() + { + Attacker = packet.ReadGuid().To128(GetSession().GameState), + Victim = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_ATTACK_STOP)] void HandleAttackStop(WorldPacket packet) { - SAttackStop attack = new(); - attack.Attacker = packet.ReadPackedGuid().To128(GetSession().GameState); - attack.Victim = packet.ReadPackedGuid().To128(GetSession().GameState); - attack.NowDead = packet.ReadUInt32() != 0; + SAttackStop attack = new() + { + Attacker = packet.ReadPackedGuid().To128(GetSession().GameState), + Victim = packet.ReadPackedGuid().To128(GetSession().GameState), + NowDead = packet.ReadUInt32() != 0 + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_ATTACKER_STATE_UPDATE)] @@ -82,19 +86,21 @@ void HandleAttackerStateUpdate(WorldPacket packet) if (hitInfo.HasAnyFlag(HitInfo.Unk0)) { - attack.UnkState = new(); - attack.UnkState.State1 = packet.ReadUInt32(); - attack.UnkState.State2 = packet.ReadFloat(); - attack.UnkState.State3 = packet.ReadFloat(); - attack.UnkState.State4 = packet.ReadFloat(); - attack.UnkState.State5 = packet.ReadFloat(); - attack.UnkState.State6 = packet.ReadFloat(); - attack.UnkState.State7 = packet.ReadFloat(); - attack.UnkState.State8 = packet.ReadFloat(); - attack.UnkState.State9 = packet.ReadFloat(); - attack.UnkState.State10 = packet.ReadFloat(); - attack.UnkState.State11 = packet.ReadFloat(); - attack.UnkState.State12 = packet.ReadUInt32(); + attack.UnkState = new() + { + State1 = packet.ReadUInt32(), + State2 = packet.ReadFloat(), + State3 = packet.ReadFloat(), + State4 = packet.ReadFloat(), + State5 = packet.ReadFloat(), + State6 = packet.ReadFloat(), + State7 = packet.ReadFloat(), + State8 = packet.ReadFloat(), + State9 = packet.ReadFloat(), + State10 = packet.ReadFloat(), + State11 = packet.ReadFloat(), + State12 = packet.ReadUInt32() + }; packet.ReadUInt32(); packet.ReadUInt32(); } @@ -104,29 +110,37 @@ void HandleAttackerStateUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_ATTACKSWING_NOTINRANGE)] void HandleAttackSwingNotInRange(WorldPacket packet) { - AttackSwingError attack = new(); - attack.Reason = AttackSwingErr.NotInRange; + AttackSwingError attack = new() + { + Reason = AttackSwingErr.NotInRange + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_ATTACKSWING_BADFACING)] void HandleAttackSwingBadFacing(WorldPacket packet) { - AttackSwingError attack = new(); - attack.Reason = AttackSwingErr.BadFacing; + AttackSwingError attack = new() + { + Reason = AttackSwingErr.BadFacing + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_ATTACKSWING_DEADTARGET)] void HandleAttackSwingDeadTarget(WorldPacket packet) { - AttackSwingError attack = new(); - attack.Reason = AttackSwingErr.DeadTarget; + AttackSwingError attack = new() + { + Reason = AttackSwingErr.DeadTarget + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_ATTACKSWING_CANT_ATTACK)] void HandleAttackSwingCantAttack(WorldPacket packet) { - AttackSwingError attack = new(); - attack.Reason = AttackSwingErr.CantAttack; + AttackSwingError attack = new() + { + Reason = AttackSwingErr.CantAttack + }; SendPacketToClient(attack); } [PacketHandler(Opcode.SMSG_CANCEL_COMBAT)] @@ -138,17 +152,21 @@ void HandleCancelCombat(WorldPacket packet) [PacketHandler(Opcode.SMSG_AI_REACTION)] void HandleAIReaction(WorldPacket packet) { - AIReaction reaction = new(); - reaction.UnitGUID = packet.ReadGuid().To128(GetSession().GameState); - reaction.Reaction = packet.ReadUInt32(); + AIReaction reaction = new() + { + UnitGUID = packet.ReadGuid().To128(GetSession().GameState), + Reaction = packet.ReadUInt32() + }; SendPacketToClient(reaction); } [PacketHandler(Opcode.SMSG_PARTY_KILL_LOG)] void HandlePartyKillLog(WorldPacket packet) { - PartyKillLog log = new(); - log.Player = packet.ReadGuid().To128(GetSession().GameState); - log.Victim = packet.ReadGuid().To128(GetSession().GameState); + PartyKillLog log = new() + { + Player = packet.ReadGuid().To128(GetSession().GameState), + Victim = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(log); } } diff --git a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs index d6ab3e61..096b525a 100644 --- a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs @@ -9,9 +9,11 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_DUEL_REQUESTED)] void HandleDuelRequested(WorldPacket packet) { - DuelRequested duel = new DuelRequested(); - duel.ArbiterGUID = packet.ReadGuid().To128(GetSession().GameState); - duel.RequestedByGUID = packet.ReadGuid().To128(GetSession().GameState); + DuelRequested duel = new DuelRequested + { + ArbiterGUID = packet.ReadGuid().To128(GetSession().GameState), + RequestedByGUID = packet.ReadGuid().To128(GetSession().GameState) + }; duel.RequestedByWowAccount = GetSession().GetGameAccountGuidForPlayer(duel.RequestedByGUID); SendPacketToClient(duel); } @@ -19,28 +21,34 @@ void HandleDuelRequested(WorldPacket packet) [PacketHandler(Opcode.SMSG_DUEL_COUNTDOWN)] void HandleDuelCountdown(WorldPacket packet) { - DuelCountdown duel = new DuelCountdown(); - duel.Countdown = packet.ReadUInt32(); + DuelCountdown duel = new DuelCountdown + { + Countdown = packet.ReadUInt32() + }; SendPacketToClient(duel); } [PacketHandler(Opcode.SMSG_DUEL_COMPLETE)] void HandleDuelComplete(WorldPacket packet) { - DuelComplete duel = new DuelComplete(); - duel.Started = packet.ReadBool(); + DuelComplete duel = new DuelComplete + { + Started = packet.ReadBool() + }; SendPacketToClient(duel); } [PacketHandler(Opcode.SMSG_DUEL_WINNER)] void HandleDuelWinner(WorldPacket packet) { - DuelWinner duel = new DuelWinner(); - duel.Fled = packet.ReadBool(); - duel.BeatenName = packet.ReadCString(); - duel.WinnerName = packet.ReadCString(); - duel.BeatenVirtualRealmAddress = GetSession().RealmId.GetAddress(); - duel.WinnerVirtualRealmAddress = GetSession().RealmId.GetAddress(); + DuelWinner duel = new DuelWinner + { + Fled = packet.ReadBool(), + BeatenName = packet.ReadCString(), + WinnerName = packet.ReadCString(), + BeatenVirtualRealmAddress = GetSession().RealmId.GetAddress(), + WinnerVirtualRealmAddress = GetSession().RealmId.GetAddress() + }; SendPacketToClient(duel); } diff --git a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs index d0dac978..33943e03 100644 --- a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs @@ -10,8 +10,10 @@ public partial class WorldClient void HandleGameObjectDespawn(WorldPacket packet) { WowGuid64 guid = packet.ReadGuid(); - GameObjectDespawn despawn = new GameObjectDespawn(); - despawn.ObjectGUID = guid.To128(GetSession().GameState); + GameObjectDespawn despawn = new GameObjectDespawn + { + ObjectGUID = guid.To128(GetSession().GameState) + }; SendPacketToClient(despawn); GetSession().GameState.DespawnedGameObjects.Add(guid); } @@ -19,17 +21,21 @@ void HandleGameObjectDespawn(WorldPacket packet) [PacketHandler(Opcode.SMSG_GAME_OBJECT_RESET_STATE)] void HandleGameObjectResetState(WorldPacket packet) { - GameObjectResetState reset = new GameObjectResetState(); - reset.ObjectGUID = packet.ReadGuid().To128(GetSession().GameState); + GameObjectResetState reset = new GameObjectResetState + { + ObjectGUID = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(reset); } [PacketHandler(Opcode.SMSG_GAME_OBJECT_CUSTOM_ANIM)] void HandleGameObjectCustomAnim(WorldPacket packet) { - GameObjectCustomAnim anim = new GameObjectCustomAnim(); - anim.ObjectGUID = packet.ReadGuid().To128(GetSession().GameState); - anim.CustomAnim = packet.ReadUInt32(); + GameObjectCustomAnim anim = new GameObjectCustomAnim + { + ObjectGUID = packet.ReadGuid().To128(GetSession().GameState), + CustomAnim = packet.ReadUInt32() + }; SendPacketToClient(anim); } diff --git a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs index d78ce84e..28b5c9a0 100644 --- a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs @@ -12,10 +12,12 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_PARTY_COMMAND_RESULT)] void HandlePartyCommandResult(WorldPacket packet) { - PartyCommandResult party = new PartyCommandResult(); - party.Command = (byte)packet.ReadUInt32(); - party.Name = packet.ReadCString(); - party.Result = (byte)packet.ReadUInt32(); + PartyCommandResult party = new PartyCommandResult + { + Command = (byte)packet.ReadUInt32(), + Name = packet.ReadCString(), + Result = (byte)packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) party.ResultData = packet.ReadUInt32(); SendPacketToClient(party); @@ -24,8 +26,10 @@ void HandlePartyCommandResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_DECLINE)] void HandleGroupDecline(WorldPacket packet) { - GroupDecline party = new GroupDecline(); - party.Name = packet.ReadCString(); + GroupDecline party = new GroupDecline + { + Name = packet.ReadCString() + }; SendPacketToClient(party); } @@ -64,8 +68,10 @@ void HandleGroupInvite(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_LIST, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleGroupListVanilla(WorldPacket packet) { - PartyUpdate party = new PartyUpdate(); - party.SequenceNum = GetSession().GameState.GroupUpdateCounter++; + PartyUpdate party = new PartyUpdate + { + SequenceNum = GetSession().GameState.GroupUpdateCounter++ + }; bool isRaid = packet.ReadBool(); byte ownSubGroupAndFlags = packet.ReadUInt8(); party.PartyIndex = (byte)(isRaid && GetSession().GameState.IsInBattleground() ? 1 : 0); @@ -80,8 +86,10 @@ void HandleGroupListVanilla(WorldPacket packet) if (isRaid) party.PartyFlags |= GroupFlags.Raid; - party.DifficultySettings = new PartyDifficultySettings(); - party.DifficultySettings.DungeonDifficultyID = Difficulty.Normal; + party.DifficultySettings = new PartyDifficultySettings + { + DungeonDifficultyID = Difficulty.Normal + }; if (ModernVersion.ExpansionVersion > 1) party.DifficultySettings.RaidDifficultyID = Difficulty.Raid25N; @@ -93,8 +101,10 @@ void HandleGroupListVanilla(WorldPacket packet) else party.PartyType = GroupType.Normal; - PartyPlayerInfo player = new PartyPlayerInfo(); - player.GUID = GetSession().GameState.CurrentPlayerGuid; + PartyPlayerInfo player = new PartyPlayerInfo + { + GUID = GetSession().GameState.CurrentPlayerGuid + }; player.Name = GetSession().GameState.GetPlayerName(player.GUID); player.Subgroup = (byte)(ownSubGroupAndFlags & 0xF); player.Flags = (ownSubGroupAndFlags & 0x80) != 0 ? GroupMemberFlags.Assistant : GroupMemberFlags.None; @@ -104,10 +114,12 @@ void HandleGroupListVanilla(WorldPacket packet) bool allAssist = true; for (uint i = 0; i < membersCount; i++) { - PartyPlayerInfo member = new PartyPlayerInfo(); - member.Name = packet.ReadCString(); - member.GUID = packet.ReadGuid().To128(GetSession().GameState); - member.Status = (GroupMemberOnlineStatus)packet.ReadUInt8(); + PartyPlayerInfo member = new PartyPlayerInfo + { + Name = packet.ReadCString(), + GUID = packet.ReadGuid().To128(GetSession().GameState), + Status = (GroupMemberOnlineStatus)packet.ReadUInt8() + }; byte subGroupAndFlags = packet.ReadUInt8(); member.Subgroup = (byte)(subGroupAndFlags & 0xF); member.Flags = (subGroupAndFlags & 0x80) != 0 ? GroupMemberFlags.Assistant : GroupMemberFlags.None; @@ -127,10 +139,12 @@ void HandleGroupListVanilla(WorldPacket packet) party.LeaderGUID = packet.ReadGuid().To128(GetSession().GameState); - party.LootSettings = new PartyLootSettings(); - party.LootSettings.Method = (LootMethod)packet.ReadUInt8(); - party.LootSettings.LootMaster = packet.ReadGuid().To128(GetSession().GameState); - party.LootSettings.Threshold = packet.ReadUInt8(); + party.LootSettings = new PartyLootSettings + { + Method = (LootMethod)packet.ReadUInt8(), + LootMaster = packet.ReadGuid().To128(GetSession().GameState), + Threshold = packet.ReadUInt8() + }; GetSession().GameState.CurrentGroups[party.PartyIndex] = party; } else @@ -149,8 +163,10 @@ void HandleGroupListVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_LIST, ClientVersionBuild.V2_0_1_6180)] void HandleGroupListTBC(WorldPacket packet) { - PartyUpdate party = new PartyUpdate(); - party.SequenceNum = GetSession().GameState.GroupUpdateCounter++; + PartyUpdate party = new PartyUpdate + { + SequenceNum = GetSession().GameState.GroupUpdateCounter++ + }; bool isRaid = packet.ReadBool(); bool isBattleground = packet.ReadBool(); byte ownSubGroup = packet.ReadUInt8(); @@ -172,8 +188,10 @@ void HandleGroupListTBC(WorldPacket packet) else party.PartyType = GroupType.Normal; - PartyPlayerInfo player = new PartyPlayerInfo(); - player.GUID = GetSession().GameState.CurrentPlayerGuid; + PartyPlayerInfo player = new PartyPlayerInfo + { + GUID = GetSession().GameState.CurrentPlayerGuid + }; player.Name = GetSession().GameState.GetPlayerName(player.GUID); player.Subgroup = ownSubGroup; player.Flags = (GroupMemberFlags)ownGroupFlags; @@ -183,12 +201,14 @@ void HandleGroupListTBC(WorldPacket packet) bool allAssist = true; for (uint i = 0; i < membersCount; i++) { - PartyPlayerInfo member = new PartyPlayerInfo(); - member.Name = packet.ReadCString(); - member.GUID = packet.ReadGuid().To128(GetSession().GameState); - member.Status = (GroupMemberOnlineStatus)packet.ReadUInt8(); - member.Subgroup = packet.ReadUInt8(); - member.Flags = (GroupMemberFlags)packet.ReadUInt8(); + PartyPlayerInfo member = new PartyPlayerInfo + { + Name = packet.ReadCString(), + GUID = packet.ReadGuid().To128(GetSession().GameState), + Status = (GroupMemberOnlineStatus)packet.ReadUInt8(), + Subgroup = packet.ReadUInt8(), + Flags = (GroupMemberFlags)packet.ReadUInt8() + }; member.ClassId = GetSession().GameState.GetUnitClass(member.GUID); if (!member.Flags.HasAnyFlag(GroupMemberFlags.Assistant)) allAssist = false; @@ -205,13 +225,17 @@ void HandleGroupListTBC(WorldPacket packet) party.LeaderGUID = packet.ReadGuid().To128(GetSession().GameState); - party.LootSettings = new PartyLootSettings(); - party.LootSettings.Method = (LootMethod)packet.ReadUInt8(); - party.LootSettings.LootMaster = packet.ReadGuid().To128(GetSession().GameState); - party.LootSettings.Threshold = packet.ReadUInt8(); + party.LootSettings = new PartyLootSettings + { + Method = (LootMethod)packet.ReadUInt8(), + LootMaster = packet.ReadGuid().To128(GetSession().GameState), + Threshold = packet.ReadUInt8() + }; - party.DifficultySettings = new PartyDifficultySettings(); - party.DifficultySettings.DungeonDifficultyID = (Difficulty)packet.ReadUInt8(); + party.DifficultySettings = new PartyDifficultySettings + { + DungeonDifficultyID = (Difficulty)packet.ReadUInt8() + }; if (ModernVersion.ExpansionVersion > 1) party.DifficultySettings.RaidDifficultyID = Difficulty.Raid25N; @@ -243,9 +267,11 @@ void HandleGroupUninvite(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_NEW_LEADER)] void HandleGroupNewLeader(WorldPacket packet) { - GroupNewLeader party = new GroupNewLeader(); - party.Name = packet.ReadCString(); - party.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); + GroupNewLeader party = new GroupNewLeader + { + Name = packet.ReadCString(), + PartyIndex = GetSession().GameState.GetCurrentPartyIndex() + }; SendPacketToClient(party); } @@ -254,27 +280,33 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) { if (!packet.CanRead()) { - ReadyCheckStarted ready = new ReadyCheckStarted(); - ready.InitiatorGUID = GetSession().GameState.GetCurrentGroupLeader(); - ready.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); - ready.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckStarted ready = new ReadyCheckStarted + { + InitiatorGUID = GetSession().GameState.GetCurrentGroupLeader(), + PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(ready); } else { - ReadyCheckResponse ready = new ReadyCheckResponse(); - ready.Player = packet.ReadGuid().To128(GetSession().GameState); - ready.IsReady = packet.ReadBool(); - ready.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckResponse ready = new ReadyCheckResponse + { + Player = packet.ReadGuid().To128(GetSession().GameState), + IsReady = packet.ReadBool(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(ready); GetSession().GameState.GroupReadyCheckResponses++; if (GetSession().GameState.GroupReadyCheckResponses >= GetSession().GameState.GetCurrentGroupSize()) { GetSession().GameState.GroupReadyCheckResponses = 0; - ReadyCheckCompleted completed = new ReadyCheckCompleted(); - completed.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); - completed.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckCompleted completed = new ReadyCheckCompleted + { + PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(completed); } } @@ -283,29 +315,35 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) [PacketHandler(Opcode.MSG_RAID_READY_CHECK, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheck(WorldPacket packet) { - ReadyCheckStarted ready = new ReadyCheckStarted(); - ready.InitiatorGUID = packet.ReadGuid().To128(GetSession().GameState); - ready.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); - ready.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckStarted ready = new ReadyCheckStarted + { + InitiatorGUID = packet.ReadGuid().To128(GetSession().GameState), + PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(ready); } [PacketHandler(Opcode.MSG_RAID_READY_CHECK_CONFIRM, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheckConfirm(WorldPacket packet) { - ReadyCheckResponse ready = new ReadyCheckResponse(); - ready.Player = packet.ReadGuid().To128(GetSession().GameState); - ready.IsReady = packet.ReadBool(); - ready.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckResponse ready = new ReadyCheckResponse + { + Player = packet.ReadGuid().To128(GetSession().GameState), + IsReady = packet.ReadBool(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(ready); GetSession().GameState.GroupReadyCheckResponses++; if (GetSession().GameState.GroupReadyCheckResponses >= GetSession().GameState.GetCurrentGroupSize()) { GetSession().GameState.GroupReadyCheckResponses = 0; - ReadyCheckCompleted completed = new ReadyCheckCompleted(); - completed.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); - completed.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckCompleted completed = new ReadyCheckCompleted + { + PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(completed); } } @@ -313,9 +351,11 @@ void HandleRaidReadyCheckConfirm(WorldPacket packet) [PacketHandler(Opcode.MSG_RAID_READY_CHECK_FINISHED, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheckFinished(WorldPacket packet) { - ReadyCheckCompleted ready = new ReadyCheckCompleted(); - ready.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); - ready.PartyGUID = GetSession().GameState.GetCurrentGroupGuid(); + ReadyCheckCompleted ready = new ReadyCheckCompleted + { + PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), + PartyGUID = GetSession().GameState.GetCurrentGroupGuid() + }; SendPacketToClient(ready); } @@ -325,8 +365,10 @@ void HandleRaidTargetUpdate(WorldPacket packet) bool isFullUpdate = packet.ReadBool(); if (isFullUpdate) { - SendRaidTargetUpdateAll update = new SendRaidTargetUpdateAll(); - update.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); + SendRaidTargetUpdateAll update = new SendRaidTargetUpdateAll + { + PartyIndex = GetSession().GameState.GetCurrentPartyIndex() + }; while (packet.CanRead()) { sbyte symbol = packet.ReadInt8(); @@ -337,8 +379,10 @@ void HandleRaidTargetUpdate(WorldPacket packet) } else { - SendRaidTargetUpdateSingle update = new SendRaidTargetUpdateSingle(); - update.PartyIndex = GetSession().GameState.GetCurrentPartyIndex(); + SendRaidTargetUpdateSingle update = new SendRaidTargetUpdateSingle + { + PartyIndex = GetSession().GameState.GetCurrentPartyIndex() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) update.ChangedBy = packet.ReadGuid().To128(GetSession().GameState); @@ -354,10 +398,12 @@ void HandleRaidTargetUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_SUMMON_REQUEST)] void HandleSummonRequest(WorldPacket packet) { - SummonRequest summon = new SummonRequest(); - summon.SummonerGUID = packet.ReadGuid().To128(GetSession().GameState); - summon.SummonerVirtualRealmAddress = GetSession().RealmId.GetAddress(); - summon.AreaID = packet.ReadInt32(); + SummonRequest summon = new SummonRequest + { + SummonerGUID = packet.ReadGuid().To128(GetSession().GameState), + SummonerVirtualRealmAddress = GetSession().RealmId.GetAddress(), + AreaID = packet.ReadInt32() + }; packet.ReadUInt32(); // time to accept SendPacketToClient(summon); } @@ -378,8 +424,10 @@ void HandlePartyMemberStats(WorldPacket packet) } } - PartyMemberPartialState state = new PartyMemberPartialState(); - state.AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState); + PartyMemberPartialState state = new PartyMemberPartialState + { + AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState) + }; var updateFlags = (GroupUpdateFlagVanilla)packet.ReadUInt32(); if (updateFlags.HasFlag(GroupUpdateFlagVanilla.Status)) @@ -408,9 +456,11 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.Position)) { - state.Position = new PartyMemberPartialState.Vector3_UInt16(); - state.Position.X = packet.ReadInt16(); - state.Position.Y = packet.ReadInt16(); + state.Position = new PartyMemberPartialState.Vector3_UInt16 + { + X = packet.ReadInt16(), + Y = packet.ReadInt16() + }; } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.Auras)) @@ -427,8 +477,10 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -452,8 +504,10 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -524,8 +578,10 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -551,8 +607,10 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -579,8 +637,10 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) } } - PartyMemberPartialState state = new PartyMemberPartialState(); - state.AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState); + PartyMemberPartialState state = new PartyMemberPartialState + { + AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState) + }; var updateFlags = (GroupUpdateFlagTBC)packet.ReadUInt32(); if (updateFlags.HasFlag(GroupUpdateFlagTBC.Status)) @@ -609,9 +669,11 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.Position)) { - state.Position = new PartyMemberPartialState.Vector3_UInt16(); - state.Position.X = packet.ReadInt16(); - state.Position.Y = packet.ReadInt16(); + state.Position = new PartyMemberPartialState.Vector3_UInt16 + { + X = packet.ReadInt16(), + Y = packet.ReadInt16() + }; } if (updateFlags.HasFlag(GroupUpdateFlagTBC.Auras)) @@ -626,8 +688,10 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; packet.ReadUInt8(); // unk if (aura.SpellId != 0) { @@ -697,8 +761,10 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; packet.ReadUInt8(); // unk if (aura.SpellId != 0) { @@ -785,8 +851,10 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -810,8 +878,10 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -882,8 +952,10 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -909,8 +981,10 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; if (aura.SpellId != 0) { aura.ActiveFlags = 1; @@ -994,8 +1068,10 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; packet.ReadUInt8(); // unk if (aura.SpellId != 0) { @@ -1065,8 +1141,10 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates(); - aura.SpellId = packet.ReadUInt16(); + PartyMemberAuraStates aura = new PartyMemberAuraStates + { + SpellId = packet.ReadUInt16() + }; packet.ReadUInt8(); // unk if (aura.SpellId != 0) { @@ -1083,20 +1161,24 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) [PacketHandler(Opcode.MSG_MINIMAP_PING)] void HandleMinimapPing(WorldPacket packet) { - MinimapPing ping = new MinimapPing(); - ping.SenderGUID = packet.ReadGuid().To128(GetSession().GameState); - ping.Position = packet.ReadVector2(); + MinimapPing ping = new MinimapPing + { + SenderGUID = packet.ReadGuid().To128(GetSession().GameState), + Position = packet.ReadVector2() + }; SendPacketToClient(ping); } [PacketHandler(Opcode.MSG_RANDOM_ROLL)] void HandleRandomRoll(WorldPacket packet) { - RandomRoll roll = new RandomRoll(); - roll.Min = packet.ReadInt32(); - roll.Max = packet.ReadInt32(); - roll.Result = packet.ReadInt32(); - roll.Roller = packet.ReadGuid().To128(GetSession().GameState); + RandomRoll roll = new RandomRoll + { + Min = packet.ReadInt32(), + Max = packet.ReadInt32(), + Result = packet.ReadInt32(), + Roller = packet.ReadGuid().To128(GetSession().GameState) + }; roll.RollerWowAccount = GetSession().GetGameAccountGuidForPlayer(roll.Roller); SendPacketToClient(roll); } diff --git a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs index 673c98c4..83a6f800 100644 --- a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs @@ -14,10 +14,12 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_GUILD_COMMAND_RESULT)] void HandleGuildCommandResult(WorldPacket packet) { - GuildCommandResult result = new(); - result.Command = (GuildCommandType)packet.ReadUInt32(); - result.Name = packet.ReadCString(); - result.Result = (GuildCommandError)packet.ReadUInt32(); + GuildCommandResult result = new() + { + Command = (GuildCommandType)packet.ReadUInt32(), + Name = packet.ReadCString(), + Result = (GuildCommandError)packet.ReadUInt32() + }; SendPacketToClient(result); } @@ -45,51 +47,61 @@ void HandleGuildEvent(WorldPacket packet) uint rankId = GetSession().GetGuildRankIdByName(GetSession().GameState.GetPlayerGuildId(GetSession().GameState.CurrentPlayerGuid), strings[2]); if (officer != null && player != null) { - GuildSendRankChange promote = new GuildSendRankChange(); - promote.Officer = officer; - promote.Other = player; - promote.Promote = eventType == GuildEventType.Promotion; - promote.RankID = rankId; + GuildSendRankChange promote = new GuildSendRankChange + { + Officer = officer, + Other = player, + Promote = eventType == GuildEventType.Promotion, + RankID = rankId + }; SendPacketToClient(promote); } break; } case GuildEventType.MOTD: { - GuildEventMotd motd = new GuildEventMotd(); - motd.MotdText = strings[0]; + GuildEventMotd motd = new GuildEventMotd + { + MotdText = strings[0] + }; SendPacketToClient(motd); break; } case GuildEventType.PlayerJoined: { - GuildEventPlayerJoined joined = new GuildEventPlayerJoined(); - joined.Guid = guid; - joined.VirtualRealmAddress = GetSession().RealmId.GetAddress(); - joined.Name = strings[0]; + GuildEventPlayerJoined joined = new GuildEventPlayerJoined + { + Guid = guid, + VirtualRealmAddress = GetSession().RealmId.GetAddress(), + Name = strings[0] + }; SendPacketToClient(joined); break; } case GuildEventType.PlayerLeft: { - GuildEventPlayerLeft left = new GuildEventPlayerLeft(); - left.Removed = false; - left.LeaverGUID = guid; - left.LeaverVirtualRealmAddress = GetSession().RealmId.GetAddress(); - left.LeaverName = strings[0]; + GuildEventPlayerLeft left = new GuildEventPlayerLeft + { + Removed = false, + LeaverGUID = guid, + LeaverVirtualRealmAddress = GetSession().RealmId.GetAddress(), + LeaverName = strings[0] + }; SendPacketToClient(left); break; } case GuildEventType.PlayerRemoved: { - GuildEventPlayerLeft removed = new GuildEventPlayerLeft(); - removed.Removed = true; - removed.LeaverGUID = guid; - removed.LeaverVirtualRealmAddress = GetSession().RealmId.GetAddress(); - removed.LeaverName = strings[0]; - removed.RemoverGUID = GetSession().GameState.GetPlayerGuidByName(strings[1]); - removed.RemoverVirtualRealmAddress = GetSession().RealmId.GetAddress(); - removed.RemoverName = strings[1]; + GuildEventPlayerLeft removed = new GuildEventPlayerLeft + { + Removed = true, + LeaverGUID = guid, + LeaverVirtualRealmAddress = GetSession().RealmId.GetAddress(), + LeaverName = strings[0], + RemoverGUID = GetSession().GameState.GetPlayerGuidByName(strings[1]), + RemoverVirtualRealmAddress = GetSession().RealmId.GetAddress(), + RemoverName = strings[1] + }; SendPacketToClient(removed); break; } @@ -103,13 +115,15 @@ void HandleGuildEvent(WorldPacket packet) WowGuid128 newLeader = GetSession().GameState.GetPlayerGuidByName(strings[1]); if (oldLeader != null && newLeader != null) { - GuildEventNewLeader leader = new GuildEventNewLeader(); - leader.OldLeaderGUID = oldLeader; - leader.OldLeaderVirtualRealmAddress = GetSession().RealmId.GetAddress(); - leader.OldLeaderName = strings[0]; - leader.NewLeaderGUID = newLeader; - leader.NewLeaderVirtualRealmAddress = GetSession().RealmId.GetAddress(); - leader.NewLeaderName = strings[1]; + GuildEventNewLeader leader = new GuildEventNewLeader + { + OldLeaderGUID = oldLeader, + OldLeaderVirtualRealmAddress = GetSession().RealmId.GetAddress(), + OldLeaderName = strings[0], + NewLeaderGUID = newLeader, + NewLeaderVirtualRealmAddress = GetSession().RealmId.GetAddress(), + NewLeaderName = strings[1] + }; SendPacketToClient(leader); } break; @@ -137,11 +151,13 @@ void HandleGuildEvent(WorldPacket packet) case GuildEventType.PlayerSignedOn: case GuildEventType.PlayerSignedOff: { - GuildEventPresenceChange presence = new GuildEventPresenceChange(); - presence.Guid = guid; - presence.VirtualRealmAddress = GetSession().RealmId.GetAddress(); - presence.LoggedOn = eventType == GuildEventType.PlayerSignedOn; - presence.Name = strings[0]; + GuildEventPresenceChange presence = new GuildEventPresenceChange + { + Guid = guid, + VirtualRealmAddress = GetSession().RealmId.GetAddress(), + LoggedOn = eventType == GuildEventType.PlayerSignedOn, + Name = strings[0] + }; SendPacketToClient(presence); break; } @@ -157,16 +173,20 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.BankTabUpdated: { - GuildEventTabModified tab = new GuildEventTabModified(); - tab.Name = strings[0]; - tab.Icon = strings[1]; + GuildEventTabModified tab = new GuildEventTabModified + { + Name = strings[0], + Icon = strings[1] + }; SendPacketToClient(tab); break; } case GuildEventType.BankMoneyUpdate: { - GuildEventBankMoneyChanged money = new GuildEventBankMoneyChanged(); - money.Money = (ulong)int.Parse(strings[0], System.Globalization.NumberStyles.HexNumber); + GuildEventBankMoneyChanged money = new GuildEventBankMoneyChanged + { + Money = (ulong)int.Parse(strings[0], System.Globalization.NumberStyles.HexNumber) + }; SendPacketToClient(money); break; } @@ -191,11 +211,13 @@ void HandleQueryGuildInfoResponse(WorldPacket packet) guild.GuildGUID = WowGuid128.Create(HighGuidType703.Guild, guildId); guild.PlayerGuid = GetSession().GameState.CurrentPlayerGuid; guild.HasGuildInfo = true; - guild.Info = new QueryGuildInfoResponse.GuildInfo(); - guild.Info.GuildGuid = guild.GuildGUID; - guild.Info.VirtualRealmAddress = GetSession().RealmId.GetAddress(); + guild.Info = new QueryGuildInfoResponse.GuildInfo + { + GuildGuid = guild.GuildGUID, + VirtualRealmAddress = GetSession().RealmId.GetAddress(), - guild.Info.GuildName = packet.ReadCString(); + GuildName = packet.ReadCString() + }; GetSession().StoreGuildGuidAndName(guild.GuildGUID, guild.Info.GuildName); List ranks = new List(); @@ -204,10 +226,12 @@ void HandleQueryGuildInfoResponse(WorldPacket packet) string rankName = packet.ReadCString(); if (!string.IsNullOrEmpty(rankName)) { - RankInfo rank = new RankInfo(); - rank.RankID = i; - rank.RankOrder = i; - rank.RankName = rankName; + RankInfo rank = new RankInfo + { + RankID = i, + RankOrder = i, + RankName = rankName + }; ranks.Add(rankName); guild.Info.Ranks.Add(rank); } @@ -278,11 +302,13 @@ void HandleGuildRoster(WorldPacket packet) GuildRanks ranks = new GuildRanks(); for (byte i = 0; i < ranksCount; i++) { - GuildRankData rank = new GuildRankData(); - rank.RankID = i; - rank.RankOrder = i; - rank.RankName = GetSession().GetGuildRankNameById(GetSession().GameState.GetPlayerGuildId(GetSession().GameState.CurrentPlayerGuid), i); - rank.Flags = packet.ReadUInt32(); + GuildRankData rank = new GuildRankData + { + RankID = i, + RankOrder = i, + RankName = GetSession().GetGuildRankNameById(GetSession().GameState.GetPlayerGuildId(GetSession().GameState.CurrentPlayerGuid), i), + Flags = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { @@ -331,11 +357,13 @@ void HandleGuildRoster(WorldPacket packet) [PacketHandler(Opcode.SMSG_GUILD_INVITE)] void HandleGuildInvite(WorldPacket packet) { - GuildInvite invite = new(); - invite.InviterName = packet.ReadCString(); - invite.InviterVirtualRealmAddress = GetSession().RealmId.GetAddress(); - invite.GuildName = packet.ReadCString(); - invite.GuildVirtualRealmAddress = GetSession().RealmId.GetAddress(); + GuildInvite invite = new() + { + InviterName = packet.ReadCString(), + InviterVirtualRealmAddress = GetSession().RealmId.GetAddress(), + GuildName = packet.ReadCString(), + GuildVirtualRealmAddress = GetSession().RealmId.GetAddress() + }; invite.GuildGUID = GetSession().GetGuildGuid(invite.GuildName); SendPacketToClient(invite); } @@ -343,35 +371,43 @@ void HandleGuildInvite(WorldPacket packet) [PacketHandler(Opcode.MSG_TABARDVENDOR_ACTIVATE)] void HandleTabardVendorActivate(WorldPacket packet) { - PlayerTabardVendorActivate activate = new(); - activate.DesignerGUID = packet.ReadGuid().To128(GetSession().GameState); + PlayerTabardVendorActivate activate = new() + { + DesignerGUID = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(activate); } [PacketHandler(Opcode.MSG_SAVE_GUILD_EMBLEM)] void HandleSaveGuildEmblem(WorldPacket packet) { - PlayerSaveGuildEmblem emblem = new(); - emblem.Error = (GuildEmblemError)packet.ReadUInt32(); + PlayerSaveGuildEmblem emblem = new() + { + Error = (GuildEmblemError)packet.ReadUInt32() + }; SendPacketToClient(emblem); } [PacketHandler(Opcode.SMSG_GUILD_INVITE_DECLINED)] void HandleGuildInviteDeclined(WorldPacket packet) { - GuildInviteDeclined invite = new(); - invite.InviterName = packet.ReadCString(); - invite.InviterVirtualRealmAddress = GetSession().RealmId.GetAddress(); + GuildInviteDeclined invite = new() + { + InviterName = packet.ReadCString(), + InviterVirtualRealmAddress = GetSession().RealmId.GetAddress() + }; SendPacketToClient(invite); } [PacketHandler(Opcode.SMSG_GUILD_BANK_QUERY_RESULTS)] void HandleGuildBankQueryResults(WorldPacket packet) { - GuildBankQueryResults result = new(); - result.Money = packet.ReadUInt64(); - result.Tab = packet.ReadUInt8(); - result.WithdrawalsRemaining = packet.ReadInt32(); + GuildBankQueryResults result = new() + { + Money = packet.ReadUInt64(), + Tab = packet.ReadUInt8(), + WithdrawalsRemaining = packet.ReadInt32() + }; bool hasTabs = false; if (packet.ReadBool() && result.Tab == 0) @@ -380,10 +416,12 @@ void HandleGuildBankQueryResults(WorldPacket packet) var size = packet.ReadUInt8(); for (var i = 0; i < size; i++) { - GuildBankTabInfo tabInfo = new GuildBankTabInfo(); - tabInfo.TabIndex = i; - tabInfo.Name = packet.ReadCString(); - tabInfo.Icon = packet.ReadCString(); + GuildBankTabInfo tabInfo = new GuildBankTabInfo + { + TabIndex = i, + Name = packet.ReadCString(), + Icon = packet.ReadCString() + }; result.TabInfo.Add(tabInfo); } } @@ -391,8 +429,10 @@ void HandleGuildBankQueryResults(WorldPacket packet) var slots = packet.ReadUInt8(); for (var i = 0; i < slots; i++) { - GuildBankItemInfo itemInfo = new GuildBankItemInfo(); - itemInfo.Slot = packet.ReadUInt8(); + GuildBankItemInfo itemInfo = new GuildBankItemInfo + { + Slot = packet.ReadUInt8() + }; int entry = packet.ReadInt32(); if (entry > 0) { @@ -422,8 +462,10 @@ void HandleGuildBankQueryResults(WorldPacket packet) uint itemId = GameData.GetGemFromEnchantId(enchantId); if (itemId != 0) { - ItemGemData gem = new ItemGemData(); - gem.Slot = slot; + ItemGemData gem = new ItemGemData + { + Slot = slot + }; gem.Item.ItemID = itemId; itemInfo.SocketEnchant.Add(gem); } @@ -441,9 +483,11 @@ void HandleGuildBankQueryResults(WorldPacket packet) [PacketHandler(Opcode.MSG_QUERY_GUILD_BANK_TEXT)] void HandleQueryGuildBankText(WorldPacket packet) { - GuildBankTextQueryResult result = new(); - result.Tab = packet.ReadUInt8(); - result.Text = packet.ReadCString(); + GuildBankTextQueryResult result = new() + { + Tab = packet.ReadUInt8(), + Text = packet.ReadCString() + }; SendPacketToClient(result); } @@ -452,14 +496,18 @@ void HandleGuildBankLongQuery(WorldPacket packet) { const int maxTabs = 6; - GuildBankLogQueryResults result = new(); - result.Tab = packet.ReadUInt8(); + GuildBankLogQueryResults result = new() + { + Tab = packet.ReadUInt8() + }; byte logSize = packet.ReadUInt8(); for (byte i = 0; i < logSize; i++) { - GuildBankLogEntry logEntry = new GuildBankLogEntry(); - logEntry.EntryType = packet.ReadInt8(); - logEntry.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); + GuildBankLogEntry logEntry = new GuildBankLogEntry + { + EntryType = packet.ReadInt8(), + PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) + }; if (result.Tab != maxTabs) { @@ -481,8 +529,10 @@ void HandleGuildBankLongQuery(WorldPacket packet) [PacketHandler(Opcode.MSG_GUILD_BANK_MONEY_WITHDRAWN)] void HandleGuildBankMoneyWithdrawn(WorldPacket packet) { - GuildBankRemainingWithdrawMoney result = new(); - result.RemainingWithdrawMoney = packet.ReadUInt32(); + GuildBankRemainingWithdrawMoney result = new() + { + RemainingWithdrawMoney = packet.ReadUInt32() + }; SendPacketToClient(result); } } diff --git a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs index 2981586c..70a9eb1f 100644 --- a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs @@ -10,25 +10,31 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_UPDATE_INSTANCE_OWNERSHIP)] void HandleUpdateInstanceOwnership(WorldPacket packet) { - UpdateInstanceOwnership instance = new UpdateInstanceOwnership(); - instance.IOwnInstance = packet.ReadUInt32(); + UpdateInstanceOwnership instance = new UpdateInstanceOwnership + { + IOwnInstance = packet.ReadUInt32() + }; SendPacketToClient(instance); } [PacketHandler(Opcode.SMSG_INSTANCE_RESET)] void HandleInstanceReset(WorldPacket packet) { - InstanceReset reset = new InstanceReset(); - reset.MapID = packet.ReadUInt32(); + InstanceReset reset = new InstanceReset + { + MapID = packet.ReadUInt32() + }; SendPacketToClient(reset); } [PacketHandler(Opcode.SMSG_INSTANCE_RESET_FAILED)] void HandleInstanceResetFailed(WorldPacket packet) { - InstanceResetFailed reset = new InstanceResetFailed(); - reset.ResetFailedReason = (ResetFailedReason)packet.ReadUInt32(); - reset.MapID = packet.ReadUInt32(); + InstanceResetFailed reset = new InstanceResetFailed + { + ResetFailedReason = (ResetFailedReason)packet.ReadUInt32(), + MapID = packet.ReadUInt32() + }; SendPacketToClient(reset); } @@ -47,8 +53,10 @@ void HandleRaidInstanceInfo(WorldPacket packet) int count = packet.ReadInt32(); for (var i = 0; i < count; ++i) { - InstanceLock instance = new InstanceLock(); - instance.MapID = packet.ReadUInt32(); + InstanceLock instance = new InstanceLock + { + MapID = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) instance.DifficultyID = (Difficulty)packet.ReadUInt32(); @@ -83,26 +91,32 @@ void HandleRaidInstanceInfo(WorldPacket packet) [PacketHandler(Opcode.SMSG_INSTANCE_SAVE_CREATED)] void HandleInstanceSaveCreated(WorldPacket packet) { - InstanceSaveCreated save = new InstanceSaveCreated(); - save.Gm = packet.ReadUInt32() != 0; + InstanceSaveCreated save = new InstanceSaveCreated + { + Gm = packet.ReadUInt32() != 0 + }; SendPacketToClient(save); } [PacketHandler(Opcode.SMSG_RAID_GROUP_ONLY)] void HandleRaidGroupOnly(WorldPacket packet) { - RaidGroupOnly save = new RaidGroupOnly(); - save.Delay = packet.ReadInt32(); - save.Reason = (RaidGroupReason)packet.ReadUInt32(); + RaidGroupOnly save = new RaidGroupOnly + { + Delay = packet.ReadInt32(), + Reason = (RaidGroupReason)packet.ReadUInt32() + }; SendPacketToClient(save); } [PacketHandler(Opcode.SMSG_RAID_INSTANCE_MESSAGE)] void HandleRaidInstanceMessage(WorldPacket packet) { - RaidInstanceMessage instance = new RaidInstanceMessage(); - instance.Type = (InstanceResetWarningType)packet.ReadUInt32(); - instance.MapID = packet.ReadUInt32(); + RaidInstanceMessage instance = new RaidInstanceMessage + { + Type = (InstanceResetWarningType)packet.ReadUInt32(), + MapID = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) instance.DifficultyID = (Difficulty)packet.ReadUInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs index ea3af8c8..658e1a89 100644 --- a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs @@ -11,26 +11,32 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_SET_PROFICIENCY)] void HandleSetProficiency(WorldPacket packet) { - SetProficiency proficiency = new SetProficiency(); - proficiency.ProficiencyClass = packet.ReadUInt8(); - proficiency.ProficiencyMask = packet.ReadUInt32(); + SetProficiency proficiency = new SetProficiency + { + ProficiencyClass = packet.ReadUInt8(), + ProficiencyMask = packet.ReadUInt32() + }; SendPacketToClient(proficiency); } [PacketHandler(Opcode.SMSG_BUY_SUCCEEDED)] void HandleBuySucceeded(WorldPacket packet) { - BuySucceeded buy = new BuySucceeded(); - buy.VendorGUID = packet.ReadGuid().To128(GetSession().GameState); - buy.Slot = packet.ReadUInt32(); - buy.NewQuantity = packet.ReadInt32(); - buy.QuantityBought = packet.ReadUInt32(); + BuySucceeded buy = new BuySucceeded + { + VendorGUID = packet.ReadGuid().To128(GetSession().GameState), + Slot = packet.ReadUInt32(), + NewQuantity = packet.ReadInt32(), + QuantityBought = packet.ReadUInt32() + }; SendPacketToClient(buy); } [PacketHandler(Opcode.SMSG_ITEM_PUSH_RESULT)] void HandleItemPushResult(WorldPacket packet) { - ItemPushResult item = new ItemPushResult(); - item.PlayerGUID = packet.ReadGuid().To128(GetSession().GameState); + ItemPushResult item = new ItemPushResult + { + PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) + }; bool fromNPC = packet.ReadUInt32() == 1; item.Created = packet.ReadUInt32() == 1; bool showInChat = packet.ReadUInt32() == 1; @@ -90,32 +96,40 @@ void HandleItemPushResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_READ_ITEM_RESULT_OK)] void HandleReadItemResultOk(WorldPacket packet) { - ReadItemResultOK read = new ReadItemResultOK(); - read.ItemGUID = packet.ReadGuid().To128(GetSession().GameState); + ReadItemResultOK read = new ReadItemResultOK + { + ItemGUID = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(read); } [PacketHandler(Opcode.SMSG_READ_ITEM_RESULT_FAILED)] void HandleReadItemResultFailed(WorldPacket packet) { - ReadItemResultFailed read = new ReadItemResultFailed(); - read.ItemGUID = packet.ReadGuid().To128(GetSession().GameState); - read.Subcode = 2; + ReadItemResultFailed read = new ReadItemResultFailed + { + ItemGUID = packet.ReadGuid().To128(GetSession().GameState), + Subcode = 2 + }; SendPacketToClient(read); } [PacketHandler(Opcode.SMSG_BUY_FAILED)] void HandleBuyFailed(WorldPacket packet) { - BuyFailed fail = new BuyFailed(); - fail.VendorGUID = packet.ReadGuid().To128(GetSession().GameState); - fail.Slot = packet.ReadUInt32(); - fail.Reason = (BuyResult)packet.ReadUInt8(); + BuyFailed fail = new BuyFailed + { + VendorGUID = packet.ReadGuid().To128(GetSession().GameState), + Slot = packet.ReadUInt32(), + Reason = (BuyResult)packet.ReadUInt8() + }; SendPacketToClient(fail); } [PacketHandler(Opcode.SMSG_INVENTORY_CHANGE_FAILURE, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleInventoryChangeFailureVanilla(WorldPacket packet) { - InventoryChangeFailure failure = new(); - failure.BagResult = LegacyVersion.ConvertInventoryResult(packet.ReadUInt8()); + InventoryChangeFailure failure = new() + { + BagResult = LegacyVersion.ConvertInventoryResult(packet.ReadUInt8()) + }; if (failure.BagResult == InventoryResult.Ok) return; @@ -143,8 +157,10 @@ void HandleInventoryChangeFailureVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_INVENTORY_CHANGE_FAILURE, ClientVersionBuild.V2_0_1_6180)] void HandleInventoryChangeFailure(WorldPacket packet) { - InventoryChangeFailure failure = new(); - failure.BagResult = LegacyVersion.ConvertInventoryResult(packet.ReadUInt8()); + InventoryChangeFailure failure = new() + { + BagResult = LegacyVersion.ConvertInventoryResult(packet.ReadUInt8()) + }; if (failure.BagResult == InventoryResult.Ok) return; @@ -182,36 +198,44 @@ void HandleInventoryChangeFailure(WorldPacket packet) [PacketHandler(Opcode.SMSG_DURABILITY_DAMAGE_DEATH)] void HandleDurabilityDamageDeath(WorldPacket packet) { - DurabilityDamageDeath death = new DurabilityDamageDeath(); - death.Percent = 10; + DurabilityDamageDeath death = new DurabilityDamageDeath + { + Percent = 10 + }; SendPacketToClient(death); } [PacketHandler(Opcode.SMSG_ITEM_COOLDOWN)] void HandleItemCooldown(WorldPacket packet) { - ItemCooldown item = new ItemCooldown(); - item.ItemGuid = packet.ReadGuid().To128(GetSession().GameState); - item.SpellID = packet.ReadUInt32(); - item.Cooldown = 30000; + ItemCooldown item = new ItemCooldown + { + ItemGuid = packet.ReadGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32(), + Cooldown = 30000 + }; SendPacketToClient(item); } [PacketHandler(Opcode.SMSG_SELL_RESPONSE)] void HandleSellResponse(WorldPacket packet) { - SellResponse sell = new SellResponse(); - sell.VendorGUID = packet.ReadGuid().To128(GetSession().GameState); - sell.ItemGUID = packet.ReadGuid().To128(GetSession().GameState); - sell.Reason = packet.ReadUInt8(); + SellResponse sell = new SellResponse + { + VendorGUID = packet.ReadGuid().To128(GetSession().GameState), + ItemGUID = packet.ReadGuid().To128(GetSession().GameState), + Reason = packet.ReadUInt8() + }; SendPacketToClient(sell); } [PacketHandler(Opcode.SMSG_ITEM_ENCHANT_TIME_UPDATE)] void HandleItemEnchantTimeUpdate(WorldPacket packet) { - ItemEnchantTimeUpdate enchant = new ItemEnchantTimeUpdate(); - enchant.ItemGuid = packet.ReadGuid().To128(GetSession().GameState); - enchant.Slot = packet.ReadUInt32(); - enchant.DurationLeft = packet.ReadUInt32(); - enchant.OwnerGuid = packet.ReadGuid().To128(GetSession().GameState); + ItemEnchantTimeUpdate enchant = new ItemEnchantTimeUpdate + { + ItemGuid = packet.ReadGuid().To128(GetSession().GameState), + Slot = packet.ReadUInt32(), + DurationLeft = packet.ReadUInt32(), + OwnerGuid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(enchant); } diff --git a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs index 8b96ddd4..58f88d17 100644 --- a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs @@ -28,8 +28,10 @@ void HandleLootResponse(WorldPacket packet) var itemsCount = packet.ReadUInt8(); for (var i = 0; i < itemsCount; ++i) { - LootItemData lootItem = new(); - lootItem.LootListID = packet.ReadUInt8(); + LootItemData lootItem = new() + { + LootListID = packet.ReadUInt8() + }; lootItem.Loot.ItemID = packet.ReadUInt32(); lootItem.Quantity = packet.ReadUInt32(); packet.ReadUInt32(); // DisplayID @@ -56,18 +58,22 @@ void HandleLootRelease(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_REMOVED)] void HandleLootRemoved(WorldPacket packet) { - LootRemoved loot = new(); - loot.Owner = GetSession().GameState.LastLootTargetGuid.To128(GetSession().GameState); - loot.LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(); - loot.LootListID = packet.ReadUInt8(); + LootRemoved loot = new() + { + Owner = GetSession().GameState.LastLootTargetGuid.To128(GetSession().GameState), + LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(), + LootListID = packet.ReadUInt8() + }; SendPacketToClient(loot); } [PacketHandler(Opcode.SMSG_LOOT_MONEY_NOTIFY)] void HandleLootMoneyNotify(WorldPacket packet) { - LootMoneyNotify loot = new(); - loot.Money = packet.ReadUInt32(); + LootMoneyNotify loot = new() + { + Money = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) loot.SoleLooter = packet.ReadBool(); SendPacketToClient(loot); @@ -76,8 +82,10 @@ void HandleLootMoneyNotify(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_CLEAR_MONEY)] void HandleLootCelarMoney(WorldPacket packet) { - CoinRemoved loot = new(); - loot.LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(); + CoinRemoved loot = new() + { + LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid() + }; SendPacketToClient(loot); } @@ -150,8 +158,10 @@ void HandleLootRoll(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_ROLL_WON)] void HandleLootRollWon(WorldPacket packet) { - LootRollWon loot = new LootRollWon(); - loot.LootObj = packet.ReadGuid().ToLootGuid(); + LootRollWon loot = new LootRollWon + { + LootObj = packet.ReadGuid().ToLootGuid() + }; loot.Item.LootListID = (byte)packet.ReadUInt32(); loot.Item.Loot.ItemID = packet.ReadUInt32(); loot.Item.Loot.RandomPropertiesSeed = packet.ReadUInt32(); @@ -164,17 +174,21 @@ void HandleLootRollWon(WorldPacket packet) loot.MainSpec = 128; SendPacketToClient(loot); - LootRollsComplete complete = new LootRollsComplete(); - complete.LootObj = loot.LootObj; - complete.LootListID = loot.Item.LootListID; + LootRollsComplete complete = new LootRollsComplete + { + LootObj = loot.LootObj, + LootListID = loot.Item.LootListID + }; SendPacketToClient(complete); } [PacketHandler(Opcode.SMSG_LOOT_ALL_PASSED)] void HandleLootAllPassed(WorldPacket packet) { - LootAllPassed loot = new LootAllPassed(); - loot.LootObj = packet.ReadGuid().ToLootGuid(); + LootAllPassed loot = new LootAllPassed + { + LootObj = packet.ReadGuid().ToLootGuid() + }; loot.Item.LootListID = (byte)packet.ReadUInt32(); loot.Item.Loot.ItemID = packet.ReadUInt32(); loot.Item.Loot.RandomPropertiesSeed = packet.ReadUInt32(); @@ -182,9 +196,11 @@ void HandleLootAllPassed(WorldPacket packet) loot.Item.Quantity = 1; SendPacketToClient(loot); - LootRollsComplete complete = new LootRollsComplete(); - complete.LootObj = loot.LootObj; - complete.LootListID = loot.Item.LootListID; + LootRollsComplete complete = new LootRollsComplete + { + LootObj = loot.LootObj, + LootListID = loot.Item.LootListID + }; SendPacketToClient(complete); } @@ -194,14 +210,18 @@ void HandleLootMasterList(WorldPacket packet) if (GetSession().GameState.LastLootTargetGuid == null) return; - LootList list = new LootList(); - list.Owner = GetSession().GameState.LastLootTargetGuid.To128(GetSession().GameState); - list.LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(); - list.Master = GetSession().GameState.CurrentPlayerGuid; + LootList list = new LootList + { + Owner = GetSession().GameState.LastLootTargetGuid.To128(GetSession().GameState), + LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(), + Master = GetSession().GameState.CurrentPlayerGuid + }; SendPacketToClient(list); - MasterLootCandidateList loot = new MasterLootCandidateList(); - loot.LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(); + MasterLootCandidateList loot = new MasterLootCandidateList + { + LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid() + }; byte count = packet.ReadUInt8(); for (byte i = 0; i < count; i++) { diff --git a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs index 88ad8332..627779ff 100644 --- a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs @@ -11,26 +11,32 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_NOTIFY_RECEIVED_MAIL)] void HandleNotifyReceivedMail(WorldPacket packet) { - NotifyReceivedMail mail = new NotifyReceivedMail(); - mail.Delay = packet.ReadFloat(); + NotifyReceivedMail mail = new NotifyReceivedMail + { + Delay = packet.ReadFloat() + }; SendPacketToClient(mail); } [PacketHandler(Opcode.MSG_QUERY_NEXT_MAIL_TIME)] void HandleQueryNextMailTime(WorldPacket packet) { - MailQueryNextTimeResult result = new MailQueryNextTimeResult(); - result.NextMailTime = packet.ReadFloat(); + MailQueryNextTimeResult result = new MailQueryNextTimeResult + { + NextMailTime = packet.ReadFloat() + }; if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_3_0_7561)) { if (result.NextMailTime == 0) { - MailNextTimeEntry mail = new MailNextTimeEntry(); - mail.SenderGuid = GetSession().GameState.CurrentPlayerGuid; - mail.AltSenderID = 0; - mail.AltSenderType = 0; - mail.StationeryID = 41; - mail.TimeLeft = 3600; + MailNextTimeEntry mail = new MailNextTimeEntry + { + SenderGuid = GetSession().GameState.CurrentPlayerGuid, + AltSenderID = 0, + AltSenderType = 0, + StationeryID = 41, + TimeLeft = 3600 + }; result.Mails.Add(mail); } } @@ -39,12 +45,14 @@ void HandleQueryNextMailTime(WorldPacket packet) var count = packet.ReadUInt32(); for (var i = 0; i < count; ++i) { - MailNextTimeEntry mail = new MailNextTimeEntry(); - mail.SenderGuid = packet.ReadGuid().To128(GetSession().GameState); - mail.AltSenderID = packet.ReadInt32(); - mail.AltSenderType = (sbyte)packet.ReadInt32(); - mail.StationeryID = packet.ReadInt32(); - mail.TimeLeft = packet.ReadFloat(); + MailNextTimeEntry mail = new MailNextTimeEntry + { + SenderGuid = packet.ReadGuid().To128(GetSession().GameState), + AltSenderID = packet.ReadInt32(), + AltSenderType = (sbyte)packet.ReadInt32(), + StationeryID = packet.ReadInt32(), + TimeLeft = packet.ReadFloat() + }; result.Mails.Add(mail); } } @@ -207,8 +215,10 @@ MailAttachedItem ReadMailItem(WorldPacket packet) for (byte k = 0; k < enchantmentCount; ++k) { - ItemEnchantData enchant = new ItemEnchantData(); - enchant.Slot = k; + ItemEnchantData enchant = new ItemEnchantData + { + Slot = k + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { enchant.Charges = packet.ReadInt32(); @@ -240,10 +250,12 @@ MailAttachedItem ReadMailItem(WorldPacket packet) [PacketHandler(Opcode.SMSG_MAIL_COMMAND_RESULT)] void HandleMailCommandResult(WorldPacket packet) { - MailCommandResult mail = new MailCommandResult(); - mail.MailID = packet.ReadUInt32(); - mail.Command = (MailActionType)packet.ReadUInt32(); - mail.ErrorCode = (MailErrorType)packet.ReadUInt32(); + MailCommandResult mail = new MailCommandResult + { + MailID = packet.ReadUInt32(), + Command = (MailActionType)packet.ReadUInt32(), + ErrorCode = (MailErrorType)packet.ReadUInt32() + }; if (mail.ErrorCode == MailErrorType.Equip) mail.BagResult = LegacyVersion.ConvertInventoryResult(packet.ReadUInt32()); else if (mail.Command == MailActionType.AttachmentExpired) diff --git a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs index 4473cbfb..b8446843 100644 --- a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs @@ -34,44 +34,54 @@ void HandleAccountDataTimes(WorldPacket packet) [PacketHandler(Opcode.SMSG_BIND_POINT_UPDATE)] void HandleBindPointUpdate(WorldPacket packet) { - BindPointUpdate point = new BindPointUpdate(); - point.BindPosition = packet.ReadVector3(); - point.BindMapID = packet.ReadUInt32(); - point.BindAreaID = packet.ReadUInt32(); + BindPointUpdate point = new BindPointUpdate + { + BindPosition = packet.ReadVector3(), + BindMapID = packet.ReadUInt32(), + BindAreaID = packet.ReadUInt32() + }; SendPacketToClient(point); } [PacketHandler(Opcode.SMSG_PLAYER_BOUND)] void HandlePlayerBound(WorldPacket packet) { - PlayerBound bound = new PlayerBound(); - bound.BinderGUID = packet.ReadGuid().To128(GetSession().GameState); - bound.AreaID = packet.ReadUInt32(); + PlayerBound bound = new PlayerBound + { + BinderGUID = packet.ReadGuid().To128(GetSession().GameState), + AreaID = packet.ReadUInt32() + }; SendPacketToClient(bound); } [PacketHandler(Opcode.SMSG_DEATH_RELEASE_LOC)] void HandleDeathReleaseLoc(WorldPacket packet) { - DeathReleaseLoc death = new(); - death.MapID = packet.ReadInt32(); - death.Location = packet.ReadVector3(); + DeathReleaseLoc death = new() + { + MapID = packet.ReadInt32(), + Location = packet.ReadVector3() + }; SendPacketToClient(death); } [PacketHandler(Opcode.SMSG_CORPSE_RECLAIM_DELAY)] void HandleCorpseReclaimDelay(WorldPacket packet) { - CorpseReclaimDelay delay = new CorpseReclaimDelay(); - delay.Remaining = packet.ReadUInt32(); + CorpseReclaimDelay delay = new CorpseReclaimDelay + { + Remaining = packet.ReadUInt32() + }; SendPacketToClient(delay); } [PacketHandler(Opcode.SMSG_TIME_SYNC_REQUEST)] void HandleTimeSyncRequest(WorldPacket packet) { - TimeSyncRequest sync = new TimeSyncRequest(); - sync.SequenceIndex = packet.ReadUInt32(); + TimeSyncRequest sync = new TimeSyncRequest + { + SequenceIndex = packet.ReadUInt32() + }; SendPacketToClient(sync); } @@ -104,8 +114,10 @@ void HandleLoginSetTimeSpeed(WorldPacket packet) if (!GetSession().GameState.IsFirstEnterWorld) return; - LoginSetTimeSpeed login = new LoginSetTimeSpeed(); - login.ServerTime = packet.ReadUInt32(); + LoginSetTimeSpeed login = new LoginSetTimeSpeed + { + ServerTime = packet.ReadUInt32() + }; login.GameTime = login.ServerTime; login.NewSpeed = packet.ReadFloat(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_2_9901)) @@ -124,8 +136,10 @@ void HandleAreaTriggerMessage(WorldPacket packet) if (GetSession().GameState.LastEnteredAreaTrigger != 0) { - AreaTriggerMessage denied = new AreaTriggerMessage(); - denied.AreaTriggerID = GetSession().GameState.LastEnteredAreaTrigger; + AreaTriggerMessage denied = new AreaTriggerMessage + { + AreaTriggerID = GetSession().GameState.LastEnteredAreaTrigger + }; SendPacketToClient(denied); } else @@ -138,9 +152,10 @@ void HandleAreaTriggerMessage(WorldPacket packet) [PacketHandler(Opcode.MSG_CORPSE_QUERY)] void HandleCorpseQuery(WorldPacket packet) { - CorpseLocation corpse = new(); - - corpse.Valid = packet.ReadBool(); + CorpseLocation corpse = new() + { + Valid = packet.ReadBool() + }; if (!corpse.Valid) { { @@ -180,43 +195,53 @@ void HandleCorpseQuery(WorldPacket packet) [PacketHandler(Opcode.SMSG_STAND_STATE_UPDATE)] void HandleStandStateUpdate(WorldPacket packet) { - StandStateUpdate state = new(); - state.StandState = packet.ReadUInt8(); + StandStateUpdate state = new() + { + StandState = packet.ReadUInt8() + }; SendPacketToClient(state); } [PacketHandler(Opcode.SMSG_EXPLORATION_EXPERIENCE)] void HandleExplorationExperience(WorldPacket packet) { - ExplorationExperience explore = new(); - explore.AreaID = packet.ReadUInt32(); - explore.Experience = packet.ReadUInt32(); + ExplorationExperience explore = new() + { + AreaID = packet.ReadUInt32(), + Experience = packet.ReadUInt32() + }; SendPacketToClient(explore); } [PacketHandler(Opcode.SMSG_PLAY_MUSIC)] void HandlePlayMusic(WorldPacket packet) { - PlayMusic music = new(); - music.SoundEntryID = packet.ReadUInt32(); + PlayMusic music = new() + { + SoundEntryID = packet.ReadUInt32() + }; SendPacketToClient(music); } [PacketHandler(Opcode.SMSG_PLAY_SOUND)] void HandlePlaySound(WorldPacket packet) { - PlaySound sound = new(); - sound.SoundEntryID = packet.ReadUInt32(); - sound.SourceObjectGuid = GetSession().GameState.CurrentPlayerGuid; + PlaySound sound = new() + { + SoundEntryID = packet.ReadUInt32(), + SourceObjectGuid = GetSession().GameState.CurrentPlayerGuid + }; SendPacketToClient(sound); } [PacketHandler(Opcode.SMSG_PLAY_OBJECT_SOUND)] void HandlePlayObjectSound(WorldPacket packet) { - PlayObjectSound sound = new(); - sound.SoundEntryID = packet.ReadUInt32(); - sound.SourceObjectGUID = packet.ReadGuid().To128(GetSession().GameState); + PlayObjectSound sound = new() + { + SoundEntryID = packet.ReadUInt32(), + SourceObjectGUID = packet.ReadGuid().To128(GetSession().GameState) + }; sound.TargetObjectGUID = sound.SourceObjectGUID; SendPacketToClient(sound); } @@ -224,54 +249,66 @@ void HandlePlayObjectSound(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRIGGER_CINEMATIC)] void HandleTriggerCinematic(WorldPacket packet) { - TriggerCinematic cinematic = new(); - cinematic.CinematicID = packet.ReadUInt32(); + TriggerCinematic cinematic = new() + { + CinematicID = packet.ReadUInt32() + }; SendPacketToClient(cinematic); } [PacketHandler(Opcode.SMSG_SPECIAL_MOUNT_ANIM)] void HandleSpecialMountAnim(WorldPacket packet) { - SpecialMountAnim mount = new(); - mount.UnitGUID = packet.ReadGuid().To128(GetSession().GameState); + SpecialMountAnim mount = new() + { + UnitGUID = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(mount); } [PacketHandler(Opcode.SMSG_START_MIRROR_TIMER)] void HandleStartMirrorTimer(WorldPacket packet) { - StartMirrorTimer timer = new(); - timer.Timer = (MirrorTimerType)packet.ReadUInt32(); - timer.Value = packet.ReadInt32(); - timer.MaxValue = packet.ReadInt32(); - timer.Scale = packet.ReadInt32(); - timer.Paused = packet.ReadBool(); - timer.SpellID = packet.ReadInt32(); + StartMirrorTimer timer = new() + { + Timer = (MirrorTimerType)packet.ReadUInt32(), + Value = packet.ReadInt32(), + MaxValue = packet.ReadInt32(), + Scale = packet.ReadInt32(), + Paused = packet.ReadBool(), + SpellID = packet.ReadInt32() + }; SendPacketToClient(timer); } [PacketHandler(Opcode.SMSG_PAUSE_MIRROR_TIMER)] void HandlePauseMirrorTimer(WorldPacket packet) { - PauseMirrorTimer timer = new(); - timer.Timer = (MirrorTimerType)packet.ReadUInt32(); - timer.Paused = packet.ReadBool(); + PauseMirrorTimer timer = new() + { + Timer = (MirrorTimerType)packet.ReadUInt32(), + Paused = packet.ReadBool() + }; SendPacketToClient(timer); } [PacketHandler(Opcode.SMSG_STOP_MIRROR_TIMER)] void HandleStopMirrorTimer(WorldPacket packet) { - StopMirrorTimer timer = new(); - timer.Timer = (MirrorTimerType)packet.ReadUInt32(); + StopMirrorTimer timer = new() + { + Timer = (MirrorTimerType)packet.ReadUInt32() + }; SendPacketToClient(timer); } [PacketHandler(Opcode.SMSG_INVALIDATE_PLAYER)] void HandleInvalidatePlayer(WorldPacket packet) { - InvalidatePlayer invalidate = new(); - invalidate.Guid = packet.ReadGuid().To128(GetSession().GameState); + InvalidatePlayer invalidate = new() + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(invalidate); if (GetSession().GameState.CachedPlayers.ContainsKey(invalidate.Guid)) diff --git a/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs b/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs index 5fe9af53..fb8b70b8 100644 --- a/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs @@ -48,9 +48,11 @@ public partial class WorldClient [PacketHandler(Opcode.MSG_MOVE_WATER_WALK)] void HandleMovementMessages(WorldPacket packet) { - MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - moveUpdate.MoveInfo = new(); + MoveUpdate moveUpdate = new MoveUpdate + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveInfo = new() + }; moveUpdate.MoveInfo.ReadMovementInfoLegacy(packet, GetSession().GameState); moveUpdate.MoveInfo.Flags = (uint)(((MovementFlagWotLK)moveUpdate.MoveInfo.Flags).CastFlags()); SendPacketToClient(moveUpdate); @@ -59,9 +61,11 @@ void HandleMovementMessages(WorldPacket packet) [PacketHandler(Opcode.MSG_MOVE_KNOCK_BACK)] void HandleMoveKnockBack(WorldPacket packet) { - MoveUpdateKnockBack knockback = new MoveUpdateKnockBack(); - knockback.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - knockback.MoveInfo = new(); + MoveUpdateKnockBack knockback = new MoveUpdateKnockBack + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveInfo = new() + }; knockback.MoveInfo.ReadMovementInfoLegacy(packet, GetSession().GameState); knockback.MoveInfo.Flags = (uint)(((MovementFlagWotLK)knockback.MoveInfo.Flags).CastFlags()); knockback.MoveInfo.JumpSinAngle = packet.ReadFloat(); @@ -74,21 +78,25 @@ void HandleMoveKnockBack(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_KNOCK_BACK)] void HandleMoveForceKnockBack(WorldPacket packet) { - MoveKnockBack knockback = new MoveKnockBack(); - knockback.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - knockback.MoveCounter = packet.ReadUInt32(); - knockback.Direction = packet.ReadVector2(); - knockback.HorizontalSpeed = packet.ReadFloat(); - knockback.VerticalSpeed = packet.ReadFloat(); + MoveKnockBack knockback = new MoveKnockBack + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveCounter = packet.ReadUInt32(), + Direction = packet.ReadVector2(), + HorizontalSpeed = packet.ReadFloat(), + VerticalSpeed = packet.ReadFloat() + }; SendPacketToClient(knockback); } [PacketHandler(Opcode.SMSG_CONTROL_UPDATE)] void HandleControlUpdate(WorldPacket packet) { - ControlUpdate control = new ControlUpdate(); - control.Guid = packet.ReadPackedGuid().To128(GetSession().GameState); - control.HasControl = packet.ReadBool(); + ControlUpdate control = new ControlUpdate + { + Guid = packet.ReadPackedGuid().To128(GetSession().GameState), + HasControl = packet.ReadBool() + }; SendPacketToClient(control); } @@ -100,16 +108,20 @@ void HandleMoveTeleportAck(WorldPacket packet) if (GetSession().GameState.IsInTaxiFlight && GetSession().GameState.CurrentPlayerGuid == guid) { - ControlUpdate control = new ControlUpdate(); - control.Guid = guid; - control.HasControl = true; + ControlUpdate control = new ControlUpdate + { + Guid = guid, + HasControl = true + }; SendPacketToClient(control); GetSession().GameState.IsInTaxiFlight = false; } - MoveTeleport teleport = new MoveTeleport(); - teleport.MoverGUID = guid; - teleport.MoveCounter = packet.ReadUInt32(); + MoveTeleport teleport = new MoveTeleport + { + MoverGUID = guid, + MoveCounter = packet.ReadUInt32() + }; MovementInfo moveInfo = new(); moveInfo.ReadMovementInfoLegacy(packet, GetSession().GameState); teleport.Position = moveInfo.Position; @@ -117,8 +129,10 @@ void HandleMoveTeleportAck(WorldPacket packet) teleport.TransportGUID = moveInfo.TransportGuid; if (moveInfo.TransportSeat > 0) { - teleport.Vehicle = new(); - teleport.Vehicle.VehicleSeatIndex = moveInfo.TransportSeat; + teleport.Vehicle = new() + { + VehicleSeatIndex = moveInfo.TransportSeat + }; } SendPacketToClient(teleport); } @@ -126,16 +140,20 @@ void HandleMoveTeleportAck(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRANSFER_PENDING)] void HandleTransferPending(WorldPacket packet) { - TransferPending transfer = new TransferPending(); - transfer.MapID = GetSession().GameState.PendingTransferMapId = packet.ReadUInt32(); - transfer.OldMapPosition = Vector3.Zero; + TransferPending transfer = new TransferPending + { + MapID = GetSession().GameState.PendingTransferMapId = packet.ReadUInt32(), + OldMapPosition = Vector3.Zero + }; SendPacketToClient(transfer); GetSession().GameState.IsFirstEnterWorld = false; GetSession().GameState.IsWaitingForNewWorld = true; - SuspendToken suspend = new(); - suspend.SequenceIndex = 3; - suspend.Reason = 1; + SuspendToken suspend = new() + { + SequenceIndex = 3, + Reason = 1 + }; SendPacketToClient(suspend); } @@ -180,16 +198,20 @@ void HandleNewWorld(WorldPacket packet) SendPacketToClient(teleport); if (teleport.MapID > 1) { - UpdateLastInstance instance = new(); - instance.MapID = teleport.MapID; + UpdateLastInstance instance = new() + { + MapID = teleport.MapID + }; SendPacketToClient(instance); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) SendPacketToClient(new TimeSyncRequest()); - ResumeToken resume = new(); - resume.SequenceIndex = 3; - resume.Reason = 1; + ResumeToken resume = new() + { + SequenceIndex = 3, + Reason = 1 + }; SendPacketToClient(resume); } @@ -216,9 +238,11 @@ void HandleNewWorld(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_SPLINE_SET_WALK_SPEED)] void HandleMoveSplineSetSpeed(WorldPacket packet) { - MoveSplineSetSpeed speed = new MoveSplineSetSpeed(packet.GetUniversalOpcode(false)); - speed.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - speed.Speed = packet.ReadFloat(); + MoveSplineSetSpeed speed = new MoveSplineSetSpeed(packet.GetUniversalOpcode(false)) + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + Speed = packet.ReadFloat() + }; SendPacketToClient(speed); } @@ -237,9 +261,11 @@ void HandleMoveForceSpeedChange(WorldPacket packet) string opcodeName = packet.GetUniversalOpcode(false).ToString().Replace("SMSG_FORCE_", "SMSG_MOVE_SET_").Replace("_CHANGE", ""); Opcode universalOpcode = Opcodes.GetUniversalOpcode(opcodeName); - MoveSetSpeed speed = new MoveSetSpeed(universalOpcode); - speed.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - speed.MoveCounter = packet.ReadUInt32(); + MoveSetSpeed speed = new MoveSetSpeed(universalOpcode) + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveCounter = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) && packet.GetUniversalOpcode(false) == Opcode.SMSG_FORCE_RUN_SPEED_CHANGE) @@ -256,10 +282,12 @@ or Opcode.SMSG_MOVE_SET_SWIM_BACK_SPEED && LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { var flyOpcode = (Opcode) Enum.Parse(typeof(Opcode), universalOpcode.ToString().Replace("SWIM", "FLIGHT")); - MoveSetSpeed flySpeed = new MoveSetSpeed(flyOpcode); - flySpeed.MoverGUID = speed.MoverGUID; - flySpeed.MoveCounter = speed.MoveCounter; - flySpeed.Speed = speed.Speed; + MoveSetSpeed flySpeed = new MoveSetSpeed(flyOpcode) + { + MoverGUID = speed.MoverGUID, + MoveCounter = speed.MoveCounter, + Speed = speed.Speed + }; SendPacketToClient(flySpeed); } } @@ -279,9 +307,11 @@ void HandleMoveUpdateSpeed(WorldPacket packet) string opcodeName = packet.GetUniversalOpcode(false).ToString().Replace("MSG_MOVE_SET", "SMSG_MOVE_UPDATE"); Opcode universalOpcode = Opcodes.GetUniversalOpcode(opcodeName); - MoveUpdateSpeed speed = new MoveUpdateSpeed(universalOpcode); - speed.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - speed.MoveInfo = new MovementInfo(); + MoveUpdateSpeed speed = new MoveUpdateSpeed(universalOpcode) + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveInfo = new MovementInfo() + }; speed.MoveInfo.ReadMovementInfoLegacy(packet, GetSession().GameState); var newFlags = ((MovementFlagWotLK)speed.MoveInfo.Flags).CastFlags(); speed.MoveInfo.Flags = (uint)(newFlags); @@ -294,10 +324,12 @@ or Opcode.SMSG_MOVE_UPDATE_SWIM_BACK_SPEED && LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { var flyOpcode = (Opcode) Enum.Parse(typeof(Opcode), universalOpcode.ToString().Replace("SWIM", "FLIGHT")); - MoveUpdateSpeed flySpeed = new MoveUpdateSpeed(flyOpcode); - flySpeed.MoverGUID = speed.MoverGUID; - flySpeed.MoveInfo = speed.MoveInfo; - flySpeed.Speed = speed.Speed; + MoveUpdateSpeed flySpeed = new MoveUpdateSpeed(flyOpcode) + { + MoverGUID = speed.MoverGUID, + MoveInfo = speed.MoveInfo, + Speed = speed.Speed + }; SendPacketToClient(flySpeed); } } @@ -320,8 +352,10 @@ or Opcode.SMSG_MOVE_UPDATE_SWIM_BACK_SPEED && [PacketHandler(Opcode.SMSG_MOVE_SPLINE_UNSET_FLYING)] void HandleSplineMovementMessages(WorldPacket packet) { - MoveSplineSetFlag spline = new MoveSplineSetFlag(packet.GetUniversalOpcode(false)); - spline.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); + MoveSplineSetFlag spline = new MoveSplineSetFlag(packet.GetUniversalOpcode(false)) + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState) + }; SendPacketToClient(spline); } @@ -341,9 +375,11 @@ void HandleSplineMovementMessages(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_SET_NORMAL_FALL)] void HandleMoveForceFlagChange(WorldPacket packet) { - MoveSetFlag flag = new MoveSetFlag(packet.GetUniversalOpcode(false)); - flag.MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - flag.MoveCounter = packet.ReadUInt32(); + MoveSetFlag flag = new MoveSetFlag(packet.GetUniversalOpcode(false)) + { + MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + MoveCounter = packet.ReadUInt32() + }; SendPacketToClient(flag); } @@ -523,24 +559,30 @@ void HandleMonsterMove(WorldPacket packet) // Exact sequence of packets from sniff. // Client instantly teleports to destination if anything is left out. - ServerSideMovement stopSpline = new(); - stopSpline.StartPosition = moveSpline.StartPosition; - stopSpline.SplineId = moveSpline.SplineId - 2; + ServerSideMovement stopSpline = new() + { + StartPosition = moveSpline.StartPosition, + SplineId = moveSpline.SplineId - 2 + }; MonsterMove moveStop = new MonsterMove(guid, stopSpline); SendPacketToClient(moveStop); - ControlUpdate update = new(); - update.Guid = guid; - update.HasControl = false; + ControlUpdate update = new() + { + Guid = guid, + HasControl = false + }; SendPacketToClient(update); stopSpline.SplineId = moveSpline.SplineId - 1; moveStop = new MonsterMove(guid, stopSpline); SendPacketToClient(moveStop); - update = new(); - update.Guid = guid; - update.HasControl = false; + update = new() + { + Guid = guid, + HasControl = false + }; SendPacketToClient(update); moveSpline.SplineFlags = SplineFlagModern.Flying | @@ -562,8 +604,10 @@ void HandleMonsterMove(WorldPacket packet) { if (GetSession().GameState.IsWaitingForTaxiStart) { - ActivateTaxiReplyPkt taxi = new(); - taxi.Reply = ActivateTaxiReply.Ok; + ActivateTaxiReplyPkt taxi = new() + { + Reply = ActivateTaxiReply.Ok + }; SendPacketToClient(taxi); GetSession().GameState.IsWaitingForTaxiStart = false; } diff --git a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs index bc41e6e0..40d55054 100644 --- a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs @@ -12,8 +12,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_GOSSIP_MESSAGE)] void HandleGossipmessage(WorldPacket packet) { - GossipMessagePkt gossip = new GossipMessagePkt(); - gossip.GossipGUID = packet.ReadGuid().To128(GetSession().GameState); + GossipMessagePkt gossip = new GossipMessagePkt + { + GossipGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = gossip.GossipGUID; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_4_0_8089)) @@ -27,10 +29,12 @@ void HandleGossipmessage(WorldPacket packet) for (uint i = 0; i < optionsCount; i++) { - ClientGossipOption option = new ClientGossipOption(); - option.OptionIndex = packet.ReadInt32(); - option.OptionIcon = packet.ReadUInt8(); - option.OptionFlags = (byte)(packet.ReadBool() ? 1 : 0); // Code Box + ClientGossipOption option = new ClientGossipOption + { + OptionIndex = packet.ReadInt32(), + OptionIcon = packet.ReadUInt8(), + OptionFlags = (byte)(packet.ReadBool() ? 1 : 0) // Code Box + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) option.OptionCost = packet.ReadInt32(); @@ -63,20 +67,24 @@ void HandleGossipComplete(WorldPacket packet) [PacketHandler(Opcode.SMSG_GOSSIP_POI)] void HandleGossipPoi(WorldPacket packet) { - GossipPOI poi = new(); - poi.Flags = packet.ReadUInt32(); - poi.Pos = new Vector3(packet.ReadVector2()); - poi.Icon = packet.ReadUInt32(); - poi.Importance = packet.ReadUInt32(); - poi.Name = packet.ReadCString(); + GossipPOI poi = new() + { + Flags = packet.ReadUInt32(), + Pos = new Vector3(packet.ReadVector2()), + Icon = packet.ReadUInt32(), + Importance = packet.ReadUInt32(), + Name = packet.ReadCString() + }; SendPacketToClient(poi); } [PacketHandler(Opcode.SMSG_BINDER_CONFIRM)] void HandleBinderConfirm(WorldPacket packet) { - BinderConfirm confirm = new BinderConfirm(); - confirm.Guid = packet.ReadGuid().To128(GetSession().GameState); + BinderConfirm confirm = new BinderConfirm + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = confirm.Guid; SendPacketToClient(confirm); } @@ -84,8 +92,10 @@ void HandleBinderConfirm(WorldPacket packet) [PacketHandler(Opcode.SMSG_VENDOR_INVENTORY)] void HandleVendorInventory(WorldPacket packet) { - VendorInventory vendor = new VendorInventory(); - vendor.VendorGUID = packet.ReadGuid().To128(GetSession().GameState); + VendorInventory vendor = new VendorInventory + { + VendorGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = vendor.VendorGUID; byte itemsCount = packet.ReadUInt8(); @@ -98,8 +108,10 @@ void HandleVendorInventory(WorldPacket packet) for (byte i = 0; i < itemsCount; i++) { - VendorItem vendorItem = new(); - vendorItem.Slot = packet.ReadInt32(); + VendorItem vendorItem = new() + { + Slot = packet.ReadInt32() + }; vendorItem.Item.ItemID = packet.ReadUInt32(); packet.ReadUInt32(); // Display Id vendorItem.Quantity = packet.ReadInt32(); @@ -118,8 +130,10 @@ void HandleVendorInventory(WorldPacket packet) [PacketHandler(Opcode.SMSG_SHOW_BANK)] void HandleShowBank(WorldPacket packet) { - ShowBank bank = new ShowBank(); - bank.Guid = packet.ReadGuid().To128(GetSession().GameState); + ShowBank bank = new ShowBank + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = bank.Guid; SendPacketToClient(bank); } @@ -127,8 +141,10 @@ void HandleShowBank(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRAINER_LIST)] void HandleTrainerList(WorldPacket packet) { - TrainerList trainer = new TrainerList(); - trainer.TrainerGUID = packet.ReadGuid().To128(GetSession().GameState); + TrainerList trainer = new TrainerList + { + TrainerGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = trainer.TrainerGUID; trainer.TrainerID = trainer.TrainerGUID.GetEntry(); trainer.TrainerType = packet.ReadInt32(); @@ -171,10 +187,12 @@ void HandleTrainerList(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRAINER_BUY_FAILED)] void HandleTrainerBuyFailed(WorldPacket packet) { - TrainerBuyFailed buy = new(); - buy.TrainerGUID = packet.ReadGuid().To128(GetSession().GameState); - buy.SpellID = packet.ReadUInt32(); - buy.TrainerFailedReason = packet.ReadUInt32(); + TrainerBuyFailed buy = new() + { + TrainerGUID = packet.ReadGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32(), + TrainerFailedReason = packet.ReadUInt32() + }; SendPacketToClient(buy); ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"Failed to learn Spell {buy.SpellID} (Reason {buy.TrainerFailedReason})."); SendPacketToClient(chat); @@ -183,17 +201,21 @@ void HandleTrainerBuyFailed(WorldPacket packet) [PacketHandler(Opcode.MSG_TALENT_WIPE_CONFIRM)] void HandleTalentWipeConfirm(WorldPacket packet) { - RespecWipeConfirm respec = new(); - respec.TrainerGUID = packet.ReadGuid().To128(GetSession().GameState); - respec.Cost = packet.ReadUInt32(); + RespecWipeConfirm respec = new() + { + TrainerGUID = packet.ReadGuid().To128(GetSession().GameState), + Cost = packet.ReadUInt32() + }; SendPacketToClient(respec); } [PacketHandler(Opcode.SMSG_SPIRIT_HEALER_CONFIRM)] void HandleSpiritHealerConfirm(WorldPacket packet) { - SpiritHealerConfirm confirm = new SpiritHealerConfirm(); - confirm.Guid = packet.ReadGuid().To128(GetSession().GameState); + SpiritHealerConfirm confirm = new SpiritHealerConfirm + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(confirm); } } diff --git a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs index 3eef57d0..ab5fa44b 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs @@ -23,8 +23,10 @@ void HandlePetSpellsMessage(WorldPacket packet) return; } - PetSpells spells = new(); - spells.PetGUID = guid.To128(GetSession().GameState); + PetSpells spells = new() + { + PetGUID = guid.To128(GetSession().GameState) + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_0_9767)) spells.CreatureFamily = packet.ReadUInt16(); @@ -65,17 +67,21 @@ void HandlePetSpellsMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_PET_ACTION_SOUND)] void HandlePetActionSound(WorldPacket packet) { - PetActionSound sound = new PetActionSound(); - sound.UnitGUID = packet.ReadGuid().To128(GetSession().GameState); - sound.Action = packet.ReadUInt32(); + PetActionSound sound = new PetActionSound + { + UnitGUID = packet.ReadGuid().To128(GetSession().GameState), + Action = packet.ReadUInt32() + }; SendPacketToClient(sound); } [PacketHandler(Opcode.SMSG_PET_BROKEN)] void HandlePetBroken(WorldPacket packet) { - PrintNotification notify = new PrintNotification(); - notify.NotifyText = "Your pet has run away"; + PrintNotification notify = new PrintNotification + { + NotifyText = "Your pet has run away" + }; SendPacketToClient(notify); } @@ -93,17 +99,21 @@ void HandleListStabledPets(WorldPacket packet) } SendPacketToClient(pets); - PetStableList stable = new PetStableList(); - stable.StableMaster = packet.ReadGuid().To128(GetSession().GameState); + PetStableList stable = new PetStableList + { + StableMaster = packet.ReadGuid().To128(GetSession().GameState) + }; byte count = packet.ReadUInt8(); stable.NumStableSlots = packet.ReadUInt8(); for (byte i = 0; i < count; i++) { - PetStableInfo pet = new PetStableInfo(); - pet.PetNumber = packet.ReadUInt32(); - pet.CreatureID = packet.ReadUInt32(); - pet.ExperienceLevel = packet.ReadUInt32(); - pet.PetName = packet.ReadCString(); + PetStableInfo pet = new PetStableInfo + { + PetNumber = packet.ReadUInt32(), + CreatureID = packet.ReadUInt32(), + ExperienceLevel = packet.ReadUInt32(), + PetName = packet.ReadCString() + }; if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V3_0_2_9056)) pet.LoyaltyLevel = (byte)packet.ReadUInt32(); pet.PetFlags = packet.ReadUInt8(); @@ -130,8 +140,10 @@ void HandleListStabledPets(WorldPacket packet) [PacketHandler(Opcode.SMSG_PET_STABLE_RESULT)] void HandlePetStableResult(WorldPacket packet) { - PetStableResult stable = new PetStableResult(); - stable.Result = packet.ReadUInt8(); + PetStableResult stable = new PetStableResult + { + Result = packet.ReadUInt8() + }; SendPacketToClient(stable); } } diff --git a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs index 715c9e66..b8033b44 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs @@ -12,15 +12,19 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_PETITION_SHOW_LIST)] void HandlePetitionShowList(WorldPacket packet) { - ServerPetitionShowList petitions = new(); - petitions.Unit = packet.ReadGuid().To128(GetSession().GameState); + ServerPetitionShowList petitions = new() + { + Unit = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = petitions.Unit; var count = packet.ReadUInt8(); for (var i = 0; i < count; i++) { - PetitionEntry petition = new PetitionEntry(); - petition.Index = packet.ReadUInt32(); - petition.CharterEntry = packet.ReadUInt32(); + PetitionEntry petition = new PetitionEntry + { + Index = packet.ReadUInt32(), + CharterEntry = packet.ReadUInt32() + }; packet.ReadUInt32(); // Charter Display petition.CharterCost = packet.ReadUInt32(); @@ -41,17 +45,21 @@ void HandlePetitionShowList(WorldPacket packet) [PacketHandler(Opcode.SMSG_PETITION_SHOW_SIGNATURES)] void HandlePetitionShowSignatures(WorldPacket packet) { - ServerPetitionShowSignatures petition = new(); - petition.Item = packet.ReadGuid().To128(GetSession().GameState); - petition.Owner = packet.ReadGuid().To128(GetSession().GameState); + ServerPetitionShowSignatures petition = new() + { + Item = packet.ReadGuid().To128(GetSession().GameState), + Owner = packet.ReadGuid().To128(GetSession().GameState) + }; petition.OwnerAccountID = GetSession().GetGameAccountGuidForPlayer(petition.Owner); petition.PetitionID = packet.ReadInt32(); var counter = packet.ReadUInt8(); for (var i = 0; i < counter; i++) { - PetitionSignature signature = new PetitionSignature(); - signature.Signer = packet.ReadGuid().To128(GetSession().GameState); - signature.Choice = packet.ReadInt32(); + PetitionSignature signature = new PetitionSignature + { + Signer = packet.ReadGuid().To128(GetSession().GameState), + Choice = packet.ReadInt32() + }; petition.Signatures.Add(signature); } SendPacketToClient(petition); @@ -60,15 +68,19 @@ void HandlePetitionShowSignatures(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_PETITION_RESPONSE)] void HandlePetitionQueryResponse(WorldPacket packet) { - QueryPetitionResponse petition = new(); - petition.PetitionID = packet.ReadUInt32(); - petition.Allow = true; - petition.Info = new PetitionInfo(); - petition.Info.PetitionID = petition.PetitionID; - petition.Info.Petitioner = packet.ReadGuid().To128(GetSession().GameState); + QueryPetitionResponse petition = new() + { + PetitionID = packet.ReadUInt32(), + Allow = true + }; + petition.Info = new PetitionInfo + { + PetitionID = petition.PetitionID, + Petitioner = packet.ReadGuid().To128(GetSession().GameState), - petition.Info.Title = packet.ReadCString(); - petition.Info.BodyText = packet.ReadCString(); + Title = packet.ReadCString(), + BodyText = packet.ReadCString() + }; if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.ReadUInt32(); // flags @@ -100,9 +112,11 @@ void HandlePetitionQueryResponse(WorldPacket packet) [PacketHandler(Opcode.MSG_PETITION_RENAME)] void HandlePetitionRename(WorldPacket packet) { - PetitionRenameGuildResponse petition = new(); - petition.PetitionGuid = packet.ReadGuid().To128(GetSession().GameState); - petition.NewGuildName = packet.ReadCString(); + PetitionRenameGuildResponse petition = new() + { + PetitionGuid = packet.ReadGuid().To128(GetSession().GameState), + NewGuildName = packet.ReadCString() + }; SendPacketToClient(petition); } @@ -121,18 +135,22 @@ void HandlePetitionDecline(WorldPacket packet) [PacketHandler(Opcode.SMSG_PETITION_SIGN_RESULTS)] void HandlePetitionSignResults(WorldPacket packet) { - PetitionSignResults petition = new(); - petition.Item = packet.ReadGuid().To128(GetSession().GameState); - petition.Player = packet.ReadGuid().To128(GetSession().GameState); - petition.Error = (PetitionSignResult)packet.ReadUInt32(); + PetitionSignResults petition = new() + { + Item = packet.ReadGuid().To128(GetSession().GameState), + Player = packet.ReadGuid().To128(GetSession().GameState), + Error = (PetitionSignResult)packet.ReadUInt32() + }; SendPacketToClient(petition); } [PacketHandler(Opcode.SMSG_TURN_IN_PETITION_RESULT)] void HandleTurnInPetitionResult(WorldPacket packet) { - TurnInPetitionResult petition = new(); - petition.Result = (PetitionTurnResult)packet.ReadUInt32(); + TurnInPetitionResult petition = new() + { + Result = (PetitionTurnResult)packet.ReadUInt32() + }; SendPacketToClient(petition); } } diff --git a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs index 2dea3628..8bce7d39 100644 --- a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs @@ -15,8 +15,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_QUERY_TIME_RESPONSE)] void HandleQueryTimeResponse(WorldPacket packet) { - QueryTimeResponse response = new QueryTimeResponse(); - response.CurrentTime = packet.ReadInt32(); + QueryTimeResponse response = new QueryTimeResponse + { + CurrentTime = packet.ReadInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180) && packet.CanRead()) packet.ReadInt32(); // Next Daily Quest Reset Time SendPacketToClient(response); @@ -60,13 +62,15 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) int factionValue = packet.ReadInt32(); // RequiredFactionValue if (factionId != 0 && factionValue != 0) { - QuestObjective objective = new QuestObjective(); - objective.QuestID = response.QuestID; - objective.Id = QuestObjective.QuestObjectiveCounter++; - objective.StorageIndex = objectiveCounter++; - objective.Type = QuestObjectiveType.MinReputation; - objective.ObjectID = factionId; - objective.Amount = factionValue; + QuestObjective objective = new QuestObjective + { + QuestID = response.QuestID, + Id = QuestObjective.QuestObjectiveCounter++, + StorageIndex = objectiveCounter++, + Type = QuestObjectiveType.MinReputation, + ObjectID = factionId, + Amount = factionValue + }; quest.Objectives.Add(objective); } } @@ -81,13 +85,15 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) quest.RewardMoney = rewOrReqMoney; else { - QuestObjective objective = new QuestObjective(); - objective.QuestID = response.QuestID; - objective.Id = QuestObjective.QuestObjectiveCounter++; - objective.StorageIndex = objectiveCounter++; - objective.Type = QuestObjectiveType.Money; - objective.ObjectID = 0; - objective.Amount = -rewOrReqMoney; + QuestObjective objective = new QuestObjective + { + QuestID = response.QuestID, + Id = QuestObjective.QuestObjectiveCounter++, + StorageIndex = objectiveCounter++, + Type = QuestObjectiveType.Money, + ObjectID = 0, + Amount = -rewOrReqMoney + }; quest.Objectives.Add(objective); } quest.RewardBonusMoney = packet.ReadUInt32(); @@ -113,13 +119,15 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) int requiredPlayerKills = packet.ReadInt32(); if (requiredPlayerKills != 0) { - QuestObjective objective = new QuestObjective(); - objective.QuestID = response.QuestID; - objective.Id = QuestObjective.QuestObjectiveCounter++; - objective.StorageIndex = objectiveCounter++; - objective.Type = QuestObjectiveType.PlayerKills; - objective.ObjectID = 0; - objective.Amount = requiredPlayerKills; + QuestObjective objective = new QuestObjective + { + QuestID = response.QuestID, + Id = QuestObjective.QuestObjectiveCounter++, + StorageIndex = objectiveCounter++, + Type = QuestObjectiveType.PlayerKills, + ObjectID = 0, + Amount = requiredPlayerKills + }; quest.Objectives.Add(objective); } packet.ReadUInt32(); // RewardTalents @@ -139,9 +147,11 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) for (int i = 0; i < 6; i++) { - QuestInfoChoiceItem choiceItem = new QuestInfoChoiceItem(); - choiceItem.ItemID = packet.ReadUInt32(); - choiceItem.Quantity = packet.ReadUInt32(); + QuestInfoChoiceItem choiceItem = new QuestInfoChoiceItem + { + ItemID = packet.ReadUInt32(), + Quantity = packet.ReadUInt32() + }; ItemDisplayData item = GameData.GetItemDisplayData(choiceItem.ItemID); if (item != null) @@ -193,13 +203,15 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) if (creatureOrGoId != 0 && creatureOrGoAmount != 0) { - QuestObjective objective = new QuestObjective(); - objective.QuestID = response.QuestID; - objective.Id = QuestObjective.QuestObjectiveCounter++; - objective.StorageIndex = objectiveCounter++; - objective.Type = isGo ? QuestObjectiveType.GameObject : QuestObjectiveType.Monster; - objective.ObjectID = creatureOrGoId; - objective.Amount = creatureOrGoAmount; + QuestObjective objective = new QuestObjective + { + QuestID = response.QuestID, + Id = QuestObjective.QuestObjectiveCounter++, + StorageIndex = objectiveCounter++, + Type = isGo ? QuestObjectiveType.GameObject : QuestObjectiveType.Monster, + ObjectID = creatureOrGoId, + Amount = creatureOrGoAmount + }; quest.Objectives.Add(objective); } @@ -229,13 +241,15 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) { if (requiredItemID[i] != 0 && requiredItemCount[i] != 0) { - QuestObjective objective = new QuestObjective(); - objective.QuestID = response.QuestID; - objective.Id = QuestObjective.QuestObjectiveCounter++; - objective.StorageIndex = objectiveCounter++; - objective.Type = QuestObjectiveType.Item; - objective.ObjectID = requiredItemID[i]; - objective.Amount = requiredItemCount[i]; + QuestObjective objective = new QuestObjective + { + QuestID = response.QuestID, + Id = QuestObjective.QuestObjectiveCounter++, + StorageIndex = objectiveCounter++, + Type = QuestObjectiveType.Item, + ObjectID = requiredItemID[i], + Amount = requiredItemCount[i] + }; quest.Objectives.Add(objective); } } @@ -402,13 +416,17 @@ void HandleQueryGameObjectResposne(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_PAGE_TEXT_RESPONSE)] void HandleQueryPageTextResponse(WorldPacket packet) { - QueryPageTextResponse response = new QueryPageTextResponse(); - response.PageTextID = packet.ReadUInt32(); - response.Allow = true; - PageTextInfo page = new PageTextInfo(); - page.Id = response.PageTextID; - page.Text = packet.ReadCString(); - page.NextPageID = packet.ReadUInt32(); + QueryPageTextResponse response = new QueryPageTextResponse + { + PageTextID = packet.ReadUInt32(), + Allow = true + }; + PageTextInfo page = new PageTextInfo + { + Id = response.PageTextID, + Text = packet.ReadCString(), + NextPageID = packet.ReadUInt32() + }; response.Pages.Add(page); SendPacketToClient(response); } @@ -646,9 +664,11 @@ void HandleQueryPetNameResponse(WorldPacket packet) return; } - QueryPetNameResponse response = new QueryPetNameResponse(); - response.UnitGUID = guid; - response.Name = packet.ReadCString(); + QueryPetNameResponse response = new QueryPetNameResponse + { + UnitGUID = guid, + Name = packet.ReadCString() + }; if (response.Name.Length == 0) { response.Allow = false; @@ -685,8 +705,10 @@ void HandleItemNameQueryResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_WHO)] void HandleWhoResponse(WorldPacket packet) { - WhoResponsePkt response = new WhoResponsePkt(); - response.RequestID = GetSession().GameState.LastWhoRequestId; + WhoResponsePkt response = new WhoResponsePkt + { + RequestID = GetSession().GameState.LastWhoRequestId + }; var count = packet.ReadUInt32(); packet.ReadUInt32(); // Online count for (var i = 0; i < count; ++i) diff --git a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs index 88872402..256d0169 100644 --- a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs @@ -12,8 +12,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_DETAILS)] void HandleQuestGiverQuestDetails(WorldPacket packet) { - QuestGiverQuestDetails quest = new(); - quest.QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState); + QuestGiverQuestDetails quest = new() + { + QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = quest.QuestGiverGUID; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -146,9 +148,11 @@ void HandleQuestGiverStatusMultple(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - QuestGiverInfo info = new(); - info.Guid = packet.ReadGuid().To128(GetSession().GameState); - info.Status = LegacyVersion.ConvertQuestGiverStatus(packet.ReadUInt8()); + QuestGiverInfo info = new() + { + Guid = packet.ReadGuid().To128(GetSession().GameState), + Status = LegacyVersion.ConvertQuestGiverStatus(packet.ReadUInt8()) + }; response.QuestGivers.Add(info); } SendPacketToClient(response); @@ -157,8 +161,10 @@ void HandleQuestGiverStatusMultple(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE)] void HandleQuestGiverQuestListMessage(WorldPacket packet) { - QuestGiverQuestListMessage quests = new QuestGiverQuestListMessage(); - quests.QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState); + QuestGiverQuestListMessage quests = new QuestGiverQuestListMessage + { + QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = quests.QuestGiverGUID; quests.Greeting = packet.ReadCString(); quests.GreetEmoteDelay = packet.ReadUInt32(); @@ -175,8 +181,10 @@ void HandleQuestGiverQuestListMessage(WorldPacket packet) ClientGossipQuest ReadGossipQuestOption(WorldPacket packet) { - ClientGossipQuest quest = new(); - quest.QuestID = packet.ReadUInt32(); + ClientGossipQuest quest = new() + { + QuestID = packet.ReadUInt32() + }; QuestGiverStatusModern dialogStatus = LegacyVersion.ConvertQuestGiverStatus((byte)packet.ReadInt32()); if (dialogStatus.HasAnyFlag(QuestGiverStatusModern.Available | QuestGiverStatusModern.AvailableCovenantCalling | QuestGiverStatusModern.AvailableJourney | QuestGiverStatusModern.AvailableLegendaryQuest | QuestGiverStatusModern.AvailableRep | QuestGiverStatusModern.LowLevelAvailable | QuestGiverStatusModern.LowLevelAvailableRep)) @@ -199,8 +207,10 @@ ClientGossipQuest ReadGossipQuestOption(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_REQUEST_ITEMS)] void HandleQuestGiverRequestItems(WorldPacket packet) { - QuestGiverRequestItems quest = new QuestGiverRequestItems(); - quest.QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState); + QuestGiverRequestItems quest = new QuestGiverRequestItems + { + QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState) + }; GetSession().GameState.CurrentInteractedWithNPC = quest.QuestGiverGUID; quest.QuestGiverCreatureID = quest.QuestGiverGUID.GetEntry(); quest.QuestID = packet.ReadUInt32(); @@ -221,9 +231,11 @@ void HandleQuestGiverRequestItems(WorldPacket packet) uint itemsCount = packet.ReadUInt32(); for (int i = 0; i < itemsCount; i++) { - QuestObjectiveCollect item = new(); - item.ObjectID = packet.ReadUInt32(); - item.Amount = packet.ReadUInt32(); + QuestObjectiveCollect item = new() + { + ObjectID = packet.ReadUInt32(), + Amount = packet.ReadUInt32() + }; packet.ReadUInt32(); // Item Display Id quest.Collect.Add(item); } @@ -269,9 +281,11 @@ void HandleQuestGiverOfferRewardMessage(WorldPacket packet) uint emotesCount = packet.ReadUInt32(); for (int i = 0; i < emotesCount; i++) { - QuestDescEmote emote = new(); - emote.Delay = packet.ReadUInt32(); - emote.Type = packet.ReadUInt32(); + QuestDescEmote emote = new() + { + Delay = packet.ReadUInt32(), + Type = packet.ReadUInt32() + }; } ReadExtraQuestInfo(packet, quest.QuestData.Rewards, true); @@ -282,8 +296,10 @@ void HandleQuestGiverOfferRewardMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_COMPLETE)] void HandleQuestGiverQuestComplete(WorldPacket packet) { - QuestGiverQuestComplete quest = new QuestGiverQuestComplete(); - quest.QuestID = packet.ReadUInt32(); + QuestGiverQuestComplete quest = new QuestGiverQuestComplete + { + QuestID = packet.ReadUInt32() + }; GetSession().GameState.CurrentPlayerStorage.CompletedQuests.MarkQuestAsCompleted(quest.QuestID); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -322,8 +338,10 @@ void HandleQuestGiverQuestComplete(WorldPacket packet) quest.ItemReward.ItemID = itemId; SendPacketToClient(quest); - DisplayToast toast = new(); - toast.QuestID = quest.QuestID; + DisplayToast toast = new() + { + QuestID = quest.QuestID + }; if (itemId != 0 && itemCount != 0) { toast.Quantity = 1; @@ -341,17 +359,21 @@ void HandleQuestGiverQuestComplete(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_FAILED)] void HandleQuestGiverQuestFailed(WorldPacket packet) { - QuestGiverQuestFailed quest = new QuestGiverQuestFailed(); - quest.QuestID = packet.ReadUInt32(); - quest.Reason = LegacyVersion.ConvertInventoryResult(packet.ReadUInt32()); + QuestGiverQuestFailed quest = new QuestGiverQuestFailed + { + QuestID = packet.ReadUInt32(), + Reason = LegacyVersion.ConvertInventoryResult(packet.ReadUInt32()) + }; SendPacketToClient(quest); } [PacketHandler(Opcode.SMSG_QUEST_GIVER_INVALID_QUEST)] void HandleQuestGiverInvalidQuest(WorldPacket packet) { - QuestGiverInvalidQuest quest = new QuestGiverInvalidQuest(); - quest.Reason = (QuestFailedReasons)packet.ReadUInt32(); + QuestGiverInvalidQuest quest = new QuestGiverInvalidQuest + { + Reason = (QuestFailedReasons)packet.ReadUInt32() + }; SendPacketToClient(quest); } @@ -360,8 +382,10 @@ void HandleQuestGiverInvalidQuest(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_UPDATE_FAILED_TIMER)] void HandleQuestUpdateStatus(WorldPacket packet) { - QuestUpdateStatus quest = new QuestUpdateStatus(packet.GetUniversalOpcode(false)); - quest.QuestID = packet.ReadUInt32(); + QuestUpdateStatus quest = new QuestUpdateStatus(packet.GetUniversalOpcode(false)) + { + QuestID = packet.ReadUInt32() + }; SendPacketToClient(quest); } @@ -395,8 +419,10 @@ void HandleQuestUpdateAddItem(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_UPDATE_ADD_KILL)] void HandleQuestUpdateAddKill(WorldPacket packet) { - QuestUpdateAddCredit credit = new QuestUpdateAddCredit(); - credit.QuestID = packet.ReadUInt32(); + QuestUpdateAddCredit credit = new QuestUpdateAddCredit + { + QuestID = packet.ReadUInt32() + }; var entry = packet.ReadEntry(); credit.ObjectID = entry.Key; credit.ObjectiveType = entry.Value ? QuestObjectiveType.GameObject : QuestObjectiveType.Monster; @@ -409,19 +435,23 @@ void HandleQuestUpdateAddKill(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_CONFIRM_ACCEPT)] void HandleQuestConfirmAccept(WorldPacket packet) { - QuestConfirmAccept quest = new QuestConfirmAccept(); - quest.QuestID = packet.ReadUInt32(); - quest.QuestTitle = packet.ReadCString(); - quest.InitiatedBy = packet.ReadGuid().To128(GetSession().GameState); + QuestConfirmAccept quest = new QuestConfirmAccept + { + QuestID = packet.ReadUInt32(), + QuestTitle = packet.ReadCString(), + InitiatedBy = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(quest); } [PacketHandler(Opcode.MSG_QUEST_PUSH_RESULT)] void HandleQuestPushResult(WorldPacket packet) { - QuestPushResult quest = new QuestPushResult(); - quest.SenderGUID = packet.ReadGuid().To128(GetSession().GameState); - quest.Result = (QuestPushReason)packet.ReadUInt8(); + QuestPushResult quest = new QuestPushResult + { + SenderGUID = packet.ReadGuid().To128(GetSession().GameState), + Result = (QuestPushReason)packet.ReadUInt8() + }; SendPacketToClient(quest); } } diff --git a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs index e0f875da..cf2d428b 100644 --- a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs @@ -42,9 +42,11 @@ void HandleSetFactionStanding(WorldPacket packet) var count = packet.ReadInt32(); for (var i = 0; i < count; i++) { - FactionStandingData faction = new(); - faction.Index = packet.ReadInt32(); - faction.Standing = packet.ReadInt32(); + FactionStandingData faction = new() + { + Index = packet.ReadInt32(), + Standing = packet.ReadInt32() + }; standing.Factions.Add(faction); } SendPacketToClient(standing); @@ -57,9 +59,11 @@ void HandleSetForcedReaction(WorldPacket packet) var count = packet.ReadInt32(); for (var i = 0; i < count; i++) { - ForcedReaction reaction = new(); - reaction.Faction = packet.ReadInt32(); - reaction.Reaction = packet.ReadInt32(); + ForcedReaction reaction = new() + { + Faction = packet.ReadInt32(), + Reaction = packet.ReadInt32() + }; reactions.Reactions.Add(reaction); } SendPacketToClient(reactions); @@ -68,8 +72,10 @@ void HandleSetForcedReaction(WorldPacket packet) [PacketHandler(Opcode.SMSG_SET_FACTION_VISIBLE)] void HandleSetFactionVisible(WorldPacket packet) { - SetFactionVisible faction = new(true); - faction.FactionIndex = packet.ReadUInt32(); + SetFactionVisible faction = new(true) + { + FactionIndex = packet.ReadUInt32() + }; SendPacketToClient(faction); } } diff --git a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs index ba10bc8f..7d2ea3e7 100644 --- a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs @@ -11,15 +11,19 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_FRIEND_LIST)] void HandleFriendList(WorldPacket packet) { - ContactList contacts = new ContactList(); - contacts.Flags = SocialFlag.Friend; + ContactList contacts = new ContactList + { + Flags = SocialFlag.Friend + }; var count = packet.ReadUInt8(); for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo(); - contact.TypeFlags = SocialFlag.Friend; - contact.Guid = packet.ReadGuid().To128(GetSession().GameState); + ContactInfo contact = new ContactInfo + { + TypeFlags = SocialFlag.Friend, + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; contact.WowAccountGuid = GetSession().GetGameAccountGuidForPlayer(contact.Guid); contact.NativeRealmAddr = GetSession().RealmId.GetAddress(); contact.VirtualRealmAddr = GetSession().RealmId.GetAddress(); @@ -39,15 +43,19 @@ void HandleFriendList(WorldPacket packet) [PacketHandler(Opcode.SMSG_IGNORE_LIST)] void HandleIgnoreList(WorldPacket packet) { - ContactList contacts = new ContactList(); - contacts.Flags = SocialFlag.Ignored; + ContactList contacts = new ContactList + { + Flags = SocialFlag.Ignored + }; var count = packet.ReadUInt8(); for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo(); - contact.TypeFlags = SocialFlag.Ignored; - contact.Guid = packet.ReadGuid().To128(GetSession().GameState); + ContactInfo contact = new ContactInfo + { + TypeFlags = SocialFlag.Ignored, + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; contact.WowAccountGuid = GetSession().GetGameAccountGuidForPlayer(contact.Guid); contact.NativeRealmAddr = GetSession().RealmId.GetAddress(); contact.VirtualRealmAddr = GetSession().RealmId.GetAddress(); @@ -60,14 +68,18 @@ void HandleIgnoreList(WorldPacket packet) [PacketHandler(Opcode.SMSG_CONTACT_LIST)] void HandleContactList(WorldPacket packet) { - ContactList contacts = new ContactList(); - contacts.Flags = (SocialFlag)packet.ReadUInt32(); + ContactList contacts = new ContactList + { + Flags = (SocialFlag)packet.ReadUInt32() + }; var count = packet.ReadUInt32(); for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo(); - contact.Guid = packet.ReadGuid().To128(GetSession().GameState); + ContactInfo contact = new ContactInfo + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; contact.WowAccountGuid = GetSession().GetGameAccountGuidForPlayer(contact.Guid); contact.NativeRealmAddr = GetSession().RealmId.GetAddress(); contact.VirtualRealmAddr = GetSession().RealmId.GetAddress(); @@ -92,9 +104,11 @@ void HandleContactList(WorldPacket packet) [PacketHandler(Opcode.SMSG_FRIEND_STATUS)] void HandleFriendStatus(WorldPacket packet) { - FriendStatusPkt friend = new FriendStatusPkt(); - friend.FriendResult = (FriendsResult)packet.ReadUInt8(); - friend.Guid = packet.ReadGuid().To128(GetSession().GameState); + FriendStatusPkt friend = new FriendStatusPkt + { + FriendResult = (FriendsResult)packet.ReadUInt8(), + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; friend.WowAccountGuid = GetSession().GetGameAccountGuidForPlayer(friend.Guid); friend.VirtualRealmAddress = GetSession().RealmId.GetAddress(); switch (friend.FriendResult) diff --git a/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs index 6c015b95..9c84b056 100644 --- a/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs @@ -13,8 +13,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_SEND_KNOWN_SPELLS)] void HandleSendKnownSpells(WorldPacket packet) { - SendKnownSpells spells = new SendKnownSpells(); - spells.InitialLogin = packet.ReadBool(); + SendKnownSpells spells = new SendKnownSpells + { + InitialLogin = packet.ReadBool() + }; ushort spellCount = packet.ReadUInt16(); for (ushort i = 0; i < spellCount; i++) { @@ -155,13 +157,15 @@ void HandleCastFailed(WorldPacket packet) if (GetSession().GameState.CurrentClientSpecialCast != null && GetSession().GameState.CurrentClientSpecialCast.SpellId == spellId) { - CastFailed failed = new(); - failed.SpellID = GetSession().GameState.CurrentClientSpecialCast.SpellId; - failed.SpellXSpellVisualID = GetSession().GameState.CurrentClientSpecialCast.SpellXSpellVisualId; - failed.Reason = LegacyVersion.ConvertSpellCastResult(reason); - failed.CastID = GetSession().GameState.CurrentClientSpecialCast.ServerGUID; - failed.FailedArg1 = arg1; - failed.FailedArg2 = arg2; + CastFailed failed = new() + { + SpellID = GetSession().GameState.CurrentClientSpecialCast.SpellId, + SpellXSpellVisualID = GetSession().GameState.CurrentClientSpecialCast.SpellXSpellVisualId, + Reason = LegacyVersion.ConvertSpellCastResult(reason), + CastID = GetSession().GameState.CurrentClientSpecialCast.ServerGUID, + FailedArg1 = arg1, + FailedArg2 = arg2 + }; SendPacketToClient(failed); GetSession().GameState.CurrentClientSpecialCast = null; } @@ -170,19 +174,23 @@ void HandleCastFailed(WorldPacket packet) { if (!GetSession().GameState.CurrentClientNormalCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare(); - prepare2.ClientCastID = GetSession().GameState.CurrentClientNormalCast.ClientGUID; - prepare2.ServerCastID = GetSession().GameState.CurrentClientNormalCast.ServerGUID; + SpellPrepare prepare2 = new SpellPrepare + { + ClientCastID = GetSession().GameState.CurrentClientNormalCast.ClientGUID, + ServerCastID = GetSession().GameState.CurrentClientNormalCast.ServerGUID + }; SendPacketToClient(prepare2); } - CastFailed failed = new(); - failed.SpellID = GetSession().GameState.CurrentClientNormalCast.SpellId; - failed.SpellXSpellVisualID = GetSession().GameState.CurrentClientNormalCast.SpellXSpellVisualId; - failed.Reason = LegacyVersion.ConvertSpellCastResult(reason); - failed.CastID = GetSession().GameState.CurrentClientNormalCast.ServerGUID; - failed.FailedArg1 = arg1; - failed.FailedArg2 = arg2; + CastFailed failed = new() + { + SpellID = GetSession().GameState.CurrentClientNormalCast.SpellId, + SpellXSpellVisualID = GetSession().GameState.CurrentClientNormalCast.SpellXSpellVisualId, + Reason = LegacyVersion.ConvertSpellCastResult(reason), + CastID = GetSession().GameState.CurrentClientNormalCast.ServerGUID, + FailedArg1 = arg1, + FailedArg2 = arg2 + }; SendPacketToClient(failed); GetSession().GameState.CurrentClientNormalCast = null; @@ -211,14 +219,18 @@ void HandlePetCastFailed(WorldPacket packet) if (!GetSession().GameState.CurrentClientPetCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare(); - prepare2.ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID; - prepare2.ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID; + SpellPrepare prepare2 = new SpellPrepare + { + ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID, + ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID + }; SendPacketToClient(prepare2); } - PetCastFailed spell = new PetCastFailed(); - spell.SpellID = spellId; + PetCastFailed spell = new PetCastFailed + { + SpellID = spellId + }; uint reason = packet.ReadUInt8(); spell.Reason = LegacyVersion.ConvertSpellCastResult(reason); spell.CastID = GetSession().GameState.CurrentClientPetCast.ServerGUID; @@ -248,14 +260,18 @@ void HandlePetCastFailedTBC(WorldPacket packet) if (!GetSession().GameState.CurrentClientPetCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare(); - prepare2.ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID; - prepare2.ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID; + SpellPrepare prepare2 = new SpellPrepare + { + ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID, + ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID + }; SendPacketToClient(prepare2); } - PetCastFailed failed = new PetCastFailed(); - failed.SpellID = spellId; + PetCastFailed failed = new PetCastFailed + { + SpellID = spellId + }; uint reason = packet.ReadUInt8(); failed.Reason = LegacyVersion.ConvertSpellCastResult(reason); failed.CastID = GetSession().GameState.CurrentClientPetCast.ServerGUID; @@ -319,20 +335,24 @@ void HandleSpellFailedOther(WorldPacket packet) spellVisual = GameData.GetSpellVisual(spellId); } - SpellFailure spell = new SpellFailure(); - spell.CasterUnit = casterUnit; - spell.CastID = castId; - spell.SpellID = spellId; - spell.SpellXSpellVisualID = spellVisual; - spell.Reason = reason; + SpellFailure spell = new SpellFailure + { + CasterUnit = casterUnit, + CastID = castId, + SpellID = spellId, + SpellXSpellVisualID = spellVisual, + Reason = reason + }; SendPacketToClient(spell); - SpellFailedOther spell2 = new SpellFailedOther(); - spell2.CasterUnit = casterUnit; - spell2.CastID = castId; - spell2.SpellID = spellId; - spell2.SpellXSpellVisualID = spellVisual; - spell2.Reason = reason; + SpellFailedOther spell2 = new SpellFailedOther + { + CasterUnit = casterUnit, + CastID = castId, + SpellID = spellId, + SpellXSpellVisualID = spellVisual, + Reason = reason + }; SendPacketToClient(spell2); } @@ -342,8 +362,10 @@ void HandleSpellStart(WorldPacket packet) if (GetSession().GameState.CurrentMapId == null) return; - SpellStart spell = new SpellStart(); - spell.Cast = HandleSpellStartOrGo(packet, false); + SpellStart spell = new SpellStart + { + Cast = HandleSpellStartOrGo(packet, false) + }; byte failPending = 0; if (GetSession().GameState.CurrentPlayerGuid == spell.Cast.CasterUnit && @@ -354,9 +376,11 @@ void HandleSpellStart(WorldPacket packet) spell.Cast.SpellXSpellVisualID = GetSession().GameState.CurrentClientNormalCast.SpellXSpellVisualId; GetSession().GameState.CurrentClientNormalCast.HasStarted = true; - SpellPrepare prepare = new(); - prepare.ClientCastID = GetSession().GameState.CurrentClientNormalCast.ClientGUID; - prepare.ServerCastID = spell.Cast.CastID; + SpellPrepare prepare = new() + { + ClientCastID = GetSession().GameState.CurrentClientNormalCast.ClientGUID, + ServerCastID = spell.Cast.CastID + }; SendPacketToClient(prepare); failPending = 1; } @@ -368,9 +392,11 @@ void HandleSpellStart(WorldPacket packet) spell.Cast.SpellXSpellVisualID = GetSession().GameState.CurrentClientPetCast.SpellXSpellVisualId; GetSession().GameState.CurrentClientPetCast.HasStarted = true; - SpellPrepare prepare = new(); - prepare.ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID; - prepare.ServerCastID = spell.Cast.CastID; + SpellPrepare prepare = new() + { + ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID, + ServerCastID = spell.Cast.CastID + }; SendPacketToClient(prepare); failPending = 2; } @@ -404,8 +430,10 @@ void HandleSpellGo(WorldPacket packet) if (GetSession().GameState.CurrentMapId == null) return; - SpellGo spell = new SpellGo(); - spell.Cast = HandleSpellStartOrGo(packet, true); + SpellGo spell = new SpellGo + { + Cast = HandleSpellStartOrGo(packet, true) + }; if (GetSession().GameState.CurrentPlayerGuid == spell.Cast.CasterUnit && GetSession().GameState.CurrentClientNormalCast != null && GetSession().GameState.CurrentClientNormalCast.SpellId == spell.Cast.SpellID) @@ -437,10 +465,11 @@ void HandleSpellGo(WorldPacket packet) SpellCastData HandleSpellStartOrGo(WorldPacket packet, bool isSpellGo) { - SpellCastData dbdata = new SpellCastData(); - - dbdata.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - dbdata.CasterUnit = packet.ReadPackedGuid().To128(GetSession().GameState); + SpellCastData dbdata = new SpellCastData + { + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterUnit = packet.ReadPackedGuid().To128(GetSession().GameState) + }; if (dbdata.CasterUnit == GetSession().GameState.CurrentPlayerGuid) { @@ -510,8 +539,10 @@ SpellCastData HandleSpellStartOrGo(WorldPacket packet, bool isSpellGo) if (targetFlags.HasAnyFlag(SpellCastTargetFlags.SourceLocation)) { - dbdata.Target.SrcLocation = new TargetLocation(); - dbdata.Target.SrcLocation.Transport = WowGuid128.Empty; + dbdata.Target.SrcLocation = new TargetLocation + { + Transport = WowGuid128.Empty + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) dbdata.Target.SrcLocation.Transport = packet.ReadPackedGuid().To128(GetSession().GameState); @@ -520,8 +551,10 @@ SpellCastData HandleSpellStartOrGo(WorldPacket packet, bool isSpellGo) if (targetFlags.HasAnyFlag(SpellCastTargetFlags.DestLocation)) { - dbdata.Target.DstLocation = new TargetLocation(); - dbdata.Target.DstLocation.Transport = WowGuid128.Empty; + dbdata.Target.DstLocation = new TargetLocation + { + Transport = WowGuid128.Empty + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_8_9464)) dbdata.Target.DstLocation.Transport = packet.ReadPackedGuid().To128(GetSession().GameState); @@ -654,9 +687,11 @@ void HandleSpellCooldown(WorldPacket packet) cooldown.Flags = packet.ReadUInt8(); while (packet.CanRead()) { - SpellCooldownStruct cd = new(); - cd.SpellID = packet.ReadUInt32(); - cd.ForcedCooldown = packet.ReadUInt32(); + SpellCooldownStruct cd = new() + { + SpellID = packet.ReadUInt32(), + ForcedCooldown = packet.ReadUInt32() + }; cooldown.SpellCooldowns.Add(cd); } } @@ -665,8 +700,10 @@ void HandleSpellCooldown(WorldPacket packet) // wrong structure from arcemu // https://github.com/arcemu/arcemu/blob/2_4_3/src/arcemu-world/Spell.cpp#L1554 packet.ResetReadPos(); - SpellCooldownStruct cd = new(); - cd.SpellID = packet.ReadUInt32(); + SpellCooldownStruct cd = new() + { + SpellID = packet.ReadUInt32() + }; cooldown.Caster = packet.ReadPackedGuid().To128(GetSession().GameState); cd.ForcedCooldown = packet.ReadUInt32(); cooldown.SpellCooldowns.Add(cd); @@ -677,8 +714,10 @@ void HandleSpellCooldown(WorldPacket packet) [PacketHandler(Opcode.SMSG_COOLDOWN_EVENT)] void HandleCooldownEvent(WorldPacket packet) { - CooldownEvent cooldown = new(); - cooldown.SpellID = packet.ReadUInt32(); + CooldownEvent cooldown = new() + { + SpellID = packet.ReadUInt32() + }; WowGuid guid = packet.ReadGuid(); cooldown.IsPet = guid.GetHighType() == HighGuidType.Pet; SendPacketToClient(cooldown); @@ -687,8 +726,10 @@ void HandleCooldownEvent(WorldPacket packet) [PacketHandler(Opcode.SMSG_CLEAR_COOLDOWN)] void HandleClearCooldown(WorldPacket packet) { - ClearCooldown cooldown = new(); - cooldown.SpellID = packet.ReadUInt32(); + ClearCooldown cooldown = new() + { + SpellID = packet.ReadUInt32() + }; WowGuid guid = packet.ReadGuid(); cooldown.IsPet = guid.GetHighType() == HighGuidType.Pet; SendPacketToClient(cooldown); @@ -697,18 +738,22 @@ void HandleClearCooldown(WorldPacket packet) [PacketHandler(Opcode.SMSG_COOLDOWN_CHEAT)] void HandleCooldownCheat(WorldPacket packet) { - CooldownCheat cooldown = new(); - cooldown.Guid = packet.ReadGuid().To128(GetSession().GameState); + CooldownCheat cooldown = new() + { + Guid = packet.ReadGuid().To128(GetSession().GameState) + }; SendPacketToClient(cooldown); } [PacketHandler(Opcode.SMSG_SPELL_NON_MELEE_DAMAGE_LOG)] void HandleSpellNonMeleeDamageLog(WorldPacket packet) { - SpellNonMeleeDamageLog spell = new(); - spell.TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.SpellID = packet.ReadUInt32(); + SpellNonMeleeDamageLog spell = new() + { + TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32() + }; spell.SpellXSpellVisualID = GameData.GetSpellVisual(spell.SpellID); spell.CastID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, spell.SpellID, spell.SpellID + spell.CasterGUID.GetCounter()); spell.Damage = packet.ReadInt32(); @@ -766,11 +811,13 @@ void HandleSpellNonMeleeDamageLog(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPELL_HEAL_LOG)] void HandleSpellHealLog(WorldPacket packet) { - SpellHealLog spell = new(); - spell.TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.SpellID = packet.ReadUInt32(); - spell.HealAmount = packet.ReadInt32(); + SpellHealLog spell = new() + { + TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32(), + HealAmount = packet.ReadInt32() + }; spell.OriginalHealAmount = spell.HealAmount; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_3_9183)) @@ -797,10 +844,12 @@ void HandleSpellHealLog(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPELL_PERIODIC_AURA_LOG)] void HandleSpellPeriodicAuraLog(WorldPacket packet) { - SpellPeriodicAuraLog spell = new(); - spell.TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.SpellID = packet.ReadUInt32(); + SpellPeriodicAuraLog spell = new() + { + TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32() + }; var count = packet.ReadInt32(); for (var i = 0; i < count; i++) @@ -811,9 +860,11 @@ void HandleSpellPeriodicAuraLog(WorldPacket packet) case AuraType.PeriodicDamage: case AuraType.PeriodicDamagePercent: { - SpellPeriodicAuraLog.SpellLogEffect effect = new(); - effect.Effect = (uint)aura; - effect.Amount = packet.ReadInt32(); + SpellPeriodicAuraLog.SpellLogEffect effect = new() + { + Effect = (uint)aura, + Amount = packet.ReadInt32() + }; effect.OriginalDamage = effect.Amount; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -836,9 +887,11 @@ void HandleSpellPeriodicAuraLog(WorldPacket packet) case AuraType.PeriodicHeal: case AuraType.ObsModHealth: { - SpellPeriodicAuraLog.SpellLogEffect effect = new(); - effect.Effect = (uint)aura; - effect.Amount = packet.ReadInt32(); + SpellPeriodicAuraLog.SpellLogEffect effect = new() + { + Effect = (uint)aura, + Amount = packet.ReadInt32() + }; effect.OriginalDamage = effect.Amount; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -857,19 +910,23 @@ void HandleSpellPeriodicAuraLog(WorldPacket packet) case AuraType.ObsModPower: case AuraType.PeriodicEnergize: { - SpellPeriodicAuraLog.SpellLogEffect effect = new(); - effect.Effect = (uint)aura; - effect.SchoolMaskOrPower = packet.ReadUInt32(); - effect.Amount = packet.ReadInt32(); + SpellPeriodicAuraLog.SpellLogEffect effect = new() + { + Effect = (uint)aura, + SchoolMaskOrPower = packet.ReadUInt32(), + Amount = packet.ReadInt32() + }; spell.Effects.Add(effect); break; } case AuraType.PeriodicManaLeech: { - SpellPeriodicAuraLog.SpellLogEffect effect = new(); - effect.Effect = (uint)aura; - effect.SchoolMaskOrPower = packet.ReadUInt32(); - effect.Amount = packet.ReadInt32(); + SpellPeriodicAuraLog.SpellLogEffect effect = new() + { + Effect = (uint)aura, + SchoolMaskOrPower = packet.ReadUInt32(), + Amount = packet.ReadInt32() + }; packet.ReadFloat(); // Gain multiplier spell.Effects.Add(effect); break; @@ -882,12 +939,14 @@ void HandleSpellPeriodicAuraLog(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPELL_ENERGIZE_LOG)] void HandleSpellEnergizeLog(WorldPacket packet) { - SpellEnergizeLog spell = new(); - spell.TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.SpellID = packet.ReadUInt32(); - spell.Type = (PowerType)packet.ReadUInt32(); - spell.Amount = packet.ReadInt32(); + SpellEnergizeLog spell = new() + { + TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + SpellID = packet.ReadUInt32(), + Type = (PowerType)packet.ReadUInt32(), + Amount = packet.ReadInt32() + }; SendPacketToClient(spell); } @@ -932,9 +991,11 @@ void HandleSpellChannelUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPELL_DAMAGE_SHIELD)] void HandleSpellDamageShield(WorldPacket packet) { - SpellDamageShield spell = new(); - spell.VictimGUID = packet.ReadGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadGuid().To128(GetSession().GameState); + SpellDamageShield spell = new() + { + VictimGUID = packet.ReadGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadGuid().To128(GetSession().GameState) + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) spell.SpellID = packet.ReadUInt32(); @@ -958,12 +1019,14 @@ void HandleSpellDamageShield(WorldPacket packet) [PacketHandler(Opcode.SMSG_ENVIRONMENTAL_DAMAGE_LOG)] void HandleEnvironmentalDamageLog(WorldPacket packet) { - EnvironmentalDamageLog damage = new(); - damage.Victim = packet.ReadGuid().To128(GetSession().GameState); - damage.Type = (EnvironmentalDamage)packet.ReadUInt8(); - damage.Amount = packet.ReadInt32(); - damage.Absorbed = packet.ReadInt32(); - damage.Resisted = packet.ReadInt32(); + EnvironmentalDamageLog damage = new() + { + Victim = packet.ReadGuid().To128(GetSession().GameState), + Type = (EnvironmentalDamage)packet.ReadUInt8(), + Amount = packet.ReadInt32(), + Absorbed = packet.ReadInt32(), + Resisted = packet.ReadInt32() + }; SendPacketToClient(damage); } @@ -985,9 +1048,11 @@ void HandleSpellInstakillLog(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPELL_DISPELL_LOG)] void HandleSpellDispellLog(WorldPacket packet) { - SpellDispellLog spell = new(); - spell.TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState); - spell.CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState); + SpellDispellLog spell = new() + { + TargetGUID = packet.ReadPackedGuid().To128(GetSession().GameState), + CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState) + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) spell.DispelledBySpellID = packet.ReadUInt32(); @@ -1003,8 +1068,10 @@ void HandleSpellDispellLog(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - SpellDispellData dispel = new SpellDispellData(); - dispel.SpellID = packet.ReadUInt32(); + SpellDispellData dispel = new SpellDispellData + { + SpellID = packet.ReadUInt32() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) dispel.Harmful = packet.ReadBool(); spell.DispellData.Add(dispel); @@ -1022,9 +1089,11 @@ void HandleSpellDispellLog(WorldPacket packet) [PacketHandler(Opcode.SMSG_PLAY_SPELL_VISUAL)] void HandlePlaySpellVisualKit(WorldPacket packet) { - PlaySpellVisualKit spell = new(); - spell.Unit = packet.ReadGuid().To128(GetSession().GameState); - spell.KitRecID = packet.ReadUInt32(); + PlaySpellVisualKit spell = new() + { + Unit = packet.ReadGuid().To128(GetSession().GameState), + KitRecID = packet.ReadUInt32() + }; SendPacketToClient(spell); } @@ -1042,9 +1111,11 @@ void HandleUpdateAuraDuration(WorldPacket packet) if (updateFields == null) return; - AuraInfo aura = new AuraInfo(); - aura.Slot = slot; - aura.AuraData = ReadAuraSlot(slot, guid, updateFields); + AuraInfo aura = new AuraInfo + { + Slot = slot, + AuraData = ReadAuraSlot(slot, guid, updateFields) + }; if (aura.AuraData == null) return; @@ -1083,9 +1154,11 @@ void HandleSetExtraAuraInfo(WorldPacket packet) if (updateFields == null) return; - AuraInfo aura = new AuraInfo(); - aura.Slot = slot; - aura.AuraData = ReadAuraSlot(slot, guid, updateFields); + AuraInfo aura = new AuraInfo + { + Slot = slot, + AuraData = ReadAuraSlot(slot, guid, updateFields) + }; if (aura.AuraData == null) return; if (aura.AuraData.SpellID != spellId) @@ -1104,9 +1177,11 @@ void HandleSetExtraAuraInfo(WorldPacket packet) [PacketHandler(Opcode.SMSG_RESURRECT_REQUEST)] void HandleResurrectRequest(WorldPacket packet) { - ResurrectRequest revive = new(); - revive.CasterGUID = packet.ReadGuid().To128(GetSession().GameState); - revive.CasterVirtualRealmAddress = GetSession().RealmId.GetAddress(); + ResurrectRequest revive = new() + { + CasterGUID = packet.ReadGuid().To128(GetSession().GameState), + CasterVirtualRealmAddress = GetSession().RealmId.GetAddress() + }; packet.ReadUInt32(); // Name Length revive.Name = packet.ReadCString(); revive.Sickness = packet.ReadBool(); @@ -1117,11 +1192,13 @@ void HandleResurrectRequest(WorldPacket packet) [PacketHandler(Opcode.SMSG_TOTEM_CREATED)] void HandleTotemCreated(WorldPacket packet) { - TotemCreated totem = new(); - totem.Slot = packet.ReadUInt8(); - totem.Totem = packet.ReadGuid().To128(GetSession().GameState); - totem.Duration = packet.ReadUInt32(); - totem.SpellId = packet.ReadUInt32(); + TotemCreated totem = new() + { + Slot = packet.ReadUInt8(), + Totem = packet.ReadGuid().To128(GetSession().GameState), + Duration = packet.ReadUInt32(), + SpellId = packet.ReadUInt32() + }; SendPacketToClient(totem); } @@ -1137,8 +1214,10 @@ void HandleSetSpellModifier(WorldPacket packet) { SetSpellModifier spell = new SetSpellModifier(packet.GetUniversalOpcode(false)); SpellModifierInfo mod = new SpellModifierInfo(); - SpellModifierData data = new SpellModifierData(); - data.ClassIndex = classIndex; + SpellModifierData data = new SpellModifierData + { + ClassIndex = classIndex + }; mod.ModIndex = modIndex; data.ModifierValue = modValue; mod.ModifierData.Add(data); diff --git a/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs b/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs index 7d91cf4e..2390f971 100644 --- a/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/TaxiHandler.cs @@ -9,8 +9,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_TAXI_NODE_STATUS)] void HandleTaxiNodeStatus(WorldPacket packet) { - TaxiNodeStatusPkt taxi = new(); - taxi.FlightMaster = packet.ReadGuid().To128(GetSession().GameState); + TaxiNodeStatusPkt taxi = new() + { + FlightMaster = packet.ReadGuid().To128(GetSession().GameState) + }; bool learned = packet.ReadBool(); taxi.Status = learned ? TaxiNodeStatus.Learned : TaxiNodeStatus.Unlearned; SendPacketToClient(taxi); @@ -22,9 +24,11 @@ void HandleShowTaxiNodes(WorldPacket packet) bool hasWindowInfo = packet.ReadUInt32() != 0; if (hasWindowInfo) { - taxi.WindowInfo = new(); - taxi.WindowInfo.UnitGUID = packet.ReadGuid().To128(GetSession().GameState); - taxi.WindowInfo.CurrentNode = GetSession().GameState.CurrentTaxiNode = packet.ReadUInt32(); + taxi.WindowInfo = new() + { + UnitGUID = packet.ReadGuid().To128(GetSession().GameState), + CurrentNode = GetSession().GameState.CurrentTaxiNode = packet.ReadUInt32() + }; } while (packet.CanRead()) { @@ -48,8 +52,10 @@ void HandleActivateTaxiReply(WorldPacket packet) // Ok status needs to be sent after the monster move packet. if (reply != ActivateTaxiReply.Ok) { - ActivateTaxiReplyPkt taxi = new(); - taxi.Reply = reply; + ActivateTaxiReplyPkt taxi = new() + { + Reply = reply + }; SendPacketToClient(taxi); GetSession().GameState.IsWaitingForTaxiStart = false; } diff --git a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs index 319ee4a9..2507f62c 100644 --- a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs @@ -11,8 +11,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_TRADE_STATUS)] void HandleTradeStatus(WorldPacket packet) { - TradeStatusPkt trade = new(); - trade.Status = (TradeStatus)packet.ReadUInt32(); + TradeStatusPkt trade = new() + { + Status = (TradeStatus)packet.ReadUInt32() + }; switch (trade.Status) { case TradeStatus.Proposed: @@ -39,8 +41,10 @@ void HandleTradeStatus(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRADE_STATUS_EXTENDED)] void HandleTradeStatusExtended(WorldPacket packet) { - TradeUpdated trade = new(); - trade.WhichPlayer = packet.ReadUInt8(); + TradeUpdated trade = new() + { + WhichPlayer = packet.ReadUInt8() + }; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) trade.Id = packet.ReadUInt32(); trade.ClientStateIndex = packet.ReadUInt32(); @@ -49,9 +53,11 @@ void HandleTradeStatusExtended(WorldPacket packet) trade.ProposedEnchantment = packet.ReadInt32(); while (packet.CanRead()) { - TradeItem item = new TradeItem(); - item.Unwrapped = new UnwrappedTradeItem(); - item.Slot = packet.ReadUInt8(); + TradeItem item = new TradeItem + { + Unwrapped = new UnwrappedTradeItem(), + Slot = packet.ReadUInt8() + }; item.Item.ItemID = packet.ReadUInt32(); packet.ReadUInt32(); // Item Display ID item.StackCount = packet.ReadInt32(); diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index e3a4e238..84a23c39 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -220,13 +220,17 @@ void HandleUpdateObject(WorldPacket packet) SetSpellModifier spell = new SetSpellModifier(Opcode.SMSG_SET_FLAT_SPELL_MODIFIER); foreach (var modItr in GetSession().GameState.FlatSpellMods) { - SpellModifierInfo mod = new SpellModifierInfo(); - mod.ModIndex = modItr.Key; + SpellModifierInfo mod = new SpellModifierInfo + { + ModIndex = modItr.Key + }; foreach (var dataItr in modItr.Value) { - SpellModifierData data = new SpellModifierData(); - data.ClassIndex = dataItr.Key; - data.ModifierValue = dataItr.Value; + SpellModifierData data = new SpellModifierData + { + ClassIndex = dataItr.Key, + ModifierValue = dataItr.Value + }; mod.ModifierData.Add(data); } spell.Modifiers.Add(mod); @@ -238,13 +242,17 @@ void HandleUpdateObject(WorldPacket packet) SetSpellModifier spell = new SetSpellModifier(Opcode.SMSG_SET_PCT_SPELL_MODIFIER); foreach (var modItr in GetSession().GameState.PctSpellMods) { - SpellModifierInfo mod = new SpellModifierInfo(); - mod.ModIndex = modItr.Key; + SpellModifierInfo mod = new SpellModifierInfo + { + ModIndex = modItr.Key + }; foreach (var dataItr in modItr.Value) { - SpellModifierData data = new SpellModifierData(); - data.ClassIndex = dataItr.Key; - data.ModifierValue = dataItr.Value; + SpellModifierData data = new SpellModifierData + { + ClassIndex = dataItr.Key, + ModifierValue = dataItr.Value + }; mod.ModifierData.Add(data); } spell.Modifiers.Add(mod); @@ -917,10 +925,12 @@ void ReadMovementUpdateBlock(WorldPacket packet, WowGuid guid, ObjectUpdate upda { if (flags.HasAnyFlag(UpdateFlag.GOPosition)) { - moveInfo = new MovementInfo(); - moveInfo.TransportGuid = packet.ReadPackedGuid().To128(GetSession().GameState); + moveInfo = new MovementInfo + { + TransportGuid = packet.ReadPackedGuid().To128(GetSession().GameState), - moveInfo.Position = packet.ReadVector3(); + Position = packet.ReadVector3() + }; moveInfo.TransportOffset.X = packet.ReadFloat(); moveInfo.TransportOffset.Y = packet.ReadFloat(); moveInfo.TransportOffset.Z = packet.ReadFloat(); @@ -932,9 +942,11 @@ void ReadMovementUpdateBlock(WorldPacket packet, WowGuid guid, ObjectUpdate upda } else if (flags.HasAnyFlag(UpdateFlag.StationaryObject)) { - moveInfo = new MovementInfo(); - moveInfo.Position = packet.ReadVector3(); - moveInfo.Orientation = packet.ReadFloat(); + moveInfo = new MovementInfo + { + Position = packet.ReadVector3(), + Orientation = packet.ReadFloat() + }; } } @@ -1085,10 +1097,12 @@ public AuraDataInfo ReadAuraSlot(byte i, WowGuid128 guid, Dictionary= 0 && updateMaskArray[UNIT_CHANNEL_SPELL]) { - UnitChannel channel = new UnitChannel(); - channel.SpellID = updates[UNIT_CHANNEL_SPELL].Int32Value; + UnitChannel channel = new UnitChannel + { + SpellID = updates[UNIT_CHANNEL_SPELL].Int32Value + }; channel.SpellXSpellVisualID = (int)GameData.GetSpellVisual((uint)channel.SpellID); updateData.UnitData.ChannelData = channel; } @@ -1727,12 +1749,14 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u int totemSlot = GameData.GetTotemSlotForSpell((uint)updateData.UnitData.CreatedBySpell); if (totemSlot >= 0) { - TotemCreated totem = new(); - totem.Slot = (byte)totemSlot; - totem.Totem = guid; - totem.Duration = 120000; - totem.SpellId = (uint)updateData.UnitData.CreatedBySpell; - totem.CannotDismiss = true; + TotemCreated totem = new() + { + Slot = (byte)totemSlot, + Totem = guid, + Duration = 120000, + SpellId = (uint)updateData.UnitData.CreatedBySpell, + CannotDismiss = true + }; SendPacketToClient(totem); } } @@ -1901,9 +1925,11 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u updateMaskArray[UNIT_FIELD_AURALEVELS + i / 4] || updateMaskArray[UNIT_FIELD_AURAAPPLICATIONS + i / 4]) { - AuraInfo aura = new AuraInfo(); - aura.Slot = i; - aura.AuraData = ReadAuraSlot(i, guid, updates); + AuraInfo aura = new AuraInfo + { + Slot = i, + AuraData = ReadAuraSlot(i, guid, updates) + }; if (aura.AuraData != null) { int durationLeft; @@ -2021,8 +2047,10 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u { if (updateMaskArray[PLAYER_VISIBLE_ITEM_1_ENTRYID + i * offset]) { - updateData.PlayerData.VisibleItems[i] = new VisibleItem(); - updateData.PlayerData.VisibleItems[i].ItemID = updates[PLAYER_VISIBLE_ITEM_1_ENTRYID + i * offset].Int32Value; + updateData.PlayerData.VisibleItems[i] = new VisibleItem + { + ItemID = updates[PLAYER_VISIBLE_ITEM_1_ENTRYID + i * offset].Int32Value + }; } } } @@ -2590,8 +2618,10 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u } else { - ArenaTeamRosterResponse response = new ArenaTeamRosterResponse(); - response.TeamSize = ModernVersion.GetArenaTeamSizeFromIndex((uint)i); + ArenaTeamRosterResponse response = new ArenaTeamRosterResponse + { + TeamSize = ModernVersion.GetArenaTeamSizeFromIndex((uint)i) + }; SendPacketToClient(response); } } @@ -2645,16 +2675,20 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u SetupCurrency currencies = new SetupCurrency(); if (updates.ContainsKey(PLAYER_FIELD_ARENA_CURRENCY)) { - SetupCurrency.Record honor = new SetupCurrency.Record(); - honor.Type = (uint)Currency.ArenaPoints; - honor.Quantity = updates[PLAYER_FIELD_ARENA_CURRENCY].UInt32Value; + SetupCurrency.Record honor = new SetupCurrency.Record + { + Type = (uint)Currency.ArenaPoints, + Quantity = updates[PLAYER_FIELD_ARENA_CURRENCY].UInt32Value + }; currencies.Data.Add(honor); } if (updates.ContainsKey(PLAYER_FIELD_HONOR_CURRENCY)) { - SetupCurrency.Record honor = new SetupCurrency.Record(); - honor.Type = (uint)Currency.HonorPoints; - honor.Quantity = updates[PLAYER_FIELD_HONOR_CURRENCY].UInt32Value; + SetupCurrency.Record honor = new SetupCurrency.Record + { + Type = (uint)Currency.HonorPoints, + Quantity = updates[PLAYER_FIELD_HONOR_CURRENCY].UInt32Value + }; currencies.Data.Add(honor); } SendPacketToClient(currencies); diff --git a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs index 17b072d5..0393ff54 100644 --- a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs @@ -11,8 +11,10 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_INIT_WORLD_STATES)] void HandleInitWorldStates(WorldPacket packet) { - InitWorldStates states = new InitWorldStates(); - states.MapID = packet.ReadUInt32(); + InitWorldStates states = new InitWorldStates + { + MapID = packet.ReadUInt32() + }; GetSession().GameState.CurrentMapId = states.MapID; states.ZoneID = packet.ReadUInt32(); states.AreaID = LegacyVersion.AddedInVersion(ClientVersionBuild.V2_1_0_6692) ? packet.ReadUInt32() : states.ZoneID; @@ -66,9 +68,11 @@ void HandleInitWorldStates(WorldPacket packet) [PacketHandler(Opcode.SMSG_UPDATE_WORLD_STATE)] void HandleUpdateWorldState(WorldPacket packet) { - UpdateWorldState update = new UpdateWorldState(); - update.VariableID = packet.ReadUInt32(); - update.Value = packet.ReadInt32(); + UpdateWorldState update = new UpdateWorldState + { + VariableID = packet.ReadUInt32(), + Value = packet.ReadInt32() + }; SendPacketToClient(update); if (update.VariableID == (uint)WorldStates.WsgFlagStateAlliance) diff --git a/HermesProxy/World/Client/WorldClient.cs b/HermesProxy/World/Client/WorldClient.cs index 9bbf1ad4..25aafa49 100644 --- a/HermesProxy/World/Client/WorldClient.cs +++ b/HermesProxy/World/Client/WorldClient.cs @@ -206,10 +206,11 @@ private void SendPacket(WorldPacket packet) try { ByteBuffer buffer = new ByteBuffer(); - LegacyClientPacketHeader header = new LegacyClientPacketHeader(); - - header.Size = (ushort)(packet.GetSize() + sizeof(uint)); // size includes the opcode - header.Opcode = packet.GetOpcode(); + LegacyClientPacketHeader header = new LegacyClientPacketHeader + { + Size = (ushort)(packet.GetSize() + sizeof(uint)), // size includes the opcode + Opcode = packet.GetOpcode() + }; header.Write(buffer); Log.PrintNet(LogType.Debug, LogNetDir.P2S, $"Sending opcode {LegacyVersion.GetUniversalOpcode(header.Opcode)} ({header.Opcode}) with size {header.Size}."); diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index 7cd5b6af..c9b3d4b5 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -325,13 +325,15 @@ public static uint GetBroadcastTextId(string maleText, string femaleText, uint l } } - BroadcastText broadcastText = new(); - broadcastText.Entry = BroadcastTextStore.Keys.Last() + 1; - broadcastText.MaleText = maleText; - broadcastText.FemaleText = femaleText; - broadcastText.Language = language; - broadcastText.EmoteDelays = emoteDelays; - broadcastText.Emotes = emotes; + BroadcastText broadcastText = new() + { + Entry = BroadcastTextStore.Keys.Last() + 1, + MaleText = maleText, + FemaleText = femaleText, + Language = language, + EmoteDelays = emoteDelays, + Emotes = emotes + }; BroadcastTextStore.Add(broadcastText.Entry, broadcastText); return broadcastText.Entry; } @@ -382,11 +384,13 @@ public static void LoadBroadcastTexts() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - BroadcastText broadcastText = new BroadcastText(); - broadcastText.Entry = uint.Parse(fields[0]); - broadcastText.MaleText = fields[1].TrimEnd().Replace("\0", "").Replace("~", "\n"); - broadcastText.FemaleText = fields[2].TrimEnd().Replace("\0", "").Replace("~", "\n"); - broadcastText.Language = uint.Parse(fields[3]); + BroadcastText broadcastText = new BroadcastText + { + Entry = uint.Parse(fields[0]), + MaleText = fields[1].TrimEnd().Replace("\0", "").Replace("~", "\n"), + FemaleText = fields[2].TrimEnd().Replace("\0", "").Replace("~", "\n"), + Language = uint.Parse(fields[3]) + }; broadcastText.Emotes[0] = ushort.Parse(fields[4]); broadcastText.Emotes[1] = ushort.Parse(fields[5]); broadcastText.Emotes[2] = ushort.Parse(fields[6]); @@ -415,10 +419,12 @@ public static void LoadItemTemplates() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - ItemDisplayData item = new ItemDisplayData(); - item.Entry = uint.Parse(fields[0]); - item.DisplayId = uint.Parse(fields[1]); - item.InventoryType = byte.Parse(fields[2]); + ItemDisplayData item = new ItemDisplayData + { + Entry = uint.Parse(fields[0]), + DisplayId = uint.Parse(fields[1]), + InventoryType = byte.Parse(fields[2]) + }; ItemDisplayDataStore.Add(item.Entry, item); } } @@ -473,10 +479,12 @@ public static void LoadChatChannels() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - ChatChannel channel = new ChatChannel(); - channel.Id = uint.Parse(fields[0]); - channel.Flags = (ChannelFlags)uint.Parse(fields[1]); - channel.Name = fields[2]; + ChatChannel channel = new ChatChannel + { + Id = uint.Parse(fields[0]), + Flags = (ChannelFlags)uint.Parse(fields[1]), + Name = fields[2] + }; ChatChannels.Add(channel.Id, channel); } } @@ -826,11 +834,13 @@ public static void LoadTaxiPaths() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiPath taxiPath = new TaxiPath(); - taxiPath.Id = uint.Parse(fields[0]); - taxiPath.From = uint.Parse(fields[1]); - taxiPath.To = uint.Parse(fields[2]); - taxiPath.Cost = int.Parse(fields[3]); + TaxiPath taxiPath = new TaxiPath + { + Id = uint.Parse(fields[0]), + From = uint.Parse(fields[1]), + To = uint.Parse(fields[2]), + Cost = int.Parse(fields[3]) + }; TaxiPaths.Add(counter, taxiPath); counter++; } @@ -855,12 +865,14 @@ public static void LoadTaxiPathNodesGraph() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiNode taxiNode = new TaxiNode(); - taxiNode.Id = uint.Parse(fields[0]); - taxiNode.mapId = uint.Parse(fields[1]); - taxiNode.x = float.Parse(fields[2]); - taxiNode.y = float.Parse(fields[3]); - taxiNode.z = float.Parse(fields[4]); + TaxiNode taxiNode = new TaxiNode + { + Id = uint.Parse(fields[0]), + mapId = uint.Parse(fields[1]), + x = float.Parse(fields[2]), + y = float.Parse(fields[3]), + z = float.Parse(fields[4]) + }; TaxiNodes.Add(taxiNode.Id, taxiNode); } } @@ -881,16 +893,18 @@ public static void LoadTaxiPathNodesGraph() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiPathNode taxiPathNode = new TaxiPathNode(); - taxiPathNode.Id = uint.Parse(fields[0]); - taxiPathNode.pathId = uint.Parse(fields[1]); - taxiPathNode.nodeIndex = uint.Parse(fields[2]); - taxiPathNode.mapId = uint.Parse(fields[3]); - taxiPathNode.x = float.Parse(fields[4]); - taxiPathNode.y = float.Parse(fields[5]); - taxiPathNode.z = float.Parse(fields[6]); - taxiPathNode.flags = uint.Parse(fields[7]); - taxiPathNode.delay = uint.Parse(fields[8]); + TaxiPathNode taxiPathNode = new TaxiPathNode + { + Id = uint.Parse(fields[0]), + pathId = uint.Parse(fields[1]), + nodeIndex = uint.Parse(fields[2]), + mapId = uint.Parse(fields[3]), + x = float.Parse(fields[4]), + y = float.Parse(fields[5]), + z = float.Parse(fields[6]), + flags = uint.Parse(fields[7]), + delay = uint.Parse(fields[8]) + }; TaxiPathNodes.Add(taxiPathNode.Id, taxiPathNode); } } @@ -1042,29 +1056,33 @@ public static void LoadAreaTriggerHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - AreaTrigger at = new AreaTrigger(); - at.Message = fields[0]; - at.PositionX = float.Parse(fields[1]); - at.PositionY = float.Parse(fields[2]); - at.PositionZ = float.Parse(fields[3]); - at.Id = uint.Parse(fields[4]); - at.MapId = ushort.Parse(fields[5]); - at.PhaseUseFlags = byte.Parse(fields[6]); - at.PhaseId = ushort.Parse(fields[7]); - at.PhaseGroupId = ushort.Parse(fields[8]); - at.Radius = float.Parse(fields[9]); - at.BoxLength = float.Parse(fields[10]); - at.BoxWidth = float.Parse(fields[11]); - at.BoxHeight = float.Parse(fields[12]); - at.BoxYaw = float.Parse(fields[13]); - at.ShapeType = byte.Parse(fields[14]); - at.ShapeId = ushort.Parse(fields[15]); - at.ActionSetId = ushort.Parse(fields[16]); - at.Flags = byte.Parse(fields[17]); - - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.AreaTrigger; - record.HotfixId = HotfixAreaTriggerBegin + counter; + AreaTrigger at = new AreaTrigger + { + Message = fields[0], + PositionX = float.Parse(fields[1]), + PositionY = float.Parse(fields[2]), + PositionZ = float.Parse(fields[3]), + Id = uint.Parse(fields[4]), + MapId = ushort.Parse(fields[5]), + PhaseUseFlags = byte.Parse(fields[6]), + PhaseId = ushort.Parse(fields[7]), + PhaseGroupId = ushort.Parse(fields[8]), + Radius = float.Parse(fields[9]), + BoxLength = float.Parse(fields[10]), + BoxWidth = float.Parse(fields[11]), + BoxHeight = float.Parse(fields[12]), + BoxYaw = float.Parse(fields[13]), + ShapeType = byte.Parse(fields[14]), + ShapeId = ushort.Parse(fields[15]), + ActionSetId = ushort.Parse(fields[16]), + Flags = byte.Parse(fields[17]) + }; + + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.AreaTrigger, + HotfixId = HotfixAreaTriggerBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = at.Id; record.Status = HotfixStatus.Valid; @@ -1124,9 +1142,11 @@ public static void LoadSkillLineHotfixes() ushort flags = ushort.Parse(fields[11]); uint spellBookSpellID = uint.Parse(fields[12]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SkillLine; - record.HotfixId = HotfixSkillLineBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SkillLine, + HotfixId = HotfixSkillLineBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1176,9 +1196,11 @@ public static void LoadSkillRaceClassInfoHotfixes() byte minLevel = byte.Parse(fields[6]); ushort skillTierId = ushort.Parse(fields[7]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SkillRaceClassInfo; - record.HotfixId = HotfixSkillRaceClassInfoBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SkillRaceClassInfo, + HotfixId = HotfixSkillRaceClassInfoBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1232,9 +1254,11 @@ public static void LoadSkillLineAbilityHotfixes() uint characterPoints2 = uint.Parse(fields[16]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SkillLineAbility; - record.HotfixId = HotfixSkillLineAbilityBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SkillLineAbility, + HotfixId = HotfixSkillLineAbilityBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1284,9 +1308,11 @@ public static void LoadSpellHotfixes() string description = fields[2]; string auraDescription = fields[3]; - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.Spell; - record.HotfixId = HotfixSpellBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.Spell, + HotfixId = HotfixSpellBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1320,9 +1346,11 @@ public static void LoadSpellNameHotfixes() uint id = uint.Parse(fields[0]); string name = fields[1]; - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellName; - record.HotfixId = HotfixSpellNameBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellName, + HotfixId = HotfixSpellNameBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1359,9 +1387,11 @@ public static void LoadSpellLevelsHotfixes() byte maxPassiveAuraLevel = byte.Parse(fields[5]); uint spellId = uint.Parse(fields[6]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellLevels; - record.HotfixId = HotfixSpellLevelsBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellLevels, + HotfixId = HotfixSpellLevelsBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1406,9 +1436,11 @@ public static void LoadSpellAuraOptionsHotfixes() uint procTypeMask1 = uint.Parse(fields[8]); uint spellId = uint.Parse(fields[9]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellAuraOptions; - record.HotfixId = HotfixSpellAuraOptionsBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellAuraOptions, + HotfixId = HotfixSpellAuraOptionsBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1472,9 +1504,11 @@ public static void LoadSpellMiscHotfixes() uint attributes14 = uint.Parse(fields[24]); uint spellId = uint.Parse(fields[25]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellMisc; - record.HotfixId = HotfixSpellMiscBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellMisc, + HotfixId = HotfixSpellMiscBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1564,9 +1598,11 @@ public static void LoadSpellEffectHotfixes() short implicitTarget2 = short.Parse(fields[34]); uint spellId = uint.Parse(fields[35]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellEffect; - record.HotfixId = HotfixSpellEffectBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellEffect, + HotfixId = HotfixSpellEffectBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1648,9 +1684,11 @@ public static void LoadSpellXSpellVisualHotfixes() else SpellVisuals.Add(spellId, id); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.SpellXSpellVisual; - record.HotfixId = HotfixSpellXSpellVisualBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.SpellXSpellVisual, + HotfixId = HotfixSpellXSpellVisualBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -1819,10 +1857,12 @@ public static void LoadItemSparseHotfixes() sbyte statValue10 = sbyte.Parse(fields[125]); sbyte requiredLevel = sbyte.Parse(fields[126]); - HotfixRecord record = new HotfixRecord(); - record.Status = HotfixStatus.Valid; - record.TableHash = DB2Hash.ItemSparse; - record.HotfixId = HotfixItemSparseBegin + counter; + HotfixRecord record = new HotfixRecord + { + Status = HotfixStatus.Valid, + TableHash = DB2Hash.ItemSparse, + HotfixId = HotfixItemSparseBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.HotfixContent.WriteInt64(allowableRace); @@ -2003,9 +2043,11 @@ public static void LoadCreatureDisplayInfoHotfixes() int textureVariationFileDataId2 = int.Parse(fields[25]); int textureVariationFileDataId3 = int.Parse(fields[26]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.CreatureDisplayInfo; - record.HotfixId = HotfixCreatureDisplayInfoBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.CreatureDisplayInfo, + HotfixId = HotfixCreatureDisplayInfoBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -2076,9 +2118,11 @@ public static void LoadCreatureDisplayInfoExtraHotfixes() byte customDisplayOption2 = byte.Parse(fields[13]); byte customDisplayOption3 = byte.Parse(fields[14]); - HotfixRecord record = new HotfixRecord(); - record.TableHash = DB2Hash.CreatureDisplayInfoExtra; - record.HotfixId = HotfixCreatureDisplayInfoExtraBegin + counter; + HotfixRecord record = new HotfixRecord + { + TableHash = DB2Hash.CreatureDisplayInfoExtra, + HotfixId = HotfixCreatureDisplayInfoExtraBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.Status = HotfixStatus.Valid; @@ -2126,10 +2170,12 @@ public static void LoadCreatureDisplayInfoOptionHotfixes() int chrCustomizationChoiceId = int.Parse(fields[2]); int creatureDisplayInfoExtraId = int.Parse(fields[3]); - HotfixRecord record = new HotfixRecord(); - record.Status = HotfixStatus.Valid; - record.TableHash = DB2Hash.CreatureDisplayInfoOption; - record.HotfixId = HotfixCreatureDisplayInfoOptionBegin + counter; + HotfixRecord record = new HotfixRecord + { + Status = HotfixStatus.Valid, + TableHash = DB2Hash.CreatureDisplayInfoOption, + HotfixId = HotfixCreatureDisplayInfoOptionBegin + counter + }; record.UniqueId = record.HotfixId; record.RecordId = id; record.HotfixContent.WriteInt32(chrCustomizationOptionId); diff --git a/HermesProxy/World/Objects/MovementInfo.cs b/HermesProxy/World/Objects/MovementInfo.cs index 1f126a03..9627c6d8 100644 --- a/HermesProxy/World/Objects/MovementInfo.cs +++ b/HermesProxy/World/Objects/MovementInfo.cs @@ -54,39 +54,41 @@ public sealed class MovementInfo public MovementInfo CopyFromMe() { - MovementInfo copy = new MovementInfo(); - copy.Flags = this.Flags; - copy.FlagsExtra = this.FlagsExtra; - copy.SwimPitch = this.SwimPitch; - copy.FallTime = this.FallTime; - copy.JumpHorizontalSpeed = this.JumpHorizontalSpeed; - copy.JumpVerticalSpeed = this.JumpVerticalSpeed; - copy.JumpCosAngle = this.JumpCosAngle; - copy.JumpSinAngle = this.JumpSinAngle; - copy.SplineElevation = this.SplineElevation; - copy.HasSplineData = this.HasSplineData; - copy.Position = this.Position; - copy.Orientation = this.Orientation; - copy.CorpseOrientation = this.CorpseOrientation; - copy.TransportGuid = this.TransportGuid; - copy.TransportOffset = this.TransportOffset; - copy.TransportTime = this.TransportTime; - copy.TransportTime2 = this.TransportTime2; - copy.TransportSeat = this.TransportSeat; - copy.Rotation = this.Rotation; - copy.WalkSpeed = this.WalkSpeed; - copy.RunSpeed = this.RunSpeed; - copy.RunBackSpeed = this.RunBackSpeed; - copy.SwimSpeed = this.SwimSpeed; - copy.SwimBackSpeed = this.SwimBackSpeed; - copy.FlightSpeed = this.FlightSpeed; - copy.FlightBackSpeed = this.FlightBackSpeed; - copy.TurnRate = this.TurnRate; - copy.PitchRate = this.PitchRate; - copy.Hover = this.Hover; - copy.VehicleId = this.VehicleId; - copy.VehicleOrientation = this.VehicleOrientation; - copy.TransportPathTimer = this.TransportPathTimer; + MovementInfo copy = new MovementInfo + { + Flags = this.Flags, + FlagsExtra = this.FlagsExtra, + SwimPitch = this.SwimPitch, + FallTime = this.FallTime, + JumpHorizontalSpeed = this.JumpHorizontalSpeed, + JumpVerticalSpeed = this.JumpVerticalSpeed, + JumpCosAngle = this.JumpCosAngle, + JumpSinAngle = this.JumpSinAngle, + SplineElevation = this.SplineElevation, + HasSplineData = this.HasSplineData, + Position = this.Position, + Orientation = this.Orientation, + CorpseOrientation = this.CorpseOrientation, + TransportGuid = this.TransportGuid, + TransportOffset = this.TransportOffset, + TransportTime = this.TransportTime, + TransportTime2 = this.TransportTime2, + TransportSeat = this.TransportSeat, + Rotation = this.Rotation, + WalkSpeed = this.WalkSpeed, + RunSpeed = this.RunSpeed, + RunBackSpeed = this.RunBackSpeed, + SwimSpeed = this.SwimSpeed, + SwimBackSpeed = this.SwimBackSpeed, + FlightSpeed = this.FlightSpeed, + FlightBackSpeed = this.FlightBackSpeed, + TurnRate = this.TurnRate, + PitchRate = this.PitchRate, + Hover = this.Hover, + VehicleId = this.VehicleId, + VehicleOrientation = this.VehicleOrientation, + TransportPathTimer = this.TransportPathTimer + }; return copy; } diff --git a/HermesProxy/World/Objects/UpdateFieldsArray.cs b/HermesProxy/World/Objects/UpdateFieldsArray.cs index 668e9899..b9a46ac9 100644 --- a/HermesProxy/World/Objects/UpdateFieldsArray.cs +++ b/HermesProxy/World/Objects/UpdateFieldsArray.cs @@ -298,8 +298,10 @@ public void SetUpdateField(int index, uint[] values, DynamicFieldChangeType chan if (value is int intValue) { uint[] values = new uint[1]; - UpdateValues union = new(); - union.SignedValue = intValue; + UpdateValues union = new() + { + SignedValue = intValue + }; values[0] = union.UnsignedValue; SetUpdateField((int)index, values, changeType); } @@ -312,8 +314,10 @@ public void SetUpdateField(int index, uint[] values, DynamicFieldChangeType chan else if (value is float floatValue) { uint[] values = new uint[1]; - UpdateValues union = new(); - union.FloatValue = floatValue; + UpdateValues union = new() + { + FloatValue = floatValue + }; values[0] = union.UnsignedValue; SetUpdateField((int)index, values, changeType); } diff --git a/HermesProxy/World/Server/PacketHandlers/AccountDataHandler.cs b/HermesProxy/World/Server/PacketHandlers/AccountDataHandler.cs index e00b070b..79283ccd 100644 --- a/HermesProxy/World/Server/PacketHandlers/AccountDataHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/AccountDataHandler.cs @@ -8,8 +8,10 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_GET_ACCOUNT_CHARACTER_LIST)] void HandleGetAccountCharacterList(GetAccountCharacterListRequest request) { - GetAccountCharacterListResult response = new(); - response.Token = request.Token; + GetAccountCharacterListResult response = new() + { + Token = request.Token + }; foreach (var ownCharacter in GetSession().GameState.OwnCharacters) { diff --git a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs index 46483503..cead364f 100644 --- a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs @@ -13,8 +13,10 @@ void HandleArenaTeamRoster(ArenaTeamRosterRequest arena) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180) || GetSession().GameState.CurrentArenaTeamIds[arena.TeamIndex] == 0) { - ArenaTeamRosterResponse response = new ArenaTeamRosterResponse(); - response.TeamSize = ModernVersion.GetArenaTeamSizeFromIndex(arena.TeamIndex); + ArenaTeamRosterResponse response = new ArenaTeamRosterResponse + { + TeamSize = ModernVersion.GetArenaTeamSizeFromIndex(arena.TeamIndex) + }; SendPacket(response); } else @@ -35,17 +37,21 @@ void HandleArenaTeamQuery(ArenaTeamQuery arena) ArenaTeamData team; if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out team)) { - ArenaTeamQueryResponse response = new ArenaTeamQueryResponse(); - response.TeamId = arena.TeamId; - response.Emblem = new ArenaTeamEmblem(); - response.Emblem.TeamId = arena.TeamId; - response.Emblem.TeamSize = team.TeamSize; - response.Emblem.BackgroundColor = team.BackgroundColor; - response.Emblem.EmblemStyle = team.EmblemStyle; - response.Emblem.EmblemColor = team.EmblemColor; - response.Emblem.BorderStyle = team.BorderStyle; - response.Emblem.BorderColor = team.BorderColor; - response.Emblem.TeamName = team.Name; + ArenaTeamQueryResponse response = new ArenaTeamQueryResponse + { + TeamId = arena.TeamId, + Emblem = new ArenaTeamEmblem + { + TeamId = arena.TeamId, + TeamSize = team.TeamSize, + BackgroundColor = team.BackgroundColor, + EmblemStyle = team.EmblemStyle, + EmblemColor = team.EmblemColor, + BorderStyle = team.BorderStyle, + BorderColor = team.BorderColor, + TeamName = team.Name + } + }; SendPacket(response); } } diff --git a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs index b3c5f3b7..ae36a9a2 100644 --- a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs @@ -195,8 +195,10 @@ void HandleInspectArenaTeams(Inspect inspect) } else { - InspectPvP pvp = new InspectPvP(); - pvp.PlayerGUID = inspect.Target; + InspectPvP pvp = new InspectPvP + { + PlayerGUID = inspect.Target + }; pvp.ArenaTeams.Add(new ArenaTeamInspectData()); pvp.ArenaTeams.Add(new ArenaTeamInspectData()); pvp.ArenaTeams.Add(new ArenaTeamInspectData()); @@ -216,10 +218,11 @@ void HandleCharacterRenameRequest(CharacterRenameRequest rename) [PacketHandler(Opcode.CMSG_GENERATE_RANDOM_CHARACTER_NAME)] void HandleGenerateRandomCharacterNameRequest(GenerateRandomCharacterNameRequest randomCharacterName) { - GenerateRandomCharacterNameResult result = new(); - - // The client can generate the name itself - result.Success = false; + GenerateRandomCharacterNameResult result = new() + { + // The client can generate the name itself + Success = false + }; SendPacket(result); } diff --git a/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs b/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs index 4c3d741f..b8331153 100644 --- a/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ClientConfigHandler.cs @@ -19,11 +19,13 @@ void HandleRequestAccountData(RequestAccountData data) if (GetSession().AccountDataMgr.Data[data.DataType] == null) { Log.Print(LogType.Error, $"Client requested missing account data {data.DataType}."); - GetSession().AccountDataMgr.Data[data.DataType] = new(); - GetSession().AccountDataMgr.Data[data.DataType].Type = data.DataType; - GetSession().AccountDataMgr.Data[data.DataType].Timestamp = Time.UnixTime; - GetSession().AccountDataMgr.Data[data.DataType].UncompressedSize = 0; - GetSession().AccountDataMgr.Data[data.DataType].CompressedData = new byte[0]; + GetSession().AccountDataMgr.Data[data.DataType] = new() + { + Type = data.DataType, + Timestamp = Time.UnixTime, + UncompressedSize = 0, + CompressedData = new byte[0] + }; } GetSession().AccountDataMgr.Data[data.DataType].Guid = data.PlayerGuid; diff --git a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs index 06dfaa41..7fb590e8 100644 --- a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs @@ -9,9 +9,11 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_CAN_DUEL)] void HandleCanDuel(CanDuel request) { - CanDuelResult result = new CanDuelResult(); - result.TargetGUID = request.TargetGUID; - result.Result = true; + CanDuelResult result = new CanDuelResult + { + TargetGUID = request.TargetGUID, + Result = true + }; SendPacket(result); } diff --git a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs index 05c45742..949e1360 100644 --- a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs @@ -105,10 +105,12 @@ void HandlReadyCheckResponse(ReadyCheckResponseClient raid) packet.WriteBool(raid.IsReady); SendPacketToServer(packet); - ReadyCheckResponse ready = new ReadyCheckResponse(); - ready.Player = GetSession().GameState.CurrentPlayerGuid; - ready.IsReady = raid.IsReady; - ready.PartyGUID = WowGuid128.Create(HighGuidType703.Party, 1000); + ReadyCheckResponse ready = new ReadyCheckResponse + { + Player = GetSession().GameState.CurrentPlayerGuid, + IsReady = raid.IsReady, + PartyGUID = WowGuid128.Create(HighGuidType703.Party, 1000) + }; SendPacket(ready); } diff --git a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs index 18ae5587..241124fc 100644 --- a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs @@ -13,21 +13,25 @@ void HandleDbQueryBulk(DBQueryBulk query) { foreach (uint id in query.Queries) { - DBReply reply = new(); - reply.RecordID = id; - reply.TableHash = query.TableHash; - reply.Status = HotfixStatus.Invalid; - reply.Timestamp = (uint)Time.UnixTime; + DBReply reply = new() + { + RecordID = id, + TableHash = query.TableHash, + Status = HotfixStatus.Invalid, + Timestamp = (uint)Time.UnixTime + }; if (query.TableHash == DB2Hash.BroadcastText) { BroadcastText bct = GameData.GetBroadcastText(id); if (bct == null) { - bct = new BroadcastText(); - bct.Entry = id; - bct.MaleText = "Clear your cache!"; - bct.FemaleText = "Clear your cache!"; + bct = new BroadcastText + { + Entry = id, + MaleText = "Clear your cache!", + FemaleText = "Clear your cache!" + }; } reply.Status = HotfixStatus.Valid; diff --git a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs index ea744c15..7a295c90 100644 --- a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs @@ -160,8 +160,10 @@ void HandleSocketGems(SocketGems gems) SendPacketToServer(packet); // Packet does not exist in old clients. - SocketGemsSuccess success = new SocketGemsSuccess(); - success.ItemGuid = gems.ItemGuid; + SocketGemsSuccess success = new SocketGemsSuccess + { + ItemGuid = gems.ItemGuid + }; SendPacket(success); } diff --git a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs index 482da59a..b192ad54 100644 --- a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs @@ -224,12 +224,14 @@ void HandleRequestLFGListBlacklist(EmptyClientPacket request) [PacketHandler(Opcode.CMSG_REQUEST_CONQUEST_FORMULA_CONSTANTS)] void HandleRequestConquestFormulaConstants(EmptyClientPacket request) { - ConquestFormulaConstants response = new ConquestFormulaConstants(); - response.PvpMinCPPerWeek = 1500; - response.PvpMaxCPPerWeek = 3000; - response.PvpCPBaseCoefficient = 1511.26f; - response.PvpCPExpCoefficient = 1639.28f; - response.PvpCPNumerator = 0.00412f; + ConquestFormulaConstants response = new ConquestFormulaConstants + { + PvpMinCPPerWeek = 1500, + PvpMaxCPPerWeek = 3000, + PvpCPBaseCoefficient = 1511.26f, + PvpCPExpCoefficient = 1639.28f, + PvpCPNumerator = 0.00412f + }; SendPacket(response); } } diff --git a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs index 83965e19..0671f9d5 100644 --- a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs @@ -105,9 +105,11 @@ void HandleQuestGiverChooseReward(QuestGiverChooseReward quest) WorldPacket packet2 = new WorldPacket(Opcode.CMSG_QUERY_QUEST_INFO); packet2.WriteUInt32(quest.QuestID); SendPacketToServer(packet2); - QuestGiverQuestFailed fail = new QuestGiverQuestFailed(); - fail.QuestID = quest.QuestID; - fail.Reason = InventoryResult.ItemNotFound; + QuestGiverQuestFailed fail = new QuestGiverQuestFailed + { + QuestID = quest.QuestID, + Reason = InventoryResult.ItemNotFound + }; SendPacket(fail); return; } diff --git a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs index 29a5cde3..fc0b7f2b 100644 --- a/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SessionHandler.cs @@ -13,8 +13,10 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_CHANGE_REALM_TICKET)] void HandleChangeRealmTicket(ChangeRealmTicket request) { - ChangeRealmTicketResponse response = new(); - response.Token = request.Token; + ChangeRealmTicketResponse response = new() + { + Token = request.Token + }; if (GetSession().AuthClient.Reconnect() != AuthResult.SUCCESS) { diff --git a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs index 3b108047..141d974b 100644 --- a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs @@ -76,27 +76,33 @@ public void SendCastRequestFailed(ClientCastRequest castRequest, bool isPet) { if (!castRequest.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare(); - prepare2.ClientCastID = castRequest.ClientGUID; - prepare2.ServerCastID = castRequest.ServerGUID; + SpellPrepare prepare2 = new SpellPrepare + { + ClientCastID = castRequest.ClientGUID, + ServerCastID = castRequest.ServerGUID + }; SendPacket(prepare2); } if (isPet) { - PetCastFailed failed = new(); - failed.SpellID = castRequest.SpellId; - failed.Reason = (uint)SpellCastResultClassic.SpellInProgress; - failed.CastID = castRequest.ServerGUID; + PetCastFailed failed = new() + { + SpellID = castRequest.SpellId, + Reason = (uint)SpellCastResultClassic.SpellInProgress, + CastID = castRequest.ServerGUID + }; SendPacket(failed); } else { - CastFailed failed = new(); - failed.SpellID = castRequest.SpellId; - failed.SpellXSpellVisualID = castRequest.SpellXSpellVisualId; - failed.Reason = (uint)SpellCastResultClassic.SpellInProgress; - failed.CastID = castRequest.ServerGUID; + CastFailed failed = new() + { + SpellID = castRequest.SpellId, + SpellXSpellVisualID = castRequest.SpellXSpellVisualId, + Reason = (uint)SpellCastResultClassic.SpellInProgress, + CastID = castRequest.ServerGUID + }; SendPacket(failed); } } @@ -111,11 +117,13 @@ void HandleCastSpell(CastSpell cast) if (GameData.NextMeleeSpells.Contains(cast.Cast.SpellID) || GameData.AutoRepeatSpells.Contains(cast.Cast.SpellID)) { - ClientCastRequest castRequest = new ClientCastRequest(); - castRequest.Timestamp = Environment.TickCount; - castRequest.SpellId = cast.Cast.SpellID; - castRequest.SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID; - castRequest.ClientGUID = cast.Cast.CastID; + ClientCastRequest castRequest = new ClientCastRequest + { + Timestamp = Environment.TickCount, + SpellId = cast.Cast.SpellID, + SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID, + ClientGUID = cast.Cast.CastID + }; if (GetSession().GameState.CurrentClientSpecialCast != null) { @@ -127,9 +135,11 @@ void HandleCastSpell(CastSpell cast) { castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, cast.Cast.SpellID + GetSession().GameState.CurrentPlayerGuid.GetCounter()); - SpellPrepare prepare = new SpellPrepare(); - prepare.ClientCastID = cast.Cast.CastID; - prepare.ServerCastID = castRequest.ServerGUID; + SpellPrepare prepare = new SpellPrepare + { + ClientCastID = cast.Cast.CastID, + ServerCastID = castRequest.ServerGUID + }; SendPacket(prepare); GetSession().GameState.CurrentClientSpecialCast = castRequest; @@ -137,12 +147,14 @@ void HandleCastSpell(CastSpell cast) } else { - ClientCastRequest castRequest = new ClientCastRequest(); - castRequest.Timestamp = Environment.TickCount; - castRequest.SpellId = cast.Cast.SpellID; - castRequest.SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID; - castRequest.ClientGUID = cast.Cast.CastID; - castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, 10000 + cast.Cast.CastID.GetCounter()); + ClientCastRequest castRequest = new ClientCastRequest + { + Timestamp = Environment.TickCount, + SpellId = cast.Cast.SpellID, + SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID, + ClientGUID = cast.Cast.CastID, + ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, 10000 + cast.Cast.CastID.GetCounter()) + }; if (GetSession().GameState.CurrentClientNormalCast != null) { @@ -199,12 +211,14 @@ void HandlePetCastSpell(PetCastSpell cast) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - ClientCastRequest castRequest = new ClientCastRequest(); - castRequest.Timestamp = Environment.TickCount; - castRequest.SpellId = cast.Cast.SpellID; - castRequest.SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID; - castRequest.ClientGUID = cast.Cast.CastID; - castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, 10000 + cast.Cast.CastID.GetCounter()); + ClientCastRequest castRequest = new ClientCastRequest + { + Timestamp = Environment.TickCount, + SpellId = cast.Cast.SpellID, + SpellXSpellVisualId = cast.Cast.SpellXSpellVisualID, + ClientGUID = cast.Cast.CastID, + ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, 10000 + cast.Cast.CastID.GetCounter()) + }; if (GetSession().GameState.CurrentClientPetCast != null) { @@ -251,13 +265,15 @@ void HandleUseItem(UseItem use) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - ClientCastRequest castRequest = new ClientCastRequest(); - castRequest.Timestamp = Environment.TickCount; - castRequest.SpellId = use.Cast.SpellID; - castRequest.SpellXSpellVisualId = use.Cast.SpellXSpellVisualID; - castRequest.ClientGUID = use.Cast.CastID; - castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, use.Cast.SpellID, 10000 + use.Cast.CastID.GetCounter()); - castRequest.ItemGUID = use.CastItem; + ClientCastRequest castRequest = new ClientCastRequest + { + Timestamp = Environment.TickCount, + SpellId = use.Cast.SpellID, + SpellXSpellVisualId = use.Cast.SpellXSpellVisualID, + ClientGUID = use.Cast.CastID, + ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, use.Cast.SpellID, 10000 + use.Cast.CastID.GetCounter()), + ItemGUID = use.CastItem + }; if (GetSession().GameState.CurrentClientNormalCast != null) { diff --git a/HermesProxy/World/Server/Packets/AuctionPackets.cs b/HermesProxy/World/Server/Packets/AuctionPackets.cs index 0c0e3bf3..ef34ee92 100644 --- a/HermesProxy/World/Server/Packets/AuctionPackets.cs +++ b/HermesProxy/World/Server/Packets/AuctionPackets.cs @@ -102,15 +102,19 @@ public override void Read() for (int i = 0; i < classFiltersCount; ++i) { - ClassFilter classFilter = new ClassFilter(); - classFilter.ItemClass = _worldPacket.ReadInt32(); + ClassFilter classFilter = new ClassFilter + { + ItemClass = _worldPacket.ReadInt32() + }; uint subClassFiltersCount = _worldPacket.ReadBits(5); for (uint j = 0; j < subClassFiltersCount; ++j) { - SubClassFilter filter = new SubClassFilter(); - filter.ItemSubclass = _worldPacket.ReadInt32(); - filter.InvTypeMask = _worldPacket.ReadUInt32(); + SubClassFilter filter = new SubClassFilter + { + ItemSubclass = _worldPacket.ReadInt32(), + InvTypeMask = _worldPacket.ReadUInt32() + }; classFilter.SubClassFilters.Add(filter); } @@ -122,9 +126,11 @@ public override void Read() var sorts = new WorldPacket(_worldPacket.GetOpcode(), data); for (var i = 0; i < sortCount; ++i) { - AuctionSort sort = new AuctionSort(); - sort.Type = sorts.ReadUInt8(); - sort.Direction = sorts.ReadUInt8(); + AuctionSort sort = new AuctionSort + { + Type = sorts.ReadUInt8(), + Direction = sorts.ReadUInt8() + }; Sorts.Add(sort); } } diff --git a/HermesProxy/World/Server/Packets/LootPackets.cs b/HermesProxy/World/Server/Packets/LootPackets.cs index b4ea068d..0cc2b6d0 100644 --- a/HermesProxy/World/Server/Packets/LootPackets.cs +++ b/HermesProxy/World/Server/Packets/LootPackets.cs @@ -368,9 +368,11 @@ public override void Read() for (int i = 0; i < Count; ++i) { - LootRequest lootRequest = new(); - lootRequest.LootObj = _worldPacket.ReadPackedGuid128(); - lootRequest.LootListID = _worldPacket.ReadUInt8(); + LootRequest lootRequest = new() + { + LootObj = _worldPacket.ReadPackedGuid128(), + LootListID = _worldPacket.ReadUInt8() + }; Loot.Add(lootRequest); } } diff --git a/HermesProxy/World/Server/Packets/MiscPackets.cs b/HermesProxy/World/Server/Packets/MiscPackets.cs index 949fe3d8..5b54a721 100644 --- a/HermesProxy/World/Server/Packets/MiscPackets.cs +++ b/HermesProxy/World/Server/Packets/MiscPackets.cs @@ -685,9 +685,11 @@ public override void Write() public void AddBlacklist(int activity, int reason) { - LFGListBlacklistEntry entry = new LFGListBlacklistEntry(); - entry.ActivityID = activity; - entry.Reason = reason; + LFGListBlacklistEntry entry = new LFGListBlacklistEntry + { + ActivityID = activity, + Reason = reason + }; Blacklist.Add(entry); } diff --git a/HermesProxy/World/Server/WorldSocket.cs b/HermesProxy/World/Server/WorldSocket.cs index 26200060..b863b76d 100644 --- a/HermesProxy/World/Server/WorldSocket.cs +++ b/HermesProxy/World/Server/WorldSocket.cs @@ -391,8 +391,10 @@ public void SendPacket(ServerPacket packet) data = buffer.GetData(); - PacketHeader header = new(); - header.Size = packetSize; + PacketHeader header = new() + { + Size = packetSize + }; _worldCrypt.Encrypt(ref data, ref header.Tag); ByteBuffer byteBuffer = new(); @@ -443,10 +445,12 @@ public override void OnClose() void HandleSendAuthSession() { - AuthChallenge challenge = new(); - challenge.Challenge = _serverChallenge; - challenge.DosChallenge = new byte[32].GenerateRandomKey(32); - challenge.DosZeroBits = 1; + AuthChallenge challenge = new() + { + Challenge = _serverChallenge, + DosChallenge = new byte[32].GenerateRandomKey(32), + DosZeroBits = 1 + }; SendPacket(challenge); } @@ -621,9 +625,11 @@ public void SendConnectToInstance(ConnectToSerial serial) BnetSessionTicketStorage.AddNewSessionByKey(_instanceConnectKey.Raw, GetSession()); - ConnectTo connectTo = new(); - connectTo.Key = _instanceConnectKey.Raw; - connectTo.Serial = serial; + ConnectTo connectTo = new() + { + Key = _instanceConnectKey.Raw, + Serial = serial + }; connectTo.Payload.Port = (ushort)Framework.Settings.InstancePort; connectTo.Con = (byte)ConnectionType.Instance; @@ -710,25 +716,31 @@ void HandleEnterEncryptedModeAck() public void SendAuthResponseError(BattlenetRpcErrorCode code) { - AuthResponse response = new(); - response.SuccessInfo = null; - response.WaitInfo = null; - response.Result = code; + AuthResponse response = new() + { + SuccessInfo = null, + WaitInfo = null, + Result = code + }; SendPacket(response); } public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queuePos = 0) { - AuthResponse response = new(); - response.Result = code; + AuthResponse response = new() + { + Result = code + }; if (code == BattlenetRpcErrorCode.Ok) { - response.SuccessInfo = new AuthResponse.AuthSuccessInfo(); - response.SuccessInfo.ActiveExpansionLevel = (byte)(LegacyVersion.ExpansionVersion - 1); - response.SuccessInfo.AccountExpansionLevel = (byte)0; - response.SuccessInfo.VirtualRealmAddress = _realmId.GetAddress(); - response.SuccessInfo.Time = (uint)Time.UnixTime; + response.SuccessInfo = new AuthResponse.AuthSuccessInfo + { + ActiveExpansionLevel = (byte)(LegacyVersion.ExpansionVersion - 1), + AccountExpansionLevel = (byte)0, + VirtualRealmAddress = _realmId.GetAddress(), + Time = (uint)Time.UnixTime + }; var realm = GetSession().RealmManager.GetRealm(_realmId); @@ -736,9 +748,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue response.SuccessInfo.VirtualRealms.Add(new VirtualRealmInfo(realm.Id.GetAddress(), true, false, realm.Name, realm.NormalizedName)); List availableRaces = new List(); - RaceClassAvailability race = new RaceClassAvailability(); - - race.RaceID = 1; + RaceClassAvailability race = new RaceClassAvailability + { + RaceID = 1 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(2, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); @@ -747,8 +760,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(9, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 2; + race = new RaceClassAvailability + { + RaceID = 2 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); @@ -756,8 +771,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(9, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 3; + race = new RaceClassAvailability + { + RaceID = 3 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(2, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); @@ -765,8 +782,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(4, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 4; + race = new RaceClassAvailability + { + RaceID = 4 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); @@ -774,8 +793,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(11, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 5; + race = new RaceClassAvailability + { + RaceID = 5 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); race.Classes.Add(new ClassAvailability(5, 0, 0)); @@ -783,24 +804,30 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(9, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 6; + race = new RaceClassAvailability + { + RaceID = 6 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); race.Classes.Add(new ClassAvailability(7, 0, 0)); race.Classes.Add(new ClassAvailability(11, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 7; + race = new RaceClassAvailability + { + RaceID = 7 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); race.Classes.Add(new ClassAvailability(8, 0, 0)); race.Classes.Add(new ClassAvailability(9, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 8; + race = new RaceClassAvailability + { + RaceID = 8 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); @@ -812,8 +839,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue if (ModernVersion.ExpansionVersion >= 2 && LegacyVersion.ExpansionVersion >= 2) { - race = new RaceClassAvailability(); - race.RaceID = 10; + race = new RaceClassAvailability + { + RaceID = 10 + }; race.Classes.Add(new ClassAvailability(3, 0, 0)); race.Classes.Add(new ClassAvailability(4, 0, 0)); race.Classes.Add(new ClassAvailability(5, 0, 0)); @@ -822,8 +851,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue race.Classes.Add(new ClassAvailability(2, 0, 0)); availableRaces.Add(race); - race = new RaceClassAvailability(); - race.RaceID = 11; + race = new RaceClassAvailability + { + RaceID = 11 + }; race.Classes.Add(new ClassAvailability(1, 0, 0)); race.Classes.Add(new ClassAvailability(2, 0, 0)); race.Classes.Add(new ClassAvailability(3, 0, 0)); @@ -838,8 +869,10 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue if (queued) { - response.WaitInfo = new AuthWaitInfo(); - response.WaitInfo.WaitCount = queuePos; + response.WaitInfo = new AuthWaitInfo + { + WaitCount = queuePos + }; } SendPacket(response); @@ -862,24 +895,28 @@ public void SendAuthWaitQue(uint position) public void SendSetTimeZoneInformation() { // @todo: replace dummy values - SetTimeZoneInformation packet = new(); - packet.ServerTimeTZ = "Europe/Paris"; - packet.GameTimeTZ = "Europe/Paris"; + SetTimeZoneInformation packet = new() + { + ServerTimeTZ = "Europe/Paris", + GameTimeTZ = "Europe/Paris" + }; SendPacket(packet);//enabled it } public void SendFeatureSystemStatusGlueScreen() { - FeatureSystemStatusGlueScreen features = new(); - features.BpayStoreAvailable = false; - features.BpayStoreDisabledByParentalControls = false; - features.CharUndeleteEnabled = false; - features.BpayStoreEnabled = false; - features.MaxCharactersPerRealm = 10; - features.MinimumExpansionLevel = 5; - features.MaximumExpansionLevel = 8; - features.Unk14 = true; + FeatureSystemStatusGlueScreen features = new() + { + BpayStoreAvailable = false, + BpayStoreDisabledByParentalControls = false, + CharUndeleteEnabled = false, + BpayStoreEnabled = false, + MaxCharactersPerRealm = 10, + MinimumExpansionLevel = 5, + MaximumExpansionLevel = 8, + Unk14 = true + }; var europaTicketConfig = new EuropaTicketConfig(); europaTicketConfig.ThrottleState.MaxTries = 10; @@ -898,22 +935,24 @@ public void SendFeatureSystemStatusGlueScreen() public void SendFeatureSystemStatus() { - FeatureSystemStatus features = new(); - features.ComplaintStatus = 2; - features.ScrollOfResurrectionRequestsRemaining = 1; - features.ScrollOfResurrectionMaxRequestsPerDay = 1; - features.CfgRealmID = 1; - features.CfgRealmRecID = 1; - features.TwitterPostThrottleLimit = 60; - features.TwitterPostThrottleCooldown = 20; - features.TokenPollTimeSeconds = 300; - features.KioskSessionMinutes = 30; - features.BpayStoreProductDeliveryDelay = 180; - features.HiddenUIClubsPresenceUpdateTimer = 60000; - features.VoiceEnabled = false; - features.BrowserEnabled = false; - - features.EuropaTicketSystemStatus = new EuropaTicketConfig(); + FeatureSystemStatus features = new() + { + ComplaintStatus = 2, + ScrollOfResurrectionRequestsRemaining = 1, + ScrollOfResurrectionMaxRequestsPerDay = 1, + CfgRealmID = 1, + CfgRealmRecID = 1, + TwitterPostThrottleLimit = 60, + TwitterPostThrottleCooldown = 20, + TokenPollTimeSeconds = 300, + KioskSessionMinutes = 30, + BpayStoreProductDeliveryDelay = 180, + HiddenUIClubsPresenceUpdateTimer = 60000, + VoiceEnabled = false, + BrowserEnabled = false, + + EuropaTicketSystemStatus = new EuropaTicketConfig() + }; features.EuropaTicketSystemStatus.ThrottleState.MaxTries = 10; features.EuropaTicketSystemStatus.ThrottleState.PerMilliseconds = 60000; features.EuropaTicketSystemStatus.ThrottleState.TryCount = 1; @@ -981,29 +1020,37 @@ public void SendMotd() public void SendClientCacheVersion(uint version) { - ClientCacheVersion cache = new(); - cache.CacheVersion = version; + ClientCacheVersion cache = new() + { + CacheVersion = version + }; SendPacket(cache); } public void SendAvailableHotfixes() { - AvailableHotfixes hotfixes = new AvailableHotfixes(); - hotfixes.VirtualRealmAddress = GetSession().RealmId.GetAddress(); + AvailableHotfixes hotfixes = new AvailableHotfixes + { + VirtualRealmAddress = GetSession().RealmId.GetAddress() + }; SendPacket(hotfixes); } public void SendBnetConnectionState(byte state) { - ConnectionStatus bnetConnected = new(); - bnetConnected.State = state; + ConnectionStatus bnetConnected = new() + { + State = state + }; SendPacket(bnetConnected); } public void SendServerTimeOffset() { - ServerTimeOffset response = new(); - response.Time = Time.UnixTime; + ServerTimeOffset response = new() + { + Time = Time.UnixTime + }; SendPacket(response); } @@ -1014,9 +1061,11 @@ public void SendAccountDataTimes() WowGuid128 guid = GetSession().GameState.CurrentPlayerGuid; GetSession().AccountDataMgr.LoadAllData(guid); - AccountDataTimes accountData = new AccountDataTimes(); - accountData.PlayerGuid = guid; - accountData.ServerTime = Time.UnixTime; + AccountDataTimes accountData = new AccountDataTimes + { + PlayerGuid = guid, + ServerTime = Time.UnixTime + }; int count = ModernVersion.GetAccountDataCount(); accountData.AccountTimes = new long[count]; From 91ce61717821d7c6f39a07f691f370ab36e23e5d Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:36:39 +0100 Subject: [PATCH 6/8] Inline variable declaration on if statements --- .../Managers/LoginServiceManager.cs | 3 +- HermesProxy/Configuration/Configuration.cs | 12 ++--- HermesProxy/GlobalSessionData.cs | 12 ++--- HermesProxy/VersionChecker.cs | 36 +++++---------- .../Client/PacketHandlers/ArenaHandler.cs | 9 ++-- .../PacketHandlers/BattleGroundHandler.cs | 6 +-- .../Client/PacketHandlers/CharacterHandler.cs | 3 +- .../Client/PacketHandlers/UpdateHandler.cs | 16 +++---- HermesProxy/World/Enums/Opcodes.cs | 6 +-- HermesProxy/World/GameData.cs | 45 +++++++------------ .../World/Objects/UpdateFieldExtensions.cs | 12 ++--- HermesProxy/World/Packet.cs | 10 ++--- .../Server/PacketHandlers/ArenaHandler.cs | 3 +- .../Server/PacketHandlers/HotfixHandler.cs | 3 +- HermesProxy/World/Server/WorldSocket.cs | 3 +- 15 files changed, 59 insertions(+), 120 deletions(-) diff --git a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs index 9030bed3..b595d2c6 100644 --- a/HermesProxy/BnetServer/Managers/LoginServiceManager.cs +++ b/HermesProxy/BnetServer/Managers/LoginServiceManager.cs @@ -30,8 +30,7 @@ public void Initialize() } string configuredAddress = Framework.Settings.ExternalAddress; - IPAddress address; - if (!IPAddress.TryParse(configuredAddress, out address)) + if (!IPAddress.TryParse(configuredAddress, out IPAddress address)) { Log.Print(LogType.Error, $"Could not resolve LoginREST.ExternalAddress {configuredAddress}"); return; diff --git a/HermesProxy/Configuration/Configuration.cs b/HermesProxy/Configuration/Configuration.cs index c776eb5d..e10718ed 100644 --- a/HermesProxy/Configuration/Configuration.cs +++ b/HermesProxy/Configuration/Configuration.cs @@ -98,8 +98,7 @@ public bool GetBoolean(string key, bool defValue) if (s?.Value == null) return defValue; - bool aux; - if (bool.TryParse(s.Value, out aux)) + if (bool.TryParse(s.Value, out bool aux)) return aux; Console.WriteLine("Warning: \"{0}\" is not a valid boolean value for key \"{1}\"", s.Value, key); @@ -112,8 +111,7 @@ public int GetInt(string key, int defValue) if (string.IsNullOrEmpty(s?.Value)) return defValue; - int aux; - if (int.TryParse(s.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out aux)) + if (int.TryParse(s.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out int aux)) return aux; Console.WriteLine("Warning: \"{0}\" is not a valid integer value for key \"{1}\"", s.Value, key); @@ -126,8 +124,7 @@ public TEnum GetEnum(string key, TEnum defValue) where TEnum : struct if (string.IsNullOrEmpty(s?.Value)) return defValue; - int value; - if (!int.TryParse(s.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out value)) + if (!int.TryParse(s.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out int value)) { Console.WriteLine("Warning: \"{0}\" is not a valid integer value for key \"{1}\"", s.Value, key); return defValue; @@ -136,8 +133,7 @@ public TEnum GetEnum(string key, TEnum defValue) where TEnum : struct if (Enum.IsDefined(typeof(TEnum), value)) return (TEnum)(object)value; - TEnum enumValue; - if (Enum.TryParse(value.ToString(), out enumValue)) + if (Enum.TryParse(value.ToString(), out TEnum enumValue)) return enumValue; Console.WriteLine("Warning: \"{0}\" is not a valid enum value for key \"{1}\", enum \"{2}\"", s.Value, key, typeof(TEnum).Name); diff --git a/HermesProxy/GlobalSessionData.cs b/HermesProxy/GlobalSessionData.cs index 46d3c2f1..cbcf8e1f 100644 --- a/HermesProxy/GlobalSessionData.cs +++ b/HermesProxy/GlobalSessionData.cs @@ -253,8 +253,7 @@ public WowGuid64 GetInventorySlotItem(int slot) } public ushort GetObjectSpawnCounter(WowGuid64 guid) { - ushort count; - if (ObjectSpawnCount.TryGetValue(guid, out count)) + if (ObjectSpawnCount.TryGetValue(guid, out ushort count)) return count; return 0; } @@ -279,8 +278,7 @@ public void SetDailyQuestSlot(uint slot, uint questId) } public bool IsAlliancePlayer(WowGuid128 guid) { - PlayerCache cache; - if (CachedPlayers.TryGetValue(guid, out cache)) + if (CachedPlayers.TryGetValue(guid, out PlayerCache cache)) return GameData.IsAllianceRace(cache.RaceId); return false; } @@ -662,9 +660,8 @@ public float GetLegacyFieldValueFloat(WowGuid128 guid, T field) public Dictionary GetCachedObjectFieldsLegacy(WowGuid128 guid) { - Dictionary dict; ObjectCacheMutex.WaitOne(); - if (ObjectCacheLegacy.TryGetValue(guid, out dict)) + if (ObjectCacheLegacy.TryGetValue(guid, out Dictionary dict)) { ObjectCacheMutex.ReleaseMutex(); return dict; @@ -675,9 +672,8 @@ public Dictionary GetCachedObjectFieldsLegacy(WowGuid128 guid) public UpdateFieldsArray GetCachedObjectFieldsModern(WowGuid128 guid) { - UpdateFieldsArray array; ObjectCacheMutex.WaitOne(); - if (ObjectCacheModern.TryGetValue(guid, out array)) + if (ObjectCacheModern.TryGetValue(guid, out UpdateFieldsArray array)) { ObjectCacheMutex.ReleaseMutex(); return array; diff --git a/HermesProxy/VersionChecker.cs b/HermesProxy/VersionChecker.cs index 9b07cd5c..d321ada1 100644 --- a/HermesProxy/VersionChecker.cs +++ b/HermesProxy/VersionChecker.cs @@ -68,16 +68,14 @@ private static bool LoadOpcodeDictionaries() public static Opcode GetUniversalOpcode(uint opcode) { - Opcode universalOpcode; - if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out universalOpcode)) + if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out Opcode universalOpcode)) return universalOpcode; return Opcode.MSG_NULL_ACTION; } public static uint GetCurrentOpcode(Opcode universalOpcode) { - uint opcode; - if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out opcode)) + if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out uint opcode)) return opcode; return 0; } @@ -167,11 +165,9 @@ private static bool LoadUFDictionariesInto(Dictionary(T field) // where T: System.Enum // C# 7.3 { - Dictionary byNamesDict; - if (UpdateFieldNameDictionary.TryGetValue(typeof(T), out byNamesDict)) + if (UpdateFieldNameDictionary.TryGetValue(typeof(T), out Dictionary byNamesDict)) { - int fieldValue; - if (byNamesDict.TryGetValue(field.ToString(), out fieldValue)) + if (byNamesDict.TryGetValue(field.ToString(), out int fieldValue)) return fieldValue; } @@ -180,8 +176,7 @@ public static int GetUpdateField(T field) // where T: System.Enum // C# 7.3 public static string GetUpdateFieldName(int field) // where T: System.Enum // C# 7.3 { - SortedList infoDict; - if (UpdateFieldDictionary.TryGetValue(typeof(T), out infoDict)) + if (UpdateFieldDictionary.TryGetValue(typeof(T), out SortedList infoDict)) { if (infoDict.Count != 0) { @@ -200,8 +195,7 @@ public static string GetUpdateFieldName(int field) // where T: System.Enum // public static UpdateFieldInfo GetUpdateFieldInfo(int field) // where T: System.Enum // C# 7.3 { - SortedList infoDict; - if (UpdateFieldDictionary.TryGetValue(typeof(T), out infoDict)) + if (UpdateFieldDictionary.TryGetValue(typeof(T), out SortedList infoDict)) { if (infoDict.Count != 0) { @@ -383,16 +377,14 @@ private static bool LoadOpcodeDictionaries() public static Opcode GetUniversalOpcode(uint opcode) { - Opcode universalOpcode; - if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out universalOpcode)) + if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out Opcode universalOpcode)) return universalOpcode; return Opcode.MSG_NULL_ACTION; } public static uint GetCurrentOpcode(Opcode universalOpcode) { - uint opcode; - if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out opcode)) + if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out uint opcode)) return opcode; return 0; } @@ -516,11 +508,9 @@ private static bool LoadUFDictionariesInto(Dictionary(T field) // where T: System.Enum // C# 7.3 { - Dictionary byNamesDict; - if (UpdateFieldNameDictionary.TryGetValue(typeof(T), out byNamesDict)) + if (UpdateFieldNameDictionary.TryGetValue(typeof(T), out Dictionary byNamesDict)) { - int fieldValue; - if (byNamesDict.TryGetValue(field.ToString(), out fieldValue)) + if (byNamesDict.TryGetValue(field.ToString(), out int fieldValue)) return fieldValue; } @@ -529,8 +519,7 @@ public static int GetUpdateField(T field) // where T: System.Enum // C# 7.3 public static string GetUpdateFieldName(int field) // where T: System.Enum // C# 7.3 { - SortedList infoDict; - if (UpdateFieldDictionary.TryGetValue(typeof(T), out infoDict)) + if (UpdateFieldDictionary.TryGetValue(typeof(T), out SortedList infoDict)) { if (infoDict.Count != 0) { @@ -549,8 +538,7 @@ public static string GetUpdateFieldName(int field) // where T: System.Enum // public static UpdateFieldInfo GetUpdateFieldInfo(int field) // where T: System.Enum // C# 7.3 { - SortedList infoDict; - if (UpdateFieldDictionary.TryGetValue(typeof(T), out infoDict)) + if (UpdateFieldDictionary.TryGetValue(typeof(T), out SortedList infoDict)) { if (infoDict.Count != 0) { diff --git a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs index 68dfd111..3d57cdfd 100644 --- a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs @@ -12,8 +12,7 @@ public partial class WorldClient void HandleArenaTeamQueryResponse(WorldPacket packet) { uint teamId = packet.ReadUInt32(); - ArenaTeamData team; - if (!GetSession().GameState.ArenaTeams.TryGetValue(teamId, out team)) + if (!GetSession().GameState.ArenaTeams.TryGetValue(teamId, out ArenaTeamData team)) { team = new ArenaTeamData(); GetSession().GameState.ArenaTeams.Add(teamId, team); @@ -32,8 +31,7 @@ void HandleArenaTeamQueryResponse(WorldPacket packet) void HandleArenaTeamStats(WorldPacket packet) { uint teamId = packet.ReadUInt32(); - ArenaTeamData team; - if (!GetSession().GameState.ArenaTeams.TryGetValue(teamId, out team)) + if (!GetSession().GameState.ArenaTeams.TryGetValue(teamId, out ArenaTeamData team)) { team = new ArenaTeamData(); GetSession().GameState.ArenaTeams.Add(teamId, team); @@ -88,8 +86,7 @@ void HandleArenaTeamRoster(WorldPacket packet) arena.Members.Add(member); } - ArenaTeamData team; - if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out team)) + if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out ArenaTeamData team)) { arena.TeamPlayed = team.WeekPlayed; arena.TeamWins = team.WeekWins; diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs index 44e85534..09443bad 100644 --- a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs @@ -311,8 +311,7 @@ void HandlePvPLogDataVanilla(WorldPacket packet) for (int j = 0; j < statsCount; j++) player.Stats.Add(packet.ReadUInt32()); - PlayerCache cache; - if (GetSession().GameState.CachedPlayers.TryGetValue(player.PlayerGUID, out cache)) + if (GetSession().GameState.CachedPlayers.TryGetValue(player.PlayerGUID, out PlayerCache cache)) { player.Sex = cache.SexId; player.PlayerRace = cache.RaceId; @@ -388,8 +387,7 @@ void HandlePvPLogDataTBC(WorldPacket packet) for (int j = 0; j < statsCount; j++) player.Stats.Add(packet.ReadUInt32()); - PlayerCache cache; - if (GetSession().GameState.CachedPlayers.TryGetValue(player.PlayerGUID, out cache)) + if (GetSession().GameState.CachedPlayers.TryGetValue(player.PlayerGUID, out PlayerCache cache)) { player.Sex = cache.SexId; player.PlayerRace = cache.RaceId; diff --git a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs index 8b2ec59f..9df61c77 100644 --- a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs @@ -418,8 +418,7 @@ void HandleInspectResult(WorldPacket packet) else inspect.DisplayInfo.GUID = packet.ReadPackedGuid().To128(GetSession().GameState); - PlayerCache cache; - if (!GetSession().GameState.CachedPlayers.TryGetValue(inspect.DisplayInfo.GUID, out cache)) + if (!GetSession().GameState.CachedPlayers.TryGetValue(inspect.DisplayInfo.GUID, out PlayerCache cache)) return; inspect.DisplayInfo.Name = cache.Name; diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index 84a23c39..215cca66 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -333,8 +333,7 @@ private void ReadCreateObjectBlock(WorldPacket packet, WowGuid128 guid, ObjectUp public void ReadValuesUpdateBlockOnCreate(WorldPacket packet, WowGuid128 guid, ObjectType type, ObjectUpdate updateData, AuraUpdate auraUpdate, object index) { - BitArray updateMaskArray = null; - var updates = ReadValuesUpdateBlock(packet, ref type, index, true, null, out updateMaskArray); + var updates = ReadValuesUpdateBlock(packet, ref type, index, true, null, out BitArray updateMaskArray); StoreObjectUpdate(guid, type, updateMaskArray, updates, auraUpdate, null, true, updateData); GetSession().GameState.ObjectCacheMutex.WaitOne(); if (!GetSession().GameState.ObjectCacheLegacy.ContainsKey(guid)) @@ -346,9 +345,8 @@ public void ReadValuesUpdateBlockOnCreate(WorldPacket packet, WowGuid128 guid, O public void ReadValuesUpdateBlock(WorldPacket packet, WowGuid128 guid, ObjectUpdate updateData, AuraUpdate auraUpdate, PowerUpdate powerUpdate, int index) { - BitArray updateMaskArray = null; ObjectType type = GetSession().GameState.GetOriginalObjectType(guid); - var updates = ReadValuesUpdateBlock(packet, ref type, index, false, GetSession().GameState.GetCachedObjectFieldsLegacy(guid), out updateMaskArray); + var updates = ReadValuesUpdateBlock(packet, ref type, index, false, GetSession().GameState.GetCachedObjectFieldsLegacy(guid), out BitArray updateMaskArray); StoreObjectUpdate(guid, type, updateMaskArray, updates, auraUpdate, powerUpdate, false, updateData); } @@ -593,8 +591,7 @@ private Dictionary ReadValuesUpdateBlock(WorldPacket packet, r List fieldData = new List(); for (int k = start; k < i; ++k) { - UpdateField updateField; - if (oldValues == null || !oldValues.TryGetValue(k, out updateField)) + if (oldValues == null || !oldValues.TryGetValue(k, out UpdateField updateField)) updateField = new UpdateField(0); fieldData.Add(updateField); @@ -1932,9 +1929,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u }; if (aura.AuraData != null) { - int durationLeft; - int durationFull; - GetSession().GameState.GetAuraDuration(guid, i, out durationLeft, out durationFull); + GetSession().GameState.GetAuraDuration(guid, i, out int durationLeft, out int durationFull); if (durationLeft > 0 && durationFull > 0) { aura.AuraData.Flags |= AuraFlagsModern.Duration; @@ -2154,8 +2149,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u if (raceId == Race.None || sexId == Gender.None) { - PlayerCache cache; - if (GetSession().GameState.CachedPlayers.TryGetValue(guid.To128(GetSession().GameState), out cache)) + if (GetSession().GameState.CachedPlayers.TryGetValue(guid.To128(GetSession().GameState), out PlayerCache cache)) { raceId = cache.RaceId; sexId = cache.SexId; diff --git a/HermesProxy/World/Enums/Opcodes.cs b/HermesProxy/World/Enums/Opcodes.cs index 60c13a87..f8919a03 100644 --- a/HermesProxy/World/Enums/Opcodes.cs +++ b/HermesProxy/World/Enums/Opcodes.cs @@ -83,8 +83,7 @@ public static uint GetOpcodeValueForVersion(Opcode opcode, ClientVersionBuild ve public static uint GetOpcodeValueForVersion(string opcodeName, ClientVersionBuild version) { - object opcode; - if (Enum.TryParse(GetOpcodesEnumForVersion(version), opcodeName, out opcode)) + if (Enum.TryParse(GetOpcodesEnumForVersion(version), opcodeName, out object opcode)) return (uint)opcode; return 0; @@ -104,8 +103,7 @@ public static Opcode GetUniversalOpcode(uint opcode, ClientVersionBuild version) public static Opcode GetUniversalOpcode(string name) { - object opcode; - if (Enum.TryParse(typeof(Opcode), name, out opcode)) + if (Enum.TryParse(typeof(Opcode), name, out object opcode)) return (Opcode)opcode; return Opcode.MSG_NULL_ACTION; diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index c9b3d4b5..f79c9551 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -51,8 +51,7 @@ public static void StoreItemName(uint entry, string name) public static string GetItemName(uint entry) { - string data; - if (ItemNames.TryGetValue(entry, out data)) + if (ItemNames.TryGetValue(entry, out string data)) return data; ItemTemplate template = GetItemTemplate(entry); @@ -72,8 +71,7 @@ public static void StoreItemTemplate(uint entry, ItemTemplate template) public static ItemTemplate GetItemTemplate(uint entry) { - ItemTemplate data; - if (ItemTemplates.TryGetValue(entry, out data)) + if (ItemTemplates.TryGetValue(entry, out ItemTemplate data)) return data; return null; } @@ -88,8 +86,7 @@ public static void StoreQuestTemplate(uint entry, QuestTemplate template) public static QuestTemplate GetQuestTemplate(uint entry) { - QuestTemplate data; - if (QuestTemplates.TryGetValue(entry, out data)) + if (QuestTemplates.TryGetValue(entry, out QuestTemplate data)) return data; return null; } @@ -126,16 +123,14 @@ public static void StoreCreatureTemplate(uint entry, CreatureTemplate template) public static CreatureTemplate GetCreatureTemplate(uint entry) { - CreatureTemplate data; - if (CreatureTemplates.TryGetValue(entry, out data)) + if (CreatureTemplates.TryGetValue(entry, out CreatureTemplate data)) return data; return null; } public static ItemDisplayData GetItemDisplayData(uint entry) { - ItemDisplayData data; - if (ItemDisplayDataStore.TryGetValue(entry, out data)) + if (ItemDisplayDataStore.TryGetValue(entry, out ItemDisplayData data)) return data; return null; } @@ -177,40 +172,35 @@ public static byte GetItemEffectSlot(uint itemId, uint spellId) public static uint GetItemEnchantVisual(uint enchantId) { - uint visualId; - if (ItemEnchantVisuals.TryGetValue(enchantId, out visualId)) + if (ItemEnchantVisuals.TryGetValue(enchantId, out uint visualId)) return visualId; return 0; } public static uint GetSpellVisual(uint spellId) { - uint visual; - if (SpellVisuals.TryGetValue(spellId, out visual)) + if (SpellVisuals.TryGetValue(spellId, out uint visual)) return visual; return 0; } public static int GetTotemSlotForSpell(uint spellId) { - uint slot; - if (TotemSpells.TryGetValue(spellId, out slot)) + if (TotemSpells.TryGetValue(spellId, out uint slot)) return (int)slot; return -1; } public static uint GetRealSpell(uint learnSpellId) { - uint realSpellId; - if (LearnSpells.TryGetValue(learnSpellId, out realSpellId)) + if (LearnSpells.TryGetValue(learnSpellId, out uint realSpellId)) return realSpellId; return learnSpellId; } public static uint GetGemFromEnchantId(uint enchantId) { - uint itemId; - if (Gems.TryGetValue(enchantId, out itemId)) + if (Gems.TryGetValue(enchantId, out uint itemId)) return itemId; return 0; } @@ -227,24 +217,21 @@ public static uint GetEnchantIdFromGem(uint itemId) public static float GetUnitDisplayScale(uint displayId) { - float scale; - if (UnitDisplayScales.TryGetValue(displayId, out scale)) + if (UnitDisplayScales.TryGetValue(displayId, out float scale)) return scale; return 1.0f; } public static uint GetTransportPeriod(uint entry) { - uint period; - if (TransportPeriods.TryGetValue(entry, out period)) + if (TransportPeriods.TryGetValue(entry, out uint period)) return period; return 0; } public static string GetAreaName(uint id) { - string name; - if (AreaNames.TryGetValue(id, out name)) + if (AreaNames.TryGetValue(id, out string name)) return name; return ""; } @@ -261,8 +248,7 @@ public static uint GetBattlegroundIdFromMapId(uint mapId) public static uint GetMapIdFromBattlegroundId(uint bgId) { - Battleground bg; - if (Battlegrounds.TryGetValue(bgId, out bg)) + if (Battlegrounds.TryGetValue(bgId, out Battleground bg)) return bg.MapIds[0]; return 0; } @@ -305,8 +291,7 @@ public static bool IsAllianceRace(Race raceId) public static BroadcastText GetBroadcastText(uint entry) { - BroadcastText data; - if (BroadcastTextStore.TryGetValue(entry, out data)) + if (BroadcastTextStore.TryGetValue(entry, out BroadcastText data)) return data; return null; } diff --git a/HermesProxy/World/Objects/UpdateFieldExtensions.cs b/HermesProxy/World/Objects/UpdateFieldExtensions.cs index ced2ce95..95fa985d 100644 --- a/HermesProxy/World/Objects/UpdateFieldExtensions.cs +++ b/HermesProxy/World/Objects/UpdateFieldExtensions.cs @@ -49,8 +49,7 @@ private static TypeCode GetTypeCodeOfReturnValue() /// public static TK GetValue(this Dictionary dict, T updateField) // where T: System.Enum // C# 7.3 { - UpdateField uf; - if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out uf)) + if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out UpdateField uf)) { var type = GetTypeCodeOfReturnValue(); switch (type) @@ -81,8 +80,7 @@ public static TK GetValue(this Dictionary dict, T updat /// public static IEnumerable GetValue(this Dictionary> dict, T updateField) // where T: System.Enum // C# 7.3 { - List ufs; - if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out ufs)) + if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out List ufs)) { var type = GetTypeCodeOfReturnValue(); switch (type) @@ -122,8 +120,7 @@ public static TK[] GetArray(this Dictionary dict, int firs var type = GetTypeCodeOfReturnValue(); for (var i = 0; i < count; i++) { - UpdateField uf; - if (dict != null && dict.TryGetValue(firstUpdateField + i, out uf)) + if (dict != null && dict.TryGetValue(firstUpdateField + i, out UpdateField uf)) { switch (type) { @@ -177,8 +174,7 @@ public static TK GetEnum(this Dictionary dict, T update try { - UpdateField uf; - if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out uf)) + if (dict != null && dict.TryGetValue(LegacyVersion.GetUpdateField(updateField), out UpdateField uf)) return (TK)Enum.Parse(typeof(TK).GetGenericArguments()[0], uf.UInt32Value.ToString(CultureInfo.InvariantCulture)); } catch (OverflowException) // Data wrongly parsed can result in very wtfy values diff --git a/HermesProxy/World/Packet.cs b/HermesProxy/World/Packet.cs index 20f7fea5..e490bcee 100644 --- a/HermesProxy/World/Packet.cs +++ b/HermesProxy/World/Packet.cs @@ -254,11 +254,9 @@ public void WritePackedGuid128(WowGuid128 guid) return; } - byte lowMask, highMask; - byte[] lowPacked, highPacked; - var loSize = PackUInt64(guid.GetLowValue(), out lowMask, out lowPacked); - var hiSize = PackUInt64(guid.GetHighValue(), out highMask, out highPacked); + var loSize = PackUInt64(guid.GetLowValue(), out byte lowMask, out byte[] lowPacked); + var hiSize = PackUInt64(guid.GetHighValue(), out byte highMask, out byte[] highPacked); WriteUInt8(lowMask); WriteUInt8(highMask); @@ -268,9 +266,7 @@ public void WritePackedGuid128(WowGuid128 guid) public void WritePackedUInt64(ulong guid) { - byte mask; - byte[] packed; - var packedSize = PackUInt64(guid, out mask, out packed); + var packedSize = PackUInt64(guid, out byte mask, out byte[] packed); WriteUInt8(mask); WriteBytes(packed, packedSize); diff --git a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs index cead364f..76b7d085 100644 --- a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs @@ -34,8 +34,7 @@ void HandleArenaTeamRoster(ArenaTeamRosterRequest arena) [PacketHandler(Opcode.CMSG_ARENA_TEAM_QUERY)] void HandleArenaTeamQuery(ArenaTeamQuery arena) { - ArenaTeamData team; - if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out team)) + if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out ArenaTeamData team)) { ArenaTeamQueryResponse response = new ArenaTeamQueryResponse { diff --git a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs index 241124fc..70830549 100644 --- a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs @@ -197,8 +197,7 @@ void HandleHotfixRequest(HotfixRequest request) HotfixConnect connect = new HotfixConnect(); foreach (uint id in request.Hotfixes) { - HotfixRecord record; - if (GameData.Hotfixes.TryGetValue(id, out record)) + if (GameData.Hotfixes.TryGetValue(id, out HotfixRecord record)) { Log.Print(LogType.Debug, $"Hotfix record {record.RecordId} from {record.TableHash}."); connect.Hotfixes.Add(record); diff --git a/HermesProxy/World/Server/WorldSocket.cs b/HermesProxy/World/Server/WorldSocket.cs index b863b76d..3348fd1e 100644 --- a/HermesProxy/World/Server/WorldSocket.cs +++ b/HermesProxy/World/Server/WorldSocket.cs @@ -372,8 +372,7 @@ public void SendPacket(ServerPacket packet) buffer.WriteInt32(packetSize + 2); buffer.WriteUInt32(ZLib.adler32(ZLib.adler32(0x9827D8F1, BitConverter.GetBytes(opcode), 2), data, (uint)packetSize)); - byte[] compressedData; - uint compressedSize = CompressPacket(data, opcode, out compressedData); + uint compressedSize = CompressPacket(data, opcode, out byte[] compressedData); buffer.WriteUInt32(ZLib.adler32(0x9827D8F1, compressedData, compressedSize)); buffer.WriteBytes(compressedData, compressedSize); From d8ab701304551281b671397002aea7620b4c1f0f Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:37:05 +0100 Subject: [PATCH 7/8] Use compound assignment --- .../BnetServer/Services/Services/Account.cs | 3 +- .../Client/PacketHandlers/GroupHandler.cs | 114 ++++++------------ .../Client/PacketHandlers/UpdateHandler.cs | 27 ++--- HermesProxy/World/Client/WorldClient.cs | 9 +- .../Server/PacketHandlers/HotfixHandler.cs | 5 +- .../World/Server/Packets/GroupPackets.cs | 15 +-- .../World/Server/Packets/UpdatePackets.cs | 84 +++++-------- 7 files changed, 85 insertions(+), 172 deletions(-) diff --git a/HermesProxy/BnetServer/Services/Services/Account.cs b/HermesProxy/BnetServer/Services/Services/Account.cs index 6261ec15..e5423cb9 100644 --- a/HermesProxy/BnetServer/Services/Services/Account.cs +++ b/HermesProxy/BnetServer/Services/Services/Account.cs @@ -59,8 +59,7 @@ BattlenetRpcErrorCode HandleGetGameAccountState(GetGameAccountStateRequest reque if (request.Options.FieldGameStatus) { - if (response.State == null) - response.State = new GameAccountState(); + response.State ??= new GameAccountState(); response.State.GameStatus = new GameStatus(); diff --git a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs index 28b5c9a0..119a9c0a 100644 --- a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs @@ -465,8 +465,7 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.Auras)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt32(); // Positive Aura Mask @@ -492,8 +491,7 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.AurasNegative)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt16(); // Negative Aura Mask @@ -519,37 +517,32 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetGuid)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetGuid = packet.ReadGuid().To128(GetSession().GameState); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetName)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetName = packet.ReadCString(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetModelId)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.DisplayID = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetCurrentHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.Health = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetMaxHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.MaxHealth = packet.ReadUInt16(); } @@ -564,10 +557,8 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetAuras)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt32(); // Pet Positive Aura Mask @@ -593,10 +584,8 @@ void HandlePartyMemberStats(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetAurasNegative)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt16(); // Pet Negative Aura Mask @@ -678,8 +667,7 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.Auras)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt64(); @@ -704,37 +692,32 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetGuid)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetGuid = packet.ReadGuid().To128(GetSession().GameState); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetName)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetName = packet.ReadCString(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetModelId)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.DisplayID = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetCurrentHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.Health = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetMaxHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.MaxHealth = packet.ReadUInt16(); } @@ -749,10 +732,8 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetAuras)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt64(); @@ -839,8 +820,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.Auras)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt32(); // Positive Aura Mask @@ -866,8 +846,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.AurasNegative)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt16(); // Negative Aura Mask @@ -893,37 +872,32 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetGuid)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetGuid = packet.ReadGuid().To128(GetSession().GameState); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetName)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetName = packet.ReadCString(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetModelId)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.DisplayID = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetCurrentHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.Health = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetMaxHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.MaxHealth = packet.ReadUInt16(); } @@ -938,10 +912,8 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetAuras)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt32(); // Pet Positive Aura Mask @@ -967,10 +939,8 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagVanilla.PetAurasNegative)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt16(); // Pet Negative Aura Mask @@ -1058,8 +1028,7 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.Auras)) { - if (state.Auras == null) - state.Auras = new List(); + state.Auras ??= new List(); var auraMask = packet.ReadUInt64(); @@ -1084,37 +1053,32 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetGuid)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetGuid = packet.ReadGuid().To128(GetSession().GameState); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetName)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.NewPetName = packet.ReadCString(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetModelId)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.DisplayID = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetCurrentHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.Health = packet.ReadUInt16(); } if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetMaxHealth)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); + state.Pet ??= new PartyMemberPetStats(); state.Pet.MaxHealth = packet.ReadUInt16(); } @@ -1129,10 +1093,8 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if (updateFlags.HasFlag(GroupUpdateFlagTBC.PetAuras)) { - if (state.Pet == null) - state.Pet = new PartyMemberPetStats(); - if (state.Pet.Auras == null) - state.Pet.Auras = new List(); + state.Pet ??= new PartyMemberPetStats(); + state.Pet.Auras ??= new List(); var auraMask = packet.ReadUInt64(); diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index 215cca66..91fc2e65 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -1032,16 +1032,14 @@ public QuestLog ReadQuestLogEntry(int i, BitArray updateMaskArray, Dictionary> 8) & 0xFF); @@ -1071,8 +1068,7 @@ public QuestLog ReadQuestLogEntry(int i, BitArray updateMaskArray, Dictionary(); + NewPetName ??= ""; + DisplayID ??= 0; + MaxHealth ??= 0; + Health ??= 0; + Auras ??= new List(); data.WritePackedGuid128(NewPetGuid); data.WriteUInt32(DisplayID.Value); diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index 4c64029c..673a4549 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -141,21 +141,17 @@ public void InitializePlaceholders() GameObjectData.PercentHealth = 255; if (GameObjectData.ParentRotation[3] == null) GameObjectData.ParentRotation[3] = 1; - if (GameObjectData.StateAnimID == null) - GameObjectData.StateAnimID = ModernVersion.GetGameObjectStateAnimId(); + GameObjectData.StateAnimID ??= ModernVersion.GetGameObjectStateAnimId(); if (Guid.GetHighType() == HighGuidType.Transport) { uint period = GameData.GetTransportPeriod((uint)ObjectData.EntryID); if (period != 0) { - if (GameObjectData.Level == null) - GameObjectData.Level = (int)period; - if (ObjectData.DynamicFlags == null) - ObjectData.DynamicFlags = (((uint)(((float)(CreateData.MoveInfo.TransportPathTimer % period) / (float)period) * ushort.MaxValue)) << 16); + GameObjectData.Level ??= (int)period; + ObjectData.DynamicFlags ??= (((uint)(((float)(CreateData.MoveInfo.TransportPathTimer % period) / (float)period) * ushort.MaxValue)) << 16); GameObjectData.Flags = 1048616; } - else if (ObjectData.DynamicFlags == null) - ObjectData.DynamicFlags = ((CreateData.MoveInfo.TransportPathTimer % ushort.MaxValue) << 16); + else ObjectData.DynamicFlags ??= ((CreateData.MoveInfo.TransportPathTimer % ushort.MaxValue) << 16); } } if (CorpseData != null) @@ -175,28 +171,17 @@ public void InitializePlaceholders() if (UnitData.ModPowerRegen[i] == null) UnitData.ModPowerRegen[i] = 1; } - if (UnitData.Flags2 == null) - UnitData.Flags2 = 2048; - if (UnitData.DisplayScale == null) - UnitData.DisplayScale = 1; - if (UnitData.NativeXDisplayScale == null) - UnitData.NativeXDisplayScale = 1; - if (UnitData.ModCastHaste == null) - UnitData.ModCastHaste = 1; - if (UnitData.ModHaste == null) - UnitData.ModHaste = 1; - if (UnitData.ModRangedHaste == null) - UnitData.ModRangedHaste = 1; - if (UnitData.ModHasteRegen == null) - UnitData.ModHasteRegen = 1; - if (UnitData.ModTimeRate == null) - UnitData.ModTimeRate = 1; - if (UnitData.HoverHeight == null) - UnitData.HoverHeight = 1; - if (UnitData.ScaleDuration == null) - UnitData.ScaleDuration = 100; - if (UnitData.LookAtControllerID == null) - UnitData.LookAtControllerID = -1; + UnitData.Flags2 ??= 2048; + UnitData.DisplayScale ??= 1; + UnitData.NativeXDisplayScale ??= 1; + UnitData.ModCastHaste ??= 1; + UnitData.ModHaste ??= 1; + UnitData.ModRangedHaste ??= 1; + UnitData.ModHasteRegen ??= 1; + UnitData.ModTimeRate ??= 1; + UnitData.HoverHeight ??= 1; + UnitData.ScaleDuration ??= 100; + UnitData.LookAtControllerID ??= -1; if (UnitData.ChannelObject == null && Guid == GlobalSession.GameState.CurrentPlayerGuid) UnitData.ChannelObject = WowGuid128.Empty; @@ -210,10 +195,8 @@ public void InitializePlaceholders() else PlayerData.WowAccount = WowGuid128.Create(HighGuidType703.WowAccount, Guid.GetCounter()); } - if (PlayerData.VirtualPlayerRealm == null) - PlayerData.VirtualPlayerRealm = GlobalSession.RealmId.GetAddress(); - if (PlayerData.HonorLevel == null) - PlayerData.HonorLevel = 1; + PlayerData.VirtualPlayerRealm ??= GlobalSession.RealmId.GetAddress(); + PlayerData.HonorLevel ??= 1; if (PlayerData.AvgItemLevel[3] == null) PlayerData.AvgItemLevel[3] = 1; } @@ -230,12 +213,9 @@ public void InitializePlaceholders() if (ActivePlayerData.ModDamageDonePercent[i] == null) ActivePlayerData.ModDamageDonePercent[i] = 1; } - if (ActivePlayerData.ModHealingPercent == null) - ActivePlayerData.ModHealingPercent = 1; - if (ActivePlayerData.ModHealingDonePercent == null) - ActivePlayerData.ModHealingDonePercent = 1; - if (ActivePlayerData.ModPeriodicHealingDonePercent == null) - ActivePlayerData.ModPeriodicHealingDonePercent = 1; + ActivePlayerData.ModHealingPercent ??= 1; + ActivePlayerData.ModHealingDonePercent ??= 1; + ActivePlayerData.ModPeriodicHealingDonePercent ??= 1; for (int i = 0; i < 3; i++) { if (ActivePlayerData.WeaponDmgMultipliers[i] == null) @@ -243,22 +223,14 @@ public void InitializePlaceholders() if (ActivePlayerData.WeaponAtkSpeedMultipliers[i] == null) ActivePlayerData.WeaponAtkSpeedMultipliers[i] = 1; } - if (ActivePlayerData.ModSpellPowerPercent == null) - ActivePlayerData.ModSpellPowerPercent = 1; - if (ActivePlayerData.NumBackpackSlots == null) - ActivePlayerData.NumBackpackSlots = 16; - if (ActivePlayerData.MultiActionBars == null) - ActivePlayerData.MultiActionBars = 7; - if (ActivePlayerData.MaxLevel == null) - ActivePlayerData.MaxLevel = LegacyVersion.GetMaxLevel(); - if (ActivePlayerData.ModPetHaste == null) - ActivePlayerData.ModPetHaste = 1; - if (ActivePlayerData.HonorNextLevel == null) - ActivePlayerData.HonorNextLevel = 5500; - if (ActivePlayerData.PvPTierMaxFromWins == null) - ActivePlayerData.PvPTierMaxFromWins = 4294967295; - if (ActivePlayerData.PvPLastWeeksTierMaxFromWins == null) - ActivePlayerData.PvPLastWeeksTierMaxFromWins = 4294967295; + ActivePlayerData.ModSpellPowerPercent ??= 1; + ActivePlayerData.NumBackpackSlots ??= 16; + ActivePlayerData.MultiActionBars ??= 7; + ActivePlayerData.MaxLevel ??= LegacyVersion.GetMaxLevel(); + ActivePlayerData.ModPetHaste ??= 1; + ActivePlayerData.HonorNextLevel ??= 5500; + ActivePlayerData.PvPTierMaxFromWins ??= 4294967295; + ActivePlayerData.PvPLastWeeksTierMaxFromWins ??= 4294967295; } } } From 8fd6090f70706b231746331d2e086990eee74445 Mon Sep 17 00:00:00 2001 From: MaxtorCoder Date: Tue, 29 Nov 2022 13:37:36 +0100 Subject: [PATCH 8/8] Simplify new(...) statements --- HermesProxy/Auth/AuthClient.cs | 12 +- .../BnetServer/Networking/BnetTcpSession.cs | 2 +- .../BnetServer/Services/BnetServices.cs | 2 +- HermesProxy/Configuration/Configuration.cs | 2 +- HermesProxy/GlobalSessionData.cs | 42 ++-- HermesProxy/Realm/Realm.cs | 2 +- HermesProxy/Realm/RealmManager.cs | 18 +- HermesProxy/World/Client/LegacyWorldCrypt.cs | 2 +- .../Client/PacketHandlers/ArenaHandler.cs | 12 +- .../Client/PacketHandlers/AuctionHandler.cs | 22 +-- .../PacketHandlers/BattleGroundHandler.cs | 54 +++--- .../Client/PacketHandlers/CharacterHandler.cs | 48 ++--- .../Client/PacketHandlers/ChatHandler.cs | 32 ++-- .../Client/PacketHandlers/DuelHandler.cs | 12 +- .../PacketHandlers/GameObjectHandler.cs | 10 +- .../Client/PacketHandlers/GroupHandler.cs | 86 ++++----- .../Client/PacketHandlers/GuildHandler.cs | 46 ++--- .../Client/PacketHandlers/InstanceHandler.cs | 18 +- .../Client/PacketHandlers/ItemHandler.cs | 22 +-- .../Client/PacketHandlers/LootHandler.cs | 18 +- .../Client/PacketHandlers/MailHandler.cs | 20 +- .../Client/PacketHandlers/MiscHandler.cs | 32 ++-- .../Client/PacketHandlers/MovementHandler.cs | 38 ++-- .../World/Client/PacketHandlers/NPCHandler.cs | 18 +- .../World/Client/PacketHandlers/PetHandler.cs | 14 +- .../Client/PacketHandlers/PetitionHandler.cs | 6 +- .../Client/PacketHandlers/QueryHandler.cs | 32 ++-- .../Client/PacketHandlers/QuestHandler.cs | 26 +-- .../PacketHandlers/ReputationHandler.cs | 2 +- .../Client/PacketHandlers/SocialHandler.cs | 14 +- .../Client/PacketHandlers/SpellHandler.cs | 52 ++--- .../Client/PacketHandlers/SystemHandler.cs | 2 +- .../Client/PacketHandlers/TradeHandler.cs | 2 +- .../Client/PacketHandlers/UpdateHandler.cs | 68 +++---- .../PacketHandlers/WorldStateHandler.cs | 10 +- HermesProxy/World/Client/WorldClient.cs | 18 +- HermesProxy/World/GameData.cs | 180 +++++++++--------- HermesProxy/World/HighGuid.cs | 8 +- HermesProxy/World/Objects/ActivePlayerData.cs | 2 +- HermesProxy/World/Objects/MovementInfo.cs | 2 +- .../World/Objects/ObjectTypeConverter.cs | 6 +- .../World/Server/AccountDataManager.cs | 8 +- .../World/Server/CurrentPlayerStorage.cs | 4 +- .../Server/PacketHandlers/ArenaHandler.cs | 18 +- .../Server/PacketHandlers/AuctionHandler.cs | 16 +- .../PacketHandlers/BattlegroundHandler.cs | 10 +- .../Server/PacketHandlers/CharacterHandler.cs | 38 ++-- .../Server/PacketHandlers/ChatHandler.cs | 12 +- .../Server/PacketHandlers/CombatHandler.cs | 6 +- .../Server/PacketHandlers/DuelHandler.cs | 6 +- .../PacketHandlers/GameObjectHandler.cs | 2 +- .../Server/PacketHandlers/GroupHandler.cs | 38 ++-- .../Server/PacketHandlers/GuildHandler.cs | 82 ++++---- .../Server/PacketHandlers/HotfixHandler.cs | 2 +- .../Server/PacketHandlers/InstanceHandler.cs | 4 +- .../Server/PacketHandlers/ItemHandler.cs | 34 ++-- .../Server/PacketHandlers/LootHandler.cs | 16 +- .../Server/PacketHandlers/MailHandler.cs | 20 +- .../Server/PacketHandlers/MiscHandler.cs | 30 +-- .../Server/PacketHandlers/MovementHandler.cs | 20 +- .../World/Server/PacketHandlers/NPCHandler.cs | 10 +- .../World/Server/PacketHandlers/PetHandler.cs | 22 +-- .../Server/PacketHandlers/PetitionHandler.cs | 16 +- .../Server/PacketHandlers/QueryHandler.cs | 16 +- .../Server/PacketHandlers/QuestHandler.cs | 32 ++-- .../PacketHandlers/ReputationPackets.cs | 8 +- .../Server/PacketHandlers/SocialHandler.cs | 12 +- .../Server/PacketHandlers/SpellHandler.cs | 38 ++-- .../Server/PacketHandlers/TaxiHandler.cs | 10 +- .../Server/PacketHandlers/TradeHandler.cs | 12 +- .../World/Server/Packets/ArenaPackets.cs | 2 +- .../World/Server/Packets/AuctionPackets.cs | 8 +- .../World/Server/Packets/CharacterPackets.cs | 4 +- .../World/Server/Packets/ChatPackets.cs | 2 +- .../World/Server/Packets/GroupPackets.cs | 2 +- .../World/Server/Packets/GuildPackets.cs | 4 +- .../World/Server/Packets/MailPackets.cs | 2 +- .../World/Server/Packets/MiscPackets.cs | 8 +- .../World/Server/Packets/PetPackets.cs | 2 +- .../World/Server/Packets/SystemPackets.cs | 6 +- .../World/Server/Packets/UpdatePackets.cs | 12 +- HermesProxy/World/Server/WorldSocket.cs | 12 +- HermesProxy/World/SniffFile.cs | 2 +- HermesProxy/World/WowGuid.cs | 4 +- 84 files changed, 813 insertions(+), 813 deletions(-) diff --git a/HermesProxy/Auth/AuthClient.cs b/HermesProxy/Auth/AuthClient.cs index 94d7e590..86df7e54 100644 --- a/HermesProxy/Auth/AuthClient.cs +++ b/HermesProxy/Auth/AuthClient.cs @@ -200,7 +200,7 @@ private void SendPacket(ByteBuffer packet) private void HandlePacket(byte[] buffer, int size) { - ByteBuffer packet = new ByteBuffer(buffer); + ByteBuffer packet = new(buffer); AuthCommand opcode = (AuthCommand)packet.ReadUInt8(); Log.PrintNet(LogType.Debug, LogNetDir.S2P, $"Received opcode {opcode} size {size}."); @@ -224,7 +224,7 @@ private void HandlePacket(byte[] buffer, int size) private void SendLogonChallenge() { - ByteBuffer buffer = new ByteBuffer(); + ByteBuffer buffer = new(); buffer.WriteUInt8((byte)AuthCommand.LOGON_CHALLENGE); buffer.WriteUInt8((byte)(LegacyVersion.ExpansionVersion > 1 ? 8 : 3)); buffer.WriteUInt16((ushort)(_username.Length + 30)); @@ -405,7 +405,7 @@ private void HandleLogonChallenge(ByteBuffer packet) private void SendLogonProof(byte[] A, byte[] M1, byte[] crc) { - ByteBuffer buffer = new ByteBuffer(); + ByteBuffer buffer = new(); buffer.WriteUInt8((byte)AuthCommand.LOGON_PROOF); buffer.WriteBytes(A); buffer.WriteBytes(M1); @@ -468,7 +468,7 @@ private void HandleLogonProof(ByteBuffer packet) public void RequestRealmListUpdate() { - ByteBuffer buffer = new ByteBuffer(); + ByteBuffer buffer = new(); buffer.WriteUInt8((byte)AuthCommand.REALM_LIST); for (int i = 0; i < 4; i++) buffer.WriteUInt8(0); @@ -491,11 +491,11 @@ private void HandleRealmList(ByteBuffer packet) } Log.Print(LogType.Network, $"Received {realmsCount} realms."); - List realmList = new List(); + List realmList = new(); for (ushort i = 0; i < realmsCount; i++) { - RealmInfo realmInfo = new RealmInfo + RealmInfo realmInfo = new() { ID = i }; diff --git a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs index 256c0427..25f1a971 100644 --- a/HermesProxy/BnetServer/Networking/BnetTcpSession.cs +++ b/HermesProxy/BnetServer/Networking/BnetTcpSession.cs @@ -43,7 +43,7 @@ public override bool Update() return true; } - private readonly List _currentBuffer = new List(); + private readonly List _currentBuffer = new(); public override async Task ReadHandler(byte[] data, int receivedLength) { diff --git a/HermesProxy/BnetServer/Services/BnetServices.cs b/HermesProxy/BnetServer/Services/BnetServices.cs index ef60c6af..e353320d 100644 --- a/HermesProxy/BnetServer/Services/BnetServices.cs +++ b/HermesProxy/BnetServer/Services/BnetServices.cs @@ -56,7 +56,7 @@ private IPEndPoint GetRemoteIpEndPoint() private void ServiceLog(LogType type, string message) { - StringBuilder prefix = new StringBuilder(); + StringBuilder prefix = new(); prefix.Append($"[{_connectionPath}]"); prefix.Append($"[{GetRemoteIpEndPoint()}"); diff --git a/HermesProxy/Configuration/Configuration.cs b/HermesProxy/Configuration/Configuration.cs index e10718ed..304be333 100644 --- a/HermesProxy/Configuration/Configuration.cs +++ b/HermesProxy/Configuration/Configuration.cs @@ -51,7 +51,7 @@ public static Configuration LoadDefaultConfiguration() if (!File.Exists(configFile)) throw new FileNotFoundException($"File '{configFile}' was not found."); - ExeConfigurationFileMap fileMap = new ExeConfigurationFileMap { ExeConfigFilename = configFile }; + ExeConfigurationFileMap fileMap = new() { ExeConfigFilename = configFile }; var config = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None); settings = ((AppSettingsSection)config.Sections.Get("appSettings")).Settings; } diff --git a/HermesProxy/GlobalSessionData.cs b/HermesProxy/GlobalSessionData.cs index cbcf8e1f..0c68e0c5 100644 --- a/HermesProxy/GlobalSessionData.cs +++ b/HermesProxy/GlobalSessionData.cs @@ -67,8 +67,8 @@ public class GameSessionData public ClientCastRequest CurrentClientNormalCast; // regular spell casts public ClientCastRequest CurrentClientSpecialCast; // next melee or auto repeat spells public ClientCastRequest CurrentClientPetCast; - public List PendingClientCasts = new List(); - public List PendingClientPetCasts = new List(); + public List PendingClientCasts = new(); + public List PendingClientPetCasts = new(); public WowGuid64 LastLootTargetGuid; public List ActionButtons = new(); public Dictionary> UnitAuraDurationUpdateTime = new(); @@ -77,7 +77,7 @@ public class GameSessionData public Dictionary> UnitAuraCaster = new(); public Dictionary CachedPlayers = new(); public Dictionary PlayerGuildIds = new(); - public System.Threading.Mutex ObjectCacheMutex = new System.Threading.Mutex(); + public System.Threading.Mutex ObjectCacheMutex = new(); public Dictionary> ObjectCacheLegacy = new(); public Dictionary ObjectCacheModern = new(); public Dictionary OriginalObjectTypes = new(); @@ -89,19 +89,19 @@ public class GameSessionData public Dictionary RealSpellToLearnSpell = new(); public Dictionary ArenaTeams = new(); public World.Server.Packets.MailListResult PendingMailListPacket; - public HashSet RequestedItemTextIds = new HashSet(); - public Dictionary ItemTexts = new Dictionary(); - public Dictionary BattleFieldQueueTypes = new Dictionary(); - public Dictionary BattleFieldQueueTimes = new Dictionary(); - public Dictionary DailyQuestsDone = new Dictionary(); - public HashSet FlagCarrierGuids = new HashSet(); - public Dictionary ObjectSpawnCount = new Dictionary(); + public HashSet RequestedItemTextIds = new(); + public Dictionary ItemTexts = new(); + public Dictionary BattleFieldQueueTypes = new(); + public Dictionary BattleFieldQueueTimes = new(); + public Dictionary DailyQuestsDone = new(); + public HashSet FlagCarrierGuids = new(); + public Dictionary ObjectSpawnCount = new(); public HashSet DespawnedGameObjects = new(); - public HashSet HunterPetGuids = new HashSet(); - public Dictionary> PlayerArenaTeams = new Dictionary>(); - public HashSet AddonPrefixes = new HashSet(); - public Dictionary> FlatSpellMods = new Dictionary>(); - public Dictionary> PctSpellMods = new Dictionary>(); + public HashSet HunterPetGuids = new(); + public Dictionary> PlayerArenaTeams = new(); + public HashSet AddonPrefixes = new(); + public Dictionary> FlatSpellMods = new(); + public Dictionary> PctSpellMods = new(); private GameSessionData() { @@ -200,7 +200,7 @@ public void SetFlatSpellMod(byte spellMod, byte spellMask, int amount) } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(spellMask, amount); FlatSpellMods.Add(spellMod, dict); } @@ -221,7 +221,7 @@ public void SetPctSpellMod(byte spellMod, byte spellMask, int amount) } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(spellMask, amount); PctSpellMods.Add(spellMod, dict); } @@ -343,7 +343,7 @@ public void StoreAuraDurationLeft(WowGuid128 guid, byte slot, int duration, int } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(slot, duration); UnitAuraDurationLeft.Add(guid, dict); } @@ -357,7 +357,7 @@ public void StoreAuraDurationLeft(WowGuid128 guid, byte slot, int duration, int } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(slot, currentTime); UnitAuraDurationUpdateTime.Add(guid, dict); } @@ -373,7 +373,7 @@ public void StoreAuraDurationFull(WowGuid128 guid, byte slot, int duration) } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(slot, duration); UnitAuraDurationFull.Add(guid, dict); } @@ -422,7 +422,7 @@ public void StoreAuraCaster(WowGuid128 target, byte slot, WowGuid128 caster) } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(slot, caster); UnitAuraCaster.Add(target, dict); } diff --git a/HermesProxy/Realm/Realm.cs b/HermesProxy/Realm/Realm.cs index 605f57aa..9838eafa 100644 --- a/HermesProxy/Realm/Realm.cs +++ b/HermesProxy/Realm/Realm.cs @@ -38,7 +38,7 @@ public IPEndPoint GetAddressForClient(IPAddress clientAddr) else realmIp = IPAddress.Parse(Framework.Settings.ExternalAddress); - IPEndPoint endpoint = new IPEndPoint(realmIp, Framework.Settings.RealmPort); + IPEndPoint endpoint = new(realmIp, Framework.Settings.RealmPort); // Return external IP return endpoint; diff --git a/HermesProxy/Realm/RealmManager.cs b/HermesProxy/Realm/RealmManager.cs index 64419dec..83d70bf5 100644 --- a/HermesProxy/Realm/RealmManager.cs +++ b/HermesProxy/Realm/RealmManager.cs @@ -39,7 +39,7 @@ public RealmManager() { void LoadBuildInfo() { - RealmBuildInfo build = new RealmBuildInfo + RealmBuildInfo build = new() { MajorVersion = ModernVersion.ExpansionVersion, MinorVersion = ModernVersion.MajorVersion, @@ -75,7 +75,7 @@ void UpdateRealm(Realm realm) public void AddRealm(uint id, string name, string externalAddress, ushort port, RealmType type, RealmFlags flags, byte characterCount, byte timezone, float populationLevel) { - Dictionary existingRealms = new Dictionary(); + Dictionary existingRealms = new(); foreach (var p in _realms) existingRealms[p.Key] = p.Value.Name; @@ -195,7 +195,7 @@ public byte[] GetCompressdRealmEntryJSON(Realm realm, uint build) CfgCategoriesID = realm.Timezone }; - ClientVersion version = new ClientVersion(); + ClientVersion version = new(); RealmBuildInfo buildInfo = GetBuildInfo(realm.Build); if (buildInfo != null) { @@ -238,7 +238,7 @@ public byte[] GetRealmList(uint build, string subRegion) if (realm.Value.Build != build) flag |= RealmFlags.VersionMismatch; - RealmListUpdate realmListUpdate = new RealmListUpdate(); + RealmListUpdate realmListUpdate = new(); realmListUpdate.Update.WowRealmAddress = (int)realm.Value.Id.GetAddress(); realmListUpdate.Update.CfgTimezonesID = 1; realmListUpdate.Update.PopulationState = (realm.Value.Flags.HasAnyFlag(RealmFlags.Offline) ? 0 : Math.Max((int)realm.Value.PopulationLevel, 1)); @@ -283,8 +283,8 @@ public BattlenetRpcErrorCode JoinRealm(GlobalSessionData globalSession, uint rea if (realm.Flags.HasAnyFlag(RealmFlags.Offline) || realm.Build != build) return BattlenetRpcErrorCode.UserServerNotPermittedOnRealm; - RealmListServerIPAddresses serverAddresses = new RealmListServerIPAddresses(); - AddressFamily addressFamily = new AddressFamily + RealmListServerIPAddresses serverAddresses = new(); + AddressFamily addressFamily = new() { Id = 1 }; @@ -317,9 +317,9 @@ public BattlenetRpcErrorCode JoinRealm(GlobalSessionData globalSession, uint rea public ICollection GetRealms() { return _realms.Values; } List GetSubRegions() { return _subRegions; } - readonly List _builds = new List(); - readonly ConcurrentDictionary _realms = new ConcurrentDictionary(); - readonly List _subRegions = new List(); + readonly List _builds = new(); + readonly ConcurrentDictionary _realms = new(); + readonly List _subRegions = new(); } public class RealmBuildInfo diff --git a/HermesProxy/World/Client/LegacyWorldCrypt.cs b/HermesProxy/World/Client/LegacyWorldCrypt.cs index ffcc3f17..8e1c7660 100644 --- a/HermesProxy/World/Client/LegacyWorldCrypt.cs +++ b/HermesProxy/World/Client/LegacyWorldCrypt.cs @@ -74,7 +74,7 @@ public class TbcWorldCrypt : LegacyWorldCrypt public void Initialize(byte[] sessionKey) { byte[] recvSeed = new byte[16] { 0x38, 0xA7, 0x83, 0x15, 0xF8, 0x92, 0x25, 0x30, 0x71, 0x98, 0x67, 0xB1, 0x8C, 0x4, 0xE2, 0xAA }; - HmacHash recvHash = new HmacHash(recvSeed); + HmacHash recvHash = new(recvSeed); recvHash.Finish(sessionKey, sessionKey.Count()); m_key = recvHash.Digest.ToArray(); diff --git a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs index 3d57cdfd..8d273e52 100644 --- a/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ArenaHandler.cs @@ -48,7 +48,7 @@ void HandleArenaTeamStats(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_ROSTER)] void HandleArenaTeamRoster(WorldPacket packet) { - ArenaTeamRosterResponse arena = new ArenaTeamRosterResponse + ArenaTeamRosterResponse arena = new() { TeamId = packet.ReadUInt32() }; @@ -62,8 +62,8 @@ void HandleArenaTeamRoster(WorldPacket packet) for (var i = 0; i < count; i++) { - ArenaTeamMember member = new ArenaTeamMember(); - PlayerCache cache = new PlayerCache(); + ArenaTeamMember member = new(); + PlayerCache cache = new(); member.MemberGUID = packet.ReadGuid().To128(GetSession().GameState); member.Online = packet.ReadBool(); member.Name = cache.Name = packet.ReadCString(); @@ -102,7 +102,7 @@ void HandleArenaTeamRoster(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_EVENT)] void HandleArenaTeamEvent(WorldPacket packet) { - ArenaTeamEvent arena = new ArenaTeamEvent(); + ArenaTeamEvent arena = new(); var eventType = (ArenaTeamEventLegacy)packet.ReadUInt8(); arena.Event = (ArenaTeamEventModern)Enum.Parse(typeof(ArenaTeamEventModern), eventType.ToString()); byte count = packet.ReadUInt8(); @@ -130,7 +130,7 @@ void HandleArenaTeamEvent(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_COMMAND_RESULT)] void HandleArenaTeamCommandResult(WorldPacket packet) { - ArenaTeamCommandResult arena = new ArenaTeamCommandResult + ArenaTeamCommandResult arena = new() { Action = (ArenaTeamCommandType)packet.ReadUInt32(), TeamName = packet.ReadCString(), @@ -144,7 +144,7 @@ void HandleArenaTeamCommandResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_ARENA_TEAM_INVITE)] void HandleArenaTeamInvite(WorldPacket packet) { - ArenaTeamInvite arena = new ArenaTeamInvite + ArenaTeamInvite arena = new() { PlayerName = packet.ReadCString(), TeamName = packet.ReadCString() diff --git a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs index daeb537f..ff1a08d9 100644 --- a/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/AuctionHandler.cs @@ -11,7 +11,7 @@ public partial class WorldClient [PacketHandler(Opcode.MSG_AUCTION_HELLO)] void HandleAuctionHello(WorldPacket packet) { - AuctionHelloResponse auction = new AuctionHelloResponse + AuctionHelloResponse auction = new() { Guid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -22,7 +22,7 @@ void HandleAuctionHello(WorldPacket packet) SendPacketToClient(auction); // Have to send this again here, or server does not reply for some reason. - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_AUCTION_LIST_OWNED_ITEMS); + WorldPacket packet2 = new(Opcode.CMSG_AUCTION_LIST_OWNED_ITEMS); packet2.WriteGuid(auction.Guid.To64()); packet2.WriteUInt32(0); SendPacketToServer(packet2); @@ -30,7 +30,7 @@ void HandleAuctionHello(WorldPacket packet) AuctionItem ReadAuctionItem(WorldPacket packet) { - AuctionItem item = new AuctionItem + AuctionItem item = new() { AuctionID = packet.ReadUInt32(), Item = new() @@ -49,7 +49,7 @@ AuctionItem ReadAuctionItem(WorldPacket packet) for (byte j = 0; j < enchantmentCount; ++j) { - ItemEnchantData enchant = new ItemEnchantData + ItemEnchantData enchant = new() { Slot = j, ID = packet.ReadUInt32() @@ -90,7 +90,7 @@ AuctionItem ReadAuctionItem(WorldPacket packet) [PacketHandler(Opcode.SMSG_AUCTION_LIST_OWNED_ITEMS_RESULT)] void HandleAuctionListMyItemsResult(WorldPacket packet) { - AuctionListMyItemsResult auction = new AuctionListMyItemsResult(packet.GetUniversalOpcode(false)); + AuctionListMyItemsResult auction = new(packet.GetUniversalOpcode(false)); uint count = packet.ReadUInt32(); for (uint i = 0; i < count; i++) { @@ -106,7 +106,7 @@ void HandleAuctionListMyItemsResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_AUCTION_LIST_ITEMS_RESULT)] void HandleAuctionListItemsResult(WorldPacket packet) { - AuctionListItemsResult auction = new AuctionListItemsResult(); + AuctionListItemsResult auction = new(); uint count = packet.ReadUInt32(); for (uint i = 0; i < count; i++) { @@ -123,7 +123,7 @@ void HandleAuctionListItemsResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_AUCTION_COMMAND_RESULT)] void HandleAuctionCommandResult(WorldPacket packet) { - AuctionCommandResult auction = new AuctionCommandResult + AuctionCommandResult auction = new() { AuctionID = packet.ReadUInt32(), Command = (AuctionHouseAction)packet.ReadUInt32(), @@ -163,7 +163,7 @@ void HandleAuctionOwnerNotification(WorldPacket packet) string name = GameData.GetItemName(itemId); if (string.IsNullOrEmpty(name)) { - WorldPacket query = new WorldPacket(Opcode.CMSG_ITEM_NAME_QUERY); + WorldPacket query = new(Opcode.CMSG_ITEM_NAME_QUERY); query.WriteUInt32(itemId); query.WriteGuid(WowGuid64.Empty); SendPacket(query); @@ -178,7 +178,7 @@ void HandleAuctionOwnerNotification(WorldPacket packet) else message = $"Your auction of {name} sold."; - ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, message); + ChatPkt chat = new(GetSession(), ChatMessageTypeModern.System, message); SendPacketToClient(chat); } } @@ -197,7 +197,7 @@ void HandleAuctionBidderNotification(WorldPacket packet) string name = GameData.GetItemName(itemId); if (string.IsNullOrEmpty(name)) { - WorldPacket query = new WorldPacket(Opcode.CMSG_ITEM_NAME_QUERY); + WorldPacket query = new(Opcode.CMSG_ITEM_NAME_QUERY); query.WriteUInt32(itemId); query.WriteGuid(WowGuid64.Empty); SendPacket(query); @@ -210,7 +210,7 @@ void HandleAuctionBidderNotification(WorldPacket packet) else message = $"You have been outbid on {name}."; - ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, message); + ChatPkt chat = new(GetSession(), ChatMessageTypeModern.System, message); SendPacketToClient(chat); } } diff --git a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs index 09443bad..ec81ff4a 100644 --- a/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/BattleGroundHandler.cs @@ -12,7 +12,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleBattlefieldListVanilla(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList + BattlefieldList bglist = new() { BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -31,7 +31,7 @@ void HandleBattlefieldListVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.V2_0_1_6180, ClientVersionBuild.V3_0_2_9056)] void HandleBattlefieldListTBC(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList + BattlefieldList bglist = new() { BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -50,7 +50,7 @@ void HandleBattlefieldListTBC(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_LIST, ClientVersionBuild.V3_0_2_9056)] void HandleBattlefieldListWotLK(WorldPacket packet) { - BattlefieldList bglist = new BattlefieldList + BattlefieldList bglist = new() { BattlemasterGuid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -86,7 +86,7 @@ void HandleBattlefieldListWotLK(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_STATUS, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleBattlefieldStatusVanilla(WorldPacket packet) { - BattlefieldStatusHeader hdr = new BattlefieldStatusHeader(); + BattlefieldStatusHeader hdr = new(); hdr.Ticket.Id = 1 + packet.ReadUInt32(); // Queue Slot hdr.Ticket.RequesterGuid = GetSession().GameState.CurrentPlayerGuid; hdr.Ticket.Time = GetSession().GameState.GetBattleFieldQueueTime(hdr.Ticket.Id); @@ -104,7 +104,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) { case BattleGroundStatus.WaitQueue: { - BattlefieldStatusQueued queue = new BattlefieldStatusQueued + BattlefieldStatusQueued queue = new() { Hdr = hdr, AverageWaitTime = packet.ReadUInt32(), @@ -115,7 +115,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) } case BattleGroundStatus.WaitJoin: { - BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation + BattlefieldStatusNeedConfirmation confirm = new() { Hdr = hdr, Mapid = mapId, @@ -126,7 +126,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) } case BattleGroundStatus.InProgress: { - BattlefieldStatusActive active = new BattlefieldStatusActive + BattlefieldStatusActive active = new() { Hdr = hdr, Mapid = mapId, @@ -135,7 +135,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) }; if (active.ShutdownTimer == 0) { - BattlegroundInit init = new BattlegroundInit + BattlegroundInit init = new() { Milliseconds = 1154756799 }; @@ -161,7 +161,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) var bgGroup = GetSession().GameState.CurrentGroups[1]; if (bgGroup != null) { - PartyUpdate party = new PartyUpdate + PartyUpdate party = new() { SequenceNum = GetSession().GameState.GroupUpdateCounter++, PartyFlags = GroupFlags.FakeRaid | GroupFlags.Destroyed, @@ -175,7 +175,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) } } - BattlefieldStatusFailed failed = new BattlefieldStatusFailed + BattlefieldStatusFailed failed = new() { Ticket = hdr.Ticket, Reason = 30, @@ -190,7 +190,7 @@ void HandleBattlefieldStatusVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEFIELD_STATUS, ClientVersionBuild.V2_0_1_6180)] void HandleBattlefieldStatusTBC(WorldPacket packet) { - BattlefieldStatusHeader hdr = new BattlefieldStatusHeader(); + BattlefieldStatusHeader hdr = new(); hdr.Ticket.Id = 1 + packet.ReadUInt32(); // Queue Slot hdr.Ticket.RequesterGuid = GetSession().GameState.CurrentPlayerGuid; hdr.Ticket.Time = GetSession().GameState.GetBattleFieldQueueTime(hdr.Ticket.Id); @@ -218,7 +218,7 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) { case BattleGroundStatus.WaitQueue: { - BattlefieldStatusQueued queue = new BattlefieldStatusQueued + BattlefieldStatusQueued queue = new() { Hdr = hdr, AverageWaitTime = packet.ReadUInt32(), @@ -229,7 +229,7 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) } case BattleGroundStatus.WaitJoin: { - BattlefieldStatusNeedConfirmation confirm = new BattlefieldStatusNeedConfirmation + BattlefieldStatusNeedConfirmation confirm = new() { Hdr = hdr, Mapid = packet.ReadUInt32() @@ -242,7 +242,7 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) } case BattleGroundStatus.InProgress: { - BattlefieldStatusActive active = new BattlefieldStatusActive + BattlefieldStatusActive active = new() { Hdr = hdr, Mapid = packet.ReadUInt32() @@ -254,7 +254,7 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) active.ArenaFaction = packet.ReadUInt8(); if (active.ShutdownTimer == 0) { - BattlegroundInit init = new BattlegroundInit + BattlegroundInit init = new() { Milliseconds = 1154756799 }; @@ -272,7 +272,7 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) } else { - BattlefieldStatusFailed failed = new BattlefieldStatusFailed + BattlefieldStatusFailed failed = new() { Ticket = hdr.Ticket, Reason = 30, @@ -287,14 +287,14 @@ void HandleBattlefieldStatusTBC(WorldPacket packet) [PacketHandler(Opcode.MSG_PVP_LOG_DATA, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandlePvPLogDataVanilla(WorldPacket packet) { - PVPMatchStatisticsMessage pvp = new PVPMatchStatisticsMessage(); + PVPMatchStatisticsMessage pvp = new(); if (packet.ReadBool()) // Has Winner pvp.Winner = packet.ReadUInt8(); int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics + PVPMatchPlayerStatistics player = new() { PlayerGUID = packet.ReadGuid().To128(GetSession().GameState), Rank = packet.ReadInt32(), @@ -332,7 +332,7 @@ void HandlePvPLogDataVanilla(WorldPacket packet) [PacketHandler(Opcode.MSG_PVP_LOG_DATA, ClientVersionBuild.V2_0_1_6180)] void HandlePvPLogDataTBC(WorldPacket packet) { - PVPMatchStatisticsMessage pvp = new PVPMatchStatisticsMessage(); + PVPMatchStatisticsMessage pvp = new(); if (packet.ReadBool()) // Has Arena Teams { pvp.ArenaTeams = new ArenaTeamsInfo(); @@ -359,7 +359,7 @@ void HandlePvPLogDataTBC(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - PVPMatchPlayerStatistics player = new PVPMatchPlayerStatistics + PVPMatchPlayerStatistics player = new() { PlayerGUID = packet.ReadGuid().To128(GetSession().GameState), Kills = packet.ReadUInt32() @@ -409,7 +409,7 @@ void HandlePvPLogDataTBC(WorldPacket packet) BattlegroundPlayerPosition ReadBattlegroundPlayerPosition(WorldPacket packet) { - BattlegroundPlayerPosition position = new BattlegroundPlayerPosition + BattlegroundPlayerPosition position = new() { Guid = packet.ReadGuid().To128(GetSession().GameState), Pos = packet.ReadVector2() @@ -421,7 +421,7 @@ BattlegroundPlayerPosition ReadBattlegroundPlayerPosition(WorldPacket packet) void HandleBattlegroundPlayerPositionsVanilla(WorldPacket packet) { GetSession().GameState.FlagCarrierGuids.Clear(); - BattlegroundPlayerPositions bglist = new BattlegroundPlayerPositions(); + BattlegroundPlayerPositions bglist = new(); uint teamMembersCount = packet.ReadUInt32(); for (uint i = 0; i < teamMembersCount; i++) { @@ -453,7 +453,7 @@ void HandleBattlegroundPlayerPositionsVanilla(WorldPacket packet) [PacketHandler(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS, ClientVersionBuild.V2_0_1_6180)] void HandleBattlegroundPlayerPositionsTBC(WorldPacket packet) { - BattlegroundPlayerPositions bglist = new BattlegroundPlayerPositions(); + BattlegroundPlayerPositions bglist = new(); uint teamMembersCount = packet.ReadUInt32(); uint flagCarriersCount = packet.ReadUInt32(); for (uint i = 0; i < teamMembersCount; i++) @@ -486,7 +486,7 @@ void HandleBattlegroundPlayerPositionsTBC(WorldPacket packet) [PacketHandler(Opcode.SMSG_BATTLEGROUND_PLAYER_LEFT)] void HandleBattlegroundPlayerLeftOrJoined(WorldPacket packet) { - BattlegroundPlayerLeftOrJoined player = new BattlegroundPlayerLeftOrJoined(packet.GetUniversalOpcode(false)) + BattlegroundPlayerLeftOrJoined player = new(packet.GetUniversalOpcode(false)) { Guid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -496,7 +496,7 @@ void HandleBattlegroundPlayerLeftOrJoined(WorldPacket packet) [PacketHandler(Opcode.SMSG_AREA_SPIRIT_HEALER_TIME)] void HandleAreaSpiritHealerTime(WorldPacket packet) { - AreaSpiritHealerTime healer = new AreaSpiritHealerTime + AreaSpiritHealerTime healer = new() { HealerGuid = packet.ReadGuid().To128(GetSession().GameState), TimeLeft = packet.ReadUInt32() @@ -507,7 +507,7 @@ void HandleAreaSpiritHealerTime(WorldPacket packet) [PacketHandler(Opcode.SMSG_PVP_CREDIT)] void HandlePvPCredit(WorldPacket packet) { - PvPCredit credit = new PvPCredit + PvPCredit credit = new() { OriginalHonor = packet.ReadInt32(), Target = packet.ReadGuid().To128(GetSession().GameState), @@ -519,7 +519,7 @@ void HandlePvPCredit(WorldPacket packet) [PacketHandler(Opcode.SMSG_PLAYER_SKINNED)] void HandlePlayerSkinned(WorldPacket packet) { - PlayerSkinned skinned = new PlayerSkinned(); + PlayerSkinned skinned = new(); if (packet.CanRead()) skinned.FreeRepop = packet.ReadBool(); SendPacketToClient(skinned); diff --git a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs index 9df61c77..18d2638c 100644 --- a/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/CharacterHandler.cs @@ -28,8 +28,8 @@ void HandleEnumCharactersResult(WorldPacket packet) byte count = packet.ReadUInt8(); for (byte i = 0; i < count; i++) { - EnumCharactersResult.CharacterInfo char1 = new EnumCharactersResult.CharacterInfo(); - PlayerCache cache = new PlayerCache(); + EnumCharactersResult.CharacterInfo char1 = new(); + PlayerCache cache = new(); char1.Guid = packet.ReadGuid().To128(GetSession().GameState); char1.Name = cache.Name = packet.ReadCString(); char1.RaceId = cache.RaceId = (Race)packet.ReadUInt8(); @@ -136,7 +136,7 @@ void HandleCreateChar(WorldPacket packet) { byte result = packet.ReadUInt8(); - CreateChar createChar = new CreateChar + CreateChar createChar = new() { Guid = new WowGuid128() }; @@ -158,7 +158,7 @@ void HandleDeleteChar(WorldPacket packet) { byte result = packet.ReadUInt8(); - DeleteChar deleteChar = new DeleteChar(); + DeleteChar deleteChar = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { Enums.TBC.ResponseCodes legacyCode = (Enums.TBC.ResponseCodes)result; @@ -175,7 +175,7 @@ void HandleDeleteChar(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_PLAYER_NAME_RESPONSE)] void HandleQueryPlayerNameResponse(WorldPacket packet) { - QueryPlayerNameResponse response = new QueryPlayerNameResponse(); + QueryPlayerNameResponse response = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_0_9767)) { response.Player = response.Data.GuidActual = packet.ReadPackedGuid().To128(GetSession().GameState); @@ -190,7 +190,7 @@ void HandleQueryPlayerNameResponse(WorldPacket packet) else response.Player = response.Data.GuidActual = packet.ReadGuid().To128(GetSession().GameState); - PlayerCache cache = new PlayerCache(); + PlayerCache cache = new(); response.Data.Name = cache.Name = packet.ReadCString(); packet.ReadCString(); // realm name @@ -233,7 +233,7 @@ void HandleQueryPlayerNameResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGIN_VERIFY_WORLD)] void HandleLoginVerifyWorld(WorldPacket packet) { - LoginVerifyWorld verify = new LoginVerifyWorld + LoginVerifyWorld verify = new() { MapID = packet.ReadUInt32() }; @@ -273,7 +273,7 @@ void HandleLoginVerifyWorld(WorldPacket packet) [PacketHandler(Opcode.SMSG_CHARACTER_LOGIN_FAILED)] void HandleCharacterLoginFailed(WorldPacket packet) { - CharacterLoginFailed failed = new CharacterLoginFailed + CharacterLoginFailed failed = new() { Code = (Framework.Constants.LoginFailureReason)packet.ReadUInt8() }; @@ -292,7 +292,7 @@ void HandleUpdateActionButtons(WorldPacket packet) return; } - List buttons = new List(); + List buttons = new(); int buttonCount = 120; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) @@ -315,7 +315,7 @@ void HandleUpdateActionButtons(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGOUT_RESPONSE)] void HandleLogoutResponse(WorldPacket packet) { - LogoutResponse logout = new LogoutResponse + LogoutResponse logout = new() { LogoutResult = packet.ReadInt32(), Instant = packet.ReadBool() @@ -326,7 +326,7 @@ void HandleLogoutResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGOUT_COMPLETE)] void HandleLogoutComplete(WorldPacket packet) { - LogoutComplete logout = new LogoutComplete(); + LogoutComplete logout = new(); SendPacketToClient(logout); GetSession().GameState = GameSessionData.CreateNewGameSessionData(GetSession()); @@ -337,7 +337,7 @@ void HandleLogoutComplete(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOGOUT_CANCEL_ACK)] void HandleLogoutCancelAck(WorldPacket packet) { - LogoutCancelAck logout = new LogoutCancelAck(); + LogoutCancelAck logout = new(); SendPacketToClient(logout); } @@ -378,7 +378,7 @@ void HandlePlayedTime(WorldPacket packet) [PacketHandler(Opcode.SMSG_LEVEL_UP_INFO)] void HandleLevelUpInfo(WorldPacket packet) { - LevelUpInfo info = new LevelUpInfo + LevelUpInfo info = new() { Level = packet.ReadInt32(), HealthDelta = packet.ReadInt32() @@ -396,14 +396,14 @@ void HandleLevelUpInfo(WorldPacket packet) [PacketHandler(Opcode.SMSG_UPDATE_COMBO_POINTS)] void HandleUpdateComboPoints(WorldPacket packet) { - ObjectUpdate updateData = new ObjectUpdate(GetSession().GameState.CurrentPlayerGuid, UpdateTypeModern.Values, GetSession()); + ObjectUpdate updateData = new(GetSession().GameState.CurrentPlayerGuid, UpdateTypeModern.Values, GetSession()); updateData.ActivePlayerData.ComboTarget = packet.ReadPackedGuid().To128(GetSession().GameState); byte comboPoints = packet.ReadUInt8(); sbyte powerSlot = ClassPowerTypes.GetPowerSlotForClass(GetSession().GameState.GetUnitClass(GetSession().GameState.CurrentPlayerGuid), PowerType.ComboPoints); if (powerSlot >= 0) updateData.UnitData.Power[powerSlot] = comboPoints; - UpdateObject updatePacket = new UpdateObject(GetSession().GameState); + UpdateObject updatePacket = new(GetSession().GameState); updatePacket.ObjectUpdates.Add(updateData); SendPacketToClient(updatePacket); } @@ -412,7 +412,7 @@ void HandleUpdateComboPoints(WorldPacket packet) [PacketHandler(Opcode.SMSG_INSPECT_TALENT)] void HandleInspectResult(WorldPacket packet) { - InspectResult inspect = new InspectResult(); + InspectResult inspect = new(); if (packet.GetUniversalOpcode(false) == Opcode.SMSG_INSPECT_RESULT) inspect.DisplayInfo.GUID = packet.ReadGuid().To128(GetSession().GameState); else @@ -440,7 +440,7 @@ void HandleInspectResult(WorldPacket packet) uint itemId = updates[PLAYER_VISIBLE_ITEM_1_0 + i * offset].UInt32Value; if (itemId != 0) { - InspectItemData itemData = new InspectItemData + InspectItemData itemData = new() { Index = i }; @@ -461,7 +461,7 @@ void HandleInspectResult(WorldPacket packet) uint itemId = updates[PLAYER_VISIBLE_ITEM_1_ENTRYID + i * offset].UInt32Value; if (itemId != 0) { - InspectItemData itemData = new InspectItemData + InspectItemData itemData = new() { Index = i }; @@ -524,7 +524,7 @@ void HandleInspectHonorStatsVanilla(WorldPacket packet) if (ModernVersion.ExpansionVersion == 1) { - InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic + InspectHonorStatsResultClassic inspect = new() { PlayerGUID = playerGuid, LifetimeHighestRank = lifetimeHighestRank, @@ -548,7 +548,7 @@ void HandleInspectHonorStatsVanilla(WorldPacket packet) } else { - InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC + InspectHonorStatsResultTBC inspect = new() { PlayerGUID = playerGuid, LifetimeHighestRank = lifetimeHighestRank, @@ -572,7 +572,7 @@ void HandleInspectHonorStatsTBC(WorldPacket packet) if (ModernVersion.ExpansionVersion == 1) { - InspectHonorStatsResultClassic inspect = new InspectHonorStatsResultClassic + InspectHonorStatsResultClassic inspect = new() { PlayerGUID = playerGuid, LifetimeHighestRank = lifetimeHighestRank, @@ -586,7 +586,7 @@ void HandleInspectHonorStatsTBC(WorldPacket packet) } else { - InspectHonorStatsResultTBC inspect = new InspectHonorStatsResultTBC + InspectHonorStatsResultTBC inspect = new() { PlayerGUID = playerGuid, LifetimeHighestRank = lifetimeHighestRank, @@ -600,11 +600,11 @@ void HandleInspectHonorStatsTBC(WorldPacket packet) [PacketHandler(Opcode.MSG_INSPECT_ARENA_TEAMS)] void HandleInspectArenaTeams(WorldPacket packet) { - InspectPvP inspect = new InspectPvP + InspectPvP inspect = new() { PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) }; - ArenaTeamInspectData team = new ArenaTeamInspectData(); + ArenaTeamInspectData team = new(); byte slot = packet.ReadUInt8(); uint teamId = packet.ReadUInt32(); team.TeamGuid = WowGuid128.Create(HighGuidType703.ArenaTeam, teamId); diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs index 67664ea6..ab2ea43c 100644 --- a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs @@ -55,7 +55,7 @@ void HandleChannelNotify(WorldPacket packet) GetSession().GameState.SetChannelId(channelName, channelId); - ChannelNotifyJoined joined = new ChannelNotifyJoined + ChannelNotifyJoined joined = new() { Channel = channelName, ChannelFlags = flags, @@ -68,7 +68,7 @@ void HandleChannelNotify(WorldPacket packet) } case ChatNotify.YouLeft: { - ChannelNotifyLeft left = new ChannelNotifyLeft + ChannelNotifyLeft left = new() { Channel = channelName }; @@ -138,7 +138,7 @@ void HandleChannelNotify(WorldPacket packet) [PacketHandler(Opcode.SMSG_CHANNEL_LIST)] void HandleChannelList(WorldPacket packet) { - ChannelListResponse list = new ChannelListResponse(); + ChannelListResponse list = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) list.Display = packet.ReadBool(); else @@ -148,7 +148,7 @@ void HandleChannelList(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - ChannelPlayer member = new ChannelPlayer + ChannelPlayer member = new() { Guid = packet.ReadGuid().To128(GetSession().GameState), VirtualRealmAddress = GetSession().RealmId.GetAddress(), @@ -221,7 +221,7 @@ void HandleServerChatMessageVanilla(WorldPacket packet) return; ChatMessageTypeModern chatTypeModern = (ChatMessageTypeModern)Enum.Parse(typeof(ChatMessageTypeModern), chatType.ToString()); - ChatPkt chat = new ChatPkt(GetSession(), chatTypeModern, text, language, sender, senderName, receiver, "", channelName, chatFlags, addonPrefix); + ChatPkt chat = new(GetSession(), chatTypeModern, text, language, sender, senderName, receiver, "", channelName, chatFlags, addonPrefix); SendPacketToClient(chat); } @@ -342,7 +342,7 @@ void HandleServerChatMessageWotLK(WorldPacket packet) return; ChatMessageTypeModern chatTypeModern = (ChatMessageTypeModern)Enum.Parse(typeof(ChatMessageTypeModern), chatType.ToString()); - ChatPkt chat = new ChatPkt(GetSession(), chatTypeModern, text, language, sender, senderName, receiver, receiverName, channelName, chatFlags, addonPrefix, achievementId); + ChatPkt chat = new(GetSession(), chatTypeModern, text, language, sender, senderName, receiver, receiverName, channelName, chatFlags, addonPrefix, achievementId); SendPacketToClient(chat); } @@ -353,7 +353,7 @@ public void SendMessageChatVanilla(ChatMessageTypeVanilla type, uint lang, strin return; // was handled by us } - WorldPacket packet = new WorldPacket(Opcode.CMSG_MESSAGECHAT); + WorldPacket packet = new(Opcode.CMSG_MESSAGECHAT); packet.WriteUInt32((uint)type); packet.WriteUInt32(lang); @@ -429,7 +429,7 @@ public void SendMessageChatWotLK(ChatMessageTypeWotLK type, uint lang, string ms return; // was handled by us } - WorldPacket packet = new WorldPacket(Opcode.CMSG_MESSAGECHAT); + WorldPacket packet = new(Opcode.CMSG_MESSAGECHAT); packet.WriteUInt32((uint)type); packet.WriteUInt32(lang); @@ -467,7 +467,7 @@ public void SendMessageChatWotLK(ChatMessageTypeWotLK type, uint lang, string ms [PacketHandler(Opcode.SMSG_EMOTE)] void HandleEmote(WorldPacket packet) { - EmoteMessage emote = new EmoteMessage + EmoteMessage emote = new() { EmoteID = packet.ReadUInt32(), Guid = packet.ReadGuid().To128(GetSession().GameState) @@ -478,7 +478,7 @@ void HandleEmote(WorldPacket packet) [PacketHandler(Opcode.SMSG_TEXT_EMOTE)] void HandleTextEmote(WorldPacket packet) { - STextEmote emote = new STextEmote + STextEmote emote = new() { SourceGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -495,7 +495,7 @@ void HandleTextEmote(WorldPacket packet) [PacketHandler(Opcode.SMSG_PRINT_NOTIFICATION)] void HandlePrintNotification(WorldPacket packet) { - PrintNotification notify = new PrintNotification + PrintNotification notify = new() { NotifyText = packet.ReadCString() }; @@ -505,7 +505,7 @@ void HandlePrintNotification(WorldPacket packet) [PacketHandler(Opcode.SMSG_CHAT_PLAYER_NOTFOUND)] void HandleChatPlayerNotFound(WorldPacket packet) { - ChatPlayerNotfound error = new ChatPlayerNotfound + ChatPlayerNotfound error = new() { Name = packet.ReadCString() }; @@ -515,7 +515,7 @@ void HandleChatPlayerNotFound(WorldPacket packet) [PacketHandler(Opcode.SMSG_DEFENSE_MESSAGE)] void HandleDefenseMessage(WorldPacket packet) { - DefenseMessage message = new DefenseMessage + DefenseMessage message = new() { ZoneID = packet.ReadUInt32() }; @@ -527,7 +527,7 @@ void HandleDefenseMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_CHAT_SERVER_MESSAGE)] void HandleChatServerMessage(WorldPacket packet) { - ChatServerMessage message = new ChatServerMessage + ChatServerMessage message = new() { MessageID = packet.ReadInt32(), StringParam = packet.ReadCString() @@ -537,7 +537,7 @@ void HandleChatServerMessage(WorldPacket packet) public void SendChatJoinChannel(int channelId, string channelName, string password) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_JOIN_CHANNEL); + WorldPacket packet = new(Opcode.CMSG_CHAT_JOIN_CHANNEL); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { packet.WriteInt32(channelId); @@ -551,7 +551,7 @@ public void SendChatJoinChannel(int channelId, string channelName, string passwo public void SendChatLeaveChannel(int channelId, string channelName) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_LEAVE_CHANNEL); + WorldPacket packet = new(Opcode.CMSG_CHAT_LEAVE_CHANNEL); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteInt32(channelId); packet.WriteCString(channelName); diff --git a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs index 096b525a..a05874c9 100644 --- a/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/DuelHandler.cs @@ -9,7 +9,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_DUEL_REQUESTED)] void HandleDuelRequested(WorldPacket packet) { - DuelRequested duel = new DuelRequested + DuelRequested duel = new() { ArbiterGUID = packet.ReadGuid().To128(GetSession().GameState), RequestedByGUID = packet.ReadGuid().To128(GetSession().GameState) @@ -21,7 +21,7 @@ void HandleDuelRequested(WorldPacket packet) [PacketHandler(Opcode.SMSG_DUEL_COUNTDOWN)] void HandleDuelCountdown(WorldPacket packet) { - DuelCountdown duel = new DuelCountdown + DuelCountdown duel = new() { Countdown = packet.ReadUInt32() }; @@ -31,7 +31,7 @@ void HandleDuelCountdown(WorldPacket packet) [PacketHandler(Opcode.SMSG_DUEL_COMPLETE)] void HandleDuelComplete(WorldPacket packet) { - DuelComplete duel = new DuelComplete + DuelComplete duel = new() { Started = packet.ReadBool() }; @@ -41,7 +41,7 @@ void HandleDuelComplete(WorldPacket packet) [PacketHandler(Opcode.SMSG_DUEL_WINNER)] void HandleDuelWinner(WorldPacket packet) { - DuelWinner duel = new DuelWinner + DuelWinner duel = new() { Fled = packet.ReadBool(), BeatenName = packet.ReadCString(), @@ -55,14 +55,14 @@ void HandleDuelWinner(WorldPacket packet) [PacketHandler(Opcode.SMSG_DUEL_IN_BOUNDS)] void HandleDuelInBounds(WorldPacket packet) { - DuelInBounds duel = new DuelInBounds(); + DuelInBounds duel = new(); SendPacketToClient(duel); } [PacketHandler(Opcode.SMSG_DUEL_OUT_OF_BOUNDS)] void HandleDuelOutOfBounds(WorldPacket packet) { - DuelOutOfBounds duel = new DuelOutOfBounds(); + DuelOutOfBounds duel = new(); SendPacketToClient(duel); } } diff --git a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs index 33943e03..bda0c999 100644 --- a/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GameObjectHandler.cs @@ -10,7 +10,7 @@ public partial class WorldClient void HandleGameObjectDespawn(WorldPacket packet) { WowGuid64 guid = packet.ReadGuid(); - GameObjectDespawn despawn = new GameObjectDespawn + GameObjectDespawn despawn = new() { ObjectGUID = guid.To128(GetSession().GameState) }; @@ -21,7 +21,7 @@ void HandleGameObjectDespawn(WorldPacket packet) [PacketHandler(Opcode.SMSG_GAME_OBJECT_RESET_STATE)] void HandleGameObjectResetState(WorldPacket packet) { - GameObjectResetState reset = new GameObjectResetState + GameObjectResetState reset = new() { ObjectGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -31,7 +31,7 @@ void HandleGameObjectResetState(WorldPacket packet) [PacketHandler(Opcode.SMSG_GAME_OBJECT_CUSTOM_ANIM)] void HandleGameObjectCustomAnim(WorldPacket packet) { - GameObjectCustomAnim anim = new GameObjectCustomAnim + GameObjectCustomAnim anim = new() { ObjectGUID = packet.ReadGuid().To128(GetSession().GameState), CustomAnim = packet.ReadUInt32() @@ -42,14 +42,14 @@ void HandleGameObjectCustomAnim(WorldPacket packet) [PacketHandler(Opcode.SMSG_FISH_NOT_HOOKED)] void HandleFishNotHooked(WorldPacket packet) { - FishNotHooked fish = new FishNotHooked(); + FishNotHooked fish = new(); SendPacketToClient(fish); } [PacketHandler(Opcode.SMSG_FISH_ESCAPED)] void HandleFishEscaped(WorldPacket packet) { - FishEscaped fish = new FishEscaped(); + FishEscaped fish = new(); SendPacketToClient(fish); } } diff --git a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs index 119a9c0a..824b32c0 100644 --- a/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GroupHandler.cs @@ -12,7 +12,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_PARTY_COMMAND_RESULT)] void HandlePartyCommandResult(WorldPacket packet) { - PartyCommandResult party = new PartyCommandResult + PartyCommandResult party = new() { Command = (byte)packet.ReadUInt32(), Name = packet.ReadCString(), @@ -26,7 +26,7 @@ void HandlePartyCommandResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_DECLINE)] void HandleGroupDecline(WorldPacket packet) { - GroupDecline party = new GroupDecline + GroupDecline party = new() { Name = packet.ReadCString() }; @@ -36,7 +36,7 @@ void HandleGroupDecline(WorldPacket packet) [PacketHandler(Opcode.SMSG_PARTY_INVITE)] void HandleGroupInvite(WorldPacket packet) { - PartyInvite party = new PartyInvite(); + PartyInvite party = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) party.CanAccept = packet.ReadBool(); @@ -68,7 +68,7 @@ void HandleGroupInvite(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_LIST, ClientVersionBuild.Zero, ClientVersionBuild.V2_0_1_6180)] void HandleGroupListVanilla(WorldPacket packet) { - PartyUpdate party = new PartyUpdate + PartyUpdate party = new() { SequenceNum = GetSession().GameState.GroupUpdateCounter++ }; @@ -101,7 +101,7 @@ void HandleGroupListVanilla(WorldPacket packet) else party.PartyType = GroupType.Normal; - PartyPlayerInfo player = new PartyPlayerInfo + PartyPlayerInfo player = new() { GUID = GetSession().GameState.CurrentPlayerGuid }; @@ -114,7 +114,7 @@ void HandleGroupListVanilla(WorldPacket packet) bool allAssist = true; for (uint i = 0; i < membersCount; i++) { - PartyPlayerInfo member = new PartyPlayerInfo + PartyPlayerInfo member = new() { Name = packet.ReadCString(), GUID = packet.ReadGuid().To128(GetSession().GameState), @@ -163,7 +163,7 @@ void HandleGroupListVanilla(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_LIST, ClientVersionBuild.V2_0_1_6180)] void HandleGroupListTBC(WorldPacket packet) { - PartyUpdate party = new PartyUpdate + PartyUpdate party = new() { SequenceNum = GetSession().GameState.GroupUpdateCounter++ }; @@ -188,7 +188,7 @@ void HandleGroupListTBC(WorldPacket packet) else party.PartyType = GroupType.Normal; - PartyPlayerInfo player = new PartyPlayerInfo + PartyPlayerInfo player = new() { GUID = GetSession().GameState.CurrentPlayerGuid }; @@ -201,7 +201,7 @@ void HandleGroupListTBC(WorldPacket packet) bool allAssist = true; for (uint i = 0; i < membersCount; i++) { - PartyPlayerInfo member = new PartyPlayerInfo + PartyPlayerInfo member = new() { Name = packet.ReadCString(), GUID = packet.ReadGuid().To128(GetSession().GameState), @@ -260,14 +260,14 @@ void HandleGroupListTBC(WorldPacket packet) [PacketHandler(Opcode.SMSG_GROUP_UNINVITE)] void HandleGroupUninvite(WorldPacket packet) { - GroupUninvite party = new GroupUninvite(); + GroupUninvite party = new(); SendPacketToClient(party); } [PacketHandler(Opcode.SMSG_GROUP_NEW_LEADER)] void HandleGroupNewLeader(WorldPacket packet) { - GroupNewLeader party = new GroupNewLeader + GroupNewLeader party = new() { Name = packet.ReadCString(), PartyIndex = GetSession().GameState.GetCurrentPartyIndex() @@ -280,7 +280,7 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) { if (!packet.CanRead()) { - ReadyCheckStarted ready = new ReadyCheckStarted + ReadyCheckStarted ready = new() { InitiatorGUID = GetSession().GameState.GetCurrentGroupLeader(), PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), @@ -290,7 +290,7 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) } else { - ReadyCheckResponse ready = new ReadyCheckResponse + ReadyCheckResponse ready = new() { Player = packet.ReadGuid().To128(GetSession().GameState), IsReady = packet.ReadBool(), @@ -302,7 +302,7 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) if (GetSession().GameState.GroupReadyCheckResponses >= GetSession().GameState.GetCurrentGroupSize()) { GetSession().GameState.GroupReadyCheckResponses = 0; - ReadyCheckCompleted completed = new ReadyCheckCompleted + ReadyCheckCompleted completed = new() { PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), PartyGUID = GetSession().GameState.GetCurrentGroupGuid() @@ -315,7 +315,7 @@ void HandleRaidReadyCheckVanilla(WorldPacket packet) [PacketHandler(Opcode.MSG_RAID_READY_CHECK, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheck(WorldPacket packet) { - ReadyCheckStarted ready = new ReadyCheckStarted + ReadyCheckStarted ready = new() { InitiatorGUID = packet.ReadGuid().To128(GetSession().GameState), PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), @@ -327,7 +327,7 @@ void HandleRaidReadyCheck(WorldPacket packet) [PacketHandler(Opcode.MSG_RAID_READY_CHECK_CONFIRM, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheckConfirm(WorldPacket packet) { - ReadyCheckResponse ready = new ReadyCheckResponse + ReadyCheckResponse ready = new() { Player = packet.ReadGuid().To128(GetSession().GameState), IsReady = packet.ReadBool(), @@ -339,7 +339,7 @@ void HandleRaidReadyCheckConfirm(WorldPacket packet) if (GetSession().GameState.GroupReadyCheckResponses >= GetSession().GameState.GetCurrentGroupSize()) { GetSession().GameState.GroupReadyCheckResponses = 0; - ReadyCheckCompleted completed = new ReadyCheckCompleted + ReadyCheckCompleted completed = new() { PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), PartyGUID = GetSession().GameState.GetCurrentGroupGuid() @@ -351,7 +351,7 @@ void HandleRaidReadyCheckConfirm(WorldPacket packet) [PacketHandler(Opcode.MSG_RAID_READY_CHECK_FINISHED, ClientVersionBuild.V2_0_1_6180)] void HandleRaidReadyCheckFinished(WorldPacket packet) { - ReadyCheckCompleted ready = new ReadyCheckCompleted + ReadyCheckCompleted ready = new() { PartyIndex = GetSession().GameState.GetCurrentPartyIndex(), PartyGUID = GetSession().GameState.GetCurrentGroupGuid() @@ -365,7 +365,7 @@ void HandleRaidTargetUpdate(WorldPacket packet) bool isFullUpdate = packet.ReadBool(); if (isFullUpdate) { - SendRaidTargetUpdateAll update = new SendRaidTargetUpdateAll + SendRaidTargetUpdateAll update = new() { PartyIndex = GetSession().GameState.GetCurrentPartyIndex() }; @@ -379,7 +379,7 @@ void HandleRaidTargetUpdate(WorldPacket packet) } else { - SendRaidTargetUpdateSingle update = new SendRaidTargetUpdateSingle + SendRaidTargetUpdateSingle update = new() { PartyIndex = GetSession().GameState.GetCurrentPartyIndex() }; @@ -398,7 +398,7 @@ void HandleRaidTargetUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_SUMMON_REQUEST)] void HandleSummonRequest(WorldPacket packet) { - SummonRequest summon = new SummonRequest + SummonRequest summon = new() { SummonerGUID = packet.ReadGuid().To128(GetSession().GameState), SummonerVirtualRealmAddress = GetSession().RealmId.GetAddress(), @@ -418,13 +418,13 @@ void HandlePartyMemberStats(WorldPacket packet) { if (_requestBgPlayerPosCounter++ > 10) // don't spam every time somebody moves { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); _requestBgPlayerPosCounter = 0; } } - PartyMemberPartialState state = new PartyMemberPartialState + PartyMemberPartialState state = new() { AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState) }; @@ -476,7 +476,7 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -502,7 +502,7 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -569,7 +569,7 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -596,7 +596,7 @@ void HandlePartyMemberStats(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -620,13 +620,13 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) { if (_requestBgPlayerPosCounter++ > 10) // don't spam every time somebody moves { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); _requestBgPlayerPosCounter = 0; } } - PartyMemberPartialState state = new PartyMemberPartialState + PartyMemberPartialState state = new() { AffectedGUID = packet.ReadPackedGuid().To128(GetSession().GameState) }; @@ -676,7 +676,7 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -742,7 +742,7 @@ void HandlePartyMemberStatsTbc(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -767,13 +767,13 @@ void HandlePartyMemberStatsFull(WorldPacket packet) { if (_requestBgPlayerPosCounter++ > 10) // don't spam every time somebody moves { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); _requestBgPlayerPosCounter = 0; } } - PartyMemberFullState state = new PartyMemberFullState(); + PartyMemberFullState state = new(); if (GetSession().GameState.IsInBattleground()) { state.PartyType[0] = 0; @@ -831,7 +831,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -857,7 +857,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -924,7 +924,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -951,7 +951,7 @@ void HandlePartyMemberStatsFull(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -975,13 +975,13 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) { if (_requestBgPlayerPosCounter++ > 10) // don't spam every time somebody moves { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); _requestBgPlayerPosCounter = 0; } } - PartyMemberFullState state = new PartyMemberFullState(); + PartyMemberFullState state = new(); if (GetSession().GameState.IsInBattleground()) { state.PartyType[0] = 0; @@ -1037,7 +1037,7 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -1103,7 +1103,7 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) if ((auraMask & (1ul << i)) == 0) continue; - PartyMemberAuraStates aura = new PartyMemberAuraStates + PartyMemberAuraStates aura = new() { SpellId = packet.ReadUInt16() }; @@ -1123,7 +1123,7 @@ void HandlePartyMemberStatsFullTBC(WorldPacket packet) [PacketHandler(Opcode.MSG_MINIMAP_PING)] void HandleMinimapPing(WorldPacket packet) { - MinimapPing ping = new MinimapPing + MinimapPing ping = new() { SenderGUID = packet.ReadGuid().To128(GetSession().GameState), Position = packet.ReadVector2() @@ -1134,7 +1134,7 @@ void HandleMinimapPing(WorldPacket packet) [PacketHandler(Opcode.MSG_RANDOM_ROLL)] void HandleRandomRoll(WorldPacket packet) { - RandomRoll roll = new RandomRoll + RandomRoll roll = new() { Min = packet.ReadInt32(), Max = packet.ReadInt32(), diff --git a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs index 83a6f800..03e33314 100644 --- a/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/GuildHandler.cs @@ -47,7 +47,7 @@ void HandleGuildEvent(WorldPacket packet) uint rankId = GetSession().GetGuildRankIdByName(GetSession().GameState.GetPlayerGuildId(GetSession().GameState.CurrentPlayerGuid), strings[2]); if (officer != null && player != null) { - GuildSendRankChange promote = new GuildSendRankChange + GuildSendRankChange promote = new() { Officer = officer, Other = player, @@ -60,7 +60,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.MOTD: { - GuildEventMotd motd = new GuildEventMotd + GuildEventMotd motd = new() { MotdText = strings[0] }; @@ -69,7 +69,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.PlayerJoined: { - GuildEventPlayerJoined joined = new GuildEventPlayerJoined + GuildEventPlayerJoined joined = new() { Guid = guid, VirtualRealmAddress = GetSession().RealmId.GetAddress(), @@ -80,7 +80,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.PlayerLeft: { - GuildEventPlayerLeft left = new GuildEventPlayerLeft + GuildEventPlayerLeft left = new() { Removed = false, LeaverGUID = guid, @@ -92,7 +92,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.PlayerRemoved: { - GuildEventPlayerLeft removed = new GuildEventPlayerLeft + GuildEventPlayerLeft removed = new() { Removed = true, LeaverGUID = guid, @@ -115,7 +115,7 @@ void HandleGuildEvent(WorldPacket packet) WowGuid128 newLeader = GetSession().GameState.GetPlayerGuidByName(strings[1]); if (oldLeader != null && newLeader != null) { - GuildEventNewLeader leader = new GuildEventNewLeader + GuildEventNewLeader leader = new() { OldLeaderGUID = oldLeader, OldLeaderVirtualRealmAddress = GetSession().RealmId.GetAddress(), @@ -130,7 +130,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.Disbanded: { - GuildEventDisbanded disband = new GuildEventDisbanded(); + GuildEventDisbanded disband = new(); SendPacketToClient(disband); break; } @@ -140,7 +140,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.RankUpdated: { - GuildEventRanksUpdated ranks = new GuildEventRanksUpdated(); + GuildEventRanksUpdated ranks = new(); SendPacketToClient(ranks); break; } @@ -151,7 +151,7 @@ void HandleGuildEvent(WorldPacket packet) case GuildEventType.PlayerSignedOn: case GuildEventType.PlayerSignedOff: { - GuildEventPresenceChange presence = new GuildEventPresenceChange + GuildEventPresenceChange presence = new() { Guid = guid, VirtualRealmAddress = GetSession().RealmId.GetAddress(), @@ -167,13 +167,13 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.BankTabPurchased: { - GuildEventTabAdded tab = new GuildEventTabAdded(); + GuildEventTabAdded tab = new(); SendPacketToClient(tab); break; } case GuildEventType.BankTabUpdated: { - GuildEventTabModified tab = new GuildEventTabModified + GuildEventTabModified tab = new() { Name = strings[0], Icon = strings[1] @@ -183,7 +183,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.BankMoneyUpdate: { - GuildEventBankMoneyChanged money = new GuildEventBankMoneyChanged + GuildEventBankMoneyChanged money = new() { Money = (ulong)int.Parse(strings[0], System.Globalization.NumberStyles.HexNumber) }; @@ -196,7 +196,7 @@ void HandleGuildEvent(WorldPacket packet) } case GuildEventType.BankTextChanged: { - GuildEventTabTextChanged tab = new GuildEventTabTextChanged(); + GuildEventTabTextChanged tab = new(); SendPacketToClient(tab); break; } @@ -220,13 +220,13 @@ void HandleQueryGuildInfoResponse(WorldPacket packet) }; GetSession().StoreGuildGuidAndName(guild.GuildGUID, guild.Info.GuildName); - List ranks = new List(); + List ranks = new(); for (uint i = 0; i < 10; i++) { string rankName = packet.ReadCString(); if (!string.IsNullOrEmpty(rankName)) { - RankInfo rank = new RankInfo + RankInfo rank = new() { RankID = i, RankOrder = i, @@ -299,10 +299,10 @@ void HandleGuildRoster(WorldPacket packet) var ranksCount = packet.ReadInt32(); if (ranksCount > 0) { - GuildRanks ranks = new GuildRanks(); + GuildRanks ranks = new(); for (byte i = 0; i < ranksCount; i++) { - GuildRankData rank = new GuildRankData + GuildRankData rank = new() { RankID = i, RankOrder = i, @@ -328,8 +328,8 @@ void HandleGuildRoster(WorldPacket packet) for (var i = 0; i < membersCount; i++) { - GuildRosterMemberData member = new GuildRosterMemberData(); - PlayerCache cache = new PlayerCache(); + GuildRosterMemberData member = new(); + PlayerCache cache = new(); member.Guid = packet.ReadGuid().To128(GetSession().GameState); member.VirtualRealmAddress = GetSession().RealmId.GetAddress(); member.Status = packet.ReadUInt8(); @@ -416,7 +416,7 @@ void HandleGuildBankQueryResults(WorldPacket packet) var size = packet.ReadUInt8(); for (var i = 0; i < size; i++) { - GuildBankTabInfo tabInfo = new GuildBankTabInfo + GuildBankTabInfo tabInfo = new() { TabIndex = i, Name = packet.ReadCString(), @@ -429,7 +429,7 @@ void HandleGuildBankQueryResults(WorldPacket packet) var slots = packet.ReadUInt8(); for (var i = 0; i < slots; i++) { - GuildBankItemInfo itemInfo = new GuildBankItemInfo + GuildBankItemInfo itemInfo = new() { Slot = packet.ReadUInt8() }; @@ -462,7 +462,7 @@ void HandleGuildBankQueryResults(WorldPacket packet) uint itemId = GameData.GetGemFromEnchantId(enchantId); if (itemId != 0) { - ItemGemData gem = new ItemGemData + ItemGemData gem = new() { Slot = slot }; @@ -503,7 +503,7 @@ void HandleGuildBankLongQuery(WorldPacket packet) byte logSize = packet.ReadUInt8(); for (byte i = 0; i < logSize; i++) { - GuildBankLogEntry logEntry = new GuildBankLogEntry + GuildBankLogEntry logEntry = new() { EntryType = packet.ReadInt8(), PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) diff --git a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs index 70a9eb1f..ca6d2a7e 100644 --- a/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/InstanceHandler.cs @@ -10,7 +10,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_UPDATE_INSTANCE_OWNERSHIP)] void HandleUpdateInstanceOwnership(WorldPacket packet) { - UpdateInstanceOwnership instance = new UpdateInstanceOwnership + UpdateInstanceOwnership instance = new() { IOwnInstance = packet.ReadUInt32() }; @@ -20,7 +20,7 @@ void HandleUpdateInstanceOwnership(WorldPacket packet) [PacketHandler(Opcode.SMSG_INSTANCE_RESET)] void HandleInstanceReset(WorldPacket packet) { - InstanceReset reset = new InstanceReset + InstanceReset reset = new() { MapID = packet.ReadUInt32() }; @@ -30,7 +30,7 @@ void HandleInstanceReset(WorldPacket packet) [PacketHandler(Opcode.SMSG_INSTANCE_RESET_FAILED)] void HandleInstanceResetFailed(WorldPacket packet) { - InstanceResetFailed reset = new InstanceResetFailed + InstanceResetFailed reset = new() { ResetFailedReason = (ResetFailedReason)packet.ReadUInt32(), MapID = packet.ReadUInt32() @@ -41,7 +41,7 @@ void HandleInstanceResetFailed(WorldPacket packet) [PacketHandler(Opcode.SMSG_RESET_FAILED_NOTIFY)] void HandleResetFailedNotify(WorldPacket packet) { - ResetFailedNotify reset = new ResetFailedNotify(); + ResetFailedNotify reset = new(); packet.ReadUInt32(); // Map ID SendPacketToClient(reset); } @@ -49,11 +49,11 @@ void HandleResetFailedNotify(WorldPacket packet) [PacketHandler(Opcode.SMSG_RAID_INSTANCE_INFO)] void HandleRaidInstanceInfo(WorldPacket packet) { - RaidInstanceInfo infos = new RaidInstanceInfo(); + RaidInstanceInfo infos = new(); int count = packet.ReadInt32(); for (var i = 0; i < count; ++i) { - InstanceLock instance = new InstanceLock + InstanceLock instance = new() { MapID = packet.ReadUInt32() }; @@ -91,7 +91,7 @@ void HandleRaidInstanceInfo(WorldPacket packet) [PacketHandler(Opcode.SMSG_INSTANCE_SAVE_CREATED)] void HandleInstanceSaveCreated(WorldPacket packet) { - InstanceSaveCreated save = new InstanceSaveCreated + InstanceSaveCreated save = new() { Gm = packet.ReadUInt32() != 0 }; @@ -101,7 +101,7 @@ void HandleInstanceSaveCreated(WorldPacket packet) [PacketHandler(Opcode.SMSG_RAID_GROUP_ONLY)] void HandleRaidGroupOnly(WorldPacket packet) { - RaidGroupOnly save = new RaidGroupOnly + RaidGroupOnly save = new() { Delay = packet.ReadInt32(), Reason = (RaidGroupReason)packet.ReadUInt32() @@ -112,7 +112,7 @@ void HandleRaidGroupOnly(WorldPacket packet) [PacketHandler(Opcode.SMSG_RAID_INSTANCE_MESSAGE)] void HandleRaidInstanceMessage(WorldPacket packet) { - RaidInstanceMessage instance = new RaidInstanceMessage + RaidInstanceMessage instance = new() { Type = (InstanceResetWarningType)packet.ReadUInt32(), MapID = packet.ReadUInt32() diff --git a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs index 658e1a89..a922d006 100644 --- a/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ItemHandler.cs @@ -11,7 +11,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_SET_PROFICIENCY)] void HandleSetProficiency(WorldPacket packet) { - SetProficiency proficiency = new SetProficiency + SetProficiency proficiency = new() { ProficiencyClass = packet.ReadUInt8(), ProficiencyMask = packet.ReadUInt32() @@ -21,7 +21,7 @@ void HandleSetProficiency(WorldPacket packet) [PacketHandler(Opcode.SMSG_BUY_SUCCEEDED)] void HandleBuySucceeded(WorldPacket packet) { - BuySucceeded buy = new BuySucceeded + BuySucceeded buy = new() { VendorGUID = packet.ReadGuid().To128(GetSession().GameState), Slot = packet.ReadUInt32(), @@ -33,7 +33,7 @@ void HandleBuySucceeded(WorldPacket packet) [PacketHandler(Opcode.SMSG_ITEM_PUSH_RESULT)] void HandleItemPushResult(WorldPacket packet) { - ItemPushResult item = new ItemPushResult + ItemPushResult item = new() { PlayerGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -96,7 +96,7 @@ void HandleItemPushResult(WorldPacket packet) [PacketHandler(Opcode.SMSG_READ_ITEM_RESULT_OK)] void HandleReadItemResultOk(WorldPacket packet) { - ReadItemResultOK read = new ReadItemResultOK + ReadItemResultOK read = new() { ItemGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -105,7 +105,7 @@ void HandleReadItemResultOk(WorldPacket packet) [PacketHandler(Opcode.SMSG_READ_ITEM_RESULT_FAILED)] void HandleReadItemResultFailed(WorldPacket packet) { - ReadItemResultFailed read = new ReadItemResultFailed + ReadItemResultFailed read = new() { ItemGUID = packet.ReadGuid().To128(GetSession().GameState), Subcode = 2 @@ -115,7 +115,7 @@ void HandleReadItemResultFailed(WorldPacket packet) [PacketHandler(Opcode.SMSG_BUY_FAILED)] void HandleBuyFailed(WorldPacket packet) { - BuyFailed fail = new BuyFailed + BuyFailed fail = new() { VendorGUID = packet.ReadGuid().To128(GetSession().GameState), Slot = packet.ReadUInt32(), @@ -198,7 +198,7 @@ void HandleInventoryChangeFailure(WorldPacket packet) [PacketHandler(Opcode.SMSG_DURABILITY_DAMAGE_DEATH)] void HandleDurabilityDamageDeath(WorldPacket packet) { - DurabilityDamageDeath death = new DurabilityDamageDeath + DurabilityDamageDeath death = new() { Percent = 10 }; @@ -207,7 +207,7 @@ void HandleDurabilityDamageDeath(WorldPacket packet) [PacketHandler(Opcode.SMSG_ITEM_COOLDOWN)] void HandleItemCooldown(WorldPacket packet) { - ItemCooldown item = new ItemCooldown + ItemCooldown item = new() { ItemGuid = packet.ReadGuid().To128(GetSession().GameState), SpellID = packet.ReadUInt32(), @@ -218,7 +218,7 @@ void HandleItemCooldown(WorldPacket packet) [PacketHandler(Opcode.SMSG_SELL_RESPONSE)] void HandleSellResponse(WorldPacket packet) { - SellResponse sell = new SellResponse + SellResponse sell = new() { VendorGUID = packet.ReadGuid().To128(GetSession().GameState), ItemGUID = packet.ReadGuid().To128(GetSession().GameState), @@ -229,7 +229,7 @@ void HandleSellResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_ITEM_ENCHANT_TIME_UPDATE)] void HandleItemEnchantTimeUpdate(WorldPacket packet) { - ItemEnchantTimeUpdate enchant = new ItemEnchantTimeUpdate + ItemEnchantTimeUpdate enchant = new() { ItemGuid = packet.ReadGuid().To128(GetSession().GameState), Slot = packet.ReadUInt32(), @@ -242,7 +242,7 @@ void HandleItemEnchantTimeUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_ENCHANTMENT_LOG)] void HandleEnchantmentLog(WorldPacket packet) { - EnchantmentLog enchantment = new EnchantmentLog(); + EnchantmentLog enchantment = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { enchantment.Owner = packet.ReadPackedGuid().To128(GetSession().GameState); diff --git a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs index 58f88d17..98cab60a 100644 --- a/HermesProxy/World/Client/PacketHandlers/LootHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/LootHandler.cs @@ -92,7 +92,7 @@ void HandleLootCelarMoney(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_START_ROLL)] void HandleLootStartRoll(WorldPacket packet) { - StartLootRoll loot = new StartLootRoll(); + StartLootRoll loot = new(); WowGuid64 owner = packet.ReadGuid(); loot.LootObj = owner.ToLootGuid(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -116,7 +116,7 @@ void HandleLootStartRoll(WorldPacket packet) if (GetSession().GameState.IsPassingOnLoot) { - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_LOOT_ROLL); + WorldPacket packet2 = new(Opcode.CMSG_LOOT_ROLL); packet2.WriteGuid(owner); packet2.WriteUInt32(loot.Item.LootListID); packet2.WriteUInt8((byte)RollType.Pass); @@ -127,7 +127,7 @@ void HandleLootStartRoll(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_ROLL)] void HandleLootRoll(WorldPacket packet) { - LootRollBroadcast loot = new LootRollBroadcast(); + LootRollBroadcast loot = new(); WowGuid64 owner = packet.ReadGuid(); loot.LootObj = owner.ToLootGuid(); loot.Item.LootListID = (byte)packet.ReadUInt32(); @@ -158,7 +158,7 @@ void HandleLootRoll(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_ROLL_WON)] void HandleLootRollWon(WorldPacket packet) { - LootRollWon loot = new LootRollWon + LootRollWon loot = new() { LootObj = packet.ReadGuid().ToLootGuid() }; @@ -174,7 +174,7 @@ void HandleLootRollWon(WorldPacket packet) loot.MainSpec = 128; SendPacketToClient(loot); - LootRollsComplete complete = new LootRollsComplete + LootRollsComplete complete = new() { LootObj = loot.LootObj, LootListID = loot.Item.LootListID @@ -185,7 +185,7 @@ void HandleLootRollWon(WorldPacket packet) [PacketHandler(Opcode.SMSG_LOOT_ALL_PASSED)] void HandleLootAllPassed(WorldPacket packet) { - LootAllPassed loot = new LootAllPassed + LootAllPassed loot = new() { LootObj = packet.ReadGuid().ToLootGuid() }; @@ -196,7 +196,7 @@ void HandleLootAllPassed(WorldPacket packet) loot.Item.Quantity = 1; SendPacketToClient(loot); - LootRollsComplete complete = new LootRollsComplete + LootRollsComplete complete = new() { LootObj = loot.LootObj, LootListID = loot.Item.LootListID @@ -210,7 +210,7 @@ void HandleLootMasterList(WorldPacket packet) if (GetSession().GameState.LastLootTargetGuid == null) return; - LootList list = new LootList + LootList list = new() { Owner = GetSession().GameState.LastLootTargetGuid.To128(GetSession().GameState), LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid(), @@ -218,7 +218,7 @@ void HandleLootMasterList(WorldPacket packet) }; SendPacketToClient(list); - MasterLootCandidateList loot = new MasterLootCandidateList + MasterLootCandidateList loot = new() { LootObj = GetSession().GameState.LastLootTargetGuid.ToLootGuid() }; diff --git a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs index 627779ff..24287188 100644 --- a/HermesProxy/World/Client/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MailHandler.cs @@ -11,7 +11,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_NOTIFY_RECEIVED_MAIL)] void HandleNotifyReceivedMail(WorldPacket packet) { - NotifyReceivedMail mail = new NotifyReceivedMail + NotifyReceivedMail mail = new() { Delay = packet.ReadFloat() }; @@ -21,7 +21,7 @@ void HandleNotifyReceivedMail(WorldPacket packet) [PacketHandler(Opcode.MSG_QUERY_NEXT_MAIL_TIME)] void HandleQueryNextMailTime(WorldPacket packet) { - MailQueryNextTimeResult result = new MailQueryNextTimeResult + MailQueryNextTimeResult result = new() { NextMailTime = packet.ReadFloat() }; @@ -29,7 +29,7 @@ void HandleQueryNextMailTime(WorldPacket packet) { if (result.NextMailTime == 0) { - MailNextTimeEntry mail = new MailNextTimeEntry + MailNextTimeEntry mail = new() { SenderGuid = GetSession().GameState.CurrentPlayerGuid, AltSenderID = 0, @@ -45,7 +45,7 @@ void HandleQueryNextMailTime(WorldPacket packet) var count = packet.ReadUInt32(); for (var i = 0; i < count; ++i) { - MailNextTimeEntry mail = new MailNextTimeEntry + MailNextTimeEntry mail = new() { SenderGuid = packet.ReadGuid().To128(GetSession().GameState), AltSenderID = packet.ReadInt32(), @@ -62,7 +62,7 @@ void HandleQueryNextMailTime(WorldPacket packet) [PacketHandler(Opcode.SMSG_MAIL_LIST_RESULT)] void HandleMailListResult(WorldPacket packet) { - MailListResult result = new MailListResult(); + MailListResult result = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) result.TotalNumRecords = packet.ReadInt32(); @@ -73,7 +73,7 @@ void HandleMailListResult(WorldPacket packet) for (var i = 0; i < count; ++i) { - MailListEntry mail = new MailListEntry(); + MailListEntry mail = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.ReadUInt16(); // Message Size @@ -105,7 +105,7 @@ void HandleMailListResult(WorldPacket packet) if (mail.ItemTextId != 0 && !GetSession().GameState.ItemTexts.ContainsKey(mail.ItemTextId)) { GetSession().GameState.RequestedItemTextIds.Add(mail.ItemTextId); - WorldPacket query = new WorldPacket(Opcode.CMSG_ITEM_TEXT_QUERY); + WorldPacket query = new(Opcode.CMSG_ITEM_TEXT_QUERY); query.WriteUInt32(mail.ItemTextId); query.WriteInt32(mail.MailID); query.WriteUInt32(0); // unk @@ -195,7 +195,7 @@ void HandleQueryItemTextResponse(WorldPacket packet) MailAttachedItem ReadMailItem(WorldPacket packet) { - MailAttachedItem mailItem = new MailAttachedItem(); + MailAttachedItem mailItem = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { @@ -215,7 +215,7 @@ MailAttachedItem ReadMailItem(WorldPacket packet) for (byte k = 0; k < enchantmentCount; ++k) { - ItemEnchantData enchant = new ItemEnchantData + ItemEnchantData enchant = new() { Slot = k }; @@ -250,7 +250,7 @@ MailAttachedItem ReadMailItem(WorldPacket packet) [PacketHandler(Opcode.SMSG_MAIL_COMMAND_RESULT)] void HandleMailCommandResult(WorldPacket packet) { - MailCommandResult mail = new MailCommandResult + MailCommandResult mail = new() { MailID = packet.ReadUInt32(), Command = (MailActionType)packet.ReadUInt32(), diff --git a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs index b8446843..3ec47b95 100644 --- a/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MiscHandler.cs @@ -10,7 +10,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_TUTORIAL_FLAGS)] void HandleTutorialFlags(WorldPacket packet) { - TutorialFlags tutorials = new TutorialFlags(); + TutorialFlags tutorials = new(); for (byte i = 0; i < (byte)Tutorials.Max; ++i) tutorials.TutorialData[i] = packet.ReadUInt32(); SendPacketToClient(tutorials); @@ -34,7 +34,7 @@ void HandleAccountDataTimes(WorldPacket packet) [PacketHandler(Opcode.SMSG_BIND_POINT_UPDATE)] void HandleBindPointUpdate(WorldPacket packet) { - BindPointUpdate point = new BindPointUpdate + BindPointUpdate point = new() { BindPosition = packet.ReadVector3(), BindMapID = packet.ReadUInt32(), @@ -46,7 +46,7 @@ void HandleBindPointUpdate(WorldPacket packet) [PacketHandler(Opcode.SMSG_PLAYER_BOUND)] void HandlePlayerBound(WorldPacket packet) { - PlayerBound bound = new PlayerBound + PlayerBound bound = new() { BinderGUID = packet.ReadGuid().To128(GetSession().GameState), AreaID = packet.ReadUInt32() @@ -68,7 +68,7 @@ void HandleDeathReleaseLoc(WorldPacket packet) [PacketHandler(Opcode.SMSG_CORPSE_RECLAIM_DELAY)] void HandleCorpseReclaimDelay(WorldPacket packet) { - CorpseReclaimDelay delay = new CorpseReclaimDelay + CorpseReclaimDelay delay = new() { Remaining = packet.ReadUInt32() }; @@ -78,7 +78,7 @@ void HandleCorpseReclaimDelay(WorldPacket packet) [PacketHandler(Opcode.SMSG_TIME_SYNC_REQUEST)] void HandleTimeSyncRequest(WorldPacket packet) { - TimeSyncRequest sync = new TimeSyncRequest + TimeSyncRequest sync = new() { SequenceIndex = packet.ReadUInt32() }; @@ -88,7 +88,7 @@ void HandleTimeSyncRequest(WorldPacket packet) [PacketHandler(Opcode.SMSG_WEATHER)] void HandleWeather(WorldPacket packet) { - WeatherPkt weather = new WeatherPkt(); + WeatherPkt weather = new(); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { WeatherType type = (WeatherType)packet.ReadUInt32(); @@ -114,7 +114,7 @@ void HandleLoginSetTimeSpeed(WorldPacket packet) if (!GetSession().GameState.IsFirstEnterWorld) return; - LoginSetTimeSpeed login = new LoginSetTimeSpeed + LoginSetTimeSpeed login = new() { ServerTime = packet.ReadUInt32() }; @@ -136,7 +136,7 @@ void HandleAreaTriggerMessage(WorldPacket packet) if (GetSession().GameState.LastEnteredAreaTrigger != 0) { - AreaTriggerMessage denied = new AreaTriggerMessage + AreaTriggerMessage denied = new() { AreaTriggerID = GetSession().GameState.LastEnteredAreaTrigger }; @@ -144,7 +144,7 @@ void HandleAreaTriggerMessage(WorldPacket packet) } else { - ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, message); + ChatPkt chat = new(GetSession(), ChatMessageTypeModern.System, message); SendPacketToClient(chat); } } @@ -159,11 +159,11 @@ void HandleCorpseQuery(WorldPacket packet) if (!corpse.Valid) { { - ChatPkt chatA = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); + ChatPkt chatA = new(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); SendPacketToClient(chatA); - ChatPkt chatB = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"HermesProxy: Did you log out? If you see this message and you cant find your corpse/rezz please report this on GitHub: \nV!FALSE!:{corpse.Valid}"); + ChatPkt chatB = new(GetSession(), ChatMessageTypeModern.System, $"HermesProxy: Did you log out? If you see this message and you cant find your corpse/rezz please report this on GitHub: \nV!FALSE!:{corpse.Valid}"); SendPacketToClient(chatB); - ChatPkt chatC = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); + ChatPkt chatC = new(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); SendPacketToClient(chatC); } return; @@ -179,13 +179,13 @@ void HandleCorpseQuery(WorldPacket packet) corpse.Transport = WowGuid128.Empty; { - ChatPkt chatA = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); + ChatPkt chatA = new(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); SendPacketToClient(chatA); - ChatPkt chatB = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"HermesProxy: Did you log out? If you see this message and you cant find your corpse/rezz please report this on GitHub: \nV:{corpse.Valid}\nI:{corpse.Player == GetSession().GameState.CurrentPlayerGuid}\nC:{GetSession().GameState.CurrentPlayerGuid == GetSession().GameState.CurrentPlayerInfo.CharacterGuid}\nM:{corpse.MapID}/{corpse.ActualMapID}\nCP:{corpse.Position}\nPP:"); + ChatPkt chatB = new(GetSession(), ChatMessageTypeModern.System, $"HermesProxy: Did you log out? If you see this message and you cant find your corpse/rezz please report this on GitHub: \nV:{corpse.Valid}\nI:{corpse.Player == GetSession().GameState.CurrentPlayerGuid}\nC:{GetSession().GameState.CurrentPlayerGuid == GetSession().GameState.CurrentPlayerInfo.CharacterGuid}\nM:{corpse.MapID}/{corpse.ActualMapID}\nCP:{corpse.Position}\nPP:"); SendPacketToClient(chatB); - ChatPkt chatC = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"And just to verify is that your current character name?: {GetSession().GameState.CurrentPlayerInfo.Name}-{GetSession().GameState.CurrentPlayerInfo.Realm.Name}"); + ChatPkt chatC = new(GetSession(), ChatMessageTypeModern.System, $"And just to verify is that your current character name?: {GetSession().GameState.CurrentPlayerInfo.Name}-{GetSession().GameState.CurrentPlayerInfo.Realm.Name}"); SendPacketToClient(chatC); - ChatPkt chatD = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); + ChatPkt chatD = new(GetSession(), ChatMessageTypeModern.System, $"----------------------------"); SendPacketToClient(chatD); } diff --git a/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs b/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs index fb8b70b8..114404ab 100644 --- a/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/MovementHandler.cs @@ -48,7 +48,7 @@ public partial class WorldClient [PacketHandler(Opcode.MSG_MOVE_WATER_WALK)] void HandleMovementMessages(WorldPacket packet) { - MoveUpdate moveUpdate = new MoveUpdate + MoveUpdate moveUpdate = new() { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveInfo = new() @@ -61,7 +61,7 @@ void HandleMovementMessages(WorldPacket packet) [PacketHandler(Opcode.MSG_MOVE_KNOCK_BACK)] void HandleMoveKnockBack(WorldPacket packet) { - MoveUpdateKnockBack knockback = new MoveUpdateKnockBack + MoveUpdateKnockBack knockback = new() { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveInfo = new() @@ -78,7 +78,7 @@ void HandleMoveKnockBack(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_KNOCK_BACK)] void HandleMoveForceKnockBack(WorldPacket packet) { - MoveKnockBack knockback = new MoveKnockBack + MoveKnockBack knockback = new() { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveCounter = packet.ReadUInt32(), @@ -92,7 +92,7 @@ void HandleMoveForceKnockBack(WorldPacket packet) [PacketHandler(Opcode.SMSG_CONTROL_UPDATE)] void HandleControlUpdate(WorldPacket packet) { - ControlUpdate control = new ControlUpdate + ControlUpdate control = new() { Guid = packet.ReadPackedGuid().To128(GetSession().GameState), HasControl = packet.ReadBool() @@ -108,7 +108,7 @@ void HandleMoveTeleportAck(WorldPacket packet) if (GetSession().GameState.IsInTaxiFlight && GetSession().GameState.CurrentPlayerGuid == guid) { - ControlUpdate control = new ControlUpdate + ControlUpdate control = new() { Guid = guid, HasControl = true @@ -117,7 +117,7 @@ void HandleMoveTeleportAck(WorldPacket packet) GetSession().GameState.IsInTaxiFlight = false; } - MoveTeleport teleport = new MoveTeleport + MoveTeleport teleport = new() { MoverGUID = guid, MoveCounter = packet.ReadUInt32() @@ -140,7 +140,7 @@ void HandleMoveTeleportAck(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRANSFER_PENDING)] void HandleTransferPending(WorldPacket packet) { - TransferPending transfer = new TransferPending + TransferPending transfer = new() { MapID = GetSession().GameState.PendingTransferMapId = packet.ReadUInt32(), OldMapPosition = Vector3.Zero @@ -160,7 +160,7 @@ void HandleTransferPending(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRANSFER_ABORTED)] void HandleTransferAborted(WorldPacket packet) { - TransferAborted transfer = new TransferAborted(); + TransferAborted transfer = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) transfer.MapID = packet.ReadUInt32(); @@ -185,7 +185,7 @@ void HandleTransferAborted(WorldPacket packet) [PacketHandler(Opcode.SMSG_NEW_WORLD)] void HandleNewWorld(WorldPacket packet) { - NewWorld teleport = new NewWorld(); + NewWorld teleport = new(); GetSession().GameState.CurrentMapId = teleport.MapID = packet.ReadUInt32(); teleport.Position = packet.ReadVector3(); teleport.Orientation = packet.ReadFloat(); @@ -238,7 +238,7 @@ void HandleNewWorld(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_SPLINE_SET_WALK_SPEED)] void HandleMoveSplineSetSpeed(WorldPacket packet) { - MoveSplineSetSpeed speed = new MoveSplineSetSpeed(packet.GetUniversalOpcode(false)) + MoveSplineSetSpeed speed = new(packet.GetUniversalOpcode(false)) { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), Speed = packet.ReadFloat() @@ -261,7 +261,7 @@ void HandleMoveForceSpeedChange(WorldPacket packet) string opcodeName = packet.GetUniversalOpcode(false).ToString().Replace("SMSG_FORCE_", "SMSG_MOVE_SET_").Replace("_CHANGE", ""); Opcode universalOpcode = Opcodes.GetUniversalOpcode(opcodeName); - MoveSetSpeed speed = new MoveSetSpeed(universalOpcode) + MoveSetSpeed speed = new(universalOpcode) { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveCounter = packet.ReadUInt32() @@ -282,7 +282,7 @@ or Opcode.SMSG_MOVE_SET_SWIM_BACK_SPEED && LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { var flyOpcode = (Opcode) Enum.Parse(typeof(Opcode), universalOpcode.ToString().Replace("SWIM", "FLIGHT")); - MoveSetSpeed flySpeed = new MoveSetSpeed(flyOpcode) + MoveSetSpeed flySpeed = new(flyOpcode) { MoverGUID = speed.MoverGUID, MoveCounter = speed.MoveCounter, @@ -307,7 +307,7 @@ void HandleMoveUpdateSpeed(WorldPacket packet) string opcodeName = packet.GetUniversalOpcode(false).ToString().Replace("MSG_MOVE_SET", "SMSG_MOVE_UPDATE"); Opcode universalOpcode = Opcodes.GetUniversalOpcode(opcodeName); - MoveUpdateSpeed speed = new MoveUpdateSpeed(universalOpcode) + MoveUpdateSpeed speed = new(universalOpcode) { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveInfo = new MovementInfo() @@ -324,7 +324,7 @@ or Opcode.SMSG_MOVE_UPDATE_SWIM_BACK_SPEED && LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { var flyOpcode = (Opcode) Enum.Parse(typeof(Opcode), universalOpcode.ToString().Replace("SWIM", "FLIGHT")); - MoveUpdateSpeed flySpeed = new MoveUpdateSpeed(flyOpcode) + MoveUpdateSpeed flySpeed = new(flyOpcode) { MoverGUID = speed.MoverGUID, MoveInfo = speed.MoveInfo, @@ -352,7 +352,7 @@ or Opcode.SMSG_MOVE_UPDATE_SWIM_BACK_SPEED && [PacketHandler(Opcode.SMSG_MOVE_SPLINE_UNSET_FLYING)] void HandleSplineMovementMessages(WorldPacket packet) { - MoveSplineSetFlag spline = new MoveSplineSetFlag(packet.GetUniversalOpcode(false)) + MoveSplineSetFlag spline = new(packet.GetUniversalOpcode(false)) { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState) }; @@ -375,7 +375,7 @@ void HandleSplineMovementMessages(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOVE_SET_NORMAL_FALL)] void HandleMoveForceFlagChange(WorldPacket packet) { - MoveSetFlag flag = new MoveSetFlag(packet.GetUniversalOpcode(false)) + MoveSetFlag flag = new(packet.GetUniversalOpcode(false)) { MoverGUID = packet.ReadPackedGuid().To128(GetSession().GameState), MoveCounter = packet.ReadUInt32() @@ -445,7 +445,7 @@ void HandleMonsterMove(WorldPacket packet) case SplineTypeLegacy.Stop: { moveSpline.SplineType = SplineTypeModern.None; - MonsterMove moveStop = new MonsterMove(guid, moveSpline); + MonsterMove moveStop = new(guid, moveSpline); SendPacketToClient(moveStop); return; } @@ -564,7 +564,7 @@ void HandleMonsterMove(WorldPacket packet) StartPosition = moveSpline.StartPosition, SplineId = moveSpline.SplineId - 2 }; - MonsterMove moveStop = new MonsterMove(guid, stopSpline); + MonsterMove moveStop = new(guid, stopSpline); SendPacketToClient(moveStop); ControlUpdate update = new() @@ -597,7 +597,7 @@ void HandleMonsterMove(WorldPacket packet) moveSpline.SplinePoints.Add(moveSpline.EndPosition); } - MonsterMove monsterMove = new MonsterMove(guid, moveSpline); + MonsterMove monsterMove = new(guid, moveSpline); SendPacketToClient(monsterMove); if (isTaxiFlight) diff --git a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs index 40d55054..7909e0c4 100644 --- a/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/NPCHandler.cs @@ -12,7 +12,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_GOSSIP_MESSAGE)] void HandleGossipmessage(WorldPacket packet) { - GossipMessagePkt gossip = new GossipMessagePkt + GossipMessagePkt gossip = new() { GossipGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -29,7 +29,7 @@ void HandleGossipmessage(WorldPacket packet) for (uint i = 0; i < optionsCount; i++) { - ClientGossipOption option = new ClientGossipOption + ClientGossipOption option = new() { OptionIndex = packet.ReadInt32(), OptionIcon = packet.ReadUInt8(), @@ -60,7 +60,7 @@ void HandleGossipmessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_GOSSIP_COMPLETE)] void HandleGossipComplete(WorldPacket packet) { - GossipComplete gossip = new GossipComplete(); + GossipComplete gossip = new(); SendPacketToClient(gossip); } @@ -81,7 +81,7 @@ void HandleGossipPoi(WorldPacket packet) [PacketHandler(Opcode.SMSG_BINDER_CONFIRM)] void HandleBinderConfirm(WorldPacket packet) { - BinderConfirm confirm = new BinderConfirm + BinderConfirm confirm = new() { Guid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -92,7 +92,7 @@ void HandleBinderConfirm(WorldPacket packet) [PacketHandler(Opcode.SMSG_VENDOR_INVENTORY)] void HandleVendorInventory(WorldPacket packet) { - VendorInventory vendor = new VendorInventory + VendorInventory vendor = new() { VendorGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -130,7 +130,7 @@ void HandleVendorInventory(WorldPacket packet) [PacketHandler(Opcode.SMSG_SHOW_BANK)] void HandleShowBank(WorldPacket packet) { - ShowBank bank = new ShowBank + ShowBank bank = new() { Guid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -141,7 +141,7 @@ void HandleShowBank(WorldPacket packet) [PacketHandler(Opcode.SMSG_TRAINER_LIST)] void HandleTrainerList(WorldPacket packet) { - TrainerList trainer = new TrainerList + TrainerList trainer = new() { TrainerGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -194,7 +194,7 @@ void HandleTrainerBuyFailed(WorldPacket packet) TrainerFailedReason = packet.ReadUInt32() }; SendPacketToClient(buy); - ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"Failed to learn Spell {buy.SpellID} (Reason {buy.TrainerFailedReason})."); + ChatPkt chat = new(GetSession(), ChatMessageTypeModern.System, $"Failed to learn Spell {buy.SpellID} (Reason {buy.TrainerFailedReason})."); SendPacketToClient(chat); } @@ -212,7 +212,7 @@ void HandleTalentWipeConfirm(WorldPacket packet) [PacketHandler(Opcode.SMSG_SPIRIT_HEALER_CONFIRM)] void HandleSpiritHealerConfirm(WorldPacket packet) { - SpiritHealerConfirm confirm = new SpiritHealerConfirm + SpiritHealerConfirm confirm = new() { Guid = packet.ReadGuid().To128(GetSession().GameState) }; diff --git a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs index ab5fa44b..f1ceb45d 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetHandler.cs @@ -67,7 +67,7 @@ void HandlePetSpellsMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_PET_ACTION_SOUND)] void HandlePetActionSound(WorldPacket packet) { - PetActionSound sound = new PetActionSound + PetActionSound sound = new() { UnitGUID = packet.ReadGuid().To128(GetSession().GameState), Action = packet.ReadUInt32() @@ -78,7 +78,7 @@ void HandlePetActionSound(WorldPacket packet) [PacketHandler(Opcode.SMSG_PET_BROKEN)] void HandlePetBroken(WorldPacket packet) { - PrintNotification notify = new PrintNotification + PrintNotification notify = new() { NotifyText = "Your pet has run away" }; @@ -88,7 +88,7 @@ void HandlePetBroken(WorldPacket packet) [PacketHandler(Opcode.MSG_LIST_STABLED_PETS)] void HandleListStabledPets(WorldPacket packet) { - PetGuids pets = new PetGuids(); + PetGuids pets = new(); var updateFields = GetSession().GameState.GetCachedObjectFieldsLegacy(GetSession().GameState.CurrentPlayerGuid); int UNIT_FIELD_SUMMON = LegacyVersion.GetUpdateField(UnitField.UNIT_FIELD_SUMMON); if (UNIT_FIELD_SUMMON >= 0 && updateFields.ContainsKey(UNIT_FIELD_SUMMON)) @@ -99,7 +99,7 @@ void HandleListStabledPets(WorldPacket packet) } SendPacketToClient(pets); - PetStableList stable = new PetStableList + PetStableList stable = new() { StableMaster = packet.ReadGuid().To128(GetSession().GameState) }; @@ -107,7 +107,7 @@ void HandleListStabledPets(WorldPacket packet) stable.NumStableSlots = packet.ReadUInt8(); for (byte i = 0; i < count; i++) { - PetStableInfo pet = new PetStableInfo + PetStableInfo pet = new() { PetNumber = packet.ReadUInt32(), CreatureID = packet.ReadUInt32(), @@ -126,7 +126,7 @@ void HandleListStabledPets(WorldPacket packet) pet.DisplayID = template.Display.CreatureDisplay[0].CreatureDisplayID; else { - WorldPacket query = new WorldPacket(Opcode.CMSG_QUERY_CREATURE); + WorldPacket query = new(Opcode.CMSG_QUERY_CREATURE); query.WriteUInt32(pet.CreatureID); query.WriteGuid(WowGuid64.Empty); SendPacket(query); @@ -140,7 +140,7 @@ void HandleListStabledPets(WorldPacket packet) [PacketHandler(Opcode.SMSG_PET_STABLE_RESULT)] void HandlePetStableResult(WorldPacket packet) { - PetStableResult stable = new PetStableResult + PetStableResult stable = new() { Result = packet.ReadUInt8() }; diff --git a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs index b8033b44..e70386ad 100644 --- a/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/PetitionHandler.cs @@ -20,7 +20,7 @@ void HandlePetitionShowList(WorldPacket packet) var count = packet.ReadUInt8(); for (var i = 0; i < count; i++) { - PetitionEntry petition = new PetitionEntry + PetitionEntry petition = new() { Index = packet.ReadUInt32(), CharterEntry = packet.ReadUInt32() @@ -55,7 +55,7 @@ void HandlePetitionShowSignatures(WorldPacket packet) var counter = packet.ReadUInt8(); for (var i = 0; i < counter; i++) { - PetitionSignature signature = new PetitionSignature + PetitionSignature signature = new() { Signer = packet.ReadGuid().To128(GetSession().GameState), Choice = packet.ReadInt32() @@ -127,7 +127,7 @@ void HandlePetitionDecline(WorldPacket packet) string name = GetSession().GameState.GetPlayerName(guid); if (!string.IsNullOrEmpty(name)) { - ChatPkt chat = new ChatPkt(GetSession(), ChatMessageTypeModern.System, $"{name} has declined your guild invitation."); + ChatPkt chat = new(GetSession(), ChatMessageTypeModern.System, $"{name} has declined your guild invitation."); SendPacketToClient(chat); } } diff --git a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs index 8bce7d39..5481c546 100644 --- a/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QueryHandler.cs @@ -15,7 +15,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_QUERY_TIME_RESPONSE)] void HandleQueryTimeResponse(WorldPacket packet) { - QueryTimeResponse response = new QueryTimeResponse + QueryTimeResponse response = new() { CurrentTime = packet.ReadInt32() }; @@ -26,7 +26,7 @@ void HandleQueryTimeResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_QUEST_INFO_RESPONSE)] void HandleQueryQuestInfoResponse(WorldPacket packet) { - QueryQuestInfoResponse response = new QueryQuestInfoResponse(); + QueryQuestInfoResponse response = new(); var id = packet.ReadEntry(); response.QuestID = (uint)id.Key; if (id.Value) // entry is masked @@ -62,7 +62,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) int factionValue = packet.ReadInt32(); // RequiredFactionValue if (factionId != 0 && factionValue != 0) { - QuestObjective objective = new QuestObjective + QuestObjective objective = new() { QuestID = response.QuestID, Id = QuestObjective.QuestObjectiveCounter++, @@ -85,7 +85,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) quest.RewardMoney = rewOrReqMoney; else { - QuestObjective objective = new QuestObjective + QuestObjective objective = new() { QuestID = response.QuestID, Id = QuestObjective.QuestObjectiveCounter++, @@ -119,7 +119,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) int requiredPlayerKills = packet.ReadInt32(); if (requiredPlayerKills != 0) { - QuestObjective objective = new QuestObjective + QuestObjective objective = new() { QuestID = response.QuestID, Id = QuestObjective.QuestObjectiveCounter++, @@ -147,7 +147,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) for (int i = 0; i < 6; i++) { - QuestInfoChoiceItem choiceItem = new QuestInfoChoiceItem + QuestInfoChoiceItem choiceItem = new() { ItemID = packet.ReadUInt32(), Quantity = packet.ReadUInt32() @@ -203,7 +203,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) if (creatureOrGoId != 0 && creatureOrGoAmount != 0) { - QuestObjective objective = new QuestObjective + QuestObjective objective = new() { QuestID = response.QuestID, Id = QuestObjective.QuestObjectiveCounter++, @@ -241,7 +241,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) { if (requiredItemID[i] != 0 && requiredItemCount[i] != 0) { - QuestObjective objective = new QuestObjective + QuestObjective objective = new() { QuestID = response.QuestID, Id = QuestObjective.QuestObjectiveCounter++, @@ -279,7 +279,7 @@ void HandleQueryQuestInfoResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_CREATURE_RESPONSE)] void HandleQueryCreatureResponse(WorldPacket packet) { - QueryCreatureResponse response = new QueryCreatureResponse(); + QueryCreatureResponse response = new(); var id = packet.ReadEntry(); response.CreatureID = (uint)id.Key; if (id.Value) // entry is masked @@ -365,7 +365,7 @@ void HandleQueryCreatureResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_GAME_OBJECT_RESPONSE)] void HandleQueryGameObjectResposne(WorldPacket packet) { - QueryGameObjectResponse response = new QueryGameObjectResponse(); + QueryGameObjectResponse response = new(); var id = packet.ReadEntry(); response.GameObjectID = (uint)id.Key; response.Guid = WowGuid128.Empty; @@ -416,12 +416,12 @@ void HandleQueryGameObjectResposne(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_PAGE_TEXT_RESPONSE)] void HandleQueryPageTextResponse(WorldPacket packet) { - QueryPageTextResponse response = new QueryPageTextResponse + QueryPageTextResponse response = new() { PageTextID = packet.ReadUInt32(), Allow = true }; - PageTextInfo page = new PageTextInfo + PageTextInfo page = new() { Id = response.PageTextID, Text = packet.ReadCString(), @@ -433,7 +433,7 @@ void HandleQueryPageTextResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUERY_NPC_TEXT_RESPONSE)] void HandleQueryNpcTextResponse(WorldPacket packet) { - QueryNPCTextResponse response = new QueryNPCTextResponse(); + QueryNPCTextResponse response = new(); var id = packet.ReadEntry(); response.TextID = (uint)id.Key; if (id.Value) // entry is masked @@ -478,7 +478,7 @@ void HandleItemQueryResponse(WorldPacket packet) if (entry.Value) return; - ItemTemplate item = new ItemTemplate + ItemTemplate item = new() { Entry = (uint)entry.Key, Class = packet.ReadInt32(), @@ -664,7 +664,7 @@ void HandleQueryPetNameResponse(WorldPacket packet) return; } - QueryPetNameResponse response = new QueryPetNameResponse + QueryPetNameResponse response = new() { UnitGUID = guid, Name = packet.ReadCString() @@ -705,7 +705,7 @@ void HandleItemNameQueryResponse(WorldPacket packet) [PacketHandler(Opcode.SMSG_WHO)] void HandleWhoResponse(WorldPacket packet) { - WhoResponsePkt response = new WhoResponsePkt + WhoResponsePkt response = new() { RequestID = GetSession().GameState.LastWhoRequestId }; diff --git a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs index 256d0169..31f51bc5 100644 --- a/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/QuestHandler.cs @@ -135,7 +135,7 @@ void ReadExtraQuestInfo(WorldPacket packet, QuestRewards rewards, bool readFlags [PacketHandler(Opcode.SMSG_QUEST_GIVER_STATUS)] void HandleQuestGiverStatus(WorldPacket packet) { - QuestGiverStatusPkt response = new QuestGiverStatusPkt(); + QuestGiverStatusPkt response = new(); response.QuestGiver.Guid = packet.ReadGuid().To128(GetSession().GameState); response.QuestGiver.Status = LegacyVersion.ConvertQuestGiverStatus(packet.ReadUInt8()); SendPacketToClient(response); @@ -144,7 +144,7 @@ void HandleQuestGiverStatus(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_STATUS_MULTIPLE)] void HandleQuestGiverStatusMultple(WorldPacket packet) { - QuestGiverStatusMultiple response = new QuestGiverStatusMultiple(); + QuestGiverStatusMultiple response = new(); int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { @@ -161,7 +161,7 @@ void HandleQuestGiverStatusMultple(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE)] void HandleQuestGiverQuestListMessage(WorldPacket packet) { - QuestGiverQuestListMessage quests = new QuestGiverQuestListMessage + QuestGiverQuestListMessage quests = new() { QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -207,7 +207,7 @@ ClientGossipQuest ReadGossipQuestOption(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_REQUEST_ITEMS)] void HandleQuestGiverRequestItems(WorldPacket packet) { - QuestGiverRequestItems quest = new QuestGiverRequestItems + QuestGiverRequestItems quest = new() { QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState) }; @@ -259,7 +259,7 @@ void HandleQuestGiverRequestItems(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_OFFER_REWARD_MESSAGE)] void HandleQuestGiverOfferRewardMessage(WorldPacket packet) { - QuestGiverOfferRewardMessage quest = new QuestGiverOfferRewardMessage(); + QuestGiverOfferRewardMessage quest = new(); quest.QuestData.QuestGiverGUID = packet.ReadGuid().To128(GetSession().GameState); GetSession().GameState.CurrentInteractedWithNPC = quest.QuestData.QuestGiverGUID; quest.QuestData.QuestGiverCreatureID = quest.QuestData.QuestGiverGUID.GetEntry(); @@ -296,7 +296,7 @@ void HandleQuestGiverOfferRewardMessage(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_COMPLETE)] void HandleQuestGiverQuestComplete(WorldPacket packet) { - QuestGiverQuestComplete quest = new QuestGiverQuestComplete + QuestGiverQuestComplete quest = new() { QuestID = packet.ReadUInt32() }; @@ -359,7 +359,7 @@ void HandleQuestGiverQuestComplete(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_QUEST_FAILED)] void HandleQuestGiverQuestFailed(WorldPacket packet) { - QuestGiverQuestFailed quest = new QuestGiverQuestFailed + QuestGiverQuestFailed quest = new() { QuestID = packet.ReadUInt32(), Reason = LegacyVersion.ConvertInventoryResult(packet.ReadUInt32()) @@ -370,7 +370,7 @@ void HandleQuestGiverQuestFailed(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_GIVER_INVALID_QUEST)] void HandleQuestGiverInvalidQuest(WorldPacket packet) { - QuestGiverInvalidQuest quest = new QuestGiverInvalidQuest + QuestGiverInvalidQuest quest = new() { Reason = (QuestFailedReasons)packet.ReadUInt32() }; @@ -382,7 +382,7 @@ void HandleQuestGiverInvalidQuest(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_UPDATE_FAILED_TIMER)] void HandleQuestUpdateStatus(WorldPacket packet) { - QuestUpdateStatus quest = new QuestUpdateStatus(packet.GetUniversalOpcode(false)) + QuestUpdateStatus quest = new(packet.GetUniversalOpcode(false)) { QuestID = packet.ReadUInt32() }; @@ -408,7 +408,7 @@ void HandleQuestUpdateAddItem(WorldPacket packet) if (GameData.GetQuestTemplate((uint)logEntry.QuestID) == null) { - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_QUERY_QUEST_INFO); + WorldPacket packet2 = new(Opcode.CMSG_QUERY_QUEST_INFO); packet2.WriteUInt32((uint)logEntry.QuestID); SendPacketToServer(packet2); } @@ -419,7 +419,7 @@ void HandleQuestUpdateAddItem(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_UPDATE_ADD_KILL)] void HandleQuestUpdateAddKill(WorldPacket packet) { - QuestUpdateAddCredit credit = new QuestUpdateAddCredit + QuestUpdateAddCredit credit = new() { QuestID = packet.ReadUInt32() }; @@ -435,7 +435,7 @@ void HandleQuestUpdateAddKill(WorldPacket packet) [PacketHandler(Opcode.SMSG_QUEST_CONFIRM_ACCEPT)] void HandleQuestConfirmAccept(WorldPacket packet) { - QuestConfirmAccept quest = new QuestConfirmAccept + QuestConfirmAccept quest = new() { QuestID = packet.ReadUInt32(), QuestTitle = packet.ReadCString(), @@ -447,7 +447,7 @@ void HandleQuestConfirmAccept(WorldPacket packet) [PacketHandler(Opcode.MSG_QUEST_PUSH_RESULT)] void HandleQuestPushResult(WorldPacket packet) { - QuestPushResult quest = new QuestPushResult + QuestPushResult quest = new() { SenderGUID = packet.ReadGuid().To128(GetSession().GameState), Result = (QuestPushReason)packet.ReadUInt8() diff --git a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs index cf2d428b..902ccb09 100644 --- a/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/ReputationHandler.cs @@ -13,7 +13,7 @@ void HandleInitializeFactions(WorldPacket packet) if (!GetSession().GameState.IsFirstEnterWorld) return; - InitializeFactions factions = new InitializeFactions(); + InitializeFactions factions = new(); uint count = packet.ReadUInt32(); for (uint i = 0; i < count; i ++) { diff --git a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs index 7d2ea3e7..8a613b7b 100644 --- a/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SocialHandler.cs @@ -11,7 +11,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_FRIEND_LIST)] void HandleFriendList(WorldPacket packet) { - ContactList contacts = new ContactList + ContactList contacts = new() { Flags = SocialFlag.Friend }; @@ -19,7 +19,7 @@ void HandleFriendList(WorldPacket packet) for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo + ContactInfo contact = new() { TypeFlags = SocialFlag.Friend, Guid = packet.ReadGuid().To128(GetSession().GameState) @@ -43,7 +43,7 @@ void HandleFriendList(WorldPacket packet) [PacketHandler(Opcode.SMSG_IGNORE_LIST)] void HandleIgnoreList(WorldPacket packet) { - ContactList contacts = new ContactList + ContactList contacts = new() { Flags = SocialFlag.Ignored }; @@ -51,7 +51,7 @@ void HandleIgnoreList(WorldPacket packet) for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo + ContactInfo contact = new() { TypeFlags = SocialFlag.Ignored, Guid = packet.ReadGuid().To128(GetSession().GameState) @@ -68,7 +68,7 @@ void HandleIgnoreList(WorldPacket packet) [PacketHandler(Opcode.SMSG_CONTACT_LIST)] void HandleContactList(WorldPacket packet) { - ContactList contacts = new ContactList + ContactList contacts = new() { Flags = (SocialFlag)packet.ReadUInt32() }; @@ -76,7 +76,7 @@ void HandleContactList(WorldPacket packet) for (var i = 0; i < count; i++) { - ContactInfo contact = new ContactInfo + ContactInfo contact = new() { Guid = packet.ReadGuid().To128(GetSession().GameState) }; @@ -104,7 +104,7 @@ void HandleContactList(WorldPacket packet) [PacketHandler(Opcode.SMSG_FRIEND_STATUS)] void HandleFriendStatus(WorldPacket packet) { - FriendStatusPkt friend = new FriendStatusPkt + FriendStatusPkt friend = new() { FriendResult = (FriendsResult)packet.ReadUInt8(), Guid = packet.ReadGuid().To128(GetSession().GameState) diff --git a/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs index 9c84b056..826fa246 100644 --- a/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SpellHandler.cs @@ -13,7 +13,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_SEND_KNOWN_SPELLS)] void HandleSendKnownSpells(WorldPacket packet) { - SendKnownSpells spells = new SendKnownSpells + SendKnownSpells spells = new() { InitialLogin = packet.ReadBool() }; @@ -33,10 +33,10 @@ void HandleSendKnownSpells(WorldPacket packet) ushort cooldownCount = packet.ReadUInt16(); if (cooldownCount != 0) { - SendSpellHistory histories = new SendSpellHistory(); + SendSpellHistory histories = new(); for (ushort i = 0; i < cooldownCount; i++) { - SpellHistoryEntry history = new SpellHistoryEntry(); + SpellHistoryEntry history = new(); uint spellId; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_0_9767)) @@ -72,7 +72,7 @@ void HandleSendKnownSpells(WorldPacket packet) [PacketHandler(Opcode.SMSG_SUPERCEDED_SPELLS)] void HandleSupercededSpells(WorldPacket packet) { - SupercededSpells spells = new SupercededSpells(); + SupercededSpells spells = new(); uint spellId; uint supercededId; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -93,7 +93,7 @@ void HandleSupercededSpells(WorldPacket packet) [PacketHandler(Opcode.SMSG_LEARNED_SPELL)] void HandleLearnedSpell(WorldPacket packet) { - LearnedSpells spells = new LearnedSpells(); + LearnedSpells spells = new(); uint spellId = packet.ReadUInt32(); spells.Spells.Add(spellId); SendPacketToClient(spells); @@ -102,7 +102,7 @@ void HandleLearnedSpell(WorldPacket packet) [PacketHandler(Opcode.SMSG_SEND_UNLEARN_SPELLS)] void HandleSendUnlearnSpells(WorldPacket packet) { - SendUnlearnSpells spells = new SendUnlearnSpells(); + SendUnlearnSpells spells = new(); uint spellCount = packet.ReadUInt32(); for (uint i = 0; i < spellCount; i++) { @@ -115,7 +115,7 @@ void HandleSendUnlearnSpells(WorldPacket packet) [PacketHandler(Opcode.SMSG_UNLEARNED_SPELLS)] void HandleUnlearnedSpells(WorldPacket packet) { - UnlearnedSpells spells = new UnlearnedSpells(); + UnlearnedSpells spells = new(); uint spellId; if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_1_0_9767)) spellId = packet.ReadUInt32(); @@ -174,7 +174,7 @@ void HandleCastFailed(WorldPacket packet) { if (!GetSession().GameState.CurrentClientNormalCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare + SpellPrepare prepare2 = new() { ClientCastID = GetSession().GameState.CurrentClientNormalCast.ClientGUID, ServerCastID = GetSession().GameState.CurrentClientNormalCast.ServerGUID @@ -219,7 +219,7 @@ void HandlePetCastFailed(WorldPacket packet) if (!GetSession().GameState.CurrentClientPetCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare + SpellPrepare prepare2 = new() { ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID, ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID @@ -227,7 +227,7 @@ void HandlePetCastFailed(WorldPacket packet) SendPacketToClient(prepare2); } - PetCastFailed spell = new PetCastFailed + PetCastFailed spell = new() { SpellID = spellId }; @@ -260,7 +260,7 @@ void HandlePetCastFailedTBC(WorldPacket packet) if (!GetSession().GameState.CurrentClientPetCast.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare + SpellPrepare prepare2 = new() { ClientCastID = GetSession().GameState.CurrentClientPetCast.ClientGUID, ServerCastID = GetSession().GameState.CurrentClientPetCast.ServerGUID @@ -268,7 +268,7 @@ void HandlePetCastFailedTBC(WorldPacket packet) SendPacketToClient(prepare2); } - PetCastFailed failed = new PetCastFailed + PetCastFailed failed = new() { SpellID = spellId }; @@ -335,7 +335,7 @@ void HandleSpellFailedOther(WorldPacket packet) spellVisual = GameData.GetSpellVisual(spellId); } - SpellFailure spell = new SpellFailure + SpellFailure spell = new() { CasterUnit = casterUnit, CastID = castId, @@ -345,7 +345,7 @@ void HandleSpellFailedOther(WorldPacket packet) }; SendPacketToClient(spell); - SpellFailedOther spell2 = new SpellFailedOther + SpellFailedOther spell2 = new() { CasterUnit = casterUnit, CastID = castId, @@ -362,7 +362,7 @@ void HandleSpellStart(WorldPacket packet) if (GetSession().GameState.CurrentMapId == null) return; - SpellStart spell = new SpellStart + SpellStart spell = new() { Cast = HandleSpellStartOrGo(packet, false) }; @@ -430,7 +430,7 @@ void HandleSpellGo(WorldPacket packet) if (GetSession().GameState.CurrentMapId == null) return; - SpellGo spell = new SpellGo + SpellGo spell = new() { Cast = HandleSpellStartOrGo(packet, true) }; @@ -465,7 +465,7 @@ void HandleSpellGo(WorldPacket packet) SpellCastData HandleSpellStartOrGo(WorldPacket packet, bool isSpellGo) { - SpellCastData dbdata = new SpellCastData + SpellCastData dbdata = new() { CasterGUID = packet.ReadPackedGuid().To128(GetSession().GameState), CasterUnit = packet.ReadPackedGuid().To128(GetSession().GameState) @@ -668,7 +668,7 @@ void HandleCancelAutoRepeat(WorldPacket packet) GetSession().GameState.CurrentClientSpecialCast = null; } - CancelAutoRepeat cancel = new CancelAutoRepeat(); + CancelAutoRepeat cancel = new(); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) cancel.Guid = packet.ReadPackedGuid().To128(GetSession().GameState); else @@ -1068,7 +1068,7 @@ void HandleSpellDispellLog(WorldPacket packet) int count = packet.ReadInt32(); for (int i = 0; i < count; i++) { - SpellDispellData dispel = new SpellDispellData + SpellDispellData dispel = new() { SpellID = packet.ReadUInt32() }; @@ -1111,7 +1111,7 @@ void HandleUpdateAuraDuration(WorldPacket packet) if (updateFields == null) return; - AuraInfo aura = new AuraInfo + AuraInfo aura = new() { Slot = slot, AuraData = ReadAuraSlot(slot, guid, updateFields) @@ -1123,7 +1123,7 @@ void HandleUpdateAuraDuration(WorldPacket packet) aura.AuraData.Duration = duration; aura.AuraData.Remaining = duration; - AuraUpdate update = new AuraUpdate(guid, false); + AuraUpdate update = new(guid, false); update.Auras.Add(aura); SendPacketToClient(update); } @@ -1154,7 +1154,7 @@ void HandleSetExtraAuraInfo(WorldPacket packet) if (updateFields == null) return; - AuraInfo aura = new AuraInfo + AuraInfo aura = new() { Slot = slot, AuraData = ReadAuraSlot(slot, guid, updateFields) @@ -1169,7 +1169,7 @@ void HandleSetExtraAuraInfo(WorldPacket packet) aura.AuraData.Duration = durationFull; aura.AuraData.Remaining = durationLeft; - AuraUpdate update = new AuraUpdate(guid, false); + AuraUpdate update = new(guid, false); update.Auras.Add(aura); SendPacketToClient(update); } @@ -1212,9 +1212,9 @@ void HandleSetSpellModifier(WorldPacket packet) if (GetSession().GameState.CurrentPlayerCreateTime != 0) { - SetSpellModifier spell = new SetSpellModifier(packet.GetUniversalOpcode(false)); - SpellModifierInfo mod = new SpellModifierInfo(); - SpellModifierData data = new SpellModifierData + SetSpellModifier spell = new(packet.GetUniversalOpcode(false)); + SpellModifierInfo mod = new(); + SpellModifierData data = new() { ClassIndex = classIndex }; diff --git a/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs b/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs index 38ef94bd..80f908d6 100644 --- a/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/SystemHandler.cs @@ -17,7 +17,7 @@ void HandleFeatureSystemStatus(WorldPacket packet) [PacketHandler(Opcode.SMSG_MOTD)] void HandleMotd(WorldPacket packet) { - MOTD motd = new MOTD(); + MOTD motd = new(); uint count = packet.ReadUInt32(); for (uint i = 0; i < count; i++) motd.Text.Add(packet.ReadCString()); diff --git a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs index 2507f62c..00a9b8dc 100644 --- a/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/TradeHandler.cs @@ -53,7 +53,7 @@ void HandleTradeStatusExtended(WorldPacket packet) trade.ProposedEnchantment = packet.ReadInt32(); while (packet.CanRead()) { - TradeItem item = new TradeItem + TradeItem item = new() { Unwrapped = new UnwrappedTradeItem(), Slot = packet.ReadUInt8() diff --git a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs index 91fc2e65..1ba4bdd3 100644 --- a/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs @@ -25,7 +25,7 @@ void HandleDestroyObject(WorldPacket packet) GetSession().GameState.ObjectCacheModern.Remove(guid); GetSession().GameState.ObjectCacheMutex.ReleaseMutex(); - UpdateObject updateObject = new UpdateObject(GetSession().GameState); + UpdateObject updateObject = new(GetSession().GameState); updateObject.DestroyedGuids.Add(guid); SendPacketToClient(updateObject); } @@ -48,9 +48,9 @@ void HandleUpdateObject(WorldPacket packet) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.ReadBool(); // Has Transport - HashSet missingItemTemplates = new HashSet(); - List auraUpdates = new List(); - UpdateObject updateObject = new UpdateObject(GetSession().GameState); + HashSet missingItemTemplates = new(); + List auraUpdates = new(); + UpdateObject updateObject = new(GetSession().GameState); for (var i = 0; i < count; i++) { @@ -64,9 +64,9 @@ void HandleUpdateObject(WorldPacket packet) var guid = packet.ReadPackedGuid().To128(GetSession().GameState); PrintString($"Guid = {guid.ToString()}", i); - ObjectUpdate updateData = new ObjectUpdate(guid, UpdateTypeModern.Values, GetSession()); - AuraUpdate auraUpdate = new AuraUpdate(guid, false); - PowerUpdate powerUpdate = new PowerUpdate(guid); + ObjectUpdate updateData = new(guid, UpdateTypeModern.Values, GetSession()); + AuraUpdate auraUpdate = new(guid, false); + PowerUpdate powerUpdate = new(guid); ReadValuesUpdateBlock(packet, guid, updateData, auraUpdate, powerUpdate, i); if (powerUpdate.Powers.Count != 0) @@ -106,15 +106,15 @@ void HandleUpdateObject(WorldPacket packet) if (guid == GetSession().GameState.CurrentPlayerGuid && GetSession().GameState.IsInFarSight) { - UpdateObject updateObject2 = new UpdateObject(GetSession().GameState); - ObjectUpdate updateData2 = new ObjectUpdate(guid, UpdateTypeModern.Values, GetSession()); + UpdateObject updateObject2 = new(GetSession().GameState); + ObjectUpdate updateData2 = new(guid, UpdateTypeModern.Values, GetSession()); updateData2.ActivePlayerData.FarsightObject = WowGuid128.Empty; updateObject2.ObjectUpdates.Add(updateData2); SendPacketToClient(updateObject2); } - ObjectUpdate updateData = new ObjectUpdate(guid, UpdateTypeModern.CreateObject1, GetSession()); - AuraUpdate auraUpdate = new AuraUpdate(guid, true); + ObjectUpdate updateData = new(guid, UpdateTypeModern.CreateObject1, GetSession()); + AuraUpdate auraUpdate = new(guid, true); ReadCreateObjectBlock(packet, guid, updateData, auraUpdate, i); if (updateData.Guid == GetSession().GameState.CurrentPlayerGuid) @@ -154,8 +154,8 @@ void HandleUpdateObject(WorldPacket packet) var guid = oldGuid.To128(GetSession().GameState); PrintString($"Guid = {guid.ToString()}", i); - ObjectUpdate updateData = new ObjectUpdate(guid, UpdateTypeModern.CreateObject2, GetSession()); - AuraUpdate auraUpdate = new AuraUpdate(guid, true); + ObjectUpdate updateData = new(guid, UpdateTypeModern.CreateObject2, GetSession()); + AuraUpdate auraUpdate = new(guid, true); ReadCreateObjectBlock(packet, guid, updateData, auraUpdate, i); if (guid.IsItem() && updateData.ObjectData.EntryID != null && @@ -194,7 +194,7 @@ void HandleUpdateObject(WorldPacket packet) foreach (uint itemId in missingItemTemplates) { - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_ITEM_QUERY_SINGLE); + WorldPacket packet2 = new(Opcode.CMSG_ITEM_QUERY_SINGLE); packet2.WriteUInt32(itemId); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) packet2.WriteGuid(WowGuid64.Empty); @@ -217,16 +217,16 @@ void HandleUpdateObject(WorldPacket packet) { if (GetSession().GameState.FlatSpellMods.Count > 0) { - SetSpellModifier spell = new SetSpellModifier(Opcode.SMSG_SET_FLAT_SPELL_MODIFIER); + SetSpellModifier spell = new(Opcode.SMSG_SET_FLAT_SPELL_MODIFIER); foreach (var modItr in GetSession().GameState.FlatSpellMods) { - SpellModifierInfo mod = new SpellModifierInfo + SpellModifierInfo mod = new() { ModIndex = modItr.Key }; foreach (var dataItr in modItr.Value) { - SpellModifierData data = new SpellModifierData + SpellModifierData data = new() { ClassIndex = dataItr.Key, ModifierValue = dataItr.Value @@ -239,16 +239,16 @@ void HandleUpdateObject(WorldPacket packet) } if (GetSession().GameState.PctSpellMods.Count > 0) { - SetSpellModifier spell = new SetSpellModifier(Opcode.SMSG_SET_PCT_SPELL_MODIFIER); + SetSpellModifier spell = new(Opcode.SMSG_SET_PCT_SPELL_MODIFIER); foreach (var modItr in GetSession().GameState.PctSpellMods) { - SpellModifierInfo mod = new SpellModifierInfo + SpellModifierInfo mod = new() { ModIndex = modItr.Key }; foreach (var dataItr in modItr.Value) { - SpellModifierData data = new SpellModifierData + SpellModifierData data = new() { ClassIndex = dataItr.Key, ModifierValue = dataItr.Value @@ -282,7 +282,7 @@ void HandleUpdateObject(WorldPacket packet) } if (resetBgPlayerPositions) { - BattlegroundPlayerPositions bglist = new BattlegroundPlayerPositions(); + BattlegroundPlayerPositions bglist = new(); SendPacketToClient(bglist); } } @@ -588,7 +588,7 @@ private Dictionary ReadValuesUpdateBlock(WorldPacket packet, r updateFieldType = fieldInfo.Format; } - List fieldData = new List(); + List fieldData = new(); for (int k = start; k < i; ++k) { if (oldValues == null || !oldValues.TryGetValue(k, out UpdateField updateField)) @@ -799,7 +799,7 @@ void ReadMovementUpdateBlock(WorldPacket packet, WowGuid guid, ObjectUpdate upda if (moveFlags.HasAnyFlag(MovementFlagWotLK.SplineEnabled)) { moveInfo.HasSplineData = true; - ServerSideMovement monsterMove = new ServerSideMovement(); + ServerSideMovement monsterMove = new(); if (moveInfo.TransportGuid != null) monsterMove.TransportGuid = moveInfo.TransportGuid; @@ -1090,7 +1090,7 @@ public AuraDataInfo ReadAuraSlot(byte i, WowGuid128 guid, Dictionary= 0 && updateMaskArray[UNIT_CHANNEL_SPELL]) { - UnitChannel channel = new UnitChannel + UnitChannel channel = new() { SpellID = updates[UNIT_CHANNEL_SPELL].Int32Value }; @@ -1914,7 +1914,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u updateMaskArray[UNIT_FIELD_AURALEVELS + i / 4] || updateMaskArray[UNIT_FIELD_AURAAPPLICATIONS + i / 4]) { - AuraInfo aura = new AuraInfo + AuraInfo aura = new() { Slot = i, AuraData = ReadAuraSlot(i, guid, updates) @@ -2593,17 +2593,17 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u if (teamId != 0) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ARENA_TEAM_QUERY); + WorldPacket packet = new(Opcode.CMSG_ARENA_TEAM_QUERY); packet.WriteUInt32(teamId); SendPacketToServer(packet); - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_ARENA_TEAM_ROSTER); + WorldPacket packet2 = new(Opcode.CMSG_ARENA_TEAM_ROSTER); packet2.WriteUInt32(teamId); SendPacketToServer(packet2); } else { - ArenaTeamRosterResponse response = new ArenaTeamRosterResponse + ArenaTeamRosterResponse response = new() { TeamSize = ModernVersion.GetArenaTeamSizeFromIndex((uint)i) }; @@ -2657,10 +2657,10 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u if (PLAYER_FIELD_HONOR_CURRENCY >= 0 && PLAYER_FIELD_ARENA_CURRENCY >= 0 && (updateMaskArray[PLAYER_FIELD_HONOR_CURRENCY] || updateMaskArray[PLAYER_FIELD_ARENA_CURRENCY])) { - SetupCurrency currencies = new SetupCurrency(); + SetupCurrency currencies = new(); if (updates.ContainsKey(PLAYER_FIELD_ARENA_CURRENCY)) { - SetupCurrency.Record honor = new SetupCurrency.Record + SetupCurrency.Record honor = new() { Type = (uint)Currency.ArenaPoints, Quantity = updates[PLAYER_FIELD_ARENA_CURRENCY].UInt32Value @@ -2669,7 +2669,7 @@ public void StoreObjectUpdate(WowGuid128 guid, ObjectType objectType, BitArray u } if (updates.ContainsKey(PLAYER_FIELD_HONOR_CURRENCY)) { - SetupCurrency.Record honor = new SetupCurrency.Record + SetupCurrency.Record honor = new() { Type = (uint)Currency.HonorPoints, Quantity = updates[PLAYER_FIELD_HONOR_CURRENCY].UInt32Value diff --git a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs index 0393ff54..c7024a58 100644 --- a/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs +++ b/HermesProxy/World/Client/PacketHandlers/WorldStateHandler.cs @@ -11,7 +11,7 @@ public partial class WorldClient [PacketHandler(Opcode.SMSG_INIT_WORLD_STATES)] void HandleInitWorldStates(WorldPacket packet) { - InitWorldStates states = new InitWorldStates + InitWorldStates states = new() { MapID = packet.ReadUInt32() }; @@ -45,7 +45,7 @@ void HandleInitWorldStates(WorldPacket packet) if (GetSession().GameState.HasWsgHordeFlagCarrier || GetSession().GameState.HasWsgAllyFlagCarrier) { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); } @@ -68,7 +68,7 @@ void HandleInitWorldStates(WorldPacket packet) [PacketHandler(Opcode.SMSG_UPDATE_WORLD_STATE)] void HandleUpdateWorldState(WorldPacket packet) { - UpdateWorldState update = new UpdateWorldState + UpdateWorldState update = new() { VariableID = packet.ReadUInt32(), Value = packet.ReadInt32() @@ -77,13 +77,13 @@ void HandleUpdateWorldState(WorldPacket packet) if (update.VariableID == (uint)WorldStates.WsgFlagStateAlliance) { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); GetSession().GameState.HasWsgAllyFlagCarrier = update.Value == 2; } else if (update.VariableID == (uint)WorldStates.WsgFlagStateHorde) { - WorldPacket packet2 = new WorldPacket(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); + WorldPacket packet2 = new(Opcode.MSG_BATTLEGROUND_PLAYER_POSITIONS); SendPacket(packet2); GetSession().GameState.HasWsgHordeFlagCarrier = update.Value == 2; } diff --git a/HermesProxy/World/Client/WorldClient.cs b/HermesProxy/World/Client/WorldClient.cs index eb98a8ae..8de7867a 100644 --- a/HermesProxy/World/Client/WorldClient.cs +++ b/HermesProxy/World/Client/WorldClient.cs @@ -25,7 +25,7 @@ public partial class WorldClient LegacyWorldCrypt _worldCrypt; Dictionary> _packetHandlers; GlobalSessionData _globalSession; - readonly System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); + readonly System.Threading.Mutex _sendMutex = new(); // packet order is not always the same as new client, sometimes we need to delay packet until another one Dictionary> _delayedPacketsToServer; @@ -157,7 +157,7 @@ private async Task ReceiveLoop() if (_worldCrypt != null) _worldCrypt.Decrypt(headerBuffer, LegacyServerPacketHeader.StructSize); - LegacyServerPacketHeader header = new LegacyServerPacketHeader(); + LegacyServerPacketHeader header = new(); header.Read(headerBuffer); ushort packetSize = header.Size; @@ -179,7 +179,7 @@ private async Task ReceiveLoop() return; } - WorldPacket packet = new WorldPacket(buffer); + WorldPacket packet = new(buffer); packet.SetReceiveTime(Environment.TickCount); HandlePacket(packet); } @@ -204,8 +204,8 @@ private void SendPacket(WorldPacket packet) _sendMutex.WaitOne(); try { - ByteBuffer buffer = new ByteBuffer(); - LegacyClientPacketHeader header = new LegacyClientPacketHeader + ByteBuffer buffer = new(); + LegacyClientPacketHeader header = new() { Size = (ushort)(packet.GetSize() + sizeof(uint)), // size includes the opcode Opcode = packet.GetOpcode() @@ -241,7 +241,7 @@ public void SendPacketToClient(ServerPacket packet, Opcode delayUntilOpcode = Op _delayedPacketsToClient[delayUntilOpcode].Add(packet); else { - List packets = new List(); + List packets = new(); packets.Add(packet); _delayedPacketsToClient.Add(delayUntilOpcode, packets); } @@ -286,7 +286,7 @@ public void SendPacketToServer(WorldPacket packet, Opcode delayUntilOpcode = Opc _delayedPacketsToServer[delayUntilOpcode].Add(packet); else { - List packets = new List(); + List packets = new(); packets.Add(packet); _delayedPacketsToServer.Add(delayUntilOpcode, packets); } @@ -390,7 +390,7 @@ public void SendAuthResponse(uint clientSeed, uint serverSeed) GetSession().AuthClient.GetSessionKey() ); - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUTH_SESSION); + WorldPacket packet = new(Opcode.CMSG_AUTH_SESSION); packet.WriteUInt32((uint)Settings.ServerBuild); packet.WriteUInt32(_realm.Id.Index); packet.WriteBytes(_username.ToUpper().ToCString()); @@ -455,7 +455,7 @@ public void SendPing(uint ping, uint latency) if (!IsConnected() || _isSuccessful == false) return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_PING); + WorldPacket packet = new(Opcode.CMSG_PING); packet.WriteUInt32(ping); packet.WriteUInt32(latency); SendPacket(packet); diff --git a/HermesProxy/World/GameData.cs b/HermesProxy/World/GameData.cs index f79c9551..7b643175 100644 --- a/HermesProxy/World/GameData.cs +++ b/HermesProxy/World/GameData.cs @@ -12,33 +12,33 @@ namespace HermesProxy.World public static class GameData { // From CSV - public static SortedDictionary BroadcastTextStore = new SortedDictionary(); - public static Dictionary ItemDisplayDataStore = new Dictionary(); - public static Dictionary Battlegrounds = new Dictionary(); - public static Dictionary ChatChannels = new Dictionary(); - public static Dictionary> ItemEffects = new Dictionary>(); - public static Dictionary ItemEnchantVisuals = new Dictionary(); - public static Dictionary SpellVisuals = new Dictionary(); - public static Dictionary LearnSpells = new Dictionary(); - public static Dictionary TotemSpells = new Dictionary(); - public static Dictionary Gems = new Dictionary(); - public static Dictionary UnitDisplayScales = new Dictionary(); - public static Dictionary TransportPeriods = new Dictionary(); - public static Dictionary AreaNames = new Dictionary(); - public static HashSet DispellSpells = new HashSet(); - public static HashSet StackableAuras = new HashSet(); - public static HashSet MountAuras = new HashSet(); - public static HashSet NextMeleeSpells = new HashSet(); - public static HashSet AutoRepeatSpells = new HashSet(); - public static Dictionary TaxiPaths = new Dictionary(); + public static SortedDictionary BroadcastTextStore = new(); + public static Dictionary ItemDisplayDataStore = new(); + public static Dictionary Battlegrounds = new(); + public static Dictionary ChatChannels = new(); + public static Dictionary> ItemEffects = new(); + public static Dictionary ItemEnchantVisuals = new(); + public static Dictionary SpellVisuals = new(); + public static Dictionary LearnSpells = new(); + public static Dictionary TotemSpells = new(); + public static Dictionary Gems = new(); + public static Dictionary UnitDisplayScales = new(); + public static Dictionary TransportPeriods = new(); + public static Dictionary AreaNames = new(); + public static HashSet DispellSpells = new(); + public static HashSet StackableAuras = new(); + public static HashSet MountAuras = new(); + public static HashSet NextMeleeSpells = new(); + public static HashSet AutoRepeatSpells = new(); + public static Dictionary TaxiPaths = new(); public static int[,] TaxiNodesGraph = new int[250,250]; - public static Dictionary QuestBits = new Dictionary(); + public static Dictionary QuestBits = new(); // From Server - public static Dictionary ItemTemplates = new Dictionary(); - public static Dictionary CreatureTemplates = new Dictionary(); - public static Dictionary QuestTemplates = new Dictionary(); - public static Dictionary ItemNames = new Dictionary(); + public static Dictionary ItemTemplates = new(); + public static Dictionary CreatureTemplates = new(); + public static Dictionary QuestTemplates = new(); + public static Dictionary ItemNames = new(); #region GettersAndSetters public static void StoreItemName(uint entry, string name) @@ -156,7 +156,7 @@ public static void SaveItemEffectSlot(uint itemId, uint spellId, byte slot) } else { - Dictionary dict = new Dictionary(); + Dictionary dict = new(); dict.Add(spellId, slot); ItemEffects.Add(itemId, dict); } @@ -265,7 +265,7 @@ public static uint GetChatChannelIdFromName(string name) public static List GetChatChannelsWithFlags(ChannelFlags flags) { - List channels = new List(); + List channels = new(); foreach (var channel in ChatChannels) { if ((channel.Value.Flags & flags) == flags) @@ -355,7 +355,7 @@ public static void LoadEverything() public static void LoadBroadcastTexts() { var path = Path.Combine("CSV", $"BroadcastTexts{LegacyVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -369,7 +369,7 @@ public static void LoadBroadcastTexts() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - BroadcastText broadcastText = new BroadcastText + BroadcastText broadcastText = new() { Entry = uint.Parse(fields[0]), MaleText = fields[1].TrimEnd().Replace("\0", "").Replace("~", "\n"), @@ -390,7 +390,7 @@ public static void LoadBroadcastTexts() public static void LoadItemTemplates() { var path = Path.Combine("CSV", $"Items{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -404,7 +404,7 @@ public static void LoadItemTemplates() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - ItemDisplayData item = new ItemDisplayData + ItemDisplayData item = new() { Entry = uint.Parse(fields[0]), DisplayId = uint.Parse(fields[1]), @@ -418,7 +418,7 @@ public static void LoadItemTemplates() public static void LoadBattlegrounds() { var path = Path.Combine("CSV", "Battlegrounds.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -432,7 +432,7 @@ public static void LoadBattlegrounds() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - Battleground bg = new Battleground(); + Battleground bg = new(); uint bgId = uint.Parse(fields[0]); bg.IsArena = byte.Parse(fields[1]) != 0; for (int i = 0; i < 6; i++) @@ -450,7 +450,7 @@ public static void LoadBattlegrounds() public static void LoadChatChannels() { var path = Path.Combine("CSV", "ChatChannels.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -464,7 +464,7 @@ public static void LoadChatChannels() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - ChatChannel channel = new ChatChannel + ChatChannel channel = new() { Id = uint.Parse(fields[0]), Flags = (ChannelFlags)uint.Parse(fields[1]), @@ -478,7 +478,7 @@ public static void LoadChatChannels() public static void LoadItemEnchantVisuals() { var path = Path.Combine("CSV", $"ItemEnchantVisuals{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -502,7 +502,7 @@ public static void LoadItemEnchantVisuals() public static void LoadSpellVisuals() { var path = Path.Combine("CSV", $"SpellVisuals{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -526,7 +526,7 @@ public static void LoadSpellVisuals() public static void LoadLearnSpells() { var path = Path.Combine("CSV", "LearnSpells.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -554,7 +554,7 @@ public static void LoadTotemSpells() return; var path = Path.Combine("CSV", $"TotemSpells.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -581,7 +581,7 @@ public static void LoadGems() return; var path = Path.Combine("CSV", $"Gems{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -608,7 +608,7 @@ public static void LoadUnitDisplayScales() return; var path = Path.Combine("CSV", "UnitDisplayScales.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -632,7 +632,7 @@ public static void LoadUnitDisplayScales() public static void LoadTransports() { var path = Path.Combine("CSV", $"Transports{LegacyVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -656,7 +656,7 @@ public static void LoadTransports() public static void LoadAreaNames() { var path = Path.Combine("CSV", $"AreaNames.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -683,7 +683,7 @@ public static void LoadDispellSpells() return; var path = Path.Combine("CSV", "DispellSpells.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -709,7 +709,7 @@ public static void LoadStackableAuras() return; var path = Path.Combine("CSV", $"StackableAuras{LegacyVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -735,7 +735,7 @@ public static void LoadMountAuras() return; var path = Path.Combine("CSV", $"MountAuras.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -758,7 +758,7 @@ public static void LoadMountAuras() public static void LoadMeleeSpells() { var path = Path.Combine("CSV", $"MeleeSpells{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -781,7 +781,7 @@ public static void LoadMeleeSpells() public static void LoadAutoRepeatSpells() { var path = Path.Combine("CSV", $"AutoRepeatSpells{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -803,7 +803,7 @@ public static void LoadAutoRepeatSpells() public static void LoadTaxiPaths() { var path = Path.Combine("CSV", $"TaxiPath{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -819,7 +819,7 @@ public static void LoadTaxiPaths() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiPath taxiPath = new TaxiPath + TaxiPath taxiPath = new() { Id = uint.Parse(fields[0]), From = uint.Parse(fields[1]), @@ -834,9 +834,9 @@ public static void LoadTaxiPaths() public static void LoadTaxiPathNodesGraph() { // Load TaxiNodes (used in calculating first and last parts of path) - Dictionary TaxiNodes = new Dictionary(); + Dictionary TaxiNodes = new(); var pathNodes = Path.Combine("CSV", $"TaxiNodes{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(pathNodes)) + using (TextFieldParser csvParser = new(pathNodes)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -850,7 +850,7 @@ public static void LoadTaxiPathNodesGraph() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiNode taxiNode = new TaxiNode + TaxiNode taxiNode = new() { Id = uint.Parse(fields[0]), mapId = uint.Parse(fields[1]), @@ -862,9 +862,9 @@ public static void LoadTaxiPathNodesGraph() } } // Load TaxiPathNode (used in calculating rest of path) - Dictionary TaxiPathNodes = new Dictionary(); + Dictionary TaxiPathNodes = new(); var pathPathNodes = Path.Combine("CSV", $"TaxiPathNode{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(pathPathNodes)) + using (TextFieldParser csvParser = new(pathPathNodes)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -878,7 +878,7 @@ public static void LoadTaxiPathNodesGraph() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - TaxiPathNode taxiPathNode = new TaxiPathNode + TaxiPathNode taxiPathNode = new() { Id = uint.Parse(fields[0]), pathId = uint.Parse(fields[1]), @@ -909,7 +909,7 @@ public static void LoadTaxiPathNodesGraph() continue; // save all node ids of this path - HashSet pathNodeList = new HashSet(); + HashSet pathNodeList = new(); foreach (var itr in TaxiPathNodes) { TaxiPathNode pNode = itr.Value; @@ -960,7 +960,7 @@ public static void LoadTaxiPathNodesGraph() public static void LoadQuestBits() { var path = Path.Combine("CSV", $"QuestV2_{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1001,7 +1001,7 @@ public static void LoadQuestBits() public const uint HotfixCreatureDisplayInfoBegin = 220000; public const uint HotfixCreatureDisplayInfoExtraBegin = 230000; public const uint HotfixCreatureDisplayInfoOptionBegin = 240000; - public static Dictionary Hotfixes = new Dictionary(); + public static Dictionary Hotfixes = new(); public static void LoadHotfixes() { LoadAreaTriggerHotfixes(); @@ -1024,7 +1024,7 @@ public static void LoadHotfixes() public static void LoadAreaTriggerHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"AreaTrigger{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1041,7 +1041,7 @@ public static void LoadAreaTriggerHotfixes() // Read current line fields, pointer moves to the next line. string[] fields = csvParser.ReadFields(); - AreaTrigger at = new AreaTrigger + AreaTrigger at = new() { Message = fields[0], PositionX = float.Parse(fields[1]), @@ -1063,7 +1063,7 @@ public static void LoadAreaTriggerHotfixes() Flags = byte.Parse(fields[17]) }; - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.AreaTrigger, HotfixId = HotfixAreaTriggerBegin + counter @@ -1096,7 +1096,7 @@ public static void LoadAreaTriggerHotfixes() public static void LoadSkillLineHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SkillLine{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1127,7 +1127,7 @@ public static void LoadSkillLineHotfixes() ushort flags = ushort.Parse(fields[11]); uint spellBookSpellID = uint.Parse(fields[12]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SkillLine, HotfixId = HotfixSkillLineBegin + counter @@ -1155,7 +1155,7 @@ public static void LoadSkillLineHotfixes() public static void LoadSkillRaceClassInfoHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SkillRaceClassInfo{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1181,7 +1181,7 @@ public static void LoadSkillRaceClassInfoHotfixes() byte minLevel = byte.Parse(fields[6]); ushort skillTierId = ushort.Parse(fields[7]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SkillRaceClassInfo, HotfixId = HotfixSkillRaceClassInfoBegin + counter @@ -1203,7 +1203,7 @@ public static void LoadSkillRaceClassInfoHotfixes() public static void LoadSkillLineAbilityHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SkillLineAbility{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1239,7 +1239,7 @@ public static void LoadSkillLineAbilityHotfixes() uint characterPoints2 = uint.Parse(fields[16]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SkillLineAbility, HotfixId = HotfixSkillLineAbilityBegin + counter @@ -1271,7 +1271,7 @@ public static void LoadSkillLineAbilityHotfixes() public static void LoadSpellHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"Spell{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1293,7 +1293,7 @@ public static void LoadSpellHotfixes() string description = fields[2]; string auraDescription = fields[3]; - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.Spell, HotfixId = HotfixSpellBegin + counter @@ -1311,7 +1311,7 @@ public static void LoadSpellHotfixes() public static void LoadSpellNameHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellName{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1331,7 +1331,7 @@ public static void LoadSpellNameHotfixes() uint id = uint.Parse(fields[0]); string name = fields[1]; - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellName, HotfixId = HotfixSpellNameBegin + counter @@ -1347,7 +1347,7 @@ public static void LoadSpellNameHotfixes() public static void LoadSpellLevelsHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellLevels{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1372,7 +1372,7 @@ public static void LoadSpellLevelsHotfixes() byte maxPassiveAuraLevel = byte.Parse(fields[5]); uint spellId = uint.Parse(fields[6]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellLevels, HotfixId = HotfixSpellLevelsBegin + counter @@ -1393,7 +1393,7 @@ public static void LoadSpellLevelsHotfixes() public static void LoadSpellAuraOptionsHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellAuraOptions{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1421,7 +1421,7 @@ public static void LoadSpellAuraOptionsHotfixes() uint procTypeMask1 = uint.Parse(fields[8]); uint spellId = uint.Parse(fields[9]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellAuraOptions, HotfixId = HotfixSpellAuraOptionsBegin + counter @@ -1445,7 +1445,7 @@ public static void LoadSpellAuraOptionsHotfixes() public static void LoadSpellMiscHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellMisc{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1489,7 +1489,7 @@ public static void LoadSpellMiscHotfixes() uint attributes14 = uint.Parse(fields[24]); uint spellId = uint.Parse(fields[25]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellMisc, HotfixId = HotfixSpellMiscBegin + counter @@ -1529,7 +1529,7 @@ public static void LoadSpellMiscHotfixes() public static void LoadSpellEffectHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellEffect{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1583,7 +1583,7 @@ public static void LoadSpellEffectHotfixes() short implicitTarget2 = short.Parse(fields[34]); uint spellId = uint.Parse(fields[35]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellEffect, HotfixId = HotfixSpellEffectBegin + counter @@ -1633,7 +1633,7 @@ public static void LoadSpellEffectHotfixes() public static void LoadSpellXSpellVisualHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"SpellXSpellVisual{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1669,7 +1669,7 @@ public static void LoadSpellXSpellVisualHotfixes() else SpellVisuals.Add(spellId, id); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.SpellXSpellVisual, HotfixId = HotfixSpellXSpellVisualBegin + counter @@ -1697,7 +1697,7 @@ public static void LoadSpellXSpellVisualHotfixes() public static void LoadItemSparseHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"ItemSparse{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -1842,7 +1842,7 @@ public static void LoadItemSparseHotfixes() sbyte statValue10 = sbyte.Parse(fields[125]); sbyte requiredLevel = sbyte.Parse(fields[126]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { Status = HotfixStatus.Valid, TableHash = DB2Hash.ItemSparse, @@ -1983,7 +1983,7 @@ public static void LoadItemSparseHotfixes() public static void LoadCreatureDisplayInfoHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"CreatureDisplayInfo{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -2028,7 +2028,7 @@ public static void LoadCreatureDisplayInfoHotfixes() int textureVariationFileDataId2 = int.Parse(fields[25]); int textureVariationFileDataId3 = int.Parse(fields[26]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.CreatureDisplayInfo, HotfixId = HotfixCreatureDisplayInfoBegin + counter @@ -2070,7 +2070,7 @@ public static void LoadCreatureDisplayInfoHotfixes() public static void LoadCreatureDisplayInfoExtraHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"CreatureDisplayInfoExtra{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -2103,7 +2103,7 @@ public static void LoadCreatureDisplayInfoExtraHotfixes() byte customDisplayOption2 = byte.Parse(fields[13]); byte customDisplayOption3 = byte.Parse(fields[14]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { TableHash = DB2Hash.CreatureDisplayInfoExtra, HotfixId = HotfixCreatureDisplayInfoExtraBegin + counter @@ -2133,7 +2133,7 @@ public static void LoadCreatureDisplayInfoExtraHotfixes() public static void LoadCreatureDisplayInfoOptionHotfixes() { var path = Path.Combine("CSV", "Hotfix", $"CreatureDisplayInfoOption{ModernVersion.ExpansionVersion}.csv"); - using (TextFieldParser csvParser = new TextFieldParser(path)) + using (TextFieldParser csvParser = new(path)) { csvParser.CommentTokens = new string[] { "#" }; csvParser.SetDelimiters(new string[] { "," }); @@ -2155,7 +2155,7 @@ public static void LoadCreatureDisplayInfoOptionHotfixes() int chrCustomizationChoiceId = int.Parse(fields[2]); int creatureDisplayInfoExtraId = int.Parse(fields[3]); - HotfixRecord record = new HotfixRecord + HotfixRecord record = new() { Status = HotfixStatus.Valid, TableHash = DB2Hash.CreatureDisplayInfoOption, @@ -2192,7 +2192,7 @@ public class ItemDisplayData public class Battleground { public bool IsArena; - public List MapIds = new List(); + public List MapIds = new(); } public class TaxiPath { diff --git a/HermesProxy/World/HighGuid.cs b/HermesProxy/World/HighGuid.cs index 573f33e4..8ec9e3d3 100644 --- a/HermesProxy/World/HighGuid.cs +++ b/HermesProxy/World/HighGuid.cs @@ -19,8 +19,8 @@ public class HighGuidLegacy : HighGuid { readonly HighGuidTypeLegacy high; static readonly Dictionary HighLegacyToHighType - = new Dictionary - { + = new() + { { HighGuidTypeLegacy.None, HighGuidType.Null }, { HighGuidTypeLegacy.Player, HighGuidType.Player }, { HighGuidTypeLegacy.Group, HighGuidType.RaidGroup }, @@ -50,8 +50,8 @@ public class HighGuid703 : HighGuid { protected byte high; static readonly Dictionary High703ToHighType - = new Dictionary - { + = new() + { { HighGuidType703.Null, HighGuidType.Null }, { HighGuidType703.Uniq, HighGuidType.Uniq }, { HighGuidType703.Player, HighGuidType.Player }, diff --git a/HermesProxy/World/Objects/ActivePlayerData.cs b/HermesProxy/World/Objects/ActivePlayerData.cs index 0aa6ddb6..bd12457f 100644 --- a/HermesProxy/World/Objects/ActivePlayerData.cs +++ b/HermesProxy/World/Objects/ActivePlayerData.cs @@ -48,7 +48,7 @@ public class ActivePlayerData public int? XP; public int? NextLevelXP; public int? TrialXP; - public SkillInfo Skill = new SkillInfo(); + public SkillInfo Skill = new(); public int? CharacterPoints; public int? MaxTalentTiers; public uint? TrackCreatureMask; diff --git a/HermesProxy/World/Objects/MovementInfo.cs b/HermesProxy/World/Objects/MovementInfo.cs index 9627c6d8..f8e2415c 100644 --- a/HermesProxy/World/Objects/MovementInfo.cs +++ b/HermesProxy/World/Objects/MovementInfo.cs @@ -54,7 +54,7 @@ public sealed class MovementInfo public MovementInfo CopyFromMe() { - MovementInfo copy = new MovementInfo + MovementInfo copy = new() { Flags = this.Flags, FlagsExtra = this.FlagsExtra, diff --git a/HermesProxy/World/Objects/ObjectTypeConverter.cs b/HermesProxy/World/Objects/ObjectTypeConverter.cs index 5bc3a415..5bb799dd 100644 --- a/HermesProxy/World/Objects/ObjectTypeConverter.cs +++ b/HermesProxy/World/Objects/ObjectTypeConverter.cs @@ -6,7 +6,7 @@ namespace HermesProxy.World.Objects { public static class ObjectTypeConverter { - private static readonly Dictionary ConvDictLegacy = new Dictionary + private static readonly Dictionary ConvDictLegacy = new() { { ObjectTypeLegacy.Object, ObjectType.Object }, { ObjectTypeLegacy.Item, ObjectType.Item }, @@ -38,7 +38,7 @@ public static ObjectTypeLegacy ConvertToLegacy(ObjectType type) throw new ArgumentOutOfRangeException("0x" + type.ToString("X")); } - private static readonly Dictionary ConvDict801 = new Dictionary + private static readonly Dictionary ConvDict801 = new() { { ObjectType801.Object, ObjectType.Object }, { ObjectType801.Item, ObjectType.Item }, @@ -73,7 +73,7 @@ public static ObjectType801 ConvertTo801(ObjectType type) throw new ArgumentOutOfRangeException("0x" + type.ToString("X")); } - private static readonly Dictionary ConvDictBCC = new Dictionary + private static readonly Dictionary ConvDictBCC = new() { { ObjectTypeBCC.Object, ObjectType.Object }, { ObjectTypeBCC.Item, ObjectType.Item }, diff --git a/HermesProxy/World/Server/AccountDataManager.cs b/HermesProxy/World/Server/AccountDataManager.cs index cc882c06..4b06ee9a 100644 --- a/HermesProxy/World/Server/AccountDataManager.cs +++ b/HermesProxy/World/Server/AccountDataManager.cs @@ -214,7 +214,7 @@ public AccountData LoadData(WowGuid128 guid, uint type) { using (FileStream file = File.OpenRead(GetFullFileName(guid, type))) { - using (BinaryReader reader = new BinaryReader(File.OpenRead(GetFullFileName(guid, type)))) + using (BinaryReader reader = new(File.OpenRead(GetFullFileName(guid, type)))) { data = new(); ulong guidLow = reader.ReadUInt64(); @@ -251,7 +251,7 @@ public void SaveData(WowGuid128 guid, long timestamp, uint type, uint uncompress Data[type].UncompressedSize = uncompressedSize; Data[type].CompressedData = compressedData; - using (BinaryWriter writer = new BinaryWriter(File.Open(GetFullFileName(guid, type), FileMode.Create))) + using (BinaryWriter writer = new(File.Open(GetFullFileName(guid, type), FileMode.Create))) { writer.Write(guid.GetLowValue()); writer.Write(guid.GetHighValue()); @@ -271,7 +271,7 @@ public byte[] LoadCUFProfiles() { using (FileStream file = File.OpenRead(fileName)) { - using (BinaryReader reader = new BinaryReader(file)) + using (BinaryReader reader = new(file)) { return File.ReadAllBytes(fileName); } @@ -285,7 +285,7 @@ public void SaveCUFProfiles(byte[] data) { string fileName = Path.Combine(GetAccountDataDirectory(), "cuf.bin"); - using (BinaryWriter writer = new BinaryWriter(File.Open(fileName, FileMode.Create))) + using (BinaryWriter writer = new(File.Open(fileName, FileMode.Create))) { writer.Write(data); } diff --git a/HermesProxy/World/Server/CurrentPlayerStorage.cs b/HermesProxy/World/Server/CurrentPlayerStorage.cs index 73da9221..d7a14f90 100644 --- a/HermesProxy/World/Server/CurrentPlayerStorage.cs +++ b/HermesProxy/World/Server/CurrentPlayerStorage.cs @@ -147,10 +147,10 @@ private void SendSingleUpdateToClient(uint questBit, bool isSet) else _cachedQuestCompleted[idx] &= ~(((ulong)1) << bitIdx); - ObjectUpdate updateData = new ObjectUpdate(Session.GameState.CurrentPlayerGuid, UpdateTypeModern.Values, Session); + ObjectUpdate updateData = new(Session.GameState.CurrentPlayerGuid, UpdateTypeModern.Values, Session); updateData.ActivePlayerData.QuestCompleted[idx] = _cachedQuestCompleted[idx]; - UpdateObject updatePacket = new UpdateObject(Session.GameState); + UpdateObject updatePacket = new(Session.GameState); updatePacket.ObjectUpdates.Add(updateData); Session.WorldClient.SendPacketToClient(updatePacket); } diff --git a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs index 76b7d085..9969a8aa 100644 --- a/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ArenaHandler.cs @@ -13,7 +13,7 @@ void HandleArenaTeamRoster(ArenaTeamRosterRequest arena) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180) || GetSession().GameState.CurrentArenaTeamIds[arena.TeamIndex] == 0) { - ArenaTeamRosterResponse response = new ArenaTeamRosterResponse + ArenaTeamRosterResponse response = new() { TeamSize = ModernVersion.GetArenaTeamSizeFromIndex(arena.TeamIndex) }; @@ -21,11 +21,11 @@ void HandleArenaTeamRoster(ArenaTeamRosterRequest arena) } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ARENA_TEAM_QUERY); + WorldPacket packet = new(Opcode.CMSG_ARENA_TEAM_QUERY); packet.WriteUInt32(GetSession().GameState.CurrentArenaTeamIds[arena.TeamIndex]); SendPacketToServer(packet); - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_ARENA_TEAM_ROSTER); + WorldPacket packet2 = new(Opcode.CMSG_ARENA_TEAM_ROSTER); packet2.WriteUInt32(GetSession().GameState.CurrentArenaTeamIds[arena.TeamIndex]); SendPacketToServer(packet2); } @@ -36,7 +36,7 @@ void HandleArenaTeamQuery(ArenaTeamQuery arena) { if (GetSession().GameState.ArenaTeams.TryGetValue(arena.TeamId, out ArenaTeamData team)) { - ArenaTeamQueryResponse response = new ArenaTeamQueryResponse + ArenaTeamQueryResponse response = new() { TeamId = arena.TeamId, Emblem = new ArenaTeamEmblem @@ -58,7 +58,7 @@ void HandleArenaTeamQuery(ArenaTeamQuery arena) [PacketHandler(Opcode.CMSG_BATTLEMASTER_JOIN_ARENA)] void HandleBattlematerJoinArena(BattlemasterJoinArena join) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEMASTER_JOIN_ARENA); + WorldPacket packet = new(Opcode.CMSG_BATTLEMASTER_JOIN_ARENA); packet.WriteGuid(join.Guid.To64()); packet.WriteUInt8(join.TeamIndex); packet.WriteBool(true); // As Group @@ -69,7 +69,7 @@ void HandleBattlematerJoinArena(BattlemasterJoinArena join) [PacketHandler(Opcode.CMSG_BATTLEMASTER_JOIN_SKIRMISH)] void HandleBattlematerJoinSkirmish(BattlemasterJoinSkirmish join) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEMASTER_JOIN_ARENA); + WorldPacket packet = new(Opcode.CMSG_BATTLEMASTER_JOIN_ARENA); packet.WriteGuid(join.Guid.To64()); packet.WriteUInt8(join.TeamSize); packet.WriteBool(join.AsGroup); @@ -81,7 +81,7 @@ void HandleBattlematerJoinSkirmish(BattlemasterJoinSkirmish join) [PacketHandler(Opcode.CMSG_ARENA_TEAM_LEADER)] void HandleArenaUnimplemented(ArenaTeamRemove arena) { - WorldPacket packet = new WorldPacket(arena.GetUniversalOpcode()); + WorldPacket packet = new(arena.GetUniversalOpcode()); packet.WriteUInt32(arena.TeamId); packet.WriteCString(GetSession().GameState.GetPlayerName(arena.PlayerGuid)); SendPacketToServer(packet); @@ -91,7 +91,7 @@ void HandleArenaUnimplemented(ArenaTeamRemove arena) [PacketHandler(Opcode.CMSG_ARENA_TEAM_LEAVE)] void HandleArenaTeamLeave(ArenaTeamLeave arena) { - WorldPacket packet = new WorldPacket(arena.GetUniversalOpcode()); + WorldPacket packet = new(arena.GetUniversalOpcode()); packet.WriteUInt32(arena.TeamId); SendPacketToServer(packet); } @@ -100,7 +100,7 @@ void HandleArenaTeamLeave(ArenaTeamLeave arena) [PacketHandler(Opcode.CMSG_ARENA_TEAM_DECLINE)] void HandleArenaTeamInviteResponse(ArenaTeamAccept arena) { - WorldPacket packet = new WorldPacket(arena.GetUniversalOpcode()); + WorldPacket packet = new(arena.GetUniversalOpcode()); SendPacketToServer(packet); } } diff --git a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs index d0d50635..b06d692b 100644 --- a/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/AuctionHandler.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_AUCTION_HELLO_REQUEST)] void HandleAuctionHelloRequest(InteractWithNPC interact) { - WorldPacket packet = new WorldPacket(Opcode.MSG_AUCTION_HELLO); + WorldPacket packet = new(Opcode.MSG_AUCTION_HELLO); packet.WriteGuid(interact.CreatureGUID.To64()); SendPacketToServer(packet); } @@ -18,7 +18,7 @@ void HandleAuctionHelloRequest(InteractWithNPC interact) [PacketHandler(Opcode.CMSG_AUCTION_LIST_BIDDED_ITEMS)] void HandleAuctionListBidderItems(AuctionListBidderItems auction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_LIST_BIDDED_ITEMS); + WorldPacket packet = new(Opcode.CMSG_AUCTION_LIST_BIDDED_ITEMS); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteUInt32(auction.Offset); packet.WriteInt32(auction.AuctionItemIDs.Count); @@ -30,7 +30,7 @@ void HandleAuctionListBidderItems(AuctionListBidderItems auction) [PacketHandler(Opcode.CMSG_AUCTION_LIST_OWNED_ITEMS)] void HandleAuctionListOwnerItems(AuctionListOwnerItems auction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_LIST_OWNED_ITEMS); + WorldPacket packet = new(Opcode.CMSG_AUCTION_LIST_OWNED_ITEMS); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteUInt32(auction.Offset); SendPacketToServer(packet); @@ -39,7 +39,7 @@ void HandleAuctionListOwnerItems(AuctionListOwnerItems auction) [PacketHandler(Opcode.CMSG_AUCTION_LIST_ITEMS)] void HandleAuctionListItems(AuctionListItems auction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_LIST_ITEMS); + WorldPacket packet = new(Opcode.CMSG_AUCTION_LIST_ITEMS); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteUInt32(auction.Offset); packet.WriteCString(auction.Name); @@ -161,7 +161,7 @@ void HandleAuctionSellItem(AuctionSellItem auction) { foreach (var item in auction.Items) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_SELL_ITEM); + WorldPacket packet = new(Opcode.CMSG_AUCTION_SELL_ITEM); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteGuid(item.Guid.To64()); packet.WriteUInt32((uint)auction.MinBid); @@ -172,7 +172,7 @@ void HandleAuctionSellItem(AuctionSellItem auction) } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_SELL_ITEM); + WorldPacket packet = new(Opcode.CMSG_AUCTION_SELL_ITEM); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteInt32(auction.Items.Count); foreach (var item in auction.Items) @@ -190,7 +190,7 @@ void HandleAuctionSellItem(AuctionSellItem auction) [PacketHandler(Opcode.CMSG_AUCTION_REMOVE_ITEM)] void HandleAuctionRemoveItem(AuctionRemoveItem auction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_REMOVE_ITEM); + WorldPacket packet = new(Opcode.CMSG_AUCTION_REMOVE_ITEM); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteUInt32(auction.AuctionID); SendPacketToServer(packet); @@ -199,7 +199,7 @@ void HandleAuctionRemoveItem(AuctionRemoveItem auction) [PacketHandler(Opcode.CMSG_AUCTION_PLACE_BID)] void HandleAuctionPlaceBId(AuctionPlaceBid auction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUCTION_PLACE_BID); + WorldPacket packet = new(Opcode.CMSG_AUCTION_PLACE_BID); packet.WriteGuid(auction.Auctioneer.To64()); packet.WriteUInt32(auction.AuctionID); packet.WriteUInt32((uint)auction.BidAmount); diff --git a/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs b/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs index cc93ec7e..0864721b 100644 --- a/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/BattlegroundHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_BATTLEMASTER_JOIN)] void HandleBattlefieldJoin(BattlemasterJoin join) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEMASTER_JOIN); + WorldPacket packet = new(Opcode.CMSG_BATTLEMASTER_JOIN); packet.WriteGuid(join.BattlemasterGuid.To64()); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteUInt32(GameData.GetMapIdFromBattlegroundId(join.BattlefieldListId)); @@ -24,7 +24,7 @@ void HandleBattlefieldJoin(BattlemasterJoin join) [PacketHandler(Opcode.CMSG_BATTLEFIELD_PORT)] void HandleBattlefieldPort(BattlefieldPort port) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEFIELD_PORT); + WorldPacket packet = new(Opcode.CMSG_BATTLEFIELD_PORT); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { packet.WriteUInt8(2); @@ -44,21 +44,21 @@ void HandleBattlefieldPort(BattlefieldPort port) [PacketHandler(Opcode.CMSG_REQUEST_BATTLEFIELD_STATUS)] void HandleRequestBattlefieldStatus(RequestBattlefieldStatus log) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEFIELD_STATUS); + WorldPacket packet = new(Opcode.CMSG_BATTLEFIELD_STATUS); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_PVP_LOG_DATA)] void HandlePvPLogData(PVPLogDataRequest log) { - WorldPacket packet = new WorldPacket(Opcode.MSG_PVP_LOG_DATA); + WorldPacket packet = new(Opcode.MSG_PVP_LOG_DATA); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_BATTLEFIELD_LEAVE)] void HandleBattlefieldLeave(BattlefieldLeave leave) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BATTLEFIELD_LEAVE); + WorldPacket packet = new(Opcode.CMSG_BATTLEFIELD_LEAVE); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { packet.WriteUInt8(2); diff --git a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs index ae36a9a2..93898d8e 100644 --- a/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/CharacterHandler.cs @@ -14,14 +14,14 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_ENUM_CHARACTERS)] void HandleEnumCharacters(EnumCharacters charEnum) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ENUM_CHARACTERS); + WorldPacket packet = new(Opcode.CMSG_ENUM_CHARACTERS); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_CREATE_CHARACTER)] void HandleCreateCharacter(CreateCharacter charCreate) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CREATE_CHARACTER); + WorldPacket packet = new(Opcode.CMSG_CREATE_CHARACTER); packet.WriteCString(charCreate.CreateInfo.Name); packet.WriteUInt8((byte)charCreate.CreateInfo.RaceId); packet.WriteUInt8((byte)charCreate.CreateInfo.ClassId); @@ -40,7 +40,7 @@ void HandleCreateCharacter(CreateCharacter charCreate) [PacketHandler(Opcode.CMSG_CHAR_DELETE)] void HandleCharDelete(CharDelete charDelete) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAR_DELETE); + WorldPacket packet = new(Opcode.CMSG_CHAR_DELETE); packet.WriteGuid(charDelete.Guid.To64()); SendPacketToServer(packet); } @@ -63,7 +63,7 @@ void HandleNameQueryRequest(QueryPlayerName queryPlayerName) GetSession().GameState.CurrentPlayerStorage.LoadCurrentPlayer(); } - WorldPacket packet = new WorldPacket(Opcode.CMSG_NAME_QUERY); + WorldPacket packet = new(Opcode.CMSG_NAME_QUERY); packet.WriteGuid(queryPlayerName.Player.To64()); SendPacketToServer(packet, GetSession().GameState.IsInWorld ? Opcode.MSG_NULL_ACTION : Opcode.SMSG_LOGIN_VERIFY_WORLD); } @@ -87,7 +87,7 @@ void HandlePlayerLogin(PlayerLogin playerLogin) GetSession().AccountMetaDataMgr.SaveLastSelectedCharacter(realm.Name, selectedChar.Name, playerLogin.Guid.Low, Time.UnixTime); GetSession().GameState.IsFirstEnterWorld = true; - WorldPacket packet = new WorldPacket(Opcode.CMSG_PLAYER_LOGIN); + WorldPacket packet = new(Opcode.CMSG_PLAYER_LOGIN); packet.WriteGuid(playerLogin.Guid.To64()); SendPacketToServer(packet); SendConnectToInstance(ConnectToSerial.WorldAttempt1); @@ -97,21 +97,21 @@ void HandlePlayerLogin(PlayerLogin playerLogin) [PacketHandler(Opcode.CMSG_LOGOUT_REQUEST)] void HandleLogoutRequest(LogoutRequest logoutRequest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOGOUT_REQUEST); + WorldPacket packet = new(Opcode.CMSG_LOGOUT_REQUEST); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_LOGOUT_CANCEL)] void HandleLogoutCancel(LogoutCancel logoutCancel) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOGOUT_CANCEL); + WorldPacket packet = new(Opcode.CMSG_LOGOUT_CANCEL); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_REQUEST_PLAYED_TIME)] void HandleRequestPlayedTime(RequestPlayedTime played) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_REQUEST_PLAYED_TIME); + WorldPacket packet = new(Opcode.CMSG_REQUEST_PLAYED_TIME); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteBool(played.TriggerScriptEvent); SendPacketToServer(packet); @@ -121,14 +121,14 @@ void HandleRequestPlayedTime(RequestPlayedTime played) [PacketHandler(Opcode.CMSG_TOGGLE_PVP)] void HandleTogglePvP(TogglePvP pvp) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TOGGLE_PVP); + WorldPacket packet = new(Opcode.CMSG_TOGGLE_PVP); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_SET_PVP)] void HandleTogglePvP(SetPvP pvp) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TOGGLE_PVP); + WorldPacket packet = new(Opcode.CMSG_TOGGLE_PVP); packet.WriteBool(pvp.Enable); SendPacketToServer(packet); } @@ -136,7 +136,7 @@ void HandleTogglePvP(SetPvP pvp) [PacketHandler(Opcode.CMSG_SET_ACTION_BUTTON)] void HandleSetActionButton(SetActionButton button) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ACTION_BUTTON); + WorldPacket packet = new(Opcode.CMSG_SET_ACTION_BUTTON); packet.WriteUInt8(button.Index); packet.WriteUInt16(button.Action); packet.WriteUInt16(button.Type); @@ -146,7 +146,7 @@ void HandleSetActionButton(SetActionButton button) [PacketHandler(Opcode.CMSG_SET_ACTION_BAR_TOGGLES)] void HandleSetActionBarToggles(SetActionBarToggles bars) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ACTION_BAR_TOGGLES); + WorldPacket packet = new(Opcode.CMSG_SET_ACTION_BAR_TOGGLES); packet.WriteUInt8(bars.Mask); SendPacketToServer(packet); } @@ -154,7 +154,7 @@ void HandleSetActionBarToggles(SetActionBarToggles bars) [PacketHandler(Opcode.CMSG_UNLEARN_SKILL)] void HandleUnlearnSkill(UnlearnSkill skill) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_UNLEARN_SKILL); + WorldPacket packet = new(Opcode.CMSG_UNLEARN_SKILL); packet.WriteUInt32(skill.SkillLine); SendPacketToServer(packet); } @@ -163,7 +163,7 @@ void HandleUnlearnSkill(UnlearnSkill skill) [PacketHandler(Opcode.CMSG_PLAYER_SHOWING_HELM)] void HandleShowHelmOrCloak(PlayerShowingHelmOrCloak show) { - WorldPacket packet = new WorldPacket(show.GetUniversalOpcode()); + WorldPacket packet = new(show.GetUniversalOpcode()); packet.WriteBool(show.Showing); SendPacketToServer(packet); } @@ -171,7 +171,7 @@ void HandleShowHelmOrCloak(PlayerShowingHelmOrCloak show) [PacketHandler(Opcode.CMSG_INSPECT)] void HandleInspect(Inspect inspect) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_INSPECT); + WorldPacket packet = new(Opcode.CMSG_INSPECT); packet.WriteGuid(inspect.Target.To64()); SendPacketToServer(packet); } @@ -179,7 +179,7 @@ void HandleInspect(Inspect inspect) [PacketHandler(Opcode.CMSG_INSPECT_HONOR_STATS)] void HandleInspectHonorStats(Inspect inspect) { - WorldPacket packet = new WorldPacket(Opcode.MSG_INSPECT_HONOR_STATS); + WorldPacket packet = new(Opcode.MSG_INSPECT_HONOR_STATS); packet.WriteGuid(inspect.Target.To64()); SendPacketToServer(packet); } @@ -189,13 +189,13 @@ void HandleInspectArenaTeams(Inspect inspect) { if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.MSG_INSPECT_ARENA_TEAMS); + WorldPacket packet = new(Opcode.MSG_INSPECT_ARENA_TEAMS); packet.WriteGuid(inspect.Target.To64()); SendPacketToServer(packet); } else { - InspectPvP pvp = new InspectPvP + InspectPvP pvp = new() { PlayerGUID = inspect.Target }; @@ -209,7 +209,7 @@ void HandleInspectArenaTeams(Inspect inspect) [PacketHandler(Opcode.CMSG_CHARACTER_RENAME_REQUEST)] void HandleCharacterRenameRequest(CharacterRenameRequest rename) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHARACTER_RENAME_REQUEST); + WorldPacket packet = new(Opcode.CMSG_CHARACTER_RENAME_REQUEST); packet.WriteGuid(rename.Guid.To64()); packet.WriteCString(rename.NewName); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs index 4ce663e8..6e4e88eb 100644 --- a/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ChatHandler.cs @@ -31,7 +31,7 @@ void HandleChatLeaveChannel(LeaveChannel leave) void HandleChatChannelCommand(ChannelCommand command) { - WorldPacket packet = new WorldPacket(command.GetUniversalOpcode()); + WorldPacket packet = new(command.GetUniversalOpcode()); packet.WriteCString(command.ChannelName); SendPacketToServer(packet); } @@ -39,7 +39,7 @@ void HandleChatChannelCommand(ChannelCommand command) [PacketHandler(Opcode.CMSG_CHAT_CHANNEL_LIST)] void HandleChatChannelList(ChannelCommand command) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_CHANNEL_LIST); + WorldPacket packet = new(Opcode.CMSG_CHAT_CHANNEL_LIST); packet.WriteCString(command.ChannelName); SendPacketToServer(packet); GetSession().GameState.ChannelDisplayList = false; @@ -50,13 +50,13 @@ void HandleChatChannelDisplayList(ChannelCommand command) { if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_CHANNEL_LIST); + WorldPacket packet = new(Opcode.CMSG_CHAT_CHANNEL_LIST); packet.WriteCString(command.ChannelName); SendPacketToServer(packet); } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_CHANNEL_DISPLAY_LIST); + WorldPacket packet = new(Opcode.CMSG_CHAT_CHANNEL_DISPLAY_LIST); packet.WriteCString(command.ChannelName); SendPacketToServer(packet); } @@ -69,7 +69,7 @@ void HandleChatChannelDeclineInvite(ChannelCommand command) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_CHAT_CHANNEL_DECLINE_INVITE); + WorldPacket packet = new(Opcode.CMSG_CHAT_CHANNEL_DECLINE_INVITE); packet.WriteCString(command.ChannelName); SendPacketToServer(packet); } @@ -218,7 +218,7 @@ void HandleAddonMessageTargeted(ChatAddonMessageTargeted packet) [PacketHandler(Opcode.CMSG_SEND_TEXT_EMOTE)] void HandleSendTextEmote(CTextEmote emote) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SEND_TEXT_EMOTE); + WorldPacket packet = new(Opcode.CMSG_SEND_TEXT_EMOTE); packet.WriteInt32(emote.EmoteID); packet.WriteInt32(emote.SoundIndex); packet.WriteGuid(emote.Target.To64()); diff --git a/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs b/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs index 33fdb405..c03681e6 100644 --- a/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/CombatHandler.cs @@ -9,20 +9,20 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_ATTACK_SWING)] void HandleAttackSwing(AttackSwing attack) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ATTACK_SWING); + WorldPacket packet = new(Opcode.CMSG_ATTACK_SWING); packet.WriteGuid(attack.Victim.To64()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_ATTACK_STOP)] void HandleAttackSwing(AttackStop attack) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ATTACK_STOP); + WorldPacket packet = new(Opcode.CMSG_ATTACK_STOP); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_SET_SHEATHED)] void HandleSetSheathed(SetSheathed sheath) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_SHEATHED); + WorldPacket packet = new(Opcode.CMSG_SET_SHEATHED); packet.WriteInt32(sheath.SheathState); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs index 7fb590e8..732b3de3 100644 --- a/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/DuelHandler.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_CAN_DUEL)] void HandleCanDuel(CanDuel request) { - CanDuelResult result = new CanDuelResult + CanDuelResult result = new() { TargetGUID = request.TargetGUID, Result = true @@ -22,13 +22,13 @@ void HandleDuelResponse(DuelResponse response) { if (response.Accepted) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_DUEL_ACCEPTED); + WorldPacket packet = new(Opcode.CMSG_DUEL_ACCEPTED); packet.WriteGuid(response.ArbiterGUID.To64()); SendPacketToServer(packet); } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_DUEL_CANCELLED); + WorldPacket packet = new(Opcode.CMSG_DUEL_CANCELLED); packet.WriteGuid(response.ArbiterGUID.To64()); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs b/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs index 4777e96a..0b831ce9 100644 --- a/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GameObjectHandler.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_GAME_OBJ_USE)] void HandleGameObjUse(GameObjUse use) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GAME_OBJ_USE); + WorldPacket packet = new(Opcode.CMSG_GAME_OBJ_USE); packet.WriteGuid(use.Guid.To64()); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs index 949e1360..e0090b7f 100644 --- a/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GroupHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_PARTY_INVITE)] void HandleUpdateRaidTarget(PartyInviteClient invite) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PARTY_INVITE); + WorldPacket packet = new(Opcode.CMSG_PARTY_INVITE); packet.WriteCString(invite.TargetName); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteUInt32(0); @@ -22,14 +22,14 @@ void HandlePartyInviteResponse(PartyInviteResponse invite) { if (invite.Accept) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_ACCEPT); + WorldPacket packet = new(Opcode.CMSG_GROUP_ACCEPT); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteUInt32(0); SendPacketToServer(packet); } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_DECLINE); + WorldPacket packet = new(Opcode.CMSG_GROUP_DECLINE); SendPacketToServer(packet); } } @@ -37,14 +37,14 @@ void HandlePartyInviteResponse(PartyInviteResponse invite) [PacketHandler(Opcode.CMSG_LEAVE_GROUP)] void HandleLeaveGroup(LeaveGroup leave) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_DISBAND); + WorldPacket packet = new(Opcode.CMSG_GROUP_DISBAND); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_PARTY_UNINVITE)] void HandlePartyUninvite(PartyUninvite kick) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_UNINVITE_GUID); + WorldPacket packet = new(Opcode.CMSG_GROUP_UNINVITE_GUID); packet.WriteGuid(kick.TargetGUID.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteCString(kick.Reason); @@ -54,7 +54,7 @@ void HandlePartyUninvite(PartyUninvite kick) [PacketHandler(Opcode.CMSG_SET_ASSISTANT_LEADER)] void HandleSetAssistantLeader(SetAssistantLeader assist) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ASSISTANT_LEADER); + WorldPacket packet = new(Opcode.CMSG_SET_ASSISTANT_LEADER); packet.WriteGuid(assist.TargetGUID.To64()); packet.WriteBool(assist.Apply); SendPacketToServer(packet); @@ -69,7 +69,7 @@ void HandleSetAssistantLeader(SetEveryoneIsAssistant assist) if (member.GUID == GetSession().GameState.CurrentPlayerGuid) continue; - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ASSISTANT_LEADER); + WorldPacket packet = new(Opcode.CMSG_SET_ASSISTANT_LEADER); packet.WriteGuid(member.GUID.To64()); packet.WriteBool(assist.Apply); SendPacketToServer(packet); @@ -79,7 +79,7 @@ void HandleSetAssistantLeader(SetEveryoneIsAssistant assist) [PacketHandler(Opcode.CMSG_SET_PARTY_LEADER)] void HandleSetPartyLeader(SetPartyLeader leader) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_PARTY_LEADER); + WorldPacket packet = new(Opcode.CMSG_SET_PARTY_LEADER); packet.WriteGuid(leader.TargetGUID.To64()); SendPacketToServer(packet); } @@ -87,25 +87,25 @@ void HandleSetPartyLeader(SetPartyLeader leader) [PacketHandler(Opcode.CMSG_CONVERT_RAID)] void HandleConvertRaid(ConvertRaid raid) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CONVERT_RAID); + WorldPacket packet = new(Opcode.CMSG_CONVERT_RAID); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_DO_READY_CHECK)] void HandlReadyCheck(DoReadyCheck raid) { - WorldPacket packet = new WorldPacket(Opcode.MSG_RAID_READY_CHECK); + WorldPacket packet = new(Opcode.MSG_RAID_READY_CHECK); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_READY_CHECK_RESPONSE)] void HandlReadyCheckResponse(ReadyCheckResponseClient raid) { - WorldPacket packet = new WorldPacket(Opcode.MSG_RAID_READY_CHECK); + WorldPacket packet = new(Opcode.MSG_RAID_READY_CHECK); packet.WriteBool(raid.IsReady); SendPacketToServer(packet); - ReadyCheckResponse ready = new ReadyCheckResponse + ReadyCheckResponse ready = new() { Player = GetSession().GameState.CurrentPlayerGuid, IsReady = raid.IsReady, @@ -117,7 +117,7 @@ void HandlReadyCheckResponse(ReadyCheckResponseClient raid) [PacketHandler(Opcode.CMSG_UPDATE_RAID_TARGET)] void HandleUpdateRaidTarget(UpdateRaidTarget update) { - WorldPacket packet = new WorldPacket(Opcode.MSG_RAID_TARGET_UPDATE); + WorldPacket packet = new(Opcode.MSG_RAID_TARGET_UPDATE); packet.WriteInt8(update.Symbol); packet.WriteGuid(update.Target.To64()); SendPacketToServer(packet); @@ -128,7 +128,7 @@ void HandleSummonResponse(SummonResponse update) { if (update.Accept || LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SUMMON_RESPONSE); + WorldPacket packet = new(Opcode.CMSG_SUMMON_RESPONSE); packet.WriteGuid(update.SummonerGUID.To64()); packet.WriteBool(update.Accept); SendPacketToServer(packet); @@ -138,7 +138,7 @@ void HandleSummonResponse(SummonResponse update) [PacketHandler(Opcode.CMSG_MINIMAP_PING)] void HandleMinimapPing(MinimapPingClient ping) { - WorldPacket packet = new WorldPacket(Opcode.MSG_MINIMAP_PING); + WorldPacket packet = new(Opcode.MSG_MINIMAP_PING); packet.WriteVector2(ping.Position); SendPacketToServer(packet); } @@ -146,7 +146,7 @@ void HandleMinimapPing(MinimapPingClient ping) [PacketHandler(Opcode.CMSG_RANDOM_ROLL)] void HandleMinimapPing(RandomRollClient roll) { - WorldPacket packet = new WorldPacket(Opcode.MSG_RANDOM_ROLL); + WorldPacket packet = new(Opcode.MSG_RANDOM_ROLL); packet.WriteInt32(roll.Min); packet.WriteInt32(roll.Max); SendPacketToServer(packet); @@ -155,7 +155,7 @@ void HandleMinimapPing(RandomRollClient roll) [PacketHandler(Opcode.CMSG_REQUEST_PARTY_MEMBER_STATS)] void HandleRequestPartyMemberStats(RequestPartyMemberStats request) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_REQUEST_PARTY_MEMBER_STATS); + WorldPacket packet = new(Opcode.CMSG_REQUEST_PARTY_MEMBER_STATS); packet.WriteGuid(request.TargetGUID.To64()); SendPacketToServer(packet); } @@ -163,7 +163,7 @@ void HandleRequestPartyMemberStats(RequestPartyMemberStats request) [PacketHandler(Opcode.CMSG_GROUP_CHANGE_SUB_GROUP)] void HandleGroupChangeSubGroup(ChangeSubGroup group) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_CHANGE_SUB_GROUP); + WorldPacket packet = new(Opcode.CMSG_GROUP_CHANGE_SUB_GROUP); packet.WriteCString(GetSession().GameState.GetPlayerName(group.TargetGUID)); packet.WriteUInt8(group.NewSubGroup); SendPacketToServer(packet); @@ -172,7 +172,7 @@ void HandleGroupChangeSubGroup(ChangeSubGroup group) [PacketHandler(Opcode.CMSG_GROUP_SWAP_SUB_GROUP)] void HandleGroupSwapSubGroup(SwapSubGroups group) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GROUP_SWAP_SUB_GROUP); + WorldPacket packet = new(Opcode.CMSG_GROUP_SWAP_SUB_GROUP); packet.WriteCString(GetSession().GameState.GetPlayerName(group.FirstTarget)); packet.WriteCString(GetSession().GameState.GetPlayerName(group.SecondTarget)); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs b/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs index 0304fcaf..d5cc8c6d 100644 --- a/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/GuildHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_QUERY_GUILD_INFO)] void HandleQueryGuildInfo(QueryGuildInfo query) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_GUILD_INFO); + WorldPacket packet = new(Opcode.CMSG_QUERY_GUILD_INFO); packet.WriteUInt32((uint)query.GuildGuid.GetCounter()); SendPacketToServer(packet); } @@ -21,7 +21,7 @@ void HandleGuildPermissionsQuery(GuildPermissionsQuery query) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.MSG_GUILD_PERMISSIONS); + WorldPacket packet = new(Opcode.MSG_GUILD_PERMISSIONS); SendPacketToServer(packet); } @@ -31,24 +31,24 @@ void HandleGuildBankRemainingWithdrawnMoneyQuery(GuildBankRemainingWithdrawMoney if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.MSG_GUILD_BANK_MONEY_WITHDRAWN); + WorldPacket packet = new(Opcode.MSG_GUILD_BANK_MONEY_WITHDRAWN); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_GUILD_GET_ROSTER)] void HandleGuildGetRoster(GuildGetRoster query) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_INFO); + WorldPacket packet = new(Opcode.CMSG_GUILD_INFO); SendPacketToServer(packet); - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_GUILD_GET_ROSTER); + WorldPacket packet2 = new(Opcode.CMSG_GUILD_GET_ROSTER); SendPacketToServer(packet2); } [PacketHandler(Opcode.CMSG_GUILD_UPDATE_MOTD_TEXT)] void HandleGuildUpdateMotdText(GuildUpdateMotdText text) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_UPDATE_MOTD_TEXT); + WorldPacket packet = new(Opcode.CMSG_GUILD_UPDATE_MOTD_TEXT); packet.WriteCString(text.MotdText); SendPacketToServer(packet); } @@ -56,7 +56,7 @@ void HandleGuildUpdateMotdText(GuildUpdateMotdText text) [PacketHandler(Opcode.CMSG_GUILD_UPDATE_INFO_TEXT)] void HandleGuildUpdateInfoText(GuildUpdateInfoText text) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_UPDATE_INFO_TEXT); + WorldPacket packet = new(Opcode.CMSG_GUILD_UPDATE_INFO_TEXT); packet.WriteCString(text.InfoText); SendPacketToServer(packet); } @@ -64,7 +64,7 @@ void HandleGuildUpdateInfoText(GuildUpdateInfoText text) [PacketHandler(Opcode.CMSG_GUILD_SET_MEMBER_NOTE)] void HandleGuildSetMemberNote(GuildSetMemberNote note) { - WorldPacket packet = new WorldPacket(note.IsPublic ? Opcode.CMSG_GUILD_SET_PUBLIC_NOTE : Opcode.CMSG_GUILD_SET_OFFICER_NOTE); + WorldPacket packet = new(note.IsPublic ? Opcode.CMSG_GUILD_SET_PUBLIC_NOTE : Opcode.CMSG_GUILD_SET_OFFICER_NOTE); packet.WriteCString(GetSession().GameState.GetPlayerName(note.NoteeGUID)); packet.WriteCString(note.Note); SendPacketToServer(packet); @@ -73,7 +73,7 @@ void HandleGuildSetMemberNote(GuildSetMemberNote note) [PacketHandler(Opcode.CMSG_GUILD_PROMOTE_MEMBER)] void HandleGuildPromoteMember(GuildPromoteMember promote) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_PROMOTE_MEMBER); + WorldPacket packet = new(Opcode.CMSG_GUILD_PROMOTE_MEMBER); packet.WriteCString(GetSession().GameState.GetPlayerName(promote.Promotee)); SendPacketToServer(packet); } @@ -81,7 +81,7 @@ void HandleGuildPromoteMember(GuildPromoteMember promote) [PacketHandler(Opcode.CMSG_GUILD_DEMOTE_MEMBER)] void HandleGuildDemoteMember(GuildDemoteMember demote) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_DEMOTE_MEMBER); + WorldPacket packet = new(Opcode.CMSG_GUILD_DEMOTE_MEMBER); packet.WriteCString(GetSession().GameState.GetPlayerName(demote.Demotee)); SendPacketToServer(packet); } @@ -89,7 +89,7 @@ void HandleGuildDemoteMember(GuildDemoteMember demote) [PacketHandler(Opcode.CMSG_GUILD_OFFICER_REMOVE_MEMBER)] void HandleGuildOfficerRemoveMember(GuildOfficerRemoveMember remove) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_OFFICER_REMOVE_MEMBER); + WorldPacket packet = new(Opcode.CMSG_GUILD_OFFICER_REMOVE_MEMBER); packet.WriteCString(GetSession().GameState.GetPlayerName(remove.Removee)); SendPacketToServer(packet); } @@ -99,13 +99,13 @@ void HandleGuildInviteByName(GuildInviteByName invite) { if (invite.ArenaTeamId == 0) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_INVITE_BY_NAME); + WorldPacket packet = new(Opcode.CMSG_GUILD_INVITE_BY_NAME); packet.WriteCString(invite.Name); SendPacketToServer(packet); } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ARENA_TEAM_INVITE); + WorldPacket packet = new(Opcode.CMSG_ARENA_TEAM_INVITE); packet.WriteUInt32(invite.ArenaTeamId); packet.WriteCString(invite.Name); SendPacketToServer(packet); @@ -115,7 +115,7 @@ void HandleGuildInviteByName(GuildInviteByName invite) [PacketHandler(Opcode.CMSG_GUILD_SET_RANK_PERMISSIONS)] void HandleGuildSetRankPermissions(GuildSetRankPermissions rank) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_SET_RANK_PERMISSIONS); + WorldPacket packet = new(Opcode.CMSG_GUILD_SET_RANK_PERMISSIONS); packet.WriteUInt32(rank.RankID); packet.WriteUInt32(rank.Flags); packet.WriteCString(rank.RankName); @@ -134,7 +134,7 @@ void HandleGuildSetRankPermissions(GuildSetRankPermissions rank) [PacketHandler(Opcode.CMSG_GUILD_ADD_RANK)] void HandleGuildAddRank(GuildAddRank rank) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_ADD_RANK); + WorldPacket packet = new(Opcode.CMSG_GUILD_ADD_RANK); packet.WriteCString(rank.Name); SendPacketToServer(packet); } @@ -142,14 +142,14 @@ void HandleGuildAddRank(GuildAddRank rank) [PacketHandler(Opcode.CMSG_GUILD_DELETE_RANK)] void HandleGuildDeleteRank(GuildDeleteRank rank) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_DELETE_RANK); + WorldPacket packet = new(Opcode.CMSG_GUILD_DELETE_RANK); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_GUILD_SET_GUILD_MASTER)] void HandleGuildSetGuildMaster(GuildSetGuildMaster master) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_SET_GUILD_MASTER); + WorldPacket packet = new(Opcode.CMSG_GUILD_SET_GUILD_MASTER); packet.WriteCString(master.NewMasterName); SendPacketToServer(packet); } @@ -157,35 +157,35 @@ void HandleGuildSetGuildMaster(GuildSetGuildMaster master) [PacketHandler(Opcode.CMSG_GUILD_LEAVE)] void HandleGuildLeave(GuildLeave leave) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_LEAVE); + WorldPacket packet = new(Opcode.CMSG_GUILD_LEAVE); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_ACCEPT_GUILD_INVITE)] void HandleGuildAccept(AcceptGuildInvite accept) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ACCEPT_GUILD_INVITE); + WorldPacket packet = new(Opcode.CMSG_ACCEPT_GUILD_INVITE); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_GUILD_DECLINE_INVITATION)] void HandleGuildDecline(DeclineGuildInvite decline) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_DECLINE_INVITATION); + WorldPacket packet = new(Opcode.CMSG_GUILD_DECLINE_INVITATION); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_GUILD_DELETE)] void HandleGuildDelete(GuildDelete delete) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_DELETE); + WorldPacket packet = new(Opcode.CMSG_GUILD_DELETE); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_SAVE_GUILD_EMBLEM)] void HandleSaveGuildEmblem(SaveGuildEmblem emblem) { - WorldPacket packet = new WorldPacket(Opcode.MSG_SAVE_GUILD_EMBLEM); + WorldPacket packet = new(Opcode.MSG_SAVE_GUILD_EMBLEM); packet.WriteGuid(emblem.DesignerGUID.To64()); packet.WriteUInt32(emblem.EmblemStyle); packet.WriteUInt32(emblem.EmblemColor); @@ -201,10 +201,10 @@ void HandleDeclineGuildInvites(SetAutoDeclineGuildInvites packet) GetSession().GameState.CurrentPlayerStorage.Settings.SetAutoBlockGuildInvites(packet.GuildInvitesShouldGetBlocked); // Send update to client - ObjectUpdate updateData = new ObjectUpdate(GetSession().GameState.CurrentPlayerGuid, UpdateTypeModern.Values, GetSession()); + ObjectUpdate updateData = new(GetSession().GameState.CurrentPlayerGuid, UpdateTypeModern.Values, GetSession()); PlayerFlags flags = GetSession().GameState.CurrentPlayerStorage.Settings.CreateNewFlags(); updateData.PlayerData.PlayerFlags = (uint) flags; - UpdateObject updatePacket = new UpdateObject(GetSession().GameState); + UpdateObject updatePacket = new(GetSession().GameState); updatePacket.ObjectUpdates.Add(updateData); GetSession().WorldClient.SendPacketToClient(updatePacket); } @@ -212,14 +212,14 @@ void HandleDeclineGuildInvites(SetAutoDeclineGuildInvites packet) [PacketHandler(Opcode.CMSG_GUILD_AUTO_DECLINE_INVITATION)] void HandleGuildAutoDeclineInvitation(AutoDeclineGuildInvite autoDecline) { // This is called when the client still receives a guild invite after enabling AutoDecline - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_DECLINE_INVITATION); + WorldPacket packet = new(Opcode.CMSG_GUILD_DECLINE_INVITATION); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_GUILD_BANK_ACTIVATE)] void HandleGuildBankActivate(GuildBankAtivate activate) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_ACTIVATE); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_ACTIVATE); packet.WriteGuid(activate.BankGuid.To64()); packet.WriteBool(activate.FullUpdate); SendPacketToServer(packet); @@ -228,7 +228,7 @@ void HandleGuildBankActivate(GuildBankAtivate activate) [PacketHandler(Opcode.CMSG_GUILD_BANK_QUERY_TAB)] void HandleGuildBankQueryTab(GuildBankQueryTab query) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_QUERY_TAB); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_QUERY_TAB); packet.WriteGuid(query.BankGuid.To64()); packet.WriteUInt8(query.Tab); packet.WriteBool(query.FullUpdate); @@ -238,7 +238,7 @@ void HandleGuildBankQueryTab(GuildBankQueryTab query) [PacketHandler(Opcode.CMSG_GUILD_BANK_DEPOSIT_MONEY)] void HandleGuildBankDepositMoney(GuildBankDepositMoney deposit) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_DEPOSIT_MONEY); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_DEPOSIT_MONEY); packet.WriteGuid(deposit.BankGuid.To64()); packet.WriteUInt32((uint)deposit.Money); SendPacketToServer(packet); @@ -247,7 +247,7 @@ void HandleGuildBankDepositMoney(GuildBankDepositMoney deposit) [PacketHandler(Opcode.CMSG_GUILD_BANK_TEXT_QUERY)] void HandleGuildBankTextQuery(GuildBankTextQuery query) { - WorldPacket packet = new WorldPacket(Opcode.MSG_QUERY_GUILD_BANK_TEXT); + WorldPacket packet = new(Opcode.MSG_QUERY_GUILD_BANK_TEXT); packet.WriteUInt8((byte)query.Tab); SendPacketToServer(packet); } @@ -255,7 +255,7 @@ void HandleGuildBankTextQuery(GuildBankTextQuery query) [PacketHandler(Opcode.CMSG_GUILD_BANK_UPDATE_TAB)] void HandleGuildBankUpdateTab(GuildBankUpdateTab update) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_UPDATE_TAB); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_UPDATE_TAB); packet.WriteGuid(update.BankGuid.To64()); packet.WriteUInt8(update.BankTab); packet.WriteCString(update.Name); @@ -266,7 +266,7 @@ void HandleGuildBankUpdateTab(GuildBankUpdateTab update) [PacketHandler(Opcode.CMSG_GUILD_BANK_LOG_QUERY)] void HandleGuildBankLogQuery(GuildBankLogQuery query) { - WorldPacket packet = new WorldPacket(Opcode.MSG_GUILD_BANK_LOG_QUERY); + WorldPacket packet = new(Opcode.MSG_GUILD_BANK_LOG_QUERY); packet.WriteUInt8((byte)query.Tab); SendPacketToServer(packet); } @@ -274,7 +274,7 @@ void HandleGuildBankLogQuery(GuildBankLogQuery query) [PacketHandler(Opcode.CMSG_GUILD_BANK_SET_TAB_TEXT)] void HandleGuildBankSetTabText(GuildBankSetTabText query) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SET_TAB_TEXT); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SET_TAB_TEXT); packet.WriteUInt8((byte)query.Tab); packet.WriteCString(query.TabText); SendPacketToServer(packet); @@ -283,7 +283,7 @@ void HandleGuildBankSetTabText(GuildBankSetTabText query) [PacketHandler(Opcode.CMSG_GUILD_BANK_BUY_TAB)] void HandleGuildBankBuyTab(GuildBankBuyTab buy) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_BUY_TAB); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_BUY_TAB); packet.WriteGuid(buy.BankGuid.To64()); packet.WriteUInt8(buy.BankTab); SendPacketToServer(packet); @@ -292,7 +292,7 @@ void HandleGuildBankBuyTab(GuildBankBuyTab buy) [PacketHandler(Opcode.CMSG_GUILD_BANK_WITHDRAW_MONEY)] void HandleGuildBankBuyTab(GuildBankWithdrawMoney withdraw) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_WITHDRAW_MONEY); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_WITHDRAW_MONEY); packet.WriteGuid(withdraw.BankGuid.To64()); packet.WriteUInt32((uint)withdraw.Money); SendPacketToServer(packet); @@ -302,7 +302,7 @@ void HandleGuildBankBuyTab(GuildBankWithdrawMoney withdraw) void HandleGuildBankItem(AutoGuildBankItem item) { // moves an item from the player to the bank - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(false); // bank to bank packet.WriteUInt8(item.BankTab); @@ -329,7 +329,7 @@ void HandleGuildBankItem(AutoGuildBankItem item) void HandleSplitItemToGuildBank(SplitItemToGuildBank item) { // moves a specific amount of stacks from the player to the bank - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(false); // bank to bank packet.WriteUInt8(item.BankTab); @@ -355,7 +355,7 @@ void HandleSplitItemToGuildBank(SplitItemToGuildBank item) void HandleAutoStoreGuildBankItem(AutoStoreGuildBankItem item) { // moves an item from the bank to the player - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(false); // bank to bank packet.WriteUInt8(item.BankTab); @@ -372,7 +372,7 @@ void HandleAutoStoreGuildBankItem(AutoStoreGuildBankItem item) void HandleStoreGuildBankItem(AutoGuildBankItem item) { // moves an item from the bank to a specific slot in the player inventory - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(false); // bank to bank packet.WriteUInt8(item.BankTab); @@ -399,7 +399,7 @@ void HandleStoreGuildBankItem(AutoGuildBankItem item) void HandleMergeGuildBankItemWithItem(SplitItemToGuildBank item) { // moves a specific amount of stacks from the bank to the player - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(false); // bank to bank packet.WriteUInt8(item.BankTab); @@ -425,7 +425,7 @@ void HandleMergeGuildBankItemWithItem(SplitItemToGuildBank item) void HandleMoveGuildBankItem(MoveGuildBankItem item) { // moves an item from the bank to the bank - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(true); // bank to bank packet.WriteUInt8(item.BankTab2); @@ -444,7 +444,7 @@ void HandleMoveGuildBankItem(MoveGuildBankItem item) void HandleMoveGuildBankItem(SplitGuildBankItem item) { // moves a specific amount of stacks from the bank to the bank - WorldPacket packet = new WorldPacket(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); + WorldPacket packet = new(Opcode.CMSG_GUILD_BANK_SWAP_ITEMS); packet.WriteGuid(item.BankGuid.To64()); packet.WriteBool(true); // bank to bank packet.WriteUInt8(item.BankTab2); diff --git a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs index 5f02763e..d89d736c 100644 --- a/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/HotfixHandler.cs @@ -191,7 +191,7 @@ void HandleDbQueryBulk(DBQueryBulk query) [PacketHandler(Opcode.CMSG_HOTFIX_REQUEST)] void HandleHotfixRequest(HotfixRequest request) { - HotfixConnect connect = new HotfixConnect(); + HotfixConnect connect = new(); foreach (uint id in request.Hotfixes) { if (GameData.Hotfixes.TryGetValue(id, out HotfixRecord record)) diff --git a/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs b/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs index 9e5ea0cf..28612b68 100644 --- a/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/InstanceHandler.cs @@ -9,14 +9,14 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_RESET_INSTANCES)] void HandleResetInstances(EmptyClientPacket reset) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_RESET_INSTANCES); + WorldPacket packet = new(Opcode.CMSG_RESET_INSTANCES); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_REQUEST_RAID_INFO)] void HandleRequestRaidInfo(EmptyClientPacket reset) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_REQUEST_RAID_INFO); + WorldPacket packet = new(Opcode.CMSG_REQUEST_RAID_INFO); SendPacketToServer(packet); } } diff --git a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs index 7a295c90..355f39d0 100644 --- a/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/ItemHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_BUY_ITEM)] void HandleBuyItem(BuyItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BUY_ITEM); + WorldPacket packet = new(Opcode.CMSG_BUY_ITEM); packet.WriteGuid(item.VendorGUID.To64()); packet.WriteUInt32(item.Item.ItemID); uint quantity = item.Quantity / GetSession().GameState.GetItemBuyCount(item.Item.ItemID); @@ -28,7 +28,7 @@ void HandleBuyItem(BuyItem item) [PacketHandler(Opcode.CMSG_SELL_ITEM)] void HandleSellItem(SellItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SELL_ITEM); + WorldPacket packet = new(Opcode.CMSG_SELL_ITEM); packet.WriteGuid(item.VendorGUID.To64()); packet.WriteGuid(item.ItemGUID.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) // not sure when this was changed exactly @@ -41,7 +41,7 @@ void HandleSellItem(SellItem item) [PacketHandler(Opcode.CMSG_SPLIT_ITEM)] void HandleSplitItem(SplitItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SPLIT_ITEM); + WorldPacket packet = new(Opcode.CMSG_SPLIT_ITEM); byte containerSlot1 = item.FromPackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.FromPackSlot) : item.FromPackSlot; byte slot1 = item.FromPackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.FromSlot) : item.FromSlot; byte containerSlot2 = item.ToPackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.ToPackSlot) : item.ToPackSlot; @@ -60,7 +60,7 @@ void HandleSplitItem(SplitItem item) [PacketHandler(Opcode.CMSG_SWAP_INV_ITEM)] void HandleSwapInvItem(SwapInvItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SWAP_INV_ITEM); + WorldPacket packet = new(Opcode.CMSG_SWAP_INV_ITEM); byte slot1 = ModernVersion.AdjustInventorySlot(item.Slot1); byte slot2 = ModernVersion.AdjustInventorySlot(item.Slot2); packet.WriteUInt8(slot1); @@ -71,7 +71,7 @@ void HandleSwapInvItem(SwapInvItem item) [PacketHandler(Opcode.CMSG_SWAP_ITEM)] void HandleSwapItem(SwapItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SWAP_ITEM); + WorldPacket packet = new(Opcode.CMSG_SWAP_ITEM); byte containerSlotB = item.ContainerSlotB != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.ContainerSlotB) : item.ContainerSlotB; byte slotB = item.ContainerSlotB == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.SlotB) : item.SlotB; byte containerSlotA = item.ContainerSlotA != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.ContainerSlotA) : item.ContainerSlotA; @@ -86,7 +86,7 @@ void HandleSwapItem(SwapItem item) [PacketHandler(Opcode.CMSG_DESTROY_ITEM)] void HandleDestroyItem(DestroyItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_DESTROY_ITEM); + WorldPacket packet = new(Opcode.CMSG_DESTROY_ITEM); byte containerSlot = item.ContainerId != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.ContainerId) : item.ContainerId; byte slot = item.ContainerId == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.SlotNum) : item.SlotNum; packet.WriteUInt8(containerSlot); @@ -100,7 +100,7 @@ void HandleDestroyItem(DestroyItem item) [PacketHandler(Opcode.CMSG_AUTOBANK_ITEM)] void HandleAutoEquipItem(AutoEquipItem item) { - WorldPacket packet = new WorldPacket(item.GetUniversalOpcode()); + WorldPacket packet = new(item.GetUniversalOpcode()); byte containerSlot = item.PackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.PackSlot) : item.PackSlot; byte slot = item.PackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.Slot) : item.Slot; packet.WriteUInt8(containerSlot); @@ -111,7 +111,7 @@ void HandleAutoEquipItem(AutoEquipItem item) [PacketHandler(Opcode.CMSG_AUTO_EQUIP_ITEM_SLOT)] void HandleAutoEquipItemSlot(AutoEquipItemSlot item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUTO_EQUIP_ITEM_SLOT); + WorldPacket packet = new(Opcode.CMSG_AUTO_EQUIP_ITEM_SLOT); packet.WriteGuid(item.Item.To64()); byte slot = ModernVersion.AdjustInventorySlot(item.ItemDstSlot); packet.WriteUInt8(slot); @@ -121,7 +121,7 @@ void HandleAutoEquipItemSlot(AutoEquipItemSlot item) [PacketHandler(Opcode.CMSG_READ_ITEM)] void HandleReadItem(ReadItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_READ_ITEM); + WorldPacket packet = new(Opcode.CMSG_READ_ITEM); byte containerSlot = item.PackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.PackSlot) : item.PackSlot; byte slot = item.PackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.Slot) : item.Slot; packet.WriteUInt8(containerSlot); @@ -132,7 +132,7 @@ void HandleReadItem(ReadItem item) [PacketHandler(Opcode.CMSG_BUY_BACK_ITEM)] void HandleBuyBackItem(BuyBackItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BUY_BACK_ITEM); + WorldPacket packet = new(Opcode.CMSG_BUY_BACK_ITEM); packet.WriteGuid(item.VendorGUID.To64()); byte slot = ModernVersion.AdjustInventorySlot((byte)item.Slot); packet.WriteUInt32(slot); @@ -142,7 +142,7 @@ void HandleBuyBackItem(BuyBackItem item) [PacketHandler(Opcode.CMSG_REPAIR_ITEM)] void HandleRepairItem(RepairItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_REPAIR_ITEM); + WorldPacket packet = new(Opcode.CMSG_REPAIR_ITEM); packet.WriteGuid(item.VendorGUID.To64()); packet.WriteGuid(item.ItemGUID.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) @@ -153,14 +153,14 @@ void HandleRepairItem(RepairItem item) [PacketHandler(Opcode.CMSG_SOCKET_GEMS)] void HandleSocketGems(SocketGems gems) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SOCKET_GEMS); + WorldPacket packet = new(Opcode.CMSG_SOCKET_GEMS); packet.WriteGuid(gems.ItemGuid.To64()); for (int i = 0; i < ItemConst.MaxGemSockets; ++i) packet.WriteGuid(gems.Gems[i].To64()); SendPacketToServer(packet); // Packet does not exist in old clients. - SocketGemsSuccess success = new SocketGemsSuccess + SocketGemsSuccess success = new() { ItemGuid = gems.ItemGuid }; @@ -170,7 +170,7 @@ void HandleSocketGems(SocketGems gems) [PacketHandler(Opcode.CMSG_OPEN_ITEM)] void HandleOpenItem(OpenItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_OPEN_ITEM); + WorldPacket packet = new(Opcode.CMSG_OPEN_ITEM); byte containerSlot = item.PackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.PackSlot) : item.PackSlot; byte slot = item.PackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.Slot) : item.Slot; packet.WriteUInt8(containerSlot); @@ -181,7 +181,7 @@ void HandleOpenItem(OpenItem item) [PacketHandler(Opcode.CMSG_SET_AMMO)] void HandleSetAmmo(SetAmmo ammo) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_AMMO); + WorldPacket packet = new(Opcode.CMSG_SET_AMMO); packet.WriteUInt32(ammo.ItemId); SendPacketToServer(packet); } @@ -191,7 +191,7 @@ void HandleCancelTempEnchantment(CancelTempEnchantment cancel) { if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_TEMP_ENCHANTMENT); + WorldPacket packet = new(Opcode.CMSG_CANCEL_TEMP_ENCHANTMENT); packet.WriteUInt32(cancel.EnchantmentSlot); SendPacketToServer(packet); } @@ -199,7 +199,7 @@ void HandleCancelTempEnchantment(CancelTempEnchantment cancel) [PacketHandler(Opcode.CMSG_WRAP_ITEM)] void HandleWrapItem(WrapItem item) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_WRAP_ITEM); + WorldPacket packet = new(Opcode.CMSG_WRAP_ITEM); byte giftBag = item.GiftBag != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.GiftBag) : item.GiftBag; byte giftSlot = item.GiftBag == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.GiftSlot) : item.GiftSlot; byte itemBag = item.ItemBag != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(item.ItemBag) : item.ItemBag; diff --git a/HermesProxy/World/Server/PacketHandlers/LootHandler.cs b/HermesProxy/World/Server/PacketHandlers/LootHandler.cs index 8c7cbf5e..8bcd871f 100644 --- a/HermesProxy/World/Server/PacketHandlers/LootHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/LootHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_LOOT_RELEASE)] void HandleLootRelease(LootRelease loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOOT_RELEASE); + WorldPacket packet = new(Opcode.CMSG_LOOT_RELEASE); packet.WriteGuid(loot.Owner.To64()); SendPacketToServer(packet); } @@ -20,7 +20,7 @@ void HandleLootItem(LootItemPkt loot) { foreach (var item in loot.Loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_AUTOSTORE_LOOT_ITEM); + WorldPacket packet = new(Opcode.CMSG_AUTOSTORE_LOOT_ITEM); packet.WriteUInt8(item.LootListID); SendPacketToServer(packet); } @@ -29,7 +29,7 @@ void HandleLootItem(LootItemPkt loot) [PacketHandler(Opcode.CMSG_LOOT_UNIT)] void HandleLootUnit(LootUnit loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOOT_UNIT); + WorldPacket packet = new(Opcode.CMSG_LOOT_UNIT); packet.WriteGuid(loot.Unit.To64()); SendPacketToServer(packet); GetSession().GameState.LastLootTargetGuid = loot.Unit.To64(); @@ -38,14 +38,14 @@ void HandleLootUnit(LootUnit loot) [PacketHandler(Opcode.CMSG_LOOT_MONEY)] void HandleLootMoney(LootMoney loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOOT_MONEY); + WorldPacket packet = new(Opcode.CMSG_LOOT_MONEY); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_SET_LOOT_METHOD)] void HandleSetLootMethod(SetLootMethod loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_LOOT_METHOD); + WorldPacket packet = new(Opcode.CMSG_SET_LOOT_METHOD); packet.WriteUInt32((uint)loot.LootMethod); packet.WriteGuid(loot.LootMasterGUID.To64()); packet.WriteUInt32(loot.LootThreshold); @@ -57,7 +57,7 @@ void HandleOptOutOfLoot(OptOutOfLoot loot) { if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_OPT_OUT_OF_LOOT); + WorldPacket packet = new(Opcode.CMSG_OPT_OUT_OF_LOOT); packet.WriteInt32(loot.PassOnLoot ? 1 : 0); SendPacketToServer(packet); } @@ -68,7 +68,7 @@ void HandleOptOutOfLoot(OptOutOfLoot loot) [PacketHandler(Opcode.CMSG_LOOT_ROLL)] void HandleLootRoll(LootRoll loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOOT_ROLL); + WorldPacket packet = new(Opcode.CMSG_LOOT_ROLL); packet.WriteGuid(loot.LootObj.To64()); packet.WriteUInt32(loot.LootListID); packet.WriteUInt8((byte)loot.RollType); @@ -80,7 +80,7 @@ void HandleLootMasterGive(LootMasterGive loot) { foreach (var item in loot.Loot) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LOOT_MASTER_GIVE); + WorldPacket packet = new(Opcode.CMSG_LOOT_MASTER_GIVE); packet.WriteGuid(item.LootObj.To64()); packet.WriteUInt8(item.LootListID); packet.WriteGuid(loot.TargetGUID.To64()); diff --git a/HermesProxy/World/Server/PacketHandlers/MailHandler.cs b/HermesProxy/World/Server/PacketHandlers/MailHandler.cs index 64943669..10dbecfe 100644 --- a/HermesProxy/World/Server/PacketHandlers/MailHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MailHandler.cs @@ -12,14 +12,14 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_QUERY_NEXT_MAIL_TIME)] void HandleMailGetList(EmptyClientPacket mail) { - WorldPacket packet = new WorldPacket(Opcode.MSG_QUERY_NEXT_MAIL_TIME); + WorldPacket packet = new(Opcode.MSG_QUERY_NEXT_MAIL_TIME); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_MAIL_GET_LIST)] void HandleMailGetList(MailGetList mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_GET_LIST); + WorldPacket packet = new(Opcode.CMSG_MAIL_GET_LIST); packet.WriteGuid(mail.Mailbox.To64()); SendPacketToServer(packet); } @@ -27,7 +27,7 @@ void HandleMailGetList(MailGetList mail) [PacketHandler(Opcode.CMSG_MAIL_CREATE_TEXT_ITEM)] void HandleMailCreateTextItem(MailCreateTextItem mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_CREATE_TEXT_ITEM); + WorldPacket packet = new(Opcode.CMSG_MAIL_CREATE_TEXT_ITEM); packet.WriteGuid(mail.Mailbox.To64()); packet.WriteUInt32(mail.MailID); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V3_0_2_9056)) @@ -38,7 +38,7 @@ void HandleMailCreateTextItem(MailCreateTextItem mail) [PacketHandler(Opcode.CMSG_MAIL_DELETE)] void HandleMailDelete(MailDelete mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_DELETE); + WorldPacket packet = new(Opcode.CMSG_MAIL_DELETE); packet.WriteGuid(GetSession().GameState.CurrentInteractedWithGO.To64()); packet.WriteUInt32(mail.MailID); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) @@ -49,7 +49,7 @@ void HandleMailDelete(MailDelete mail) [PacketHandler(Opcode.CMSG_MAIL_MARK_AS_READ)] void HandleMailMarkAsRead(MailMarkAsRead mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_MARK_AS_READ); + WorldPacket packet = new(Opcode.CMSG_MAIL_MARK_AS_READ); packet.WriteGuid(mail.Mailbox.To64()); packet.WriteUInt32(mail.MailID); SendPacketToServer(packet); @@ -58,7 +58,7 @@ void HandleMailMarkAsRead(MailMarkAsRead mail) [PacketHandler(Opcode.CMSG_MAIL_RETURN_TO_SENDER)] void HandleMailReturnToSender(MailReturnToSender mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_RETURN_TO_SENDER); + WorldPacket packet = new(Opcode.CMSG_MAIL_RETURN_TO_SENDER); packet.WriteGuid(GetSession().GameState.CurrentInteractedWithGO.To64()); packet.WriteUInt32(mail.MailID); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) @@ -69,7 +69,7 @@ void HandleMailReturnToSender(MailReturnToSender mail) [PacketHandler(Opcode.CMSG_MAIL_TAKE_ITEM)] void HandleMailTakeItem(MailTakeItem mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_TAKE_ITEM); + WorldPacket packet = new(Opcode.CMSG_MAIL_TAKE_ITEM); packet.WriteGuid(mail.Mailbox.To64()); packet.WriteUInt32(mail.MailID); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) @@ -80,7 +80,7 @@ void HandleMailTakeItem(MailTakeItem mail) [PacketHandler(Opcode.CMSG_MAIL_TAKE_MONEY)] void HandleMailTakeMoney(MailTakeMoney mail) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MAIL_TAKE_MONEY); + WorldPacket packet = new(Opcode.CMSG_MAIL_TAKE_MONEY); packet.WriteGuid(mail.Mailbox.To64()); packet.WriteUInt32(mail.MailID); SendPacketToServer(packet); @@ -88,7 +88,7 @@ void HandleMailTakeMoney(MailTakeMoney mail) void BuildSendMail(SendMail mail, List attachments) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SEND_MAIL); + WorldPacket packet = new(Opcode.CMSG_SEND_MAIL); packet.WriteGuid(mail.Mailbox.To64()); packet.WriteCString(mail.Target); packet.WriteCString(mail.Subject); @@ -134,7 +134,7 @@ void HandleSendMail(SendMail mail) mail.Cod /= mail.Attachments.Count; foreach (var item in mail.Attachments) { - List attachments = new List(); + List attachments = new(); attachments.Add(item); BuildSendMail(mail, attachments); System.Threading.Thread.Sleep(500); // prevent triggering antiflood on server diff --git a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs index b192ad54..fd65cf7c 100644 --- a/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MiscHandler.cs @@ -12,7 +12,7 @@ void HandleTimeSyncResponse(TimeSyncResponse response) { if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TIME_SYNC_RESPONSE); + WorldPacket packet = new(Opcode.CMSG_TIME_SYNC_RESPONSE); packet.WriteUInt32(response.SequenceIndex); packet.WriteUInt32(response.ClientTime); SendPacketToServer(packet); @@ -26,7 +26,7 @@ void HandleAreaTrigger(AreaTriggerPkt at) return; GetSession().GameState.LastEnteredAreaTrigger = at.AreaTriggerID; - WorldPacket packet = new WorldPacket(Opcode.CMSG_AREA_TRIGGER); + WorldPacket packet = new(Opcode.CMSG_AREA_TRIGGER); packet.WriteUInt32(at.AreaTriggerID); SendPacketToServer(packet); } @@ -34,14 +34,14 @@ void HandleAreaTrigger(AreaTriggerPkt at) [PacketHandler(Opcode.CMSG_SET_SELECTION)] void HandleSetSelection(SetSelection selection) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_SELECTION); + WorldPacket packet = new(Opcode.CMSG_SET_SELECTION); packet.WriteGuid(selection.TargetGUID.To64()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_REPOP_REQUEST)] void HandleRepopRequest(RepopRequest repop) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_REPOP_REQUEST); + WorldPacket packet = new(Opcode.CMSG_REPOP_REQUEST); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteBool(repop.CheckInstance); SendPacketToServer(packet); @@ -49,20 +49,20 @@ void HandleRepopRequest(RepopRequest repop) [PacketHandler(Opcode.CMSG_QUERY_CORPSE_LOCATION_FROM_CLIENT)] void HandleQueryCorpseLocationFromClient(QueryCorpseLocationFromClient query) { - WorldPacket packet = new WorldPacket(Opcode.MSG_CORPSE_QUERY); + WorldPacket packet = new(Opcode.MSG_CORPSE_QUERY); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_RECLAIM_CORPSE)] void HandleReclaimCorpse(ReclaimCorpse corpse) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_RECLAIM_CORPSE); + WorldPacket packet = new(Opcode.CMSG_RECLAIM_CORPSE); packet.WriteGuid(corpse.CorpseGUID.To64()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_STAND_STATE_CHANGE)] void HandleStandStateChange(StandStateChange state) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_STAND_STATE_CHANGE); + WorldPacket packet = new(Opcode.CMSG_STAND_STATE_CHANGE); packet.WriteUInt32(state.StandState); SendPacketToServer(packet); } @@ -71,14 +71,14 @@ void HandleStandStateChange(StandStateChange state) [PacketHandler(Opcode.CMSG_COMPLETE_CINEMATIC)] void HandleCinematicPacket(ClientCinematicPkt cinematic) { - WorldPacket packet = new WorldPacket(cinematic.GetUniversalOpcode()); + WorldPacket packet = new(cinematic.GetUniversalOpcode()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_FAR_SIGHT)] void HandleFarSight(FarSight sight) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_FAR_SIGHT); + WorldPacket packet = new(Opcode.CMSG_FAR_SIGHT); packet.WriteBool(sight.Enable); SendPacketToServer(packet); GetSession().GameState.IsInFarSight = sight.Enable; @@ -87,7 +87,7 @@ void HandleFarSight(FarSight sight) [PacketHandler(Opcode.CMSG_MOUNT_SPECIAL_ANIM)] void HandleMountSpecialAnim(MountSpecial mount) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MOUNT_SPECIAL_ANIM); + WorldPacket packet = new(Opcode.CMSG_MOUNT_SPECIAL_ANIM); SendPacketToServer(packet); } @@ -98,19 +98,19 @@ void HandleTutorialFlag(TutorialSetFlag tutorial) { case TutorialAction.Clear: { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TUTORIAL_CLEAR); + WorldPacket packet = new(Opcode.CMSG_TUTORIAL_CLEAR); SendPacketToServer(packet); break; } case TutorialAction.Reset: { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TUTORIAL_RESET); + WorldPacket packet = new(Opcode.CMSG_TUTORIAL_RESET); SendPacketToServer(packet); break; } case TutorialAction.Update: { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TUTORIAL_FLAG); + WorldPacket packet = new(Opcode.CMSG_TUTORIAL_FLAG); packet.WriteUInt32(tutorial.TutorialBit); SendPacketToServer(packet); break; @@ -121,7 +121,7 @@ void HandleTutorialFlag(TutorialSetFlag tutorial) [PacketHandler(Opcode.CMSG_REQUEST_LFG_LIST_BLACKLIST)] void HandleRequestLFGListBlacklist(EmptyClientPacket request) { - LFGListUpdateBlacklist blacklist = new LFGListUpdateBlacklist(); + LFGListUpdateBlacklist blacklist = new(); if (ModernVersion.ExpansionVersion > 1) { blacklist.AddBlacklist(796, 3); @@ -224,7 +224,7 @@ void HandleRequestLFGListBlacklist(EmptyClientPacket request) [PacketHandler(Opcode.CMSG_REQUEST_CONQUEST_FORMULA_CONSTANTS)] void HandleRequestConquestFormulaConstants(EmptyClientPacket request) { - ConquestFormulaConstants response = new ConquestFormulaConstants + ConquestFormulaConstants response = new() { PvpMinCPPerWeek = 1500, PvpMaxCPPerWeek = 3000, diff --git a/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs b/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs index 631ebaf3..2f7a3873 100644 --- a/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/MovementHandler.cs @@ -46,7 +46,7 @@ void HandlePlayerMove(ClientPlayerMovement movement) if (opcode == 0) opcode = Opcodes.GetOpcodeValueForVersion("MSG_MOVE_SET_FACING", Framework.Settings.ServerBuild); - WorldPacket packet = new WorldPacket(opcode); + WorldPacket packet = new(opcode); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(movement.Guid.To64()); movement.MoveInfo.WriteMovementInfoLegacy(packet); @@ -56,7 +56,7 @@ void HandlePlayerMove(ClientPlayerMovement movement) [PacketHandler(Opcode.CMSG_MOVE_TELEPORT_ACK)] void HandleMoveTeleportAck(MoveTeleportAck teleport) { - WorldPacket packet = new WorldPacket(Opcode.MSG_MOVE_TELEPORT_ACK); + WorldPacket packet = new(Opcode.MSG_MOVE_TELEPORT_ACK); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(teleport.MoverGUID.To64()); else @@ -69,7 +69,7 @@ void HandleMoveTeleportAck(MoveTeleportAck teleport) [PacketHandler(Opcode.CMSG_WORLD_PORT_RESPONSE)] void HandleWorldPortResponse(WorldPortResponse teleport) { - WorldPacket packet = new WorldPacket(Opcode.MSG_MOVE_WORLDPORT_ACK); + WorldPacket packet = new(Opcode.MSG_MOVE_WORLDPORT_ACK); SendPacketToServer(packet); } @@ -90,7 +90,7 @@ void HandleMoveForceSpeedChangeAck(MovementSpeedAck speed) or Opcode.CMSG_MOVE_FORCE_FLIGHT_BACK_SPEED_CHANGE_ACK) return; // This is probably an ack by our swim to fly speed change for vanilla - WorldPacket packet = new WorldPacket(opcode); + WorldPacket packet = new(opcode); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(speed.MoverGUID.To64()); else @@ -123,7 +123,7 @@ MovementFlagModern GetFlagForAckOpcode(Opcode opcode) [PacketHandler(Opcode.CMSG_MOVE_WATER_WALK_ACK)] void HandleMoveForceAck1(MovementAckMessage movementAck) { - WorldPacket packet = new WorldPacket(movementAck.GetUniversalOpcode()); + WorldPacket packet = new(movementAck.GetUniversalOpcode()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(movementAck.MoverGUID.To64()); else @@ -141,7 +141,7 @@ void HandleMoveForceAck1(MovementAckMessage movementAck) [PacketHandler(Opcode.CMSG_MOVE_GRAVITY_ENABLE_ACK)] void HandleMoveForceAck2(MovementAckMessage movementAck) { - WorldPacket packet = new WorldPacket(movementAck.GetUniversalOpcode()); + WorldPacket packet = new(movementAck.GetUniversalOpcode()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(movementAck.MoverGUID.To64()); else @@ -154,7 +154,7 @@ void HandleMoveForceAck2(MovementAckMessage movementAck) [PacketHandler(Opcode.CMSG_SET_ACTIVE_MOVER)] void HandleMoveSetActiveMover(SetActiveMover move) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ACTIVE_MOVER); + WorldPacket packet = new(Opcode.CMSG_SET_ACTIVE_MOVER); packet.WriteGuid(move.MoverGUID.To64()); SendPacketToServer(packet); } @@ -162,7 +162,7 @@ void HandleMoveSetActiveMover(SetActiveMover move) [PacketHandler(Opcode.CMSG_MOVE_INIT_ACTIVE_MOVER_COMPLETE)] void HandleMoveInitActiveMoverComplete(InitActiveMoverComplete move) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_ACTIVE_MOVER); + WorldPacket packet = new(Opcode.CMSG_SET_ACTIVE_MOVER); packet.WriteGuid(GetSession().GameState.CurrentPlayerGuid.To64()); SendPacketToServer(packet); } @@ -170,7 +170,7 @@ void HandleMoveInitActiveMoverComplete(InitActiveMoverComplete move) [PacketHandler(Opcode.CMSG_MOVE_SPLINE_DONE)] void HandleMoveSplineDone(MoveSplineDone movement) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MOVE_SPLINE_DONE); + WorldPacket packet = new(Opcode.CMSG_MOVE_SPLINE_DONE); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(movement.Guid.To64()); movement.MoveInfo.WriteMovementInfoLegacy(packet); @@ -183,7 +183,7 @@ void HandleMoveSplineDone(MoveSplineDone movement) [PacketHandler(Opcode.CMSG_MOVE_TIME_SKIPPED)] void HandleMoveSplineDone(MoveTimeSkipped movement) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_MOVE_TIME_SKIPPED); + WorldPacket packet = new(Opcode.CMSG_MOVE_TIME_SKIPPED); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_2_0_10192)) packet.WritePackedGuid(movement.MoverGUID.To64()); else diff --git a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs index cfee861b..411d75ec 100644 --- a/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/NPCHandler.cs @@ -19,7 +19,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_AREA_SPIRIT_HEALER_QUEUE)] void HandleInteractWithNPC(InteractWithNPC interact) { - WorldPacket packet = new WorldPacket(interact.GetUniversalOpcode()); + WorldPacket packet = new(interact.GetUniversalOpcode()); packet.WriteGuid(interact.CreatureGUID.To64()); SendPacketToServer(packet); } @@ -27,7 +27,7 @@ void HandleInteractWithNPC(InteractWithNPC interact) [PacketHandler(Opcode.CMSG_GOSSIP_SELECT_OPTION)] void HandleGossipSelectOption(GossipSelectOption gossip) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_GOSSIP_SELECT_OPTION); + WorldPacket packet = new(Opcode.CMSG_GOSSIP_SELECT_OPTION); packet.WriteGuid(gossip.GossipUnit.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteUInt32(gossip.GossipID); @@ -40,7 +40,7 @@ void HandleGossipSelectOption(GossipSelectOption gossip) [PacketHandler(Opcode.CMSG_BUY_BANK_SLOT)] void HandleBuyBankSlot(BuyBankSlot bank) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BUY_BANK_SLOT); + WorldPacket packet = new(Opcode.CMSG_BUY_BANK_SLOT); packet.WriteGuid(bank.Guid.To64()); SendPacketToServer(packet); } @@ -48,7 +48,7 @@ void HandleBuyBankSlot(BuyBankSlot bank) [PacketHandler(Opcode.CMSG_TRAINER_BUY_SPELL)] void HandleTrainerBuySpell(TrainerBuySpell buy) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TRAINER_BUY_SPELL); + WorldPacket packet = new(Opcode.CMSG_TRAINER_BUY_SPELL); packet.WriteGuid(buy.TrainerGUID.To64()); if (ModernVersion.ExpansionVersion > 1 && LegacyVersion.ExpansionVersion <= 1) @@ -64,7 +64,7 @@ void HandleTrainerBuySpell(TrainerBuySpell buy) [PacketHandler(Opcode.CMSG_CONFIRM_RESPEC_WIPE)] void HandleConfirmRespecWipe(ConfirmRespecWipe respec) { - WorldPacket packet = new WorldPacket(Opcode.MSG_TALENT_WIPE_CONFIRM); + WorldPacket packet = new(Opcode.MSG_TALENT_WIPE_CONFIRM); packet.WriteGuid(respec.TrainerGUID.To64()); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/PetHandler.cs b/HermesProxy/World/Server/PacketHandlers/PetHandler.cs index f73ec185..ca45a330 100644 --- a/HermesProxy/World/Server/PacketHandlers/PetHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/PetHandler.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_PET_ACTION)] void HandlePetAction(PetAction act) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_ACTION); + WorldPacket packet = new(Opcode.CMSG_PET_ACTION); packet.WriteGuid(act.PetGUID.To64()); packet.WriteUInt32(act.Action); packet.WriteGuid(act.TargetGUID.To64()); @@ -19,7 +19,7 @@ void HandlePetAction(PetAction act) [PacketHandler(Opcode.CMSG_PET_STOP_ATTACK)] void HandlePetStopAttack(PetStopAttack stop) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_STOP_ATTACK); + WorldPacket packet = new(Opcode.CMSG_PET_STOP_ATTACK); packet.WriteGuid(stop.PetGUID.To64()); SendPacketToServer(packet); } @@ -27,7 +27,7 @@ void HandlePetStopAttack(PetStopAttack stop) [PacketHandler(Opcode.CMSG_PET_SET_ACTION)] void HandlePetStopAttack(PetSetAction action) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_SET_ACTION); + WorldPacket packet = new(Opcode.CMSG_PET_SET_ACTION); packet.WriteGuid(action.PetGUID.To64()); packet.WriteUInt32(action.Index); packet.WriteUInt32(action.Action); @@ -37,7 +37,7 @@ void HandlePetStopAttack(PetSetAction action) [PacketHandler(Opcode.CMSG_PET_RENAME)] void HandlePetRename(PetRename pet) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_RENAME); + WorldPacket packet = new(Opcode.CMSG_PET_RENAME); packet.WriteGuid(pet.RenameData.PetGUID.To64()); packet.WriteCString(pet.RenameData.NewName); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) @@ -55,7 +55,7 @@ void HandlePetRename(PetRename pet) [PacketHandler(Opcode.CMSG_REQUEST_STABLED_PETS)] void HandleRequestStabledPets(RequestStabledPets stable) { - WorldPacket packet = new WorldPacket(Opcode.MSG_LIST_STABLED_PETS); + WorldPacket packet = new(Opcode.MSG_LIST_STABLED_PETS); packet.WriteGuid(stable.StableMaster.To64()); SendPacketToServer(packet); } @@ -63,7 +63,7 @@ void HandleRequestStabledPets(RequestStabledPets stable) [PacketHandler(Opcode.CMSG_BUY_STABLE_SLOT)] void HandleBuyStableSlot(BuyStableSlot stable) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_BUY_STABLE_SLOT); + WorldPacket packet = new(Opcode.CMSG_BUY_STABLE_SLOT); packet.WriteGuid(stable.StableMaster.To64()); SendPacketToServer(packet); } @@ -71,7 +71,7 @@ void HandleBuyStableSlot(BuyStableSlot stable) [PacketHandler(Opcode.CMSG_PET_ABANDON)] void HandlePetAbandon(PetAbandon pet) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_ABANDON); + WorldPacket packet = new(Opcode.CMSG_PET_ABANDON); packet.WriteGuid(pet.PetGUID.To64()); SendPacketToServer(packet); } @@ -79,7 +79,7 @@ void HandlePetAbandon(PetAbandon pet) [PacketHandler(Opcode.CMSG_STABLE_PET)] void HandleStablePet(StablePet pet) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_STABLE_PET); + WorldPacket packet = new(Opcode.CMSG_STABLE_PET); packet.WriteGuid(pet.StableMaster.To64()); SendPacketToServer(packet); } @@ -87,7 +87,7 @@ void HandleStablePet(StablePet pet) [PacketHandler(Opcode.CMSG_UNSTABLE_PET)] void HandleUnstablePet(UnstablePet pet) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_UNSTABLE_PET); + WorldPacket packet = new(Opcode.CMSG_UNSTABLE_PET); packet.WriteGuid(pet.StableMaster.To64()); packet.WriteUInt32(pet.PetNumber); SendPacketToServer(packet); @@ -96,7 +96,7 @@ void HandleUnstablePet(UnstablePet pet) [PacketHandler(Opcode.CMSG_STABLE_SWAP_PET)] void HandleStableSwapPet(StableSwapPet pet) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_STABLE_SWAP_PET); + WorldPacket packet = new(Opcode.CMSG_STABLE_SWAP_PET); packet.WriteGuid(pet.StableMaster.To64()); packet.WriteUInt32(pet.PetNumber); SendPacketToServer(packet); @@ -105,7 +105,7 @@ void HandleStableSwapPet(StableSwapPet pet) [PacketHandler(Opcode.CMSG_PET_CANCEL_AURA)] void HandlePetCancelAura(PetCancelAura cancel) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_CANCEL_AURA); + WorldPacket packet = new(Opcode.CMSG_PET_CANCEL_AURA); packet.WriteGuid(cancel.PetGUID.To64()); packet.WriteUInt32(cancel.SpellID); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs index 5be01cf1..047bfbb4 100644 --- a/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/PetitionHandler.cs @@ -10,7 +10,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_PETITION_BUY)] void HandlePetitionBuy(PetitionBuy petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PETITION_BUY); + WorldPacket packet = new(Opcode.CMSG_PETITION_BUY); packet.WriteGuid(petition.Unit.To64()); packet.WriteUInt32(0); packet.WriteUInt64(0); @@ -53,7 +53,7 @@ void HandlePetitionBuy(PetitionBuy petition) [PacketHandler(Opcode.CMSG_PETITION_SHOW_SIGNATURES)] void HandlePetitionShowSignatures(PetitionShowSignatures petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PETITION_SHOW_SIGNATURES); + WorldPacket packet = new(Opcode.CMSG_PETITION_SHOW_SIGNATURES); packet.WriteGuid(petition.Item.To64()); SendPacketToServer(packet); } @@ -61,7 +61,7 @@ void HandlePetitionShowSignatures(PetitionShowSignatures petition) [PacketHandler(Opcode.CMSG_QUERY_PETITION)] void HandleQueryPetition(QueryPetition petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_PETITION); + WorldPacket packet = new(Opcode.CMSG_QUERY_PETITION); packet.WriteUInt32(petition.PetitionID); packet.WriteGuid(petition.ItemGUID.To64()); SendPacketToServer(packet); @@ -70,7 +70,7 @@ void HandleQueryPetition(QueryPetition petition) [PacketHandler(Opcode.CMSG_PETITION_RENAME_GUILD)] void HandlePetitionRenameGuild(PetitionRenameGuild petition) { - WorldPacket packet = new WorldPacket(Opcode.MSG_PETITION_RENAME); + WorldPacket packet = new(Opcode.MSG_PETITION_RENAME); packet.WriteGuid(petition.PetitionGuid.To64()); packet.WriteCString(petition.NewGuildName); SendPacketToServer(packet); @@ -79,7 +79,7 @@ void HandlePetitionRenameGuild(PetitionRenameGuild petition) [PacketHandler(Opcode.CMSG_OFFER_PETITION)] void HandleOfferPetition(OfferPetition petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_OFFER_PETITION); + WorldPacket packet = new(Opcode.CMSG_OFFER_PETITION); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteUInt32(petition.UnkInt); packet.WriteGuid(petition.ItemGUID.To64()); @@ -90,7 +90,7 @@ void HandleOfferPetition(OfferPetition petition) [PacketHandler(Opcode.CMSG_DECLINE_PETITION)] void HandleDeclinePetition(DeclinePetition petition) { - WorldPacket packet = new WorldPacket(Opcode.MSG_PETITION_DECLINE); + WorldPacket packet = new(Opcode.MSG_PETITION_DECLINE); packet.WriteGuid(petition.PetitionGUID.To64()); SendPacketToServer(packet); } @@ -98,7 +98,7 @@ void HandleDeclinePetition(DeclinePetition petition) [PacketHandler(Opcode.CMSG_SIGN_PETITION)] void HandleSignPetition(SignPetition petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SIGN_PETITION); + WorldPacket packet = new(Opcode.CMSG_SIGN_PETITION); packet.WriteGuid(petition.PetitionGUID.To64()); packet.WriteUInt8(petition.Choice); SendPacketToServer(packet); @@ -107,7 +107,7 @@ void HandleSignPetition(SignPetition petition) [PacketHandler(Opcode.CMSG_TURN_IN_PETITION)] void HandleTurnInPetition(TurnInPetition petition) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TURN_IN_PETITION); + WorldPacket packet = new(Opcode.CMSG_TURN_IN_PETITION); packet.WriteGuid(petition.Item.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { diff --git a/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs b/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs index 066f3b97..ef3d165a 100644 --- a/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QueryHandler.cs @@ -9,20 +9,20 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_QUERY_TIME)] void HandleQueryTime(EmptyClientPacket queryTime) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_TIME); + WorldPacket packet = new(Opcode.CMSG_QUERY_TIME); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_QUERY_QUEST_INFO)] void HandleQueryQuestInfo(QueryQuestInfo queryQuest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_QUEST_INFO); + WorldPacket packet = new(Opcode.CMSG_QUERY_QUEST_INFO); packet.WriteUInt32(queryQuest.QuestID); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_QUERY_CREATURE)] void HandleQueryCreature(QueryCreature queryCreature) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_CREATURE); + WorldPacket packet = new(Opcode.CMSG_QUERY_CREATURE); packet.WriteUInt32(queryCreature.CreatureID); packet.WriteGuid(new WowGuid64(HighGuidTypeLegacy.Creature, queryCreature.CreatureID, 1)); SendPacketToServer(packet); @@ -30,7 +30,7 @@ void HandleQueryCreature(QueryCreature queryCreature) [PacketHandler(Opcode.CMSG_QUERY_GAME_OBJECT)] void HandleQueryGameObject(QueryGameObject queryGo) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_GAME_OBJECT); + WorldPacket packet = new(Opcode.CMSG_QUERY_GAME_OBJECT); packet.WriteUInt32(queryGo.GameObjectID); packet.WriteGuid(queryGo.Guid.To64()); SendPacketToServer(packet); @@ -38,7 +38,7 @@ void HandleQueryGameObject(QueryGameObject queryGo) [PacketHandler(Opcode.CMSG_QUERY_PAGE_TEXT)] void HandleQueryPageText(QueryPageText queryText) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_PAGE_TEXT); + WorldPacket packet = new(Opcode.CMSG_QUERY_PAGE_TEXT); packet.WriteUInt32(queryText.PageTextID); packet.WriteGuid(queryText.ItemGUID.To64()); SendPacketToServer(packet); @@ -46,7 +46,7 @@ void HandleQueryPageText(QueryPageText queryText) [PacketHandler(Opcode.CMSG_QUERY_NPC_TEXT)] void HandleQueryNpcText(QueryNPCText queryText) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_NPC_TEXT); + WorldPacket packet = new(Opcode.CMSG_QUERY_NPC_TEXT); packet.WriteUInt32(queryText.TextID); packet.WriteGuid(queryText.Guid.To64()); SendPacketToServer(packet); @@ -54,7 +54,7 @@ void HandleQueryNpcText(QueryNPCText queryText) [PacketHandler(Opcode.CMSG_QUERY_PET_NAME)] void HandleQueryPetName(QueryPetName queryName) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUERY_PET_NAME); + WorldPacket packet = new(Opcode.CMSG_QUERY_PET_NAME); packet.WriteUInt32(queryName.UnitGUID.GetEntry()); packet.WriteGuid(queryName.UnitGUID.To64()); SendPacketToServer(packet); @@ -62,7 +62,7 @@ void HandleQueryPetName(QueryPetName queryName) [PacketHandler(Opcode.CMSG_WHO)] void HandleWhoRequest(WhoRequestPkt who) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_WHO); + WorldPacket packet = new(Opcode.CMSG_WHO); packet.WriteInt32(who.Request.MinLevel); packet.WriteInt32(who.Request.MaxLevel); packet.WriteCString(who.Request.Name); diff --git a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs index 0671f9d5..54fd3f7e 100644 --- a/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/QuestHandler.cs @@ -13,7 +13,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_QUEST_GIVER_QUERY_QUEST)] void HandleQuestGiverQueryQuest(QuestGiverQueryQuest quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_QUERY_QUEST); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_QUERY_QUEST); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); if (LegacyVersion.AddedInVersion(HermesProxy.Enums.ClientVersionBuild.V2_0_1_6180)) @@ -23,7 +23,7 @@ void HandleQuestGiverQueryQuest(QuestGiverQueryQuest quest) [PacketHandler(Opcode.CMSG_QUEST_GIVER_ACCEPT_QUEST)] void HandleQuestGiverAcceptQuest(QuestGiverAcceptQuest quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_ACCEPT_QUEST); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_ACCEPT_QUEST); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); if (LegacyVersion.AddedInVersion(HermesProxy.Enums.ClientVersionBuild.V3_1_2_9901)) @@ -33,14 +33,14 @@ void HandleQuestGiverAcceptQuest(QuestGiverAcceptQuest quest) [PacketHandler(Opcode.CMSG_QUEST_LOG_REMOVE_QUEST)] void HandleQuestLogRemoveQuest(QuestLogRemoveQuest quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_LOG_REMOVE_QUEST); + WorldPacket packet = new(Opcode.CMSG_QUEST_LOG_REMOVE_QUEST); packet.WriteUInt8(quest.Slot); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_QUEST_GIVER_STATUS_QUERY)] void HandleQuestGiverStatusQuery(QuestGiverStatusQuery query) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_STATUS_QUERY); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_STATUS_QUERY); packet.WriteGuid(query.QuestGiverGUID.To64()); SendPacketToServer(packet); } @@ -49,7 +49,7 @@ void HandleQuestGiverStatusMultipleQuery(QuestGiverStatusMultipleQuery query) { if (LegacyVersion.AddedInVersion(HermesProxy.Enums.ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_STATUS_MULTIPLE_QUERY); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_STATUS_MULTIPLE_QUERY); SendPacketToServer(packet); } else @@ -58,7 +58,7 @@ void HandleQuestGiverStatusMultipleQuery(QuestGiverStatusMultipleQuery query) if (UNIT_NPC_FLAGS < 0) return; - List npcGuids = new List(); + List npcGuids = new(); GetSession().GameState.ObjectCacheMutex.WaitOne(); foreach (var obj in GetSession().GameState.ObjectCacheModern) { @@ -70,7 +70,7 @@ void HandleQuestGiverStatusMultipleQuery(QuestGiverStatusMultipleQuery query) foreach (var guid in npcGuids) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_STATUS_QUERY); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_STATUS_QUERY); packet.WriteGuid(guid.To64()); SendPacketToServer(packet); } @@ -79,14 +79,14 @@ void HandleQuestGiverStatusMultipleQuery(QuestGiverStatusMultipleQuery query) [PacketHandler(Opcode.CMSG_QUEST_GIVER_HELLO)] void HandleQuestGiverHello(QuestGiverHello hello) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_HELLO); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_HELLO); packet.WriteGuid(hello.QuestGiverGUID.To64()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_QUEST_GIVER_REQUEST_REWARD)] void HandleQuestGiverRequestReward(QuestGiverRequestReward quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_REQUEST_REWARD); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_REQUEST_REWARD); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); SendPacketToServer(packet); @@ -102,10 +102,10 @@ void HandleQuestGiverChooseReward(QuestGiverChooseReward quest) if (questTemplate == null) { Log.Print(LogType.Error, "Unable to select quest reward because quest template is missing. Try again."); - WorldPacket packet2 = new WorldPacket(Opcode.CMSG_QUERY_QUEST_INFO); + WorldPacket packet2 = new(Opcode.CMSG_QUERY_QUEST_INFO); packet2.WriteUInt32(quest.QuestID); SendPacketToServer(packet2); - QuestGiverQuestFailed fail = new QuestGiverQuestFailed + QuestGiverQuestFailed fail = new() { QuestID = quest.QuestID, Reason = InventoryResult.ItemNotFound @@ -124,7 +124,7 @@ void HandleQuestGiverChooseReward(QuestGiverChooseReward quest) } } - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_CHOOSE_REWARD); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_CHOOSE_REWARD); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); packet.WriteInt32(choiceIndex); @@ -133,7 +133,7 @@ void HandleQuestGiverChooseReward(QuestGiverChooseReward quest) [PacketHandler(Opcode.CMSG_QUEST_GIVER_COMPLETE_QUEST)] void HandleQuestGiverCompleteQuest(QuestGiverCompleteQuest quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_GIVER_COMPLETE_QUEST); + WorldPacket packet = new(Opcode.CMSG_QUEST_GIVER_COMPLETE_QUEST); packet.WriteGuid(quest.QuestGiverGUID.To64()); packet.WriteUInt32(quest.QuestID); SendPacketToServer(packet); @@ -141,21 +141,21 @@ void HandleQuestGiverCompleteQuest(QuestGiverCompleteQuest quest) [PacketHandler(Opcode.CMSG_QUEST_CONFIRM_ACCEPT)] void HandleQuestConfirmAcceptResponse(QuestConfirmAcceptResponse quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_QUEST_CONFIRM_ACCEPT); + WorldPacket packet = new(Opcode.CMSG_QUEST_CONFIRM_ACCEPT); packet.WriteUInt32(quest.QuestID); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_PUSH_QUEST_TO_PARTY)] void HandlePushQuestToParty(PushQuestToParty quest) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_PUSH_QUEST_TO_PARTY); + WorldPacket packet = new(Opcode.CMSG_PUSH_QUEST_TO_PARTY); packet.WriteUInt32(quest.QuestID); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_QUEST_PUSH_RESULT)] void HandleQuestPushResult(QuestPushResultResponse quest) { - WorldPacket packet = new WorldPacket(Opcode.MSG_QUEST_PUSH_RESULT); + WorldPacket packet = new(Opcode.MSG_QUEST_PUSH_RESULT); packet.WriteGuid(quest.SenderGUID.To64()); packet.WriteUInt8((byte)quest.Result); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs b/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs index 80a87354..3c11eef5 100644 --- a/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs +++ b/HermesProxy/World/Server/PacketHandlers/ReputationPackets.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_SET_FACTION_AT_WAR)] void HandleSetFactionAtWar(SetFactionAtWar faction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_FACTION_AT_WAR); + WorldPacket packet = new(Opcode.CMSG_SET_FACTION_AT_WAR); packet.WriteUInt32(faction.FactionIndex); packet.WriteBool(true); SendPacketToServer(packet); @@ -17,7 +17,7 @@ void HandleSetFactionAtWar(SetFactionAtWar faction) [PacketHandler(Opcode.CMSG_SET_FACTION_NOT_AT_WAR)] void HandleSetFactionNotAtWar(SetFactionNotAtWar faction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_FACTION_AT_WAR); + WorldPacket packet = new(Opcode.CMSG_SET_FACTION_AT_WAR); packet.WriteUInt32(faction.FactionIndex); packet.WriteBool(false); SendPacketToServer(packet); @@ -25,7 +25,7 @@ void HandleSetFactionNotAtWar(SetFactionNotAtWar faction) [PacketHandler(Opcode.CMSG_SET_FACTION_INACTIVE)] void HandleSetFactionInactive(SetFactionInactive faction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_FACTION_INACTIVE); + WorldPacket packet = new(Opcode.CMSG_SET_FACTION_INACTIVE); packet.WriteUInt32(faction.FactionIndex); packet.WriteBool(faction.State); SendPacketToServer(packet); @@ -33,7 +33,7 @@ void HandleSetFactionInactive(SetFactionInactive faction) [PacketHandler(Opcode.CMSG_SET_WATCHED_FACTION)] void HandleSetFactionInactive(SetWatchedFaction faction) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_WATCHED_FACTION); + WorldPacket packet = new(Opcode.CMSG_SET_WATCHED_FACTION); packet.WriteUInt32(faction.FactionIndex); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs b/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs index 77e1c7ad..787fdfb1 100644 --- a/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SocialHandler.cs @@ -12,12 +12,12 @@ void HandleContactList(ContactListRequest contacts) { if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_FRIEND_LIST); + WorldPacket packet = new(Opcode.CMSG_FRIEND_LIST); SendPacketToServer(packet); } else { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CONTACT_LIST); + WorldPacket packet = new(Opcode.CMSG_CONTACT_LIST); packet.WriteUInt32((uint)contacts.Flags); SendPacketToServer(packet); } @@ -26,7 +26,7 @@ void HandleContactList(ContactListRequest contacts) [PacketHandler(Opcode.CMSG_ADD_FRIEND)] void HandleAddFriend(AddFriend friend) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ADD_FRIEND); + WorldPacket packet = new(Opcode.CMSG_ADD_FRIEND); packet.WriteCString(friend.Name); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) packet.WriteCString(friend.Note); @@ -36,7 +36,7 @@ void HandleAddFriend(AddFriend friend) [PacketHandler(Opcode.CMSG_ADD_IGNORE)] void HandleAddIgnore(AddIgnore ignore) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ADD_IGNORE); + WorldPacket packet = new(Opcode.CMSG_ADD_IGNORE); packet.WriteCString(ignore.Name); SendPacketToServer(packet); } @@ -45,7 +45,7 @@ void HandleAddIgnore(AddIgnore ignore) [PacketHandler(Opcode.CMSG_DEL_IGNORE)] void HandleDelFriend(DelFriend friend) { - WorldPacket packet = new WorldPacket(friend.GetUniversalOpcode()); + WorldPacket packet = new(friend.GetUniversalOpcode()); packet.WriteGuid(friend.Guid.To64()); SendPacketToServer(packet); } @@ -56,7 +56,7 @@ void HandleSetContactNotes(SetContactNotes friend) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_CONTACT_NOTES); + WorldPacket packet = new(Opcode.CMSG_SET_CONTACT_NOTES); packet.WriteGuid(friend.Guid.To64()); packet.WriteCString(friend.Notes); SendPacketToServer(packet); diff --git a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs index 141d974b..6c79ddba 100644 --- a/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/SpellHandler.cs @@ -76,7 +76,7 @@ public void SendCastRequestFailed(ClientCastRequest castRequest, bool isPet) { if (!castRequest.HasStarted) { - SpellPrepare prepare2 = new SpellPrepare + SpellPrepare prepare2 = new() { ClientCastID = castRequest.ClientGUID, ServerCastID = castRequest.ServerGUID @@ -117,7 +117,7 @@ void HandleCastSpell(CastSpell cast) if (GameData.NextMeleeSpells.Contains(cast.Cast.SpellID) || GameData.AutoRepeatSpells.Contains(cast.Cast.SpellID)) { - ClientCastRequest castRequest = new ClientCastRequest + ClientCastRequest castRequest = new() { Timestamp = Environment.TickCount, SpellId = cast.Cast.SpellID, @@ -135,7 +135,7 @@ void HandleCastSpell(CastSpell cast) { castRequest.ServerGUID = WowGuid128.Create(HighGuidType703.Cast, SpellCastSource.Normal, (uint)GetSession().GameState.CurrentMapId, cast.Cast.SpellID, cast.Cast.SpellID + GetSession().GameState.CurrentPlayerGuid.GetCounter()); - SpellPrepare prepare = new SpellPrepare + SpellPrepare prepare = new() { ClientCastID = cast.Cast.CastID, ServerCastID = castRequest.ServerGUID @@ -147,7 +147,7 @@ void HandleCastSpell(CastSpell cast) } else { - ClientCastRequest castRequest = new ClientCastRequest + ClientCastRequest castRequest = new() { Timestamp = Environment.TickCount, SpellId = cast.Cast.SpellID, @@ -184,7 +184,7 @@ void HandleCastSpell(CastSpell cast) SpellCastTargetFlags targetFlags = ConvertSpellTargetFlags(cast.Cast.Target); - WorldPacket packet = new WorldPacket(Opcode.CMSG_CAST_SPELL); + WorldPacket packet = new(Opcode.CMSG_CAST_SPELL); if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) { packet.WriteUInt32(cast.Cast.SpellID); @@ -211,7 +211,7 @@ void HandlePetCastSpell(PetCastSpell cast) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - ClientCastRequest castRequest = new ClientCastRequest + ClientCastRequest castRequest = new() { Timestamp = Environment.TickCount, SpellId = cast.Cast.SpellID, @@ -247,7 +247,7 @@ void HandlePetCastSpell(PetCastSpell cast) SpellCastTargetFlags targetFlags = ConvertSpellTargetFlags(cast.Cast.Target); - WorldPacket packet = new WorldPacket(Opcode.CMSG_PET_CAST_SPELL); + WorldPacket packet = new(Opcode.CMSG_PET_CAST_SPELL); packet.WriteGuid(cast.PetGUID.To64()); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteUInt8(0); // cast count @@ -265,7 +265,7 @@ void HandleUseItem(UseItem use) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - ClientCastRequest castRequest = new ClientCastRequest + ClientCastRequest castRequest = new() { Timestamp = Environment.TickCount, SpellId = use.Cast.SpellID, @@ -300,7 +300,7 @@ void HandleUseItem(UseItem use) GetSession().GameState.CurrentClientNormalCast = castRequest; - WorldPacket packet = new WorldPacket(Opcode.CMSG_USE_ITEM); + WorldPacket packet = new(Opcode.CMSG_USE_ITEM); byte containerSlot = use.PackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(use.PackSlot) : use.PackSlot; byte slot = use.PackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(use.Slot) : use.Slot; packet.WriteUInt8(containerSlot); @@ -323,7 +323,7 @@ void HandleCancelCast(CancelCast cast) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_CAST); + WorldPacket packet = new(Opcode.CMSG_CANCEL_CAST); if (LegacyVersion.AddedInVersion(ClientVersionBuild.V3_0_2_9056)) packet.WriteUInt8(0); packet.WriteUInt32(cast.SpellID); @@ -337,14 +337,14 @@ void HandleCancelChannelling(CancelChannelling cast) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_CHANNELLING); + WorldPacket packet = new(Opcode.CMSG_CANCEL_CHANNELLING); packet.WriteInt32(cast.SpellID); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_CANCEL_AURA)] void HandleCancelAura(CancelAura aura) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_AURA); + WorldPacket packet = new(Opcode.CMSG_CANCEL_AURA); packet.WriteUInt32(aura.SpellID); SendPacketToServer(packet); } @@ -353,7 +353,7 @@ void HandleCancelMountAura(EmptyClientPacket cancel) { if (LegacyVersion.AddedInVersion(ClientVersionBuild.V2_0_1_6180)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_MOUNT_AURA); + WorldPacket packet = new(Opcode.CMSG_CANCEL_MOUNT_AURA); SendPacketToServer(packet); } else @@ -371,7 +371,7 @@ void HandleCancelMountAura(EmptyClientPacket cancel) if (GameData.MountAuras.Contains(aura.SpellID)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_AURA); + WorldPacket packet = new(Opcode.CMSG_CANCEL_AURA); packet.WriteUInt32(aura.SpellID); SendPacketToServer(packet); } @@ -386,13 +386,13 @@ void HandleCancelAutoRepeatSpell(CancelAutoRepeatSpell aura) if (Settings.ServerSpellDelay > 0) Thread.Sleep(Settings.ServerSpellDelay); - WorldPacket packet = new WorldPacket(Opcode.CMSG_CANCEL_AUTO_REPEAT_SPELL); + WorldPacket packet = new(Opcode.CMSG_CANCEL_AUTO_REPEAT_SPELL); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_LEARN_TALENT)] void HandleLearnTalent(LearnTalent talent) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_LEARN_TALENT); + WorldPacket packet = new(Opcode.CMSG_LEARN_TALENT); packet.WriteUInt32(talent.TalentID); packet.WriteUInt32(talent.Rank); SendPacketToServer(packet); @@ -400,7 +400,7 @@ void HandleLearnTalent(LearnTalent talent) [PacketHandler(Opcode.CMSG_RESURRECT_RESPONSE)] void HandleResurrectResponse(ResurrectResponse revive) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_RESURRECT_RESPONSE); + WorldPacket packet = new(Opcode.CMSG_RESURRECT_RESPONSE); packet.WriteGuid(revive.CasterGUID.To64()); packet.WriteUInt8((byte)(revive.Response != 0 ? 0 : 1)); SendPacketToServer(packet); @@ -408,7 +408,7 @@ void HandleResurrectResponse(ResurrectResponse revive) [PacketHandler(Opcode.CMSG_SELF_RES)] void HandleSelfRes(SelfRes revive) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SELF_RES); + WorldPacket packet = new(Opcode.CMSG_SELF_RES); SendPacketToServer(packet); } @@ -418,7 +418,7 @@ void HandleTotemDestroyed(TotemDestroyed totem) if (LegacyVersion.RemovedInVersion(ClientVersionBuild.V2_0_1_6180)) return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_TOTEM_DESTROYED); + WorldPacket packet = new(Opcode.CMSG_TOTEM_DESTROYED); packet.WriteUInt8(totem.Slot); SendPacketToServer(packet); } diff --git a/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs b/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs index 82d55fe7..0c7464a3 100644 --- a/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/TaxiHandler.cs @@ -12,7 +12,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_TAXI_QUERY_AVAILABLE_NODES)] void HandleTaxiNodesQuery(InteractWithNPC interact) { - WorldPacket packet = new WorldPacket(interact.GetUniversalOpcode()); + WorldPacket packet = new(interact.GetUniversalOpcode()); packet.WriteGuid(interact.CreatureGUID.To64()); SendPacketToServer(packet); } @@ -20,7 +20,7 @@ void HandleTaxiNodesQuery(InteractWithNPC interact) [PacketHandler(Opcode.CMSG_ENABLE_TAXI_NODE)] void HandleEnableTaxiNode(InteractWithNPC interact) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_TALK_TO_GOSSIP); + WorldPacket packet = new(Opcode.CMSG_TALK_TO_GOSSIP); packet.WriteGuid(interact.CreatureGUID.To64()); SendPacketToServer(packet); } @@ -31,7 +31,7 @@ void HandleActivateTaxi(ActivateTaxi taxi) // direct path exist if (TaxiPathExist(GetSession().GameState.CurrentTaxiNode, taxi.Node)) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ACTIVATE_TAXI); + WorldPacket packet = new(Opcode.CMSG_ACTIVATE_TAXI); packet.WriteGuid(taxi.FlightMaster.To64()); packet.WriteUInt32(GetSession().GameState.CurrentTaxiNode); packet.WriteUInt32(taxi.Node); @@ -43,7 +43,7 @@ void HandleActivateTaxi(ActivateTaxi taxi) if (path.Count <= 1) // no nodes found return; - WorldPacket packet = new WorldPacket(Opcode.CMSG_ACTIVATE_TAXI_EXPRESS); + WorldPacket packet = new(Opcode.CMSG_ACTIVATE_TAXI_EXPRESS); packet.WriteGuid(taxi.FlightMaster.To64()); packet.WriteUInt32(0); // total cost, not used packet.WriteUInt32((uint)path.Count); // node count @@ -72,7 +72,7 @@ bool IsTaxiNodeKnown(uint node, List usableNodes) HashSet GetTaxiPath(uint from, uint to, List usableNodes) { // shortest path node list - HashSet nodes = new HashSet { from }; + HashSet nodes = new() { from }; // copy taxi nodes graph and disable unknown nodes int[,] graphCopy = new int[GameData.TaxiNodesGraph.GetLength(0), GameData.TaxiNodesGraph.GetLength(1)]; Buffer.BlockCopy(GameData.TaxiNodesGraph, 0, graphCopy, 0, GameData.TaxiNodesGraph.Length * sizeof(uint)); diff --git a/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs b/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs index 1c9bdf64..65d86720 100644 --- a/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs +++ b/HermesProxy/World/Server/PacketHandlers/TradeHandler.cs @@ -9,7 +9,7 @@ public partial class WorldSocket [PacketHandler(Opcode.CMSG_INITIATE_TRADE)] void HandleInitiateTrade(InitiateTrade trade) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_INITIATE_TRADE); + WorldPacket packet = new(Opcode.CMSG_INITIATE_TRADE); packet.WriteGuid(trade.Guid.To64()); SendPacketToServer(packet); } @@ -17,7 +17,7 @@ void HandleInitiateTrade(InitiateTrade trade) [PacketHandler(Opcode.CMSG_SET_TRADE_GOLD)] void HandleSetTradeGold(SetTradeGold trade) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_TRADE_GOLD); + WorldPacket packet = new(Opcode.CMSG_SET_TRADE_GOLD); packet.WriteInt32((int)trade.Coinage); SendPacketToServer(packet); } @@ -25,7 +25,7 @@ void HandleSetTradeGold(SetTradeGold trade) [PacketHandler(Opcode.CMSG_ACCEPT_TRADE)] void HandleAcceptTrade(AcceptTrade trade) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_ACCEPT_TRADE); + WorldPacket packet = new(Opcode.CMSG_ACCEPT_TRADE); packet.WriteUInt32(trade.StateIndex); SendPacketToServer(packet); } @@ -37,14 +37,14 @@ void HandleAcceptTrade(AcceptTrade trade) [PacketHandler(Opcode.CMSG_IGNORE_TRADE)] void HandleEmptyTradePacket(EmptyClientPacket trade) { - WorldPacket packet = new WorldPacket(trade.GetUniversalOpcode()); + WorldPacket packet = new(trade.GetUniversalOpcode()); SendPacketToServer(packet); } [PacketHandler(Opcode.CMSG_CLEAR_TRADE_ITEM)] void HandleClearTradeItem(ClearTradeItem trade) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_CLEAR_TRADE_ITEM); + WorldPacket packet = new(Opcode.CMSG_CLEAR_TRADE_ITEM); packet.WriteUInt8(trade.TradeSlot); SendPacketToServer(packet); } @@ -52,7 +52,7 @@ void HandleClearTradeItem(ClearTradeItem trade) [PacketHandler(Opcode.CMSG_SET_TRADE_ITEM)] void HandleSetTradeItem(SetTradeItem trade) { - WorldPacket packet = new WorldPacket(Opcode.CMSG_SET_TRADE_ITEM); + WorldPacket packet = new(Opcode.CMSG_SET_TRADE_ITEM); packet.WriteUInt8(trade.TradeSlot); byte containerSlot = trade.PackSlot != Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(trade.PackSlot) : trade.PackSlot; byte slot = trade.PackSlot == Enums.Classic.InventorySlots.Bag0 ? ModernVersion.AdjustInventorySlot(trade.ItemSlotInPack) : trade.ItemSlotInPack; diff --git a/HermesProxy/World/Server/Packets/ArenaPackets.cs b/HermesProxy/World/Server/Packets/ArenaPackets.cs index c7251dd5..7c43424b 100644 --- a/HermesProxy/World/Server/Packets/ArenaPackets.cs +++ b/HermesProxy/World/Server/Packets/ArenaPackets.cs @@ -73,7 +73,7 @@ public override void Write() public uint SeasonWins; public uint TeamRating; public uint PlayerRating; - public List Members = new List(); + public List Members = new(); } struct ArenaTeamMember diff --git a/HermesProxy/World/Server/Packets/AuctionPackets.cs b/HermesProxy/World/Server/Packets/AuctionPackets.cs index ef34ee92..b61ff0ef 100644 --- a/HermesProxy/World/Server/Packets/AuctionPackets.cs +++ b/HermesProxy/World/Server/Packets/AuctionPackets.cs @@ -102,7 +102,7 @@ public override void Read() for (int i = 0; i < classFiltersCount; ++i) { - ClassFilter classFilter = new ClassFilter + ClassFilter classFilter = new() { ItemClass = _worldPacket.ReadInt32() }; @@ -110,7 +110,7 @@ public override void Read() uint subClassFiltersCount = _worldPacket.ReadBits(5); for (uint j = 0; j < subClassFiltersCount; ++j) { - SubClassFilter filter = new SubClassFilter + SubClassFilter filter = new() { ItemSubclass = _worldPacket.ReadInt32(), InvTypeMask = _worldPacket.ReadUInt32() @@ -126,7 +126,7 @@ public override void Read() var sorts = new WorldPacket(_worldPacket.GetOpcode(), data); for (var i = 0; i < sortCount; ++i) { - AuctionSort sort = new AuctionSort + AuctionSort sort = new() { Type = sorts.ReadUInt8(), Direction = sorts.ReadUInt8() @@ -145,7 +145,7 @@ public override void Read() public string Name; public bool OnlyUsable; public bool ExactMatch; - public List ClassFilters = new List(); + public List ClassFilters = new(); public List Sorts = new(); } diff --git a/HermesProxy/World/Server/Packets/CharacterPackets.cs b/HermesProxy/World/Server/Packets/CharacterPackets.cs index 379c7517..e42febfe 100644 --- a/HermesProxy/World/Server/Packets/CharacterPackets.cs +++ b/HermesProxy/World/Server/Packets/CharacterPackets.cs @@ -926,8 +926,8 @@ public override void Write() } public WowGuid128 PlayerGUID; - public List Brackets = new List(); - public List ArenaTeams = new List(); + public List Brackets = new(); + public List ArenaTeams = new(); } public class PvPBracketInspectData diff --git a/HermesProxy/World/Server/Packets/ChatPackets.cs b/HermesProxy/World/Server/Packets/ChatPackets.cs index 85a494e8..e02d7f24 100644 --- a/HermesProxy/World/Server/Packets/ChatPackets.cs +++ b/HermesProxy/World/Server/Packets/ChatPackets.cs @@ -530,6 +530,6 @@ public override void Read() Prefixes.Add(_worldPacket.ReadString(_worldPacket.ReadBits(5))); } - public List Prefixes = new List(); + public List Prefixes = new(); } } diff --git a/HermesProxy/World/Server/Packets/GroupPackets.cs b/HermesProxy/World/Server/Packets/GroupPackets.cs index e967c41b..f38e34cd 100644 --- a/HermesProxy/World/Server/Packets/GroupPackets.cs +++ b/HermesProxy/World/Server/Packets/GroupPackets.cs @@ -824,7 +824,7 @@ public void Write(WorldPacket data) } public uint PhaseShiftFlags; - public List Phases = new List(); + public List Phases = new(); public WowGuid128 PersonalGUID = WowGuid128.Empty; public struct PartyMemberPhase diff --git a/HermesProxy/World/Server/Packets/GuildPackets.cs b/HermesProxy/World/Server/Packets/GuildPackets.cs index 91cca774..453a7248 100644 --- a/HermesProxy/World/Server/Packets/GuildPackets.cs +++ b/HermesProxy/World/Server/Packets/GuildPackets.cs @@ -168,7 +168,7 @@ public override void Write() _worldPacket.WriteString(InfoText); } - public List MemberData = new List(); + public List MemberData = new(); public string WelcomeText; public string InfoText; public uint CreateDate; @@ -266,7 +266,7 @@ public override void Write() Ranks.ForEach(p => p.Write(_worldPacket)); } - public List Ranks = new List(); + public List Ranks = new(); } public class GuildRankData diff --git a/HermesProxy/World/Server/Packets/MailPackets.cs b/HermesProxy/World/Server/Packets/MailPackets.cs index 9792a373..5dbeba2e 100644 --- a/HermesProxy/World/Server/Packets/MailPackets.cs +++ b/HermesProxy/World/Server/Packets/MailPackets.cs @@ -54,7 +54,7 @@ public override void Write() } public float NextMailTime; - public List Mails = new List(); + public List Mails = new(); public class MailNextTimeEntry { diff --git a/HermesProxy/World/Server/Packets/MiscPackets.cs b/HermesProxy/World/Server/Packets/MiscPackets.cs index 5b54a721..381f98e6 100644 --- a/HermesProxy/World/Server/Packets/MiscPackets.cs +++ b/HermesProxy/World/Server/Packets/MiscPackets.cs @@ -365,7 +365,7 @@ public override void Write() task.Write(_worldPacket); } - public List Tasks = new List(); + public List Tasks = new(); } public class TaskProgress @@ -384,7 +384,7 @@ public void Write(WorldPacket data) public uint FailureTime; public uint Flags; public uint Unk; - public List Progress = new List(); + public List Progress = new(); } public class InitialSetup : ServerPacket @@ -685,7 +685,7 @@ public override void Write() public void AddBlacklist(int activity, int reason) { - LFGListBlacklistEntry entry = new LFGListBlacklistEntry + LFGListBlacklistEntry entry = new() { ActivityID = activity, Reason = reason @@ -693,7 +693,7 @@ public void AddBlacklist(int activity, int reason) Blacklist.Add(entry); } - public List Blacklist = new List(); + public List Blacklist = new(); } public struct LFGListBlacklistEntry diff --git a/HermesProxy/World/Server/Packets/PetPackets.cs b/HermesProxy/World/Server/Packets/PetPackets.cs index e2e6daea..b998c1a5 100644 --- a/HermesProxy/World/Server/Packets/PetPackets.cs +++ b/HermesProxy/World/Server/Packets/PetPackets.cs @@ -292,7 +292,7 @@ public override void Write() _worldPacket.WritePackedGuid128(guid); } - public List Guids = new List(); + public List Guids = new(); } class PetStableResult : ServerPacket diff --git a/HermesProxy/World/Server/Packets/SystemPackets.cs b/HermesProxy/World/Server/Packets/SystemPackets.cs index bfd6c1a6..7e5b6e0e 100644 --- a/HermesProxy/World/Server/Packets/SystemPackets.cs +++ b/HermesProxy/World/Server/Packets/SystemPackets.cs @@ -199,7 +199,7 @@ public override void Write() public uint ClubsPresenceUpdateTimer; public uint HiddenUIClubsPresenceUpdateTimer; // Timer for updating club presence when communities ui frame is hidden public int ActiveSeason; - public List GameRuleValues = new List(); + public List GameRuleValues = new(); public short MaxPlayerNameQueriesPerPacket; public short PlayerNameQueryTelemetryInterval; public uint KioskSessionMinutes; @@ -379,7 +379,7 @@ public override void Write() public int MinimumExpansionLevel; public int MaximumExpansionLevel; public int ActiveSeason; - public List GameRuleValues = new List(); + public List GameRuleValues = new(); public short MaxPlayerNameQueriesPerPacket; public short PlayerNameQueryTelemetryInterval; public uint KioskSessionMinutes; @@ -402,7 +402,7 @@ public override void Write() } } - public List Text = new List(); + public List Text = new(); } public class SetTimeZoneInformation : ServerPacket diff --git a/HermesProxy/World/Server/Packets/UpdatePackets.cs b/HermesProxy/World/Server/Packets/UpdatePackets.cs index 673a4549..390eaf60 100644 --- a/HermesProxy/World/Server/Packets/UpdatePackets.cs +++ b/HermesProxy/World/Server/Packets/UpdatePackets.cs @@ -271,19 +271,19 @@ public override void Write() { case ClientVersionBuild.V1_14_0_40237: { - Objects.Version.V1_14_0_40237.ObjectUpdateBuilder builder = new Objects.Version.V1_14_0_40237.ObjectUpdateBuilder(update, _gameState); + Objects.Version.V1_14_0_40237.ObjectUpdateBuilder builder = new(update, _gameState); builder.WriteToPacket(data); break; } case ClientVersionBuild.V1_14_1_40688: { - Objects.Version.V1_14_1_40688.ObjectUpdateBuilder builder = new Objects.Version.V1_14_1_40688.ObjectUpdateBuilder(update, _gameState); + Objects.Version.V1_14_1_40688.ObjectUpdateBuilder builder = new(update, _gameState); builder.WriteToPacket(data); break; } case ClientVersionBuild.V2_5_2_39570: { - Objects.Version.V2_5_2_39570.ObjectUpdateBuilder builder = new Objects.Version.V2_5_2_39570.ObjectUpdateBuilder(update, _gameState); + Objects.Version.V2_5_2_39570.ObjectUpdateBuilder builder = new(update, _gameState); builder.WriteToPacket(data); break; } @@ -305,9 +305,9 @@ public override void Write() public ushort MapID; public byte[] Data; - public List OutOfRangeGuids = new List(); - public List DestroyedGuids = new List(); - public List ObjectUpdates = new List(); + public List OutOfRangeGuids = new(); + public List DestroyedGuids = new(); + public List ObjectUpdates = new(); } public class PowerUpdate : ServerPacket diff --git a/HermesProxy/World/Server/WorldSocket.cs b/HermesProxy/World/Server/WorldSocket.cs index 3348fd1e..9c332cc3 100644 --- a/HermesProxy/World/Server/WorldSocket.cs +++ b/HermesProxy/World/Server/WorldSocket.cs @@ -65,7 +65,7 @@ public partial class WorldSocket : SocketBase, BnetServices.INetwork ZLib.z_stream _compressionStream; readonly ConcurrentDictionary _clientPacketTable = new(); GlobalSessionData _globalSession; - readonly System.Threading.Mutex _sendMutex = new System.Threading.Mutex(); + readonly System.Threading.Mutex _sendMutex = new(); private BnetServices.ServiceManager _bnetRpc; @@ -616,7 +616,7 @@ void HandleAuthContinuedSessionCallback(AuthContinuedSession authSession) public void SendConnectToInstance(ConnectToSerial serial) { IPAddress externalIp = IPAddress.Parse(Framework.Settings.ExternalAddress); - IPEndPoint instanceAddress = new IPEndPoint(externalIp, Framework.Settings.InstancePort); + IPEndPoint instanceAddress = new(externalIp, Framework.Settings.InstancePort); _instanceConnectKey.AccountId = GetSession().AccountInfo.Id; _instanceConnectKey.connectionType = ConnectionType.Instance; @@ -746,8 +746,8 @@ public void SendAuthResponse(BattlenetRpcErrorCode code, bool queued, uint queue // Send current home realm. Also there is no need to send it later in realm queries. response.SuccessInfo.VirtualRealms.Add(new VirtualRealmInfo(realm.Id.GetAddress(), true, false, realm.Name, realm.NormalizedName)); - List availableRaces = new List(); - RaceClassAvailability race = new RaceClassAvailability + List availableRaces = new(); + RaceClassAvailability race = new() { RaceID = 1 }; @@ -1028,7 +1028,7 @@ public void SendClientCacheVersion(uint version) public void SendAvailableHotfixes() { - AvailableHotfixes hotfixes = new AvailableHotfixes + AvailableHotfixes hotfixes = new() { VirtualRealmAddress = GetSession().RealmId.GetAddress() }; @@ -1060,7 +1060,7 @@ public void SendAccountDataTimes() WowGuid128 guid = GetSession().GameState.CurrentPlayerGuid; GetSession().AccountDataMgr.LoadAllData(guid); - AccountDataTimes accountData = new AccountDataTimes + AccountDataTimes accountData = new() { PlayerGuid = guid, ServerTime = Time.UnixTime diff --git a/HermesProxy/World/SniffFile.cs b/HermesProxy/World/SniffFile.cs index 80098458..462475b7 100644 --- a/HermesProxy/World/SniffFile.cs +++ b/HermesProxy/World/SniffFile.cs @@ -20,7 +20,7 @@ public SniffFile(string fileName, ushort build) readonly BinaryWriter _fileWriter; readonly ushort _gameVersion; - readonly System.Threading.Mutex _mutex = new System.Threading.Mutex(); + readonly System.Threading.Mutex _mutex = new(); public void WriteHeader() { diff --git a/HermesProxy/World/WowGuid.cs b/HermesProxy/World/WowGuid.cs index 52da9b14..bd277b20 100644 --- a/HermesProxy/World/WowGuid.cs +++ b/HermesProxy/World/WowGuid.cs @@ -147,7 +147,7 @@ public bool IsEmpty() public class WowGuid128 : WowGuid { - public static WowGuid128 Empty = new WowGuid128(); + public static WowGuid128 Empty = new(); public WowGuid128() { @@ -336,7 +336,7 @@ public override WowGuid128 To128(GameSessionData gameState) public class WowGuid64 : WowGuid { - public static WowGuid64 Empty = new WowGuid64(0); + public static WowGuid64 Empty = new(0); public WowGuid64(ulong id) {