From ebaf10493564b8148f30c1a96044da8310176684 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sat, 27 Dec 2025 16:47:28 -0800 Subject: [PATCH] chore: Use var everywhere (#2294) --- .../Tests/Buffers/SpanReaderTests.cs | 26 ++-- .../Tests/Collections/OrderedSetTests.cs | 2 +- .../Tests/Geometry/Point2DTests.cs | 4 +- .../Tests/Geometry/Point3DTests.cs | 4 +- .../Tests/Geometry/Rectangle2DTests.cs | 4 +- .../Tests/Geometry/Rectangle3DTests.cs | 4 +- .../Tests/Geometry/WorldLocationTests.cs | 4 +- .../Tests/Items/ContainerTests.cs | 2 +- .../Maps/ItemByDistanceEnumeratorTests.cs | 2 +- .../Tests/Maps/MapSelectionTests.cs | 4 +- .../Maps/MobileByDistanceEnumeratorTests.cs | 2 +- .../Tests/Network/Firewall/FirewallTests.cs | 8 +- .../Packets/Outgoing/CombatPacketTests.cs | 6 +- .../Packets/Outgoing/ContainerPacketTests.cs | 20 +-- .../Packets/Outgoing/DamagePacketTests.cs | 4 +- .../Packets/Outgoing/EffectPacketTests.cs | 10 +- .../Packets/Outgoing/GumpPacketTests.cs | 2 +- .../Packets/Outgoing/ItemPacketTests.cs | 6 +- .../Packets/Outgoing/LightPacketTests.cs | 2 +- .../Packets/Outgoing/MessagePacketTests.cs | 14 +- .../Packets/Outgoing/MobilePacketTests.cs | 12 +- .../DecimalSerializationTests.cs | 2 +- .../Tests/Serialization/TypeConverterTests.cs | 10 +- .../Server.Tests/Tests/Timer/TimerTests.cs | 4 +- .../Tests/World/VirtualSerialTests.cs | 4 +- Projects/Server/AssemblyHandler.cs | 2 +- .../Buffers/RawInterpolatedStringHandler.cs | 30 ++--- Projects/Server/Buffers/STArrayPool.cs | 6 +- Projects/Server/Buffers/ValueStringBuilder.cs | 34 ++--- Projects/Server/Client/ArtData.cs | 14 +- Projects/Server/Client/UOClient.cs | 2 +- .../Server/Collections/ArrayEnumerator.cs | 2 +- Projects/Server/Collections/HashHelpers.cs | 14 +- Projects/Server/Collections/PooledRefList.cs | 66 +++++----- Projects/Server/Collections/PooledRefQueue.cs | 30 ++--- Projects/Server/Effects.cs | 26 ++-- Projects/Server/EventLoopTasks.cs | 6 +- .../Server/Exceptions/ExceptionExtensions.cs | 16 +-- Projects/Server/ExpansionInfo.cs | 6 +- .../GarbageCollection/Gen2GcCallback.cs | 2 +- Projects/Server/Geometry/WorldLocation.cs | 4 +- Projects/Server/Guild.cs | 2 +- Projects/Server/Items/BaseMulti.cs | 16 +-- Projects/Server/Items/Item.Enumerable.cs | 2 +- Projects/Server/Items/Item.cs | 26 ++-- Projects/Server/Items/VirtualHair.cs | 4 +- .../Json/Converters/RegionByNameConverter.cs | 2 +- Projects/Server/Json/JsonUtilities.cs | 8 +- Projects/Server/Localization/Localization.cs | 2 +- .../Server/Localization/LocalizationEntry.cs | 2 +- Projects/Server/Main.cs | 4 +- .../Maps/Map.ClientByDistanceEnumerator.cs | 2 +- Projects/Server/Maps/Map.ClientEnumerator.cs | 4 +- Projects/Server/Maps/Map.ItemEnumerator.cs | 2 +- Projects/Server/Maps/Map.MobileEnumerator.cs | 2 +- Projects/Server/Maps/Map.MultiEnumerator.cs | 2 +- .../Server/Maps/Map.StaticTileEnumerator.cs | 4 +- Projects/Server/Maps/Map.cs | 16 +-- Projects/Server/Maps/MapSelection.cs | 2 +- Projects/Server/Mobiles/Mobile.cs | 56 ++++---- Projects/Server/MultiData.cs | 2 +- .../Network/Firewall/CidrFirewallEntry.cs | 2 +- Projects/Server/Network/IPRateLimiter.cs | 4 +- Projects/Server/Network/MovementThrottle.cs | 8 +- Projects/Server/Network/NetState/NetState.cs | 16 +-- Projects/Server/Network/NetworkCompression.cs | 10 +- .../Network/Packets/OutgoingAccountPackets.cs | 8 +- .../Network/Packets/OutgoingEffectPackets.cs | 2 +- .../Network/Packets/OutgoingEntityPackets.cs | 14 +- .../Network/Packets/OutgoingItemPackets.cs | 2 +- .../Network/Packets/OutgoingMapPackets.cs | 2 +- .../Network/Packets/OutgoingMenuPackets.cs | 4 +- .../Network/Packets/OutgoingMessagePackets.cs | 6 +- .../Network/Packets/OutgoingMobilePackets.cs | 22 ++-- .../Network/Packets/OutgoingPlayerPackets.cs | 2 +- .../Packets/OutgoingVendorBuyPackets.cs | 2 +- .../Network/Packets/PacketContainerBuilder.cs | 6 +- .../Server/PropertyList/ObjectPropertyList.cs | 34 ++--- Projects/Server/Random/StableRandom.cs | 8 +- .../Server/Serialization/AdhocPersistence.cs | 2 +- .../Serialization/GenericEntityPersistence.cs | 14 +- .../Server/Serialization/IGenericReader.cs | 6 +- .../Server/Serialization/IGenericWriter.cs | 4 +- Projects/Server/Serialization/Persistence.cs | 4 +- .../Serialization/SerializationExtensions.cs | 2 +- Projects/Server/Skills.cs | 2 +- Projects/Server/Targeting/Target.cs | 2 +- Projects/Server/Text/HexStringConverter.cs | 2 +- Projects/Server/Text/StringHelpers.cs | 4 +- Projects/Server/Text/TextEncoding.cs | 2 +- Projects/Server/Timer/Timer.DelayCall.cs | 6 +- Projects/Server/Timer/Timer.TimerWheel.cs | 2 +- .../Server/Utilities/ActivatorExtensions.cs | 12 +- Projects/Server/Utilities/HashUtility.cs | 6 +- Projects/Server/Utilities/Html.cs | 6 +- Projects/Server/Utilities/PathUtility.cs | 14 +- Projects/Server/Utilities/Utility.cs | 24 ++-- Projects/Server/World/World.cs | 4 +- .../Engines/Events/EventSchedulerTests.cs | 12 +- .../Tests/Engines/Party/PartyPacketTests.cs | 6 +- .../Tests/Items/Books/BookPacketTests.cs | 4 +- .../Items/Games/Mahjong/MahjongPacketTests.cs | 4 +- .../Tests/Multis/Houses/HousePacketTests.cs | 2 +- .../Tests/Multis/Houses/HousePackets.cs | 2 +- .../Tests/Network/Packets/ArrowPacketTests.cs | 4 +- .../Network/Packets/BuffIconPacketTests.cs | 2 +- .../Tests/Utilities/TryParseTests.cs | 2 +- .../Accounting/Account.Migrations.cs | 10 +- Projects/UOContent/Accounting/Account.cs | 2 +- .../HashAlgorithmPasswordProtection.cs | 2 +- .../UOContent/Assistants/AssistantHandler.cs | 2 +- Projects/UOContent/Commands/AddonGenerator.cs | 80 ++++++------ .../UOContent/Commands/BoundingBoxPicker.cs | 2 +- .../Commands/Generic/Commands/BaseCommand.cs | 2 +- .../Commands/Generic/Commands/Commands.cs | 2 +- .../Compilers/ConditionalCompiler.cs | 2 +- .../Implementors/SerialCommandImplementor.cs | 2 +- Projects/UOContent/Commands/Handlers.cs | 2 +- .../Commands/Object Creation/AddGump.cs | 2 +- .../Commands/Object Creation/CAGLoader.cs | 4 +- Projects/UOContent/Commands/StaffAccess.cs | 2 +- Projects/UOContent/Commands/VisibilityList.cs | 2 +- Projects/UOContent/Compression/TarArchive.cs | 4 +- .../Advanced Search/AdvancedSearchGump.cs | 12 +- .../AdvancedSearchThreadWorker.cs | 22 ++-- .../AdvancedSearchUtilities.cs | 6 +- .../Engines/Bulk Orders/LargeBODAcceptGump.cs | 2 +- .../Engines/Bulk Orders/LargeBODGump.cs | 2 +- .../Engines/Bulk Orders/SmallBODAcceptGump.cs | 2 +- .../Engines/Bulk Orders/SmallBODGump.cs | 2 +- .../Engines/Bulk Orders/SmallSmithBOD.cs | 2 +- .../Engines/Bulk Orders/SmallTailorBOD.cs | 2 +- .../Engines/CannedEvil/ChampionCommands.cs | 2 +- .../Engines/CannedEvil/ChampionPlatform.cs | 2 +- .../Engines/CannedEvil/ChampionSpawn.cs | 122 +++++++++--------- .../UOContent/Engines/CannedEvil/GenChamps.cs | 6 +- .../Character Creation/CharacterCreation.cs | 6 +- .../UOContent/Engines/ConPVP/DuelContext.cs | 6 +- .../UOContent/Engines/Craft/Core/CraftItem.cs | 8 +- .../UOContent/Engines/Craft/Core/Enhance.cs | 4 +- .../Doom/LeverPuzzle/LeverPuzzleController.cs | 2 +- .../Engines/Factions/Core/Faction.cs | 4 +- .../Factions/Mobiles/Guards/GuardAI.cs | 2 +- Projects/UOContent/Engines/Harvest/Fishing.cs | 2 +- .../Engines/ML Quests/Mobiles/SirHelper.cs | 2 +- Projects/UOContent/Engines/Party/Party.cs | 24 ++-- .../UOContent/Engines/Party/PartyPackets.cs | 6 +- .../UOContent/Engines/Plants/PlantSystem.cs | 2 +- .../ReportMurdererGump.cs | 2 +- .../Quests/Core/Items/EnchantedSextant.cs | 4 +- .../Quests/Regions/QuestOfferRegion.cs | 2 +- .../Study of the Solen Hive/NestArea.cs | 2 +- .../Commands/ExportSpawnersCommand.cs | 4 +- .../Commands/ImportSpawnersCommand.cs | 30 ++--- .../Engines/Spawners/SpawnPropsGump.cs | 2 +- .../Engines/Spawners/SpawnerControllerGump.cs | 8 +- .../UOContent/Engines/Spawners/SpawnerGump.cs | 2 +- .../Character Statue Maker/CharacterStatue.cs | 2 +- .../CharacterStatuePackets.cs | 2 +- Projects/UOContent/Engines/Virtues/Honor.cs | 2 +- .../UOContent/Engines/Virtues/Sacrifice.cs | 2 +- .../UOContent/Engines/Virtues/VirtueGump.cs | 2 +- .../UOContent/Engines/Virtues/VirtueSystem.cs | 2 +- Projects/UOContent/Gumps/Base/DynamicGump.cs | 2 +- .../Gumps/Base/DynamicGumpBuilder.cs | 4 +- .../UOContent/Gumps/Base/GumpLayoutBuilder.cs | 6 +- .../Gumps/Base/GumpStringsBuilder.cs | 4 +- .../Gumps/Base/GumpSystem.IncomingPackets.cs | 4 +- Projects/UOContent/Gumps/Base/GumpSystem.cs | 4 +- .../UOContent/Gumps/Base/Legacy/GumpGrid.cs | 24 ++-- .../UOContent/Gumps/Base/NetStateGumps.cs | 8 +- Projects/UOContent/Gumps/Base/RelayInfo.cs | 2 +- Projects/UOContent/Gumps/Base/StaticGump.cs | 2 +- .../UOContent/Gumps/Base/StaticGumpBuilder.cs | 4 +- Projects/UOContent/Gumps/Go/GoGump.cs | 2 +- .../UOContent/Gumps/Guilds/GuildListGump.cs | 2 +- .../Gumps/Guilds/GuildMobileListGump.cs | 2 +- .../Christmas/2010/Addons/FireFliesDeed.cs | 4 +- .../Items/Addons/AddonContainerComponent.cs | 2 +- Projects/UOContent/Items/Addons/DartBoard.cs | 2 +- Projects/UOContent/Items/Armor/BaseArmor.cs | 2 +- .../Bulletin Boards/BulletinBoardPackets.cs | 2 +- .../Items/Construction/Doors/BaseDoor.cs | 4 +- .../Fillable Containers/FillableContent.cs | 2 +- .../Items/Containers/LockableContainer.cs | 2 +- Projects/UOContent/Items/Games/BaseBoard.cs | 2 +- .../Items/Games/Mahjong/MahjongPackets.cs | 4 +- .../Items/Games/Mahjong/MahjongPlayers.cs | 6 +- Projects/UOContent/Items/Misc/Blocker.cs | 2 +- .../UOContent/Items/Misc/ClockworkAssembly.cs | 2 +- Projects/UOContent/Items/Misc/LOSBlocker.cs | 2 +- .../UOContent/Items/Misc/PublicMoongate.cs | 2 +- .../UOContent/Items/Quivers/BaseQuiver.cs | 2 +- .../Carpenter Items/TaxidermyKit.cs | 2 +- .../Special/House Raffle/HouseRaffleStone.cs | 2 +- .../Special/Special Scrolls/PowerScroll.cs | 2 +- .../Items/Special/Veteran Rewards/Banner.cs | 2 +- .../Items/Special/Veteran Rewards/Cannon.cs | 2 +- .../Items/Weapons/Abilities/ForceArrow.cs | 10 +- .../Items/Weapons/Abilities/ForceOfNature.cs | 2 +- .../Weapons/Abilities/FrenziedWhirlwind.cs | 2 +- .../Items/Weapons/Abilities/InfusedThrow.cs | 2 +- .../Items/Weapons/Abilities/LightningArrow.cs | 4 +- .../Items/Weapons/Abilities/MysticArc.cs | 4 +- .../Items/Weapons/Abilities/WeaponAbility.cs | 6 +- .../UOContent/Items/Weapons/BaseWeapon.cs | 6 +- .../Items/Weapons/Throwing/BaseThrown.cs | 2 +- Projects/UOContent/Misc/ClientVerification.cs | 4 +- Projects/UOContent/Misc/CrashGuard.cs | 14 +- Projects/UOContent/Misc/Guild.cs | 6 +- Projects/UOContent/Misc/PacketThrottles.cs | 8 +- Projects/UOContent/Misc/ServerList.cs | 2 +- Projects/UOContent/Misc/ShrinkTable.cs | 2 +- Projects/UOContent/Misc/StaminaSystem.cs | 4 +- .../UOContent/Misc/TreasureMapProtection.cs | 2 +- .../BaseAI/DebugInterpolatedStringHandler.cs | 30 ++--- .../UOContent/Mobiles/AI/BaseAI/PetOrders.cs | 4 +- Projects/UOContent/Mobiles/AI/ThiefAI.cs | 2 +- .../Summon Undead/SummonUndeadCounter.cs | 2 +- Projects/UOContent/Mobiles/BaseCreature.cs | 8 +- .../UOContent/Mobiles/Hireables/BaseHire.cs | 4 +- .../Monsters/Humanoid/Magic/SavageShaman.cs | 2 +- .../Mobiles/Monsters/LBR/Meers/MeerEternal.cs | 2 +- Projects/UOContent/Mobiles/PlayerMobile.cs | 6 +- .../Mobiles/Townfolk/BaseEscortable.cs | 2 +- .../UOContent/Mobiles/Vendors/BaseVendor.cs | 2 +- Projects/UOContent/Multis/Boats/BaseBoat.cs | 4 +- .../UOContent/Multis/Boats/BaseDockedBoat.cs | 2 +- .../UOContent/Multis/Boats/BoatPackets.cs | 4 +- .../UOContent/Multis/HousePlacementTarget.cs | 2 +- Projects/UOContent/Multis/Houses/BaseHouse.cs | 4 +- .../UOContent/Multis/Houses/HousePackets.cs | 8 +- .../UOContent/Multis/Houses/HousePlacement.cs | 8 +- .../Multis/Houses/HousePlacementTool.cs | 2 +- Projects/UOContent/Network/EntityPackets.cs | 2 +- Projects/UOContent/Network/MapUO.cs | 10 +- .../Network/Packets/IncomingAccountPackets.cs | 2 +- .../Network/Packets/IncomingEntityPackets.cs | 6 +- .../Packets/IncomingExtendedCommandPackets.cs | 4 +- .../Network/Packets/IncomingItemPackets.cs | 2 +- .../Packets/IncomingMovementPackets.cs | 2 +- .../Packets/IncomingTargetingPackets.cs | 2 +- .../UOContent/Network/ProtocolExtensions.cs | 2 +- Projects/UOContent/Skills/AntiMacroSystem.cs | 6 +- Projects/UOContent/Skills/Begging.cs | 4 +- Projects/UOContent/Skills/DetectHidden.cs | 6 +- Projects/UOContent/Skills/ForensicEval.cs | 2 +- .../UOContent/Skills/ItemIdentification.cs | 2 +- Projects/UOContent/Skills/Stealing.cs | 4 +- Projects/UOContent/Spells/Base/SpecialMove.cs | 2 +- Projects/UOContent/Spells/Base/Spell.cs | 2 +- Projects/UOContent/Spells/Base/SpellHelper.cs | 2 +- .../Spells/Bushido/MomentumStrike.cs | 2 +- .../Spells/Chivalry/NobleSacrifice.cs | 2 +- .../UOContent/Spells/Chivalry/RemoveCurse.cs | 2 +- .../Spells/Mysticism/BombardSpell.cs | 2 +- .../Spells/Mysticism/CleansingWindsSpell.cs | 2 +- .../Spells/Necromancy/AnimateDeadSpell.cs | 2 +- .../Spells/Necromancy/PoisonStrike.cs | 2 +- .../UOContent/Spells/Ninjitsu/AnimalForm.cs | 20 +-- .../UOContent/Spells/Second/Protection.cs | 6 +- .../UOContent/Spells/Seventh/EnergyField.cs | 2 +- .../UOContent/Spells/Seventh/MeteorSwarm.cs | 2 +- Projects/UOContent/Spells/Sixth/Explosion.cs | 2 +- Projects/UOContent/Spells/UnsummonTimer.cs | 2 +- Projects/UOContent/Targets/MoveTarget.cs | 2 +- Projects/UOContent/Utilities/Types.cs | 2 +- 267 files changed, 873 insertions(+), 873 deletions(-) diff --git a/Projects/Server.Tests/Tests/Buffers/SpanReaderTests.cs b/Projects/Server.Tests/Tests/Buffers/SpanReaderTests.cs index 9a68576c8..c74f15205 100644 --- a/Projects/Server.Tests/Tests/Buffers/SpanReaderTests.cs +++ b/Projects/Server.Tests/Tests/Buffers/SpanReaderTests.cs @@ -188,7 +188,7 @@ public class SpanReaderTests [Fact] public void TestReadAsciiString() { - ReadOnlySpan buffer = "Hello"u8; + var buffer = "Hello"u8; var reader = new SpanReader(buffer); var result = reader.ReadAscii(); @@ -200,7 +200,7 @@ public class SpanReaderTests [Fact] public void TestReadAsciiStringWithNull() { - ReadOnlySpan buffer = "Hel\0o"u8; + var buffer = "Hel\0o"u8; var reader = new SpanReader(buffer); var result = reader.ReadAscii(); @@ -212,7 +212,7 @@ public class SpanReaderTests [Fact] public void TestReadAsciiStringFixedLength() { - ReadOnlySpan buffer = "Hello\0\0\0\0\0"u8; + var buffer = "Hello\0\0\0\0\0"u8; var reader = new SpanReader(buffer); var result = reader.ReadAscii(10); @@ -227,7 +227,7 @@ public class SpanReaderTests Assert.Throws( () => { - ReadOnlySpan buffer = "Hel"u8; + var buffer = "Hel"u8; var reader = new SpanReader(buffer); reader.ReadAscii(10); } @@ -249,7 +249,7 @@ public class SpanReaderTests [Fact] public void TestReadUTF8String() { - ReadOnlySpan buffer = "Hello"u8; + var buffer = "Hello"u8; var reader = new SpanReader(buffer); var result = reader.ReadUTF8(); @@ -261,7 +261,7 @@ public class SpanReaderTests [Fact] public void TestReadUTF8StringWithNull() { - ReadOnlySpan buffer = "Hi\0Bye"u8; + var buffer = "Hi\0Bye"u8; var reader = new SpanReader(buffer); var result = reader.ReadUTF8(); @@ -273,7 +273,7 @@ public class SpanReaderTests [Fact] public void TestReadLittleUniString() { - ReadOnlySpan buffer = "H\0i\0"u8; + var buffer = "H\0i\0"u8; var reader = new SpanReader(buffer); var result = reader.ReadLittleUni(); @@ -285,7 +285,7 @@ public class SpanReaderTests [Fact] public void TestReadLittleUniStringWithNull() { - ReadOnlySpan buffer = "H\0i\0\0\0X\0"u8; + var buffer = "H\0i\0\0\0X\0"u8; var reader = new SpanReader(buffer); var result = reader.ReadLittleUni(); @@ -297,7 +297,7 @@ public class SpanReaderTests [Fact] public void TestReadLittleUniStringFixedLength() { - ReadOnlySpan buffer = "H\0i\0\0\0\0\0"u8; + var buffer = "H\0i\0\0\0\0\0"u8; var reader = new SpanReader(buffer); var result = reader.ReadLittleUni(4); @@ -321,7 +321,7 @@ public class SpanReaderTests [Fact] public void TestReadBigUniString() { - ReadOnlySpan buffer = "\0H\0i"u8; + var buffer = "\0H\0i"u8; var reader = new SpanReader(buffer); var result = reader.ReadBigUni(); @@ -333,7 +333,7 @@ public class SpanReaderTests [Fact] public void TestReadBigUniStringWithNull() { - ReadOnlySpan buffer = "\0H\0i\0\0\0X"u8; + var buffer = "\0H\0i\0\0\0X"u8; var reader = new SpanReader(buffer); var result = reader.ReadBigUni(); @@ -345,7 +345,7 @@ public class SpanReaderTests [Fact] public void TestReadBigUniStringFixedLength() { - ReadOnlySpan buffer = "\0H\0i\0\0\0\0"u8; + var buffer = "\0H\0i\0\0\0\0"u8; var reader = new SpanReader(buffer); var result = reader.ReadBigUni(4); @@ -560,7 +560,7 @@ public class SpanReaderTests [Fact] public void TestReadMultipleStringsWithNullTerminators() { - ReadOnlySpan buffer = "AB\0CD\0EF"u8; + var buffer = "AB\0CD\0EF"u8; var reader = new SpanReader(buffer); Assert.Equal("AB", reader.ReadAscii()); diff --git a/Projects/Server.Tests/Tests/Collections/OrderedSetTests.cs b/Projects/Server.Tests/Tests/Collections/OrderedSetTests.cs index 4d81d5598..3a9a29da6 100644 --- a/Projects/Server.Tests/Tests/Collections/OrderedSetTests.cs +++ b/Projects/Server.Tests/Tests/Collections/OrderedSetTests.cs @@ -20,7 +20,7 @@ public class OrderedSetTests Assert.True(set.Contains(4)); Assert.False(set.Contains(8)); - int index = 0; + var index = 0; foreach (var value in set) { Assert.Equal(expected[index++], value); diff --git a/Projects/Server.Tests/Tests/Geometry/Point2DTests.cs b/Projects/Server.Tests/Tests/Geometry/Point2DTests.cs index 0d1426275..b93a391af 100644 --- a/Projects/Server.Tests/Tests/Geometry/Point2DTests.cs +++ b/Projects/Server.Tests/Tests/Geometry/Point2DTests.cs @@ -19,7 +19,7 @@ public class Point2DTests [Fact] public void TestPoint2DTryFormatSucceeds() { - char[] array = new char[128]; + var array = new char[128]; var p1 = new Point2D(0, 0); Assert.True(p1.TryFormat(array, out var cp1, null, null)); @@ -44,7 +44,7 @@ public class Point2DTests [Fact] public void TestPoint2DTryFormatFails() { - char[] array = new char[1]; + var array = new char[1]; var p1 = new Point2D(0, 0); Assert.False(p1.TryFormat(array, out var cp1, null, null)); diff --git a/Projects/Server.Tests/Tests/Geometry/Point3DTests.cs b/Projects/Server.Tests/Tests/Geometry/Point3DTests.cs index e90a7531d..8bdd279f5 100644 --- a/Projects/Server.Tests/Tests/Geometry/Point3DTests.cs +++ b/Projects/Server.Tests/Tests/Geometry/Point3DTests.cs @@ -32,7 +32,7 @@ public class Point3DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[128]; + var array = new char[128]; var p1 = new Point3D(0, 0, 0); Assert.True(p1.TryFormat(array, out var cp1, null, null)); @@ -59,7 +59,7 @@ public class Point3DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[1]; + var array = new char[1]; var p1 = new Point3D(0, 0, 0); Assert.False(p1.TryFormat(array, out var cp1, null, null)); diff --git a/Projects/Server.Tests/Tests/Geometry/Rectangle2DTests.cs b/Projects/Server.Tests/Tests/Geometry/Rectangle2DTests.cs index b009ac0af..1c9bb58fd 100644 --- a/Projects/Server.Tests/Tests/Geometry/Rectangle2DTests.cs +++ b/Projects/Server.Tests/Tests/Geometry/Rectangle2DTests.cs @@ -21,7 +21,7 @@ public class Rectangle2DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[128]; + var array = new char[128]; var p1 = new Rectangle2D(0, 0, 0, 0); Assert.True(p1.TryFormat(array, out var cp1, null, null)); @@ -48,7 +48,7 @@ public class Rectangle2DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[1]; + var array = new char[1]; var p1 = new Rectangle2D(0, 0, 0, 0); Assert.False(p1.TryFormat(array, out var cp1, null, null)); diff --git a/Projects/Server.Tests/Tests/Geometry/Rectangle3DTests.cs b/Projects/Server.Tests/Tests/Geometry/Rectangle3DTests.cs index 8dcbef2a6..2b030a183 100644 --- a/Projects/Server.Tests/Tests/Geometry/Rectangle3DTests.cs +++ b/Projects/Server.Tests/Tests/Geometry/Rectangle3DTests.cs @@ -21,7 +21,7 @@ public class Rectangle3DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[128]; + var array = new char[128]; var p1 = new Rectangle3D(0, 0, 0, 0, 0, 0); Assert.True(p1.TryFormat(array, out var cp1, null, null)); @@ -48,7 +48,7 @@ public class Rectangle3DTests { const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[1]; + var array = new char[1]; var p1 = new Rectangle3D(0, 0, 0, 0, 0, 0); Assert.False(p1.TryFormat(array, out var cp1, null, null)); diff --git a/Projects/Server.Tests/Tests/Geometry/WorldLocationTests.cs b/Projects/Server.Tests/Tests/Geometry/WorldLocationTests.cs index f6611a67b..b9fcc6f7a 100644 --- a/Projects/Server.Tests/Tests/Geometry/WorldLocationTests.cs +++ b/Projects/Server.Tests/Tests/Geometry/WorldLocationTests.cs @@ -50,7 +50,7 @@ public sealed class WorldLocationTests const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[128]; + var array = new char[128]; var p1 = new WorldLocation(0, 0, 0, map); Assert.True(p1.TryFormat(array, out var cp1, null, null)); @@ -82,7 +82,7 @@ public sealed class WorldLocationTests const int max = int.MaxValue; const int min = int.MinValue; - char[] array = new char[1]; + var array = new char[1]; var p1 = new WorldLocation(0, 0, 0, map); Assert.False(p1.TryFormat(array, out var cp1, null, null)); diff --git a/Projects/Server.Tests/Tests/Items/ContainerTests.cs b/Projects/Server.Tests/Tests/Items/ContainerTests.cs index 8c165f5f6..5079069cc 100644 --- a/Projects/Server.Tests/Tests/Items/ContainerTests.cs +++ b/Projects/Server.Tests/Tests/Items/ContainerTests.cs @@ -48,7 +48,7 @@ public class ContainerTests container2.AddItem(static1); - List statics = new List(); + var statics = new List(); foreach (var item in container.FindItemsByType()) { statics.Add(item); diff --git a/Projects/Server.Tests/Tests/Maps/ItemByDistanceEnumeratorTests.cs b/Projects/Server.Tests/Tests/Maps/ItemByDistanceEnumeratorTests.cs index fe19c76fb..76172cb2c 100644 --- a/Projects/Server.Tests/Tests/Maps/ItemByDistanceEnumeratorTests.cs +++ b/Projects/Server.Tests/Tests/Maps/ItemByDistanceEnumeratorTests.cs @@ -400,7 +400,7 @@ public class ItemByDistanceEnumeratorTests for (var side = 0; side < 4; side++) { var offset = ringOffset * Map.SectorSize; - Point3D pos = side switch + var pos = side switch { 0 => new Point3D(center.X + offset, center.Y, 0), 1 => new Point3D(center.X, center.Y + offset, 0), diff --git a/Projects/Server.Tests/Tests/Maps/MapSelectionTests.cs b/Projects/Server.Tests/Tests/Maps/MapSelectionTests.cs index 6c34c584a..793205a35 100644 --- a/Projects/Server.Tests/Tests/Maps/MapSelectionTests.cs +++ b/Projects/Server.Tests/Tests/Maps/MapSelectionTests.cs @@ -40,8 +40,8 @@ namespace Server.Tests.Tests.Maps }; // When - string serialized = JsonConfig.Serialize(mapConfig); - TestMapConfig deserialized = JsonSerializer.Deserialize(serialized, JsonConfig.GetOptions()); + var serialized = JsonConfig.Serialize(mapConfig); + var deserialized = JsonSerializer.Deserialize(serialized, JsonConfig.GetOptions()); // Then Assert.Equal(mapConfig.TestMapFlags, deserialized.TestMapFlags); diff --git a/Projects/Server.Tests/Tests/Maps/MobileByDistanceEnumeratorTests.cs b/Projects/Server.Tests/Tests/Maps/MobileByDistanceEnumeratorTests.cs index 0a84da9e6..e81f13357 100644 --- a/Projects/Server.Tests/Tests/Maps/MobileByDistanceEnumeratorTests.cs +++ b/Projects/Server.Tests/Tests/Maps/MobileByDistanceEnumeratorTests.cs @@ -402,7 +402,7 @@ public class MobileByDistanceEnumeratorTests for (var side = 0; side < 4; side++) { var offset = ringOffset * Map.SectorSize; - Point3D pos = side switch + var pos = side switch { 0 => new Point3D(center.X + offset, center.Y, 0), 1 => new Point3D(center.X, center.Y + offset, 0), diff --git a/Projects/Server.Tests/Tests/Network/Firewall/FirewallTests.cs b/Projects/Server.Tests/Tests/Network/Firewall/FirewallTests.cs index af0f877e2..f803ee586 100644 --- a/Projects/Server.Tests/Tests/Network/Firewall/FirewallTests.cs +++ b/Projects/Server.Tests/Tests/Network/Firewall/FirewallTests.cs @@ -74,7 +74,7 @@ public class FirewallTests var entry = new SingleIpFirewallEntry("172.16.0.1"); Firewall.Add(entry); - bool found = false; + var found = false; Firewall.ReadFirewallSet(set => { found = set.Contains(entry); @@ -86,8 +86,8 @@ public class FirewallTests [Fact] public void Firewall_IsThreadSafe() { - IPAddress[] testIps = new IPAddress[256]; - for (int i = 0; i <= 255; i++) + var testIps = new IPAddress[256]; + for (var i = 0; i <= 255; i++) { testIps[i] = IPAddress.Parse($"192.168.0.{i}"); } @@ -97,7 +97,7 @@ public class FirewallTests Parallel.ForEach(testIps, ip => { - bool shouldBlock = int.Parse(ip.ToString().Split('.')[3]) is > 0; + var shouldBlock = int.Parse(ip.ToString().Split('.')[3]) is > 0; Assert.Equal(shouldBlock, Firewall.IsBlocked(ip)); }); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs index 6638c125b..4c499d891 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs @@ -8,8 +8,8 @@ namespace Server.Tests.Network [Fact] public void TestSwing() { - Serial attacker = (Serial)0x1024; - Serial defender = (Serial)0x2048; + var attacker = (Serial)0x1024; + var defender = (Serial)0x2048; var expected = new Swing(attacker, defender).Compile(); @@ -35,7 +35,7 @@ namespace Server.Tests.Network [Fact] public void TestChangeCombatant() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new ChangeCombatant(serial).Compile(); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs index 0b3435481..7e93e8563 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs @@ -11,7 +11,7 @@ namespace Server.Tests.Network [Fact] public void TestContainerDisplay() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort gumpId = 100; var expected = new ContainerDisplay(serial, gumpId).Compile(); @@ -26,7 +26,7 @@ namespace Server.Tests.Network [Fact] public void TestContainerDisplayHS() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort gumpId = 100; var expected = new ContainerDisplayHS(serial, gumpId).Compile(); @@ -42,7 +42,7 @@ namespace Server.Tests.Network [Fact] public void TestDisplaySpellbook() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new DisplaySpellbook(serial).Compile(); @@ -56,7 +56,7 @@ namespace Server.Tests.Network [Fact] public void TestDisplaySpellbookHS() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new DisplaySpellbookHS(serial).Compile(); @@ -71,11 +71,11 @@ namespace Server.Tests.Network [Fact] public void TestNewSpellbookContent() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort graphic = 100; ushort offset = 10; ulong content = 0x123456789ABCDEF0; - bool opl = ObjectPropertyList.Enabled; + var opl = ObjectPropertyList.Enabled; var expected = new NewSpellbookContent(serial, graphic, offset, content).Compile(); @@ -92,7 +92,7 @@ namespace Server.Tests.Network [Fact] public void TestSpellbookContent() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort offset = 10; ushort graphic = 100; ulong content = 0x123456789ABCDEF0; @@ -109,7 +109,7 @@ namespace Server.Tests.Network [Fact] public void TestSpellbookContent6017() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort offset = 10; ushort graphic = 100; ulong content = 0x123456789ABCDEF0; @@ -127,7 +127,7 @@ namespace Server.Tests.Network [Fact] public void TestContainerContentUpdate() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var item = new Item(serial); var expected = new ContainerContentUpdate(item).Compile(); @@ -142,7 +142,7 @@ namespace Server.Tests.Network [Fact] public void TestContainerContentUpdate6017() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var item = new Item(serial); var expected = new ContainerContentUpdate6017(item).Compile(); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs index 6caf6f3ee..4e0d2f0c3 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs @@ -9,7 +9,7 @@ public class DamagePacketTests [Theory, InlineData(10), InlineData(-5), InlineData(1024)] public void TestDamagePacketOld(int inputAmount) { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new DamagePacketOld(serial, inputAmount).Compile(); @@ -23,7 +23,7 @@ public class DamagePacketTests [Theory, InlineData(10), InlineData(-5), InlineData(1024), InlineData(100000)] public void TestDamage(int inputAmount) { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new DamagePacket(serial, inputAmount).Compile(); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs index 73af5b0a4..416bfebd6 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs @@ -24,9 +24,9 @@ namespace Server.Tests.Network public void TestParticleEffect() { var effectType = EffectType.Moving; - Serial serial = (Serial)0x4000; - Serial from = (Serial)0x1000; - Serial to = (Serial)0x2000; + var serial = (Serial)0x4000; + var from = (Serial)0x1000; + var to = (Serial)0x2000; var itemId = 0x100; var fromPoint = new Point3D(1000, 100, -10); var toPoint = new Point3D(1500, 500, 0); @@ -63,8 +63,8 @@ namespace Server.Tests.Network public void TestHuedEffect() { var effectType = EffectType.Moving; - Serial from = (Serial)0x1000; - Serial to = (Serial)0x2000; + var from = (Serial)0x1000; + var to = (Serial)0x2000; var itemId = 0x100; var fromPoint = new Point3D(1000, 100, -10); var toPoint = new Point3D(1500, 500, 0); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs index a93d23dfe..feca7d510 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs @@ -22,7 +22,7 @@ public class GumpPacketTests [Fact] public void TestDisplaySignGump() { - Serial gumpSerial = (Serial)0x1000; + var gumpSerial = (Serial)0x1000; const int gumpId = 100; const string unknownString = "This is an unknown string"; const string caption = "This is a caption"; diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs index 4e2d2d50f..4dd054aa1 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs @@ -9,7 +9,7 @@ public class ItemPacketTests [Fact] public void TestWorldItemPacket() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var itemId = 1; // Move to fixture @@ -45,7 +45,7 @@ public class ItemPacketTests [Fact] public void TestWorldItemSAPacket() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; ushort itemId = 1; // Move to fixture @@ -81,7 +81,7 @@ public class ItemPacketTests [Fact] public void TestWorldItemHSPacket() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var itemId = 1; // Move to fixture diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs index 9a6ddf8ee..adb4fb99b 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs @@ -21,7 +21,7 @@ namespace Server.Tests.Network [Fact] public void TestPersonalLightLevel() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; byte lightLevel = 5; var expected = new PersonalLightLevel(serial, lightLevel).Compile(); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs index dc4beb6a9..31c79a863 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs @@ -9,7 +9,7 @@ namespace Server.Tests.Network [Fact] public void TestMessageLocalized() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var graphic = 0x100; var messageType = MessageType.Label; var hue = 1024; @@ -48,7 +48,7 @@ namespace Server.Tests.Network [Fact] public void TestMessageLocalizedAffix() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var graphic = 0x100; var messageType = MessageType.Label; var hue = 1024; @@ -93,7 +93,7 @@ namespace Server.Tests.Network [Fact] public void TestAsciiMessage() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var graphic = 0x100; var messageType = MessageType.Label; var hue = 1024; @@ -131,7 +131,7 @@ namespace Server.Tests.Network [Fact] public void TestUnicodeMessage() { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var graphic = 0x100; var messageType = MessageType.Label; var hue = 1024; @@ -171,8 +171,8 @@ namespace Server.Tests.Network [Fact] public void TestFollowMessage() { - Serial serial = (Serial)0x1024; - Serial serial2 = (Serial)0x2; + var serial = (Serial)0x1024; + var serial2 = (Serial)0x2; var expected = new FollowMessage(serial, serial2).Compile(); @@ -186,7 +186,7 @@ namespace Server.Tests.Network [Fact] public void TestObjectHelpResponse() { - Serial s = (Serial)0x100; + var s = (Serial)0x100; var text = "This is some testing text"; var expected = new ObjectHelpResponse(s, text).Compile(); diff --git a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs index f0e41c4b3..09bf64b3e 100644 --- a/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs +++ b/Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs @@ -9,8 +9,8 @@ public class MobilePacketTests [Fact] public void TestDeathAnimation() { - Serial killed = (Serial)0x1; - Serial corpse = (Serial)0x1000; + var killed = (Serial)0x1; + var corpse = (Serial)0x1000; var expected = new DeathAnimation(killed, corpse).Compile(); @@ -24,7 +24,7 @@ public class MobilePacketTests [Fact] public void TestBondStatus() { - Serial petSerial = (Serial)0x1; + var petSerial = (Serial)0x1; const bool bonded = true; var expected = new BondedStatus(petSerial, bonded).Compile(); @@ -79,7 +79,7 @@ public class MobilePacketTests [InlineData(10, 100, 25, true, false, 0)] public void TestMobileAnimation(int action, int frameCount, int repeatCount, bool reverse, bool repeat, byte delay) { - Serial mobile = (Serial)0x1; + var mobile = (Serial)0x1; var expected = new MobileAnimation( mobile, @@ -111,7 +111,7 @@ public class MobilePacketTests [InlineData(10, 100, 20)] public void TestNewMobileAnimation(int action, int frameCount, byte delay) { - Serial mobile = (Serial)0x1; + var mobile = (Serial)0x1; var expected = new NewMobileAnimation( mobile, @@ -490,7 +490,7 @@ public class MobilePacketTests [Fact] public void TestRemoveEntity() { - Serial e = (Serial)0x1000; + var e = (Serial)0x1000; var expected = new RemoveEntity(e).Compile(); var ns = PacketTestUtilities.CreateTestNetState(); diff --git a/Projects/Server.Tests/Tests/Serialization/DecimalSerializationTests.cs b/Projects/Server.Tests/Tests/Serialization/DecimalSerializationTests.cs index 246307e74..5a25189d6 100644 --- a/Projects/Server.Tests/Tests/Serialization/DecimalSerializationTests.cs +++ b/Projects/Server.Tests/Tests/Serialization/DecimalSerializationTests.cs @@ -35,7 +35,7 @@ public class DecimalSerializationTests public void TestSerializeDecimal(decimal value) { // Arrange - byte[] buffer = new byte[sizeof(decimal)]; + var buffer = new byte[sizeof(decimal)]; // Act Write(buffer, value); diff --git a/Projects/Server.Tests/Tests/Serialization/TypeConverterTests.cs b/Projects/Server.Tests/Tests/Serialization/TypeConverterTests.cs index ead74f63b..9d1c8114b 100644 --- a/Projects/Server.Tests/Tests/Serialization/TypeConverterTests.cs +++ b/Projects/Server.Tests/Tests/Serialization/TypeConverterTests.cs @@ -15,11 +15,11 @@ public class TypeConverterTests public void TestReadAfterWrite() { // Arrange - Type itemType = typeof(Item); + var itemType = typeof(Item); - JsonSerializerOptions options = new JsonSerializerOptions(); + var options = new JsonSerializerOptions(); - TypeConverter converter = new TypeConverter(); + var converter = new TypeConverter(); var bufferWriter = new ArrayBufferWriter(); using var jsonWriter = new Utf8JsonWriter(bufferWriter); converter.Write(jsonWriter, itemType, options); @@ -28,11 +28,11 @@ public class TypeConverterTests jsonWriter.Flush(); var jsonData = bufferWriter.WrittenSpan; - Utf8JsonReader jsonReader = new Utf8JsonReader(jsonData); + var jsonReader = new Utf8JsonReader(jsonData); jsonReader.Read(); // Assert - Type readType = converter.Read(ref jsonReader, typeof(Type), options); + var readType = converter.Read(ref jsonReader, typeof(Type), options); Assert.Equal(typeof(Item), readType); } } diff --git a/Projects/Server.Tests/Tests/Timer/TimerTests.cs b/Projects/Server.Tests/Tests/Timer/TimerTests.cs index 15a6f73d8..9f610de50 100644 --- a/Projects/Server.Tests/Tests/Timer/TimerTests.cs +++ b/Projects/Server.Tests/Tests/Timer/TimerTests.cs @@ -23,7 +23,7 @@ public class TimerTests var tickCount = expectedTicks / 8; - for (int i = 1; i <= tickCount; i++) + for (var i = 1; i <= tickCount; i++) { timerTicks.Ticks = i * 8; @@ -52,7 +52,7 @@ public class TimerTests var tickCount = (expectedDelayTicks + (expectedIntervalTicks * count - 1)) / 8; - for (int i = 1; i <= tickCount; i++) + for (var i = 1; i <= tickCount; i++) { timerTicks.Ticks = i * 8; diff --git a/Projects/Server.Tests/Tests/World/VirtualSerialTests.cs b/Projects/Server.Tests/Tests/World/VirtualSerialTests.cs index 6eefe5a8b..6c841f9f8 100644 --- a/Projects/Server.Tests/Tests/World/VirtualSerialTests.cs +++ b/Projects/Server.Tests/Tests/World/VirtualSerialTests.cs @@ -9,10 +9,10 @@ public class VirtualSerialTests public void TestNewVirtualGetsAndRollover() { // Acquire virtual serials until we hit the max - Serial lastSerial = World.NewVirtual; + var lastSerial = World.NewVirtual; do { - Serial virtualSerial = World.NewVirtual; + var virtualSerial = World.NewVirtual; Assert.Equal(lastSerial + 1, virtualSerial); lastSerial = (Serial) (uint) virtualSerial; } while (lastSerial != World.MaxVirtualSerial); diff --git a/Projects/Server/AssemblyHandler.cs b/Projects/Server/AssemblyHandler.cs index 4e3f45e8b..124e79ae9 100644 --- a/Projects/Server/AssemblyHandler.cs +++ b/Projects/Server/AssemblyHandler.cs @@ -152,7 +152,7 @@ public static class AssemblyHandler { var types = assembly.GetTypes(); - for (int i = 0; i < types.Length; i++) + for (var i = 0; i < types.Length; i++) { var m = types[i].GetMethod(method, BindingFlags.Static | BindingFlags.Public); if (m?.GetParameters().Length == 0) diff --git a/Projects/Server/Buffers/RawInterpolatedStringHandler.cs b/Projects/Server/Buffers/RawInterpolatedStringHandler.cs index 5f29c594d..4dcbbccbe 100644 --- a/Projects/Server/Buffers/RawInterpolatedStringHandler.cs +++ b/Projects/Server/Buffers/RawInterpolatedStringHandler.cs @@ -84,7 +84,7 @@ public ref struct RawInterpolatedStringHandler [MethodImpl(MethodImplOptions.AggressiveInlining)] // used only on a few hot paths public void Clear() { - char[]? toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; this = default; // defensive clear if (toReturn is not null) { @@ -102,8 +102,8 @@ public ref struct RawInterpolatedStringHandler { if (value.Length == 1) { - Span chars = _chars; - int pos = _pos; + var chars = _chars; + var pos = _pos; if ((uint)pos < (uint)chars.Length) { chars[pos] = value[0]; @@ -312,7 +312,7 @@ public ref struct RawInterpolatedStringHandler /// Minimum number of characters that should be written for this value. If the value is negative, it indicates left-aligned and the required minimum is the absolute value. public void AppendFormatted(T value, int alignment) { - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value); if (alignment != 0) { @@ -326,7 +326,7 @@ public ref struct RawInterpolatedStringHandler /// Minimum number of characters that should be written for this value. If the value is negative, it indicates left-aligned and the required minimum is the absolute value. public void AppendFormatted(T value, int alignment, string? format) { - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value, format); if (alignment != 0) { @@ -357,14 +357,14 @@ public ref struct RawInterpolatedStringHandler /// The format string. public void AppendFormatted(ReadOnlySpan value, int alignment = 0, string? format = null) { - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingRequired = alignment - value.Length; + var paddingRequired = alignment - value.Length; if (paddingRequired <= 0) { // The value is as large or larger than the required amount of padding, @@ -477,7 +477,7 @@ public ref struct RawInterpolatedStringHandler Debug.Assert(_hasCustomFormatter); Debug.Assert(_provider != null); - ICustomFormatter? formatter = (ICustomFormatter?)_provider.GetFormat(typeof(ICustomFormatter)); + var formatter = (ICustomFormatter?)_provider.GetFormat(typeof(ICustomFormatter)); Debug.Assert(formatter != null, "An incorrectly written provider said it implemented ICustomFormatter, and then didn't"); if (formatter?.Format(format, value, _provider) is string customFormatted) @@ -494,16 +494,16 @@ public ref struct RawInterpolatedStringHandler Debug.Assert(startingPos >= 0 && startingPos <= _pos); Debug.Assert(alignment != 0); - int charsWritten = _pos - startingPos; + var charsWritten = _pos - startingPos; - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingNeeded = alignment - charsWritten; + var paddingNeeded = alignment - charsWritten; if (paddingNeeded > 0) { EnsureCapacityForAdditionalChars(paddingNeeded); @@ -583,13 +583,13 @@ public ref struct RawInterpolatedStringHandler // ints that could technically overflow if someone tried to, for example, append a huge string to a huge string, we also clamp to int.MaxValue. // Even if the array creation fails in such a case, we may later fail in ToStringAndClear. - uint newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_chars.Length * 2, 0x3FFFFFDF)); - int arraySize = (int)Math.Clamp(newCapacity, MinimumArrayPoolLength, int.MaxValue); + var newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_chars.Length * 2, 0x3FFFFFDF)); + var arraySize = (int)Math.Clamp(newCapacity, MinimumArrayPoolLength, int.MaxValue); - char[] newArray = STArrayPool.Shared.Rent(arraySize); + var newArray = STArrayPool.Shared.Rent(arraySize); _chars[.._pos].CopyTo(newArray); - char[]? toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; _chars = _arrayToReturnToPool = newArray; if (toReturn is not null) diff --git a/Projects/Server/Buffers/STArrayPool.cs b/Projects/Server/Buffers/STArrayPool.cs index 25dd6a7f4..b611c7a65 100644 --- a/Projects/Server/Buffers/STArrayPool.cs +++ b/Projects/Server/Buffers/STArrayPool.cs @@ -245,7 +245,7 @@ public class STArrayPool : ArrayPool [MethodImpl(MethodImplOptions.AggressiveInlining)] internal static int GetMaxSizeForBucket(int binIndex) { - int maxSize = 16 << binIndex; + var maxSize = 16 << binIndex; Debug.Assert(maxSize >= 0); return maxSize; } @@ -259,7 +259,7 @@ public class STArrayPool : ArrayPool internal static MemoryPressure GetMemoryPressure() { - GCMemoryInfo memoryInfo = GC.GetGCMemoryInfo(); + var memoryInfo = GC.GetGCMemoryInfo(); if (memoryInfo.MemoryLoadBytes >= memoryInfo.HighMemoryLoadThresholdBytes * 0.90) { @@ -333,7 +333,7 @@ public class STArrayPool : ArrayPool return; } - int trimCount = 1; + var trimCount = 1; switch (pressure) { case MemoryPressure.Medium: diff --git a/Projects/Server/Buffers/ValueStringBuilder.cs b/Projects/Server/Buffers/ValueStringBuilder.cs index b6d4ab2f1..5e4b9d2dd 100644 --- a/Projects/Server/Buffers/ValueStringBuilder.cs +++ b/Projects/Server/Buffers/ValueStringBuilder.cs @@ -151,7 +151,7 @@ public ref struct ValueStringBuilder Grow(count); } - int remaining = _length - index; + var remaining = _length - index; _chars.Slice(index, remaining).CopyTo(_chars[(index + count)..]); _chars.Slice(index, count).Fill(value); _length += count; @@ -165,14 +165,14 @@ public ref struct ValueStringBuilder return; } - int count = s.Length; + var count = s.Length; if (_length > _chars.Length - count) { Grow(count); } - int remaining = _length - index; + var remaining = _length - index; _chars.Slice(index, remaining).CopyTo(_chars[(index + count)..]); s.AsSpan().CopyTo(_chars[index..]); _length += count; @@ -184,7 +184,7 @@ public ref struct ValueStringBuilder { if (value is ISpanFormattable) { - Span destination = _chars[_length..]; + var destination = _chars[_length..]; int charsWritten; while (!((ISpanFormattable)value).TryFormat(destination, out charsWritten, format, default)) { @@ -229,7 +229,7 @@ public ref struct ValueStringBuilder return; } - int pos = _length; + var pos = _length; if (s.Length == 1 && (uint)pos < (uint)_chars.Length) // very common case, e.g. appending strings from NumberFormatInfo like separators, percent symbols, etc. { _chars[pos] = s[0]; @@ -265,7 +265,7 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] private void AppendSlow(string? s) { - int pos = _length; + var pos = _length; if (pos > _chars.Length - s.Length) { Grow(s.Length); @@ -283,8 +283,8 @@ public ref struct ValueStringBuilder Grow(count); } - Span dst = _chars.Slice(_length, count); - for (int i = 0; i < dst.Length; i++) + var dst = _chars.Slice(_length, count); + for (var i = 0; i < dst.Length; i++) { dst[i] = c; } @@ -294,14 +294,14 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public unsafe void Append(char* value, int length) { - int pos = _length; + var pos = _length; if (pos > _chars.Length - length) { Grow(length); } - Span dst = _chars.Slice(_length, length); - for (int i = 0; i < dst.Length; i++) + var dst = _chars.Slice(_length, length); + for (var i = 0; i < dst.Length; i++) { dst[i] = *value++; } @@ -311,7 +311,7 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Append(scoped ReadOnlySpan value) { - int pos = _length; + var pos = _length; if (pos > _chars.Length - value.Length) { Grow(value.Length); @@ -324,7 +324,7 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public Span AppendSpan(int length) { - int origPos = _length; + var origPos = _length; if (origPos > _chars.Length - length) { Grow(length); @@ -345,11 +345,11 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.NoInlining)] private void Grow(int additionalCapacityBeyondPos) { - char[] poolArray = ArrayPool.Rent(Math.Max(_length + additionalCapacityBeyondPos, _chars.Length * 2)); + var poolArray = ArrayPool.Rent(Math.Max(_length + additionalCapacityBeyondPos, _chars.Length * 2)); _chars[.._length].CopyTo(poolArray); - char[] toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; _chars = _arrayToReturnToPool = poolArray; if (toReturn != null) { @@ -372,7 +372,7 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public void ReplaceAny(ReadOnlySpan oldChars, ReadOnlySpan newChars, int startIndex, int count) { - int currentLength = _length; + var currentLength = _length; if ((uint)startIndex > (uint)currentLength) { throw new ArgumentOutOfRangeException(nameof(startIndex)); @@ -403,7 +403,7 @@ public ref struct ValueStringBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Replace(char oldChar, char newChar, int startIndex, int count) { - int currentLength = _length; + var currentLength = _length; if ((uint)startIndex > (uint)currentLength) { throw new ArgumentOutOfRangeException(nameof(startIndex)); diff --git a/Projects/Server/Client/ArtData.cs b/Projects/Server/Client/ArtData.cs index d8f54d868..7c0d6f900 100644 --- a/Projects/Server/Client/ArtData.cs +++ b/Projects/Server/Client/ArtData.cs @@ -106,15 +106,15 @@ public class ArtData : IDisposable public static Rectangle2D GetBoundsFromRGBA1555Bitmap(int width, int height, ReadOnlySpan data) { - ReadOnlySpan lookups = data[..height]; + var lookups = data[..height]; data = data[height..]; - int xMin = width; - int yMin = height; - int xMax = -1; - int yMax = -1; + var xMin = width; + var yMin = height; + var xMax = -1; + var yMax = -1; - for (int y = 0; y < height; y++) + for (var y = 0; y < height; y++) { var i = lookups[y]; var x = 0; @@ -133,7 +133,7 @@ public class ArtData : IDisposable for (var end = x + pixelCount; x < end; x++) { // Get the pixel value from the bitmap data - ushort pixel = data[i++]; + var pixel = data[i++]; // Check if the pixel is non-black (0 in 555 RGB is completely black) if (pixel == 0) diff --git a/Projects/Server/Client/UOClient.cs b/Projects/Server/Client/UOClient.cs index 921f638a5..c7c4003d6 100644 --- a/Projects/Server/Client/UOClient.cs +++ b/Projects/Server/Client/UOClient.cs @@ -95,7 +95,7 @@ public static class UOClient if (File.Exists(path)) { - using FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read); var buffer = GC.AllocateUninitializedArray((int)fs.Length, true); _ = fs.Read(buffer); // VS_VERSION_INFO (unicode) diff --git a/Projects/Server/Collections/ArrayEnumerator.cs b/Projects/Server/Collections/ArrayEnumerator.cs index cec7abb8b..6700cb7c6 100644 --- a/Projects/Server/Collections/ArrayEnumerator.cs +++ b/Projects/Server/Collections/ArrayEnumerator.cs @@ -44,7 +44,7 @@ public struct ArrayEnumerator : IEnumerator public bool MoveNext() { - T[] localList = _array; + var localList = _array; if ((uint)_index < (uint)localList.Length) { diff --git a/Projects/Server/Collections/HashHelpers.cs b/Projects/Server/Collections/HashHelpers.cs index 2e8f8ac8b..314ff28bf 100644 --- a/Projects/Server/Collections/HashHelpers.cs +++ b/Projects/Server/Collections/HashHelpers.cs @@ -43,8 +43,8 @@ internal static class HashHelpers { if ((candidate & 1) != 0) { - int limit = (int)Math.Sqrt(candidate); - for (int divisor = 3; divisor <= limit; divisor += 2) + var limit = (int)Math.Sqrt(candidate); + for (var divisor = 3; divisor <= limit; divisor += 2) { if (candidate % divisor == 0) { @@ -63,9 +63,9 @@ internal static class HashHelpers throw new ArgumentException("Hashtable's capacity overflowed and went negative. Check load factor, capacity and the current size of the table."); } - for (int i = 0; i < primes.Length; i++) + for (var i = 0; i < primes.Length; i++) { - int prime = primes[i]; + var prime = primes[i]; if (prime >= min) { return prime; @@ -74,7 +74,7 @@ internal static class HashHelpers //outside of our predefined table. //compute the hard way. - for (int i = min | 1; i < int.MaxValue; i += 2) + for (var i = min | 1; i < int.MaxValue; i += 2) { if (IsPrime(i) && (i - 1) % HashPrime != 0) { @@ -87,7 +87,7 @@ internal static class HashHelpers // Returns size of hashtable to grow to. public static int ExpandPrime(int oldSize) { - int newSize = 2 * oldSize; + var newSize = 2 * oldSize; // Allow the hashtables to grow to maximum possible size (~2G elements) before encountering capacity overflow. // Note that this check works even when _items.Length overflowed thanks to the (uint) cast @@ -116,7 +116,7 @@ internal static class HashHelpers // This is equivalent of (uint)Math.BigMul(multiplier * value, divisor, out _). This version // is faster than BigMul currently because we only need the high bits. - uint highbits = (uint)(((((multiplier * value) >> 32) + 1) * divisor) >> 32); + var highbits = (uint)(((((multiplier * value) >> 32) + 1) * divisor) >> 32); Debug.Assert(highbits == value % divisor); return highbits; diff --git a/Projects/Server/Collections/PooledRefList.cs b/Projects/Server/Collections/PooledRefList.cs index f17476a44..5919e65fe 100644 --- a/Projects/Server/Collections/PooledRefList.cs +++ b/Projects/Server/Collections/PooledRefList.cs @@ -70,7 +70,7 @@ public ref struct PooledRefList _version = 0; _mt = mt; - int count = collection.Count; + var count = collection.Count; if (count == 0) { _items = s_emptyArray; @@ -100,7 +100,7 @@ public ref struct PooledRefList if (collection is ICollection c) { - int count = c.Count; + var count = c.Count; if (count == 0) { _items = s_emptyArray; @@ -117,7 +117,7 @@ public ref struct PooledRefList { _size = 0; _items = s_emptyArray; - using IEnumerator en = collection!.GetEnumerator(); + using var en = collection!.GetEnumerator(); while (en.MoveNext()) { Add(en.Current); @@ -143,7 +143,7 @@ public ref struct PooledRefList { if (value > 0) { - T[] newItems = ArrayPool.Rent(value); + var newItems = ArrayPool.Rent(value); if (_size > 0) { Array.Copy(_items, newItems, _size); @@ -211,8 +211,8 @@ public ref struct PooledRefList public void Add(T item) { _version++; - T[] array = _items; - int size = _size; + var array = _items; + var size = _size; if ((uint)size < (uint)array.Length) { _size = size + 1; @@ -229,7 +229,7 @@ public ref struct PooledRefList private void AddWithResize(T item) { Debug.Assert(_size == _items.Length); - int size = _size; + var size = _size; Grow(size + 1); _size = size + 1; _items[size] = item; @@ -292,7 +292,7 @@ public ref struct PooledRefList _version++; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { - int size = _size; + var size = _size; _size = 0; if (size > 0) { @@ -329,8 +329,8 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(converter)); } - PooledRefList list = new PooledRefList(_size); - for (int i = 0; i < _size; i++) + var list = new PooledRefList(_size); + for (var i = 0; i < _size; i++) { list._items[i] = converter(_items[i]); } @@ -393,7 +393,7 @@ public ref struct PooledRefList { Debug.Assert(_items.Length < capacity); - int newcapacity = _items.Length == 0 ? DefaultCapacity : 2 * _items.Length; + var newcapacity = _items.Length == 0 ? DefaultCapacity : 2 * _items.Length; // Allow the list to grow to maximum possible capacity (~2G elements) before encountering overflow. // Note that this check works even when _items.Length overflowed thanks to the (uint) cast @@ -421,7 +421,7 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - for (int i = 0; i < _size; i++) + for (var i = 0; i < _size; i++) { if (match(_items[i])) { @@ -438,8 +438,8 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - PooledRefList list = new PooledRefList(); - for (int i = 0; i < _size; i++) + var list = new PooledRefList(); + for (var i = 0; i < _size; i++) { if (match(_items[i])) { @@ -470,8 +470,8 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - int endIndex = startIndex + count; - for (int i = startIndex; i < endIndex; i++) + var endIndex = startIndex + count; + for (var i = startIndex; i < endIndex; i++) { if (match(_items[i])) { @@ -488,7 +488,7 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - for (int i = _size - 1; i >= 0; i--) + for (var i = _size - 1; i >= 0; i--) { if (match(_items[i])) { @@ -532,8 +532,8 @@ public ref struct PooledRefList throw new ArgumentOutOfRangeException(nameof(count)); } - int endIndex = startIndex - count; - for (int i = startIndex; i > endIndex; i--) + var endIndex = startIndex - count; + for (var i = startIndex; i > endIndex; i--) { if (match(_items[i])) { @@ -550,9 +550,9 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(action)); } - int version = _version; + var version = _version; - for (int i = 0; i < _size; i++) + for (var i = 0; i < _size; i++) { if (version != _version) { @@ -591,7 +591,7 @@ public ref struct PooledRefList throw new ArgumentException("Length must be greater than zero"); } - PooledRefList list = new PooledRefList(count); + var list = new PooledRefList(count); Array.Copy(_items, index, list._items, 0, count); list._size = count; return list; @@ -694,7 +694,7 @@ public ref struct PooledRefList if (collection is ICollection c) { - int count = c.Count; + var count = c.Count; if (count > 0) { if (_items.Length - _size < count) @@ -712,7 +712,7 @@ public ref struct PooledRefList } else { - using IEnumerator en = collection.GetEnumerator(); + using var en = collection.GetEnumerator(); while (en.MoveNext()) { Insert(index++, en.Current); @@ -801,7 +801,7 @@ public ref struct PooledRefList // decreased by one. public bool Remove(T item) { - int index = IndexOf(item); + var index = IndexOf(item); if (index >= 0) { RemoveAt(index); @@ -820,7 +820,7 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - int freeIndex = 0; // the first free slot in items array + var freeIndex = 0; // the first free slot in items array // Find the first item which needs to be removed. while (freeIndex < _size && !match(_items[freeIndex])) @@ -833,7 +833,7 @@ public ref struct PooledRefList return 0; } - int current = freeIndex + 1; + var current = freeIndex + 1; while (current < _size) { // Find the first item which needs to be kept. @@ -854,7 +854,7 @@ public ref struct PooledRefList Array.Clear(_items, freeIndex, _size - freeIndex); // Clear the elements so that the gc can reclaim the references. } - int result = _size - freeIndex; + var result = _size - freeIndex; _size = freeIndex; _version++; return result; @@ -1002,7 +1002,7 @@ public ref struct PooledRefList return s_emptyArray; } - T[] array = new T[_size]; + var array = new T[_size]; Array.Copy(_items, array, _size); return array; } @@ -1014,7 +1014,7 @@ public ref struct PooledRefList return s_emptyArray; } - T[] array = ArrayPool.Rent(_size); + var array = ArrayPool.Rent(_size); Array.Copy(_items, array, _size); return array; } @@ -1030,7 +1030,7 @@ public ref struct PooledRefList // public void TrimExcess() { - int threshold = (int)(_items.Length * 0.9); + var threshold = (int)(_items.Length * 0.9); if (_size < threshold) { Capacity = _size; @@ -1044,7 +1044,7 @@ public ref struct PooledRefList throw new ArgumentNullException(nameof(match)); } - for (int i = 0; i < _size; i++) + for (var i = 0; i < _size; i++) { if (!match(_items[i])) { @@ -1077,7 +1077,7 @@ public ref struct PooledRefList public bool MoveNext() { - PooledRefList localList = _list; + var localList = _list; if (_version == localList._version && (uint)_index < (uint)localList._size) { diff --git a/Projects/Server/Collections/PooledRefQueue.cs b/Projects/Server/Collections/PooledRefQueue.cs index deddb67de..70da5f099 100644 --- a/Projects/Server/Collections/PooledRefQueue.cs +++ b/Projects/Server/Collections/PooledRefQueue.cs @@ -97,13 +97,13 @@ public ref struct PooledRefQueue throw new ArgumentException(CollectionThrowStrings.Argument_InvalidOffLen); } - int numToCopy = _size; + var numToCopy = _size; if (numToCopy == 0) { return; } - int firstPart = Math.Min(_array.Length - _head, numToCopy); + var firstPart = Math.Min(_array.Length - _head, numToCopy); Array.Copy(_array, _head, array, arrayIndex, firstPart); numToCopy -= firstPart; if (numToCopy > 0) @@ -135,15 +135,15 @@ public ref struct PooledRefQueue // InvalidOperationException. public T Dequeue() { - int head = _head; - T[] array = _array; + var head = _head; + var array = _array; if (_size == 0) { ThrowForEmptyQueue(); } - T removed = array[head]; + var removed = array[head]; if (RuntimeHelpers.IsReferenceOrContainsReferences()) { array[head] = default!; @@ -156,8 +156,8 @@ public ref struct PooledRefQueue public bool TryDequeue([MaybeNullWhen(false)] out T result) { - int head = _head; - T[] array = _array; + var head = _head; + var array = _array; if (_size == 0) { @@ -248,7 +248,7 @@ public ref struct PooledRefQueue return s_emptyArray; } - T[] arr = new T[_size]; + var arr = new T[_size]; if (_head < _tail) { @@ -270,7 +270,7 @@ public ref struct PooledRefQueue return s_emptyArray; } - T[] arr = (mt ? ArrayPool.Shared : STArrayPool.Shared).Rent(_size); + var arr = (mt ? ArrayPool.Shared : STArrayPool.Shared).Rent(_size); if (_head < _tail) { @@ -289,7 +289,7 @@ public ref struct PooledRefQueue // must be >= _size. private void SetCapacity(int capacity) { - T[] newarray = (_mt ? ArrayPool.Shared : STArrayPool.Shared).Rent(capacity); + var newarray = (_mt ? ArrayPool.Shared : STArrayPool.Shared).Rent(capacity); if (_size > 0) { if (_head < _tail) @@ -321,7 +321,7 @@ public ref struct PooledRefQueue // It is tempting to use the remainder operator here but it is actually much slower // than a simple comparison and a rarely taken branch. // JIT produces better code than with ternary operator ?: - int tmp = index + 1; + var tmp = index + 1; if (tmp == _array.Length) { tmp = 0; @@ -359,7 +359,7 @@ public ref struct PooledRefQueue const int GrowFactor = 2; const int MinimumGrow = 4; - int newcapacity = GrowFactor * _array.Length; + var newcapacity = GrowFactor * _array.Length; // Allow the list to grow to maximum possible capacity (~2G elements) before encountering overflow. // Note that this check works even when _items.Length overflowed thanks to the (uint) cast @@ -441,13 +441,13 @@ public ref struct PooledRefQueue } // Cache some fields in locals to decrease code size - T[] array = _q._array; - int capacity = array.Length; + var array = _q._array; + var capacity = array.Length; // _index represents the 0-based index into the queue, however the queue // doesn't have to start from 0 and it may not even be stored contiguously in memory. - int arrayIndex = _q._head + _index; // this is the actual index into the queue's backing array + var arrayIndex = _q._head + _index; // this is the actual index into the queue's backing array if (arrayIndex >= capacity) { // NOTE: Originally we were using the modulo operator here, however diff --git a/Projects/Server/Effects.cs b/Projects/Server/Effects.cs index 938413701..cb8464105 100644 --- a/Projects/Server/Effects.cs +++ b/Projects/Server/Effects.cs @@ -72,7 +72,7 @@ public static class Effects if (map != null) { - Span buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); foreach (var state in map.GetClientsInRange(p)) { @@ -94,9 +94,9 @@ public static class Effects e.ProcessDelta(); - Span preEffect = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); - Span boltEffect = stackalloc byte[OutgoingEffectPackets.BoltEffectLength].InitializePacket(); - Span soundEffect = sound ? stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket() : null; + var preEffect = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); + var boltEffect = stackalloc byte[OutgoingEffectPackets.BoltEffectLength].InitializePacket(); + var soundEffect = sound ? stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket() : null; foreach (var state in map.GetClientsInRange(e.Location)) { @@ -131,7 +131,7 @@ public static class Effects Point3D p, Map map, int itemID, int duration, int speed = 10, int hue = 0, int renderMode = 0 ) { - Span effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); + var effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); OutgoingEffectPackets.CreateLocationHuedEffect( effect, p, itemID, speed, duration, hue, renderMode @@ -161,9 +161,9 @@ public static class Effects return; } - Span particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); + var particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); - Span regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; + var regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; foreach (var state in map.GetClientsInRange(e.Location)) { @@ -192,7 +192,7 @@ public static class Effects { (target as Mobile)?.ProcessDelta(); - Span effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); + var effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); OutgoingEffectPackets.CreateTargetHuedEffect( effect, target, itemID, speed, duration, hue, renderMode @@ -223,8 +223,8 @@ public static class Effects return; } - Span particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); - Span regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; + var particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); + var regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; foreach (var state in map.GetClientsInRange(target.Location)) { @@ -363,7 +363,7 @@ public static class Effects int speed, int duration, bool fixedDirection = false, bool explodes = false, int hue = 0, int renderMode = 0 ) { - Span effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); + var effect = stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket(); OutgoingEffectPackets.CreateMovingHuedEffect( effect, from, to, itemID, fromLocation, toLocation, speed, duration, fixedDirection, @@ -435,8 +435,8 @@ public static class Effects return; } - Span particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); - Span regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; + var particles = stackalloc byte[OutgoingEffectPackets.ParticleEffectLength].InitializePacket(); + var regular = itemID != 0 ? stackalloc byte[OutgoingEffectPackets.HuedEffectLength].InitializePacket() : null; foreach (var state in map.GetClientsInRange(from.Location)) { diff --git a/Projects/Server/EventLoopTasks.cs b/Projects/Server/EventLoopTasks.cs index aeb3351e0..3946897aa 100644 --- a/Projects/Server/EventLoopTasks.cs +++ b/Projects/Server/EventLoopTasks.cs @@ -55,7 +55,7 @@ public sealed class EventLoopContext : SynchronizationContext return; } - AutoResetEvent evt = new AutoResetEvent(false); + var evt = new AutoResetEvent(false); _queue.Enqueue(() => { @@ -75,7 +75,7 @@ public sealed class EventLoopContext : SynchronizationContext var count = _priorityQueue.Count; - for (int i = 0; i < count; i++) + for (var i = 0; i < count; i++) { if (_priorityQueue.TryDequeue(out var a)) { @@ -85,7 +85,7 @@ public sealed class EventLoopContext : SynchronizationContext count = Math.Min(_queue.Count, _maxPerFrame); - for (int i = 0; i < count; i++) + for (var i = 0; i < count; i++) { if (_queue.TryDequeue(out var a)) { diff --git a/Projects/Server/Exceptions/ExceptionExtensions.cs b/Projects/Server/Exceptions/ExceptionExtensions.cs index dc95bde9f..f1cb7f437 100644 --- a/Projects/Server/Exceptions/ExceptionExtensions.cs +++ b/Projects/Server/Exceptions/ExceptionExtensions.cs @@ -28,14 +28,14 @@ public static class ExceptionExtensions private static Func _createStackTraceMethod() { - ParameterExpression target = Expression.Parameter(typeof(Exception)); - ParameterExpression stack = Expression.Parameter(typeof(StackTrace)); - Type traceFormatType = typeof(StackTrace).GetNestedType("TraceFormat", BindingFlags.NonPublic); - MethodInfo toString = typeof(StackTrace).GetMethod("ToString", BindingFlags.NonPublic | BindingFlags.Instance, null, new[] { traceFormatType }, null); - object normalTraceFormat = Enum.GetValues(traceFormatType!).GetValue(0); - MethodCallExpression stackTraceString = Expression.Call(stack, toString!, Expression.Constant(normalTraceFormat, traceFormatType)); - FieldInfo stackTraceStringField = typeof(Exception).GetField("_stackTraceString", BindingFlags.NonPublic | BindingFlags.Instance); - BinaryExpression assign = Expression.Assign(Expression.Field(target, stackTraceStringField!), stackTraceString); + var target = Expression.Parameter(typeof(Exception)); + var stack = Expression.Parameter(typeof(StackTrace)); + var traceFormatType = typeof(StackTrace).GetNestedType("TraceFormat", BindingFlags.NonPublic); + var toString = typeof(StackTrace).GetMethod("ToString", BindingFlags.NonPublic | BindingFlags.Instance, null, new[] { traceFormatType }, null); + var normalTraceFormat = Enum.GetValues(traceFormatType!).GetValue(0); + var stackTraceString = Expression.Call(stack, toString!, Expression.Constant(normalTraceFormat, traceFormatType)); + var stackTraceStringField = typeof(Exception).GetField("_stackTraceString", BindingFlags.NonPublic | BindingFlags.Instance); + var assign = Expression.Assign(Expression.Field(target, stackTraceStringField!), stackTraceString); return Expression.Lambda>(Expression.Block(assign, target), target, stack).Compile(); } } diff --git a/Projects/Server/ExpansionInfo.cs b/Projects/Server/ExpansionInfo.cs index 48020fdea..80bc16486 100644 --- a/Projects/Server/ExpansionInfo.cs +++ b/Projects/Server/ExpansionInfo.cs @@ -193,7 +193,7 @@ public class ExpansionInfo public static void StoreMapSelection(MapSelectionFlags mapSelectionFlags, Expansion expansion) { - int expansionIndex = (int)expansion; + var expansionIndex = (int)expansion; Table[expansionIndex].MapSelectionFlags = mapSelectionFlags; } @@ -207,14 +207,14 @@ public class ExpansionInfo { var pathToExpansionFile = Path.Combine(Core.BaseDirectory, ExpansionConfigurationPath); - ExpansionInfo expansionConfig = JsonConfig.Deserialize(pathToExpansionFile); + var expansionConfig = JsonConfig.Deserialize(pathToExpansionFile); if (expansionConfig == null) { expansion = Expansion.None; return false; } - int currentExpansionIndex = expansionConfig.Id; + var currentExpansionIndex = expansionConfig.Id; Table[currentExpansionIndex] = expansionConfig; expansion = (Expansion)currentExpansionIndex; return true; diff --git a/Projects/Server/GarbageCollection/Gen2GcCallback.cs b/Projects/Server/GarbageCollection/Gen2GcCallback.cs index 97b4b91ff..d8d7f2c28 100644 --- a/Projects/Server/GarbageCollection/Gen2GcCallback.cs +++ b/Projects/Server/GarbageCollection/Gen2GcCallback.cs @@ -53,7 +53,7 @@ internal sealed class Gen2GcCallback : CriticalFinalizerObject if (_weakTargetObj.IsAllocated) { // Check to see if the target object is still alive. - object? targetObj = _weakTargetObj.Target; + var targetObj = _weakTargetObj.Target; if (targetObj == null) { // The target object is dead, so this callback object is no longer needed. diff --git a/Projects/Server/Geometry/WorldLocation.cs b/Projects/Server/Geometry/WorldLocation.cs index 2f0ee7ac0..40e8d9ae8 100644 --- a/Projects/Server/Geometry/WorldLocation.cs +++ b/Projects/Server/Geometry/WorldLocation.cs @@ -167,8 +167,8 @@ public struct WorldLocation : IPoint3D, IComparable, IEquatable.Shared.Rent(128); - Span span = array.AsSpan(); + var array = ArrayPool.Shared.Rent(128); + var span = array.AsSpan(); while (!TryFormat(span, out charsWritten, null, null)) { array = ArrayPool.Shared.Rent(array.Length * 2); diff --git a/Projects/Server/Guild.cs b/Projects/Server/Guild.cs index 8998860cf..4abef920a 100644 --- a/Projects/Server/Guild.cs +++ b/Projects/Server/Guild.cs @@ -97,7 +97,7 @@ public abstract class BaseGuild : ISerializable { var name = g.Name; - bool all = true; + var all = true; foreach (var t in words) { if (name.InsensitiveIndexOf(t) == -1) diff --git a/Projects/Server/Items/BaseMulti.cs b/Projects/Server/Items/BaseMulti.cs index 41c448776..df306ddee 100644 --- a/Projects/Server/Items/BaseMulti.cs +++ b/Projects/Server/Items/BaseMulti.cs @@ -107,17 +107,17 @@ public abstract partial class BaseMulti : Item return false; } - int minX = Math.Max(bounds.X, Location.X + Components.Min.X); - int maxX = Math.Min(bounds.X + bounds.Width, Location.X + Components.Max.X); - int minY = Math.Max(bounds.Y, Location.Y + Components.Min.Y); - int maxY = Math.Min(bounds.Y + bounds.Height, Location.Y + Components.Max.Y); + var minX = Math.Max(bounds.X, Location.X + Components.Min.X); + var maxX = Math.Min(bounds.X + bounds.Width, Location.X + Components.Max.X); + var minY = Math.Max(bounds.Y, Location.Y + Components.Min.Y); + var maxY = Math.Min(bounds.Y + bounds.Height, Location.Y + Components.Max.Y); - for (int x = minX; x <= maxX; x++) + for (var x = minX; x <= maxX; x++) { - for (int y = minY; y <= maxY; y++) + for (var y = minY; y <= maxY; y++) { - int offsetX = x - Location.X - Components.Min.X; - int offsetY = y - Location.Y - Components.Min.Y; + var offsetX = x - Location.X - Components.Min.X; + var offsetY = y - Location.Y - Components.Min.Y; if (offsetX < 0 || offsetY < 0 || offsetX >= Components.Width || offsetY >= Components.Height) { diff --git a/Projects/Server/Items/Item.Enumerable.cs b/Projects/Server/Items/Item.Enumerable.cs index c909efcc4..35242e75e 100644 --- a/Projects/Server/Items/Item.Enumerable.cs +++ b/Projects/Server/Items/Item.Enumerable.cs @@ -268,7 +268,7 @@ public partial class Item while (_index < _items.Length) { - Item item = _items[_index++]; + var item = _items[_index++]; if (_recurse && item.LookupItems() is { Count: > 0 } items) { _containers.Enqueue(item); diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index 130ccb6f1..da4b57d85 100644 --- a/Projects/Server/Items/Item.cs +++ b/Projects/Server/Items/Item.cs @@ -131,7 +131,7 @@ public class BounceInfo var loc = reader.ReadPoint3D(); var worldLoc = reader.ReadPoint3D(); - IEntity parent = reader.ReadEntity(); + var parent = reader.ReadEntity(); return new BounceInfo(map, loc, worldLoc, parent); } @@ -353,7 +353,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert { var worldLoc = GetWorldLocation(); - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(worldLoc, GetMaxUpdateRange())) { @@ -1139,9 +1139,9 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert if (m_Map != null) { - Span oldWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); - Span saWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); - Span hsWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var oldWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var saWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var hsWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location, GetMaxUpdateRange())) { @@ -1194,7 +1194,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert { if (oldLocation.m_X != 0) { - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(oldLocation, GetMaxUpdateRange())) { @@ -1522,7 +1522,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert { if (m_Location.m_X != 0) { - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(oldLocation, GetMaxUpdateRange())) { @@ -2663,7 +2663,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert if (GetSaveFlag(flags, SaveFlag.Parent)) { - Serial parent = reader.ReadSerial(); + var parent = reader.ReadSerial(); if (parent.IsMobile) { @@ -2824,7 +2824,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert if (GetSaveFlag(flags, SaveFlag.Parent)) { - Serial parent = reader.ReadSerial(); + var parent = reader.ReadSerial(); if (parent.IsMobile) { @@ -2942,7 +2942,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert AcquireCompactInfo().m_Name = name; } - Serial parent = reader.ReadSerial(); + var parent = reader.ReadSerial(); if (parent.IsMobile) { @@ -3296,7 +3296,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert var worldLoc = GetWorldLocation(); - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(worldLoc, GetMaxUpdateRange())) { @@ -3327,7 +3327,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert var worldLoc = GetWorldLocation(); - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(worldLoc, GetMaxUpdateRange())) { @@ -3820,7 +3820,7 @@ public partial class Item : IHued, IComparable, ISpawnable, IObjectPropert return; } - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(worldLoc, GetMaxUpdateRange())) { diff --git a/Projects/Server/Items/VirtualHair.cs b/Projects/Server/Items/VirtualHair.cs index ce6735073..95f43d3f2 100644 --- a/Projects/Server/Items/VirtualHair.cs +++ b/Projects/Server/Items/VirtualHair.cs @@ -17,7 +17,7 @@ public static class OutgoingVirtualHairPackets return; } - Span buffer = stackalloc byte[EquipUpdatePacketLength].InitializePacket(); + var buffer = stackalloc byte[EquipUpdatePacketLength].InitializePacket(); CreateHairEquipUpdatePacket(buffer, m, hairSerial, itemId, hue, layer); ns.Send(buffer); } @@ -47,7 +47,7 @@ public static class OutgoingVirtualHairPackets return; } - Span buffer = stackalloc byte[RemovePacketLength].InitializePacket(); + var buffer = stackalloc byte[RemovePacketLength].InitializePacket(); CreateRemoveHairPacket(buffer, hairSerial); ns.Send(buffer); } diff --git a/Projects/Server/Json/Converters/RegionByNameConverter.cs b/Projects/Server/Json/Converters/RegionByNameConverter.cs index df0209c47..6e4611801 100644 --- a/Projects/Server/Json/Converters/RegionByNameConverter.cs +++ b/Projects/Server/Json/Converters/RegionByNameConverter.cs @@ -44,7 +44,7 @@ public class RegionByNameConverter : JsonConverter throw new JsonException("Invalid json for RegionByName"); } - string property = reader.GetString()?.ToLower(); + var property = reader.GetString()?.ToLower(); if (property != "name" && property != "map") { diff --git a/Projects/Server/Json/JsonUtilities.cs b/Projects/Server/Json/JsonUtilities.cs index df6c5c0ac..33bd8bb91 100644 --- a/Projects/Server/Json/JsonUtilities.cs +++ b/Projects/Server/Json/JsonUtilities.cs @@ -26,7 +26,7 @@ public static class JsonUtilities { public static string SortByPropertyName(string jsonStr) { - using JsonDocument doc = JsonDocument.Parse(jsonStr); + using var doc = JsonDocument.Parse(jsonStr); return SortByPropertyName(doc.RootElement); } @@ -34,7 +34,7 @@ public static class JsonUtilities { // TODO: Better way to do this than a stream? using var ms = new MemoryStream(); - JsonWriterOptions opts = new JsonWriterOptions + var opts = new JsonWriterOptions { Indented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping @@ -58,7 +58,7 @@ public static class JsonUtilities writer.WriteStartObject(); // TODO: This is slow, can make it faster? - foreach (JsonProperty x in je.EnumerateObject().OrderBy(prop => prop.Name)) + foreach (var x in je.EnumerateObject().OrderBy(prop => prop.Name)) { writer.WritePropertyName(x.Name); WriteJsonElementSorted(x.Value, writer); @@ -70,7 +70,7 @@ public static class JsonUtilities case JsonValueKind.Array: { writer.WriteStartArray(); - foreach(JsonElement x in je.EnumerateArray()) + foreach(var x in je.EnumerateArray()) { WriteJsonElementSorted(x, writer); } diff --git a/Projects/Server/Localization/Localization.cs b/Projects/Server/Localization/Localization.cs index 0e08c1e0c..fade7b134 100644 --- a/Projects/Server/Localization/Localization.cs +++ b/Projects/Server/Localization/Localization.cs @@ -88,7 +88,7 @@ public static class Localization private static Dictionary LoadClilocs(string lang, string file) { lang = lang?.ToLower() ?? FallbackLanguage; - Dictionary entries = _localizations[lang] = new Dictionary(); + var entries = _localizations[lang] = new Dictionary(); if (lang == FallbackLanguage) { _fallbackEntries = entries; diff --git a/Projects/Server/Localization/LocalizationEntry.cs b/Projects/Server/Localization/LocalizationEntry.cs index b17810392..f2fd3b427 100644 --- a/Projects/Server/Localization/LocalizationEntry.cs +++ b/Projects/Server/Localization/LocalizationEntry.cs @@ -54,7 +54,7 @@ public class LocalizationEntry var sb = ValueStringBuilder.Create(256); using var queue = PooledRefQueue.Create(); - bool hasMatch = false; + var hasMatch = false; var prevIndex = 0; foreach (Match match in _textRegex.Matches(text)) { diff --git a/Projects/Server/Main.cs b/Projects/Server/Main.cs index b1a76f014..863d9f9e8 100644 --- a/Projects/Server/Main.cs +++ b/Projects/Server/Main.cs @@ -464,11 +464,11 @@ public static class Core #endif var cycleCount = _cyclesPerSecond.Length; - long last = _tickCount; + var last = _tickCount; const int interval = 100; double frequency = Stopwatch.Frequency * interval; - int sample = 0; + var sample = 0; while (!Closing) { diff --git a/Projects/Server/Maps/Map.ClientByDistanceEnumerator.cs b/Projects/Server/Maps/Map.ClientByDistanceEnumerator.cs index 64c7b3851..30c631fbd 100644 --- a/Projects/Server/Maps/Map.ClientByDistanceEnumerator.cs +++ b/Projects/Server/Maps/Map.ClientByDistanceEnumerator.cs @@ -147,7 +147,7 @@ public partial class Map throw new InvalidOperationException(CollectionThrowStrings.InvalidOperation_EnumFailedVersion); } - NetState current = _current; + var current = _current; while (true) { diff --git a/Projects/Server/Maps/Map.ClientEnumerator.cs b/Projects/Server/Maps/Map.ClientEnumerator.cs index 921affec9..4913e7558 100644 --- a/Projects/Server/Maps/Map.ClientEnumerator.cs +++ b/Projects/Server/Maps/Map.ClientEnumerator.cs @@ -236,8 +236,8 @@ public partial class Map throw new InvalidOperationException(CollectionThrowStrings.InvalidOperation_EnumFailedVersion); } - NetState current = _current; - ref Rectangle2D bounds = ref _bounds; + var current = _current; + ref var bounds = ref _bounds; var currentSectorX = _currentSectorX; var currentSectorY = _currentSectorY; var sectorEndX = _sectorEndX; diff --git a/Projects/Server/Maps/Map.ItemEnumerator.cs b/Projects/Server/Maps/Map.ItemEnumerator.cs index f70c45172..77f4fad32 100644 --- a/Projects/Server/Maps/Map.ItemEnumerator.cs +++ b/Projects/Server/Maps/Map.ItemEnumerator.cs @@ -256,7 +256,7 @@ public partial class Map } Item current = _current; - ref Rectangle2D bounds = ref _bounds; + ref var bounds = ref _bounds; var currentSectorX = _currentSectorX; var currentSectorY = _currentSectorY; var sectorEndX = _sectorEndX; diff --git a/Projects/Server/Maps/Map.MobileEnumerator.cs b/Projects/Server/Maps/Map.MobileEnumerator.cs index 01def1015..fc125f6f4 100644 --- a/Projects/Server/Maps/Map.MobileEnumerator.cs +++ b/Projects/Server/Maps/Map.MobileEnumerator.cs @@ -255,7 +255,7 @@ public partial class Map } Mobile current = _current; - ref Rectangle2D bounds = ref _bounds; + ref var bounds = ref _bounds; var currentSectorX = _currentSectorX; var currentSectorY = _currentSectorY; var sectorEndX = _sectorEndX; diff --git a/Projects/Server/Maps/Map.MultiEnumerator.cs b/Projects/Server/Maps/Map.MultiEnumerator.cs index 2069d4c94..3e383ea98 100644 --- a/Projects/Server/Maps/Map.MultiEnumerator.cs +++ b/Projects/Server/Maps/Map.MultiEnumerator.cs @@ -236,7 +236,7 @@ public partial class Map return false; } - ref Rectangle2D bounds = ref _bounds; + ref var bounds = ref _bounds; var currentSectorX = _currentSectorX; var currentSectorY = _currentSectorY; var sectorEndX = _sectorEndX; diff --git a/Projects/Server/Maps/Map.StaticTileEnumerator.cs b/Projects/Server/Maps/Map.StaticTileEnumerator.cs index ec83d244e..e9924d212 100644 --- a/Projects/Server/Maps/Map.StaticTileEnumerator.cs +++ b/Projects/Server/Maps/Map.StaticTileEnumerator.cs @@ -92,8 +92,8 @@ public partial class Map var components = multi!.Components; var location = multi!.Location; - int offsetX = p.X - location.X - components.Min.X; - int offsetY = p.Y - location.Y - components.Min.Y; + var offsetX = p.X - location.X - components.Min.X; + var offsetY = p.Y - location.Y - components.Min.Y; if (offsetX >= 0 && offsetY >= 0 && offsetX < components.Width && offsetY < components.Height) { diff --git a/Projects/Server/Maps/Map.cs b/Projects/Server/Maps/Map.cs index 69361f855..1cef774f1 100644 --- a/Projects/Server/Maps/Map.cs +++ b/Projects/Server/Maps/Map.cs @@ -494,10 +494,10 @@ public sealed partial class Map : IComparable, ISpanFormattable, ISpanParsa out int sectorStartX, out int sectorStartY, out int sectorEndX, out int sectorEndY) { - int left = bounds.Start.X; - int top = bounds.Start.Y; - int right = bounds.End.X; - int bottom = bounds.End.Y; + var left = bounds.Start.X; + var top = bounds.Start.Y; + var right = bounds.End.X; + var bottom = bounds.End.Y; // Limit the coordinates to inside the valid map region Bound(left, top, out left, out top); @@ -1070,7 +1070,7 @@ public sealed partial class Map : IComparable, ISpanFormattable, ISpanParsa contains = ltID == InvalidLandTiles[j]; } - bool foundStatic = false; + var foundStatic = false; foreach (var t in Tiles.GetStaticAndMultiTiles(point.X, point.Y)) { @@ -1094,7 +1094,7 @@ public sealed partial class Map : IComparable, ISpanFormattable, ISpanParsa if (contains && !foundStatic) { - foreach (Item item in GetItemsAt(point)) + foreach (var item in GetItemsAt(point)) { if (item.Visible) { @@ -1289,7 +1289,7 @@ public sealed partial class Map : IComparable, ISpanFormattable, ISpanParsa return Internal; } - for (int i = 0; i < Maps.Length; i++) + for (var i = 0; i < Maps.Length; i++) { var map = Maps[i]; if (map == null) @@ -1332,7 +1332,7 @@ public sealed partial class Map : IComparable, ISpanFormattable, ISpanParsa return true; } - for (int i = 0; i < Maps.Length; i++) + for (var i = 0; i < Maps.Length; i++) { var map = Maps[i]; if (map == null) diff --git a/Projects/Server/Maps/MapSelection.cs b/Projects/Server/Maps/MapSelection.cs index a0988c0a6..ccde5063d 100644 --- a/Projects/Server/Maps/MapSelection.cs +++ b/Projects/Server/Maps/MapSelection.cs @@ -88,7 +88,7 @@ public static class MapSelection [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool MoveNext() { - MapSelectionFlags[] localList = _allMaps; + var localList = _allMaps; while ((uint)_index < (uint)localList.Length) { diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs index 035d96945..93301c32e 100644 --- a/Projects/Server/Mobiles/Mobile.cs +++ b/Projects/Server/Mobiles/Mobile.cs @@ -2726,18 +2726,18 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro ? OutgoingVirtualHairPackets.RemovePacketLength : OutgoingVirtualHairPackets.EquipUpdatePacketLength; - Span hairPacket = stackalloc byte[hairLength].InitializePacket(); + var hairPacket = stackalloc byte[hairLength].InitializePacket(); var facialHairSerial = FacialHair.VirtualSerial; var facialHairLength = removeFacialHair ? OutgoingVirtualHairPackets.RemovePacketLength : OutgoingVirtualHairPackets.EquipUpdatePacketLength; - Span facialHairPacket = stackalloc byte[facialHairLength].InitializePacket(); + var facialHairPacket = stackalloc byte[facialHairLength].InitializePacket(); const int cacheLength = OutgoingMobilePackets.MobileMovingPacketCacheByteLength; - Span mobileMovingCache = stackalloc byte[cacheLength].InitializePacket(); + var mobileMovingCache = stackalloc byte[cacheLength].InitializePacket(); var ourState = m_NetState; @@ -2879,13 +2879,13 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span statBufferTrue = stackalloc byte[OutgoingMobilePackets.MobileStatusCompactLength].InitializePacket(); - Span statBufferFalse = stackalloc byte[OutgoingMobilePackets.MobileStatusCompactLength].InitializePacket(); - Span hbpBuffer = stackalloc byte[OutgoingMobilePackets.MobileHealthbarPacketLength].InitializePacket(); - Span hbyBuffer = stackalloc byte[OutgoingMobilePackets.MobileHealthbarPacketLength].InitializePacket(); - Span deadBuffer = stackalloc byte[OutgoingMobilePackets.BondedStatusPacketLength].InitializePacket(); - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); - Span hitsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); + var statBufferTrue = stackalloc byte[OutgoingMobilePackets.MobileStatusCompactLength].InitializePacket(); + var statBufferFalse = stackalloc byte[OutgoingMobilePackets.MobileStatusCompactLength].InitializePacket(); + var hbpBuffer = stackalloc byte[OutgoingMobilePackets.MobileHealthbarPacketLength].InitializePacket(); + var hbyBuffer = stackalloc byte[OutgoingMobilePackets.MobileHealthbarPacketLength].InitializePacket(); + var deadBuffer = stackalloc byte[OutgoingMobilePackets.BondedStatusPacketLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var hitsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); mobileMovingCache.InitializePacket(); foreach (var state in Map.GetClientsInRange(m_Location)) @@ -3288,7 +3288,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro var hasTitle = PropertyTitle && !string.IsNullOrEmpty(Title); var hasGuild = guild != null && (m_Player || m_DisplayGuildTitle); - string suffix = hasTitle switch + var suffix = hasTitle switch { true when hasGuild => $" {Title} [{guild.Abbreviation.FixHtmlFormattable()}]", true => $" {Title}", @@ -4759,8 +4759,8 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro { var corpseSerial = c?.Serial ?? Serial.Zero; - Span deathAnimation = stackalloc byte[OutgoingMobilePackets.DeathAnimationPacketLength].InitializePacket(); - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var deathAnimation = stackalloc byte[OutgoingMobilePackets.DeathAnimationPacketLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -5049,7 +5049,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro { var rootItem = root as Item; - Span buffer = stackalloc byte[OutgoingPlayerPackets.DragEffectPacketLength] + var buffer = stackalloc byte[OutgoingPlayerPackets.DragEffectPacketLength] .InitializePacket(); foreach (var ns in map.GetClientsInRange(from.Location)) @@ -5205,7 +5205,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingPlayerPackets.DragEffectPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingPlayerPackets.DragEffectPacketLength].InitializePacket(); foreach (var ns in map.GetClientsInRange(m_Location)) { @@ -5352,7 +5352,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro var length = text.Length; char[] rentedChars = null; - Span chars = length <= 256 + var chars = length <= 256 ? stackalloc char[length] : rentedChars = STArrayPool.Shared.Rent(length); @@ -5565,8 +5565,8 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro ProcessDelta(); - Span regBuffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); - Span mutBuffer = + var regBuffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var mutBuffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(mutatedText)].InitializePacket(); // TODO: Should this be sorted like onSpeech is below? @@ -6658,7 +6658,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro ProcessDelta(); - Span buffer = stackalloc byte[OutgoingMobilePackets.MobileAnimationPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingMobilePackets.MobileAnimationPacketLength].InitializePacket(); foreach (var state in map.GetClientsInRange(m_Location)) { @@ -6735,7 +6735,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -6785,7 +6785,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -7015,7 +7015,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -7238,7 +7238,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro if (map != null) { // First, send a remove message to everyone who can no longer see us. (inOldRange && !inNewRange) - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); foreach (var ns in map.GetClientsInRange(oldLocation)) { @@ -8795,7 +8795,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -8835,7 +8835,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -8874,7 +8874,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(affix, args)] + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(affix, args)] .InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) @@ -8933,7 +8933,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { @@ -8968,7 +8968,7 @@ public partial class Mobile : IHued, IComparable, ISpawnable, IObjectPro return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); foreach (var state in m_Map.GetClientsInRange(m_Location)) { diff --git a/Projects/Server/MultiData.cs b/Projects/Server/MultiData.cs index f5860c3f3..e8884b141 100644 --- a/Projects/Server/MultiData.cs +++ b/Projects/Server/MultiData.cs @@ -56,7 +56,7 @@ public static class MultiData // TODO: Find out if housing.bin is needed and read that. var uopEntries = UOPFiles.ReadUOPIndexes(stream, ".bin", 0x10000, 4, 6); - byte[] compressionBuffer = STArrayPool.Shared.Rent(0x10000); + var compressionBuffer = STArrayPool.Shared.Rent(0x10000); var buffer = STArrayPool.Shared.Rent(0x10000); foreach (var (i, entry) in uopEntries) diff --git a/Projects/Server/Network/Firewall/CidrFirewallEntry.cs b/Projects/Server/Network/Firewall/CidrFirewallEntry.cs index fc6467387..60ad847e9 100644 --- a/Projects/Server/Network/Firewall/CidrFirewallEntry.cs +++ b/Projects/Server/Network/Firewall/CidrFirewallEntry.cs @@ -52,7 +52,7 @@ public class CidrFirewallEntry : BaseFirewallEntry private static IPAddress ParseIPAddress(ReadOnlySpan ipString, out int prefixLength) { - int slashIndex = ipString.IndexOf('/'); + var slashIndex = ipString.IndexOf('/'); var ipAddress = IPAddress.Parse(slashIndex > -1 ? ipString[..slashIndex] : ipString); var maxPrefixLength = ipAddress.AddressFamily == AddressFamily.InterNetworkV6 ? 128 : 32; diff --git a/Projects/Server/Network/IPRateLimiter.cs b/Projects/Server/Network/IPRateLimiter.cs index 5de0ad552..d7f5320b2 100644 --- a/Projects/Server/Network/IPRateLimiter.cs +++ b/Projects/Server/Network/IPRateLimiter.cs @@ -136,10 +136,10 @@ public class IPRateLimiter { await _cleanupSignal.WaitAsync(_cts.Token); - int maxToProcess = Math.Min(_cleanupQueue.Count, 500); + var maxToProcess = Math.Min(_cleanupQueue.Count, 500); var nowTicks = Core.TickCount; - for (int i = 0; i < maxToProcess; i++) + for (var i = 0; i < maxToProcess; i++) { if (!_cts.IsCancellationRequested) { diff --git a/Projects/Server/Network/MovementThrottle.cs b/Projects/Server/Network/MovementThrottle.cs index 22ce9c1e4..6e425d321 100644 --- a/Projects/Server/Network/MovementThrottle.cs +++ b/Projects/Server/Network/MovementThrottle.cs @@ -42,9 +42,9 @@ public static class MovementThrottle return false; } - long now = Core.TickCount; - long credit = ns._movementCredit; - long nextMove = ns._nextMovementTime; + var now = Core.TickCount; + var credit = ns._movementCredit; + var nextMove = ns._nextMovementTime; // Reset system if idle for more than 1 second if (now - nextMove + _movementThrottleReset > 0) @@ -54,7 +54,7 @@ public static class MovementThrottle return false; } - long cost = nextMove - now; + var cost = nextMove - now; if (credit < cost) { diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs index e30a521e1..91e7a3a29 100755 --- a/Projects/Server/Network/NetState/NetState.cs +++ b/Projects/Server/Network/NetState/NetState.cs @@ -278,9 +278,9 @@ public partial class NetState : IComparable, IValueLinkListNode PacketPerSecondThreshold) @@ -583,7 +583,7 @@ public partial class NetState : IComparable, IValueLinkListNode, IValueLinkListNode= 4) { - int newSeed = (packetId << 24) | (packetReader.ReadByte() << 16) | (packetReader.ReadByte() << 8) | packetReader.ReadByte(); + var newSeed = (packetId << 24) | (packetReader.ReadByte() << 16) | (packetReader.ReadByte() << 8) | packetReader.ReadByte(); if (newSeed == 0) { @@ -763,8 +763,8 @@ public partial class NetState : IComparable, IValueLinkListNode, IValueLinkListNode 0) { - for (int i = 0; i < count; i++) + for (var i = 0; i < count; i++) { (_polledStates[i].Target as NetState)?.HandleReceive(); _polledStates[i] = default; @@ -1050,7 +1050,7 @@ public partial class NetState : IComparable, IValueLinkListNode buffer = stackalloc byte[SoundPacketLength].InitializePacket(); + var buffer = stackalloc byte[SoundPacketLength].InitializePacket(); CreateSoundEffect(buffer, soundID, target); ns.Send(buffer); diff --git a/Projects/Server/Network/Packets/OutgoingEntityPackets.cs b/Projects/Server/Network/Packets/OutgoingEntityPackets.cs index 9ab810d9c..c497ee991 100644 --- a/Projects/Server/Network/Packets/OutgoingEntityPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingEntityPackets.cs @@ -54,7 +54,7 @@ public static class OutgoingEntityPackets return; } - Span buffer = stackalloc byte[OPLPacketLength].InitializePacket(); + var buffer = stackalloc byte[OPLPacketLength].InitializePacket(); CreateOPLInfo(buffer, serial, hash); ns.Send(buffer); @@ -79,7 +79,7 @@ public static class OutgoingEntityPackets return; } - Span buffer = stackalloc byte[RemoveEntityLength].InitializePacket(); + var buffer = stackalloc byte[RemoveEntityLength].InitializePacket(); CreateRemoveEntity(buffer, serial); ns.Send(buffer); @@ -96,12 +96,12 @@ public static class OutgoingEntityPackets writer.Write((byte)0xF3); // Packet ID writer.Write((short)0x1); // command - int type = 0; - int gfx = 0; - int amount = 1; - int hue = 0; + var type = 0; + var gfx = 0; + var amount = 1; + var hue = 0; byte light = 0; - int flags = 0; + var flags = 0; if (entity is BaseMulti multi) { diff --git a/Projects/Server/Network/Packets/OutgoingItemPackets.cs b/Projects/Server/Network/Packets/OutgoingItemPackets.cs index 645465042..4c8a53cb1 100644 --- a/Projects/Server/Network/Packets/OutgoingItemPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingItemPackets.cs @@ -88,7 +88,7 @@ public static class OutgoingItemPackets return; } - Span buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); var length = ns.StygianAbyss ? OutgoingEntityPackets.CreateWorldEntity(buffer, item, ns.HighSeas) : diff --git a/Projects/Server/Network/Packets/OutgoingMapPackets.cs b/Projects/Server/Network/Packets/OutgoingMapPackets.cs index 48bbc2bdc..d44d8e301 100644 --- a/Projects/Server/Network/Packets/OutgoingMapPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingMapPackets.cs @@ -37,7 +37,7 @@ public static class OutgoingMapPackets writer.Write((ushort)0x18); // Subpacket writer.Write(4); - for (int i = 0; i < 4; i++) + for (var i = 0; i < 4; i++) { var map = Map.Maps[i]; diff --git a/Projects/Server/Network/Packets/OutgoingMenuPackets.cs b/Projects/Server/Network/Packets/OutgoingMenuPackets.cs index 96787c9f0..dbe1f9aeb 100644 --- a/Projects/Server/Network/Packets/OutgoingMenuPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingMenuPackets.cs @@ -47,7 +47,7 @@ public static class OutgoingMenuPackets int entriesLength = (byte)entries.Length; var maxLength = 11 + questionLength; - for (int i = 0; i < entriesLength; i++) + for (var i = 0; i < entriesLength; i++) { maxLength += 5 + entries[i].Name?.Length ?? 0; // could be trimmed } @@ -106,7 +106,7 @@ public static class OutgoingMenuPackets int answersLength = (byte)answers.Length; var maxLength = 11 + questionLength; - for (int i = 0; i < answersLength; i++) + for (var i = 0; i < answersLength; i++) { maxLength += 5 + answers[i]?.Length ?? 0; // could be trimmed } diff --git a/Projects/Server/Network/Packets/OutgoingMessagePackets.cs b/Projects/Server/Network/Packets/OutgoingMessagePackets.cs index aba639176..3a5e7f974 100644 --- a/Projects/Server/Network/Packets/OutgoingMessagePackets.cs +++ b/Projects/Server/Network/Packets/OutgoingMessagePackets.cs @@ -41,7 +41,7 @@ public static class OutgoingMessagePackets return; } - Span buffer = stackalloc byte[GetMaxMessageLocalizedLength(args)].InitializePacket(); + var buffer = stackalloc byte[GetMaxMessageLocalizedLength(args)].InitializePacket(); var length = CreateMessageLocalized( buffer, serial, graphic, type, hue, font, number, name, args ); @@ -97,7 +97,7 @@ public static class OutgoingMessagePackets return; } - Span buffer = stackalloc byte[GetMaxMessageLocalizedAffixLength(affix, args)].InitializePacket(); + var buffer = stackalloc byte[GetMaxMessageLocalizedAffixLength(affix, args)].InitializePacket(); var length = CreateMessageLocalizedAffix( buffer, serial, graphic, type, hue, font, number, name, affixType, affix, args ); @@ -157,7 +157,7 @@ public static class OutgoingMessagePackets return; } - Span buffer = stackalloc byte[GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[GetMaxMessageLength(text)].InitializePacket(); var length = CreateMessage( buffer, serial, diff --git a/Projects/Server/Network/Packets/OutgoingMobilePackets.cs b/Projects/Server/Network/Packets/OutgoingMobilePackets.cs index 9345b6be9..a121ec1da 100644 --- a/Projects/Server/Network/Packets/OutgoingMobilePackets.cs +++ b/Projects/Server/Network/Packets/OutgoingMobilePackets.cs @@ -96,7 +96,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[DeathAnimationPacketLength].InitializePacket(); + var span = stackalloc byte[DeathAnimationPacketLength].InitializePacket(); CreateDeathAnimation(span, killed, corpse); ns.Send(span); } @@ -134,7 +134,7 @@ public static class OutgoingMobilePackets return; } - Span buffer = stackalloc byte[MobileMovingPacketLength].InitializePacket(); + var buffer = stackalloc byte[MobileMovingPacketLength].InitializePacket(); var packetFlags = (byte)target.GetPacketFlags(ns.StygianAbyss); CreateMobileMoving(buffer, target, noto, packetFlags); ns.Send(buffer); @@ -202,7 +202,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); + var span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); CreateMobileHits(span, m, normalize); ns.Send(span); } @@ -227,7 +227,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); + var span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); CreateMobileMana(span, m, normalize); ns.Send(span); } @@ -252,7 +252,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); + var span = stackalloc byte[MobileAttributePacketLength].InitializePacket(); CreateMobileStam(span, m, normalize); ns.Send(span); } @@ -277,7 +277,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileAttributesPacketLength].InitializePacket(); + var span = stackalloc byte[MobileAttributesPacketLength].InitializePacket(); CreateMobileAttributes(span, m, normalize); ns.Send(span); } @@ -346,7 +346,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileAnimationPacketLength].InitializePacket(); + var span = stackalloc byte[MobileAnimationPacketLength].InitializePacket(); CreateMobileAnimation(span, mobile, action, frameCount, repeatCount, forward, repeat, delay); ns.Send(span); } @@ -371,7 +371,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[NewMobileAnimationPacketLength].InitializePacket(); + var span = stackalloc byte[NewMobileAnimationPacketLength].InitializePacket(); CreateNewMobileAnimation(span, mobile, action, frameCount, delay); ns.Send(span); } @@ -383,7 +383,7 @@ public static class OutgoingMobilePackets return; } - Span span = stackalloc byte[MobileHealthbarPacketLength].InitializePacket(); + var span = stackalloc byte[MobileHealthbarPacketLength].InitializePacket(); CreateMobileHealthbar(span, m, healthbar); ns.Send(span); } @@ -438,7 +438,7 @@ public static class OutgoingMobilePackets return; } - Span buffer = stackalloc byte[MobileStatusCompactLength].InitializePacket(); + var buffer = stackalloc byte[MobileStatusCompactLength].InitializePacket(); CreateMobileStatusCompact(buffer, m, canBeRenamed); ns.Send(buffer); @@ -489,7 +489,7 @@ public static class OutgoingMobilePackets } } - Span buffer = stackalloc byte[length].InitializePacket(); + var buffer = stackalloc byte[length].InitializePacket(); CreateMobileStatus(buffer, beheld, version, beheld.CanBeRenamedBy(beholder)); ns.Send(buffer); } diff --git a/Projects/Server/Network/Packets/OutgoingPlayerPackets.cs b/Projects/Server/Network/Packets/OutgoingPlayerPackets.cs index f12fc388f..b05a43940 100644 --- a/Projects/Server/Network/Packets/OutgoingPlayerPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingPlayerPackets.cs @@ -235,7 +235,7 @@ public static class OutgoingPlayerPackets return; } - Span buffer = stackalloc byte[DragEffectPacketLength].InitializePacket(); + var buffer = stackalloc byte[DragEffectPacketLength].InitializePacket(); CreateDragEffect(buffer, srcSerial, srcLocation, trgSerial, trgLocation, itemID, hue, amount); ns.Send(buffer); } diff --git a/Projects/Server/Network/Packets/OutgoingVendorBuyPackets.cs b/Projects/Server/Network/Packets/OutgoingVendorBuyPackets.cs index b3b679a35..da4b593b7 100644 --- a/Projects/Server/Network/Packets/OutgoingVendorBuyPackets.cs +++ b/Projects/Server/Network/Packets/OutgoingVendorBuyPackets.cs @@ -82,7 +82,7 @@ public static class OutgoingVendorBuyPackets } var length = 8; - for (int i = 0; i < list.Count; i++) + for (var i = 0; i < list.Count; i++) { length += 6 + list[i].Description?.Length ?? 0; } diff --git a/Projects/Server/Network/Packets/PacketContainerBuilder.cs b/Projects/Server/Network/Packets/PacketContainerBuilder.cs index ca7ca64f0..281f2dcd3 100644 --- a/Projects/Server/Network/Packets/PacketContainerBuilder.cs +++ b/Projects/Server/Network/Packets/PacketContainerBuilder.cs @@ -89,11 +89,11 @@ public ref struct PacketContainerBuilder private void Grow(int additionalCapacityBeyondPos) { var newLength = Math.Max(Length + additionalCapacityBeyondPos, _bytes.Length * 2); - byte[] poolArray = STArrayPool.Shared.Rent(newLength); + var poolArray = STArrayPool.Shared.Rent(newLength); _bytes[..Length].CopyTo(poolArray); - byte[] toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; _bytes = _arrayToReturnToPool = poolArray; if (toReturn != null) { @@ -104,7 +104,7 @@ public ref struct PacketContainerBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public void Dispose() { - byte[] toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; this = default; // for safety, to avoid using pooled array if this instance is erroneously appended to again if (toReturn != null) { diff --git a/Projects/Server/PropertyList/ObjectPropertyList.cs b/Projects/Server/PropertyList/ObjectPropertyList.cs index 5a8a94e97..d20fe4294 100644 --- a/Projects/Server/PropertyList/ObjectPropertyList.cs +++ b/Projects/Server/PropertyList/ObjectPropertyList.cs @@ -99,7 +99,7 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable public void Terminate() { - int length = _bufferPos + 4; + var length = _bufferPos + 4; if (length != _buffer.Length) { Resize(length); @@ -135,7 +135,7 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable AddHash(number); - int length = _bufferPos + 6; + var length = _bufferPos + 6; while (length > _buffer.Length) { Flush(); @@ -188,8 +188,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable AddHash(number); AddHash(string.GetHashCode(chars, StringComparison.Ordinal)); - int strLength = chars.Length * 2; - int length = _bufferPos + 6 + strLength; + var strLength = chars.Length * 2; + var length = _bufferPos + 6 + strLength; while (length > _buffer.Length) { Flush(); @@ -219,8 +219,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable { if (value.Length == 1) { - Span chars = _arrayToReturnToPool.AsSpan(); - int pos = _pos; + var chars = _arrayToReturnToPool.AsSpan(); + var pos = _pos; if ((uint)pos < (uint)chars.Length) { chars[pos] = value[0]; @@ -318,7 +318,7 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable public void AppendFormatted(T value, int alignment) { - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value); if (alignment != 0) { @@ -328,7 +328,7 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable public void AppendFormatted(T value, int alignment, string? format) { - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value, format); if (alignment != 0) { @@ -350,14 +350,14 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable public void AppendFormatted(ReadOnlySpan value, int alignment = 0, string? format = null) { - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingRequired = alignment - value.Length; + var paddingRequired = alignment - value.Length; if (paddingRequired <= 0) { AppendFormatted(value); @@ -416,16 +416,16 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable Debug.Assert(startingPos >= 0 && startingPos <= _pos); Debug.Assert(alignment != 0); - int charsWritten = _pos - startingPos; + var charsWritten = _pos - startingPos; - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingNeeded = alignment - charsWritten; + var paddingNeeded = alignment - charsWritten; if (paddingNeeded > 0) { EnsureCapacityForAdditionalChars(paddingNeeded); @@ -486,13 +486,13 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable [MethodImpl(MethodImplOptions.AggressiveInlining)] private void GrowCore(uint requiredMinCapacity) { - uint newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_arrayToReturnToPool.Length * 2, 0x3FFFFFDF)); - int arraySize = (int)Math.Clamp(newCapacity, 256, int.MaxValue); + var newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_arrayToReturnToPool.Length * 2, 0x3FFFFFDF)); + var arraySize = (int)Math.Clamp(newCapacity, 256, int.MaxValue); - char[] newArray = STArrayPool.Shared.Rent(arraySize); + var newArray = STArrayPool.Shared.Rent(arraySize); _arrayToReturnToPool.AsSpan(.._pos).CopyTo(newArray); - char[] toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; _arrayToReturnToPool = newArray; STArrayPool.Shared.Return(toReturn); diff --git a/Projects/Server/Random/StableRandom.cs b/Projects/Server/Random/StableRandom.cs index c79cbfb58..5592a15c4 100644 --- a/Projects/Server/Random/StableRandom.cs +++ b/Projects/Server/Random/StableRandom.cs @@ -38,11 +38,11 @@ public static class StableRandom [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong NextUInt64(Span state, ulong maxValue) { - ulong randomProduct = Math.BigMul(maxValue, NextUInt64(ref state), out ulong lowPart); + var randomProduct = Math.BigMul(maxValue, NextUInt64(ref state), out var lowPart); if (lowPart < maxValue) { - ulong remainder = (0ul - maxValue) % maxValue; + var remainder = (0ul - maxValue) % maxValue; while (lowPart < remainder) { @@ -56,8 +56,8 @@ public static class StableRandom [MethodImpl(MethodImplOptions.AggressiveInlining)] private static ulong NextUInt64(ref Span state) { - ulong result = BitOperations.RotateLeft(state[1] * 5, 7) * 9; - ulong t = state[1] << 17; + var result = BitOperations.RotateLeft(state[1] * 5, 7) * 9; + var t = state[1] << 17; state[2] ^= state[0]; state[3] ^= state[1]; diff --git a/Projects/Server/Serialization/AdhocPersistence.cs b/Projects/Server/Serialization/AdhocPersistence.cs index b60e2482a..d604601e3 100644 --- a/Projects/Server/Serialization/AdhocPersistence.cs +++ b/Projects/Server/Serialization/AdhocPersistence.cs @@ -94,7 +94,7 @@ public static class AdhocPersistence byte* ptr = null; accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr); - UnmanagedDataReader dataReader = new UnmanagedDataReader(ptr, accessor.Length); + var dataReader = new UnmanagedDataReader(ptr, accessor.Length); deserializer(dataReader); error = dataReader.Position != fileLength diff --git a/Projects/Server/Serialization/GenericEntityPersistence.cs b/Projects/Server/Serialization/GenericEntityPersistence.cs index 12e929711..abc6ba3e0 100644 --- a/Projects/Server/Serialization/GenericEntityPersistence.cs +++ b/Projects/Server/Serialization/GenericEntityPersistence.cs @@ -178,7 +178,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer */ private unsafe Dictionary ReadTypes(string savePath) { - string typesPath = Path.Combine(savePath, Name, $"{Name}.tdb"); + var typesPath = Path.Combine(savePath, Name, $"{Name}.tdb"); if (!File.Exists(typesPath)) { return []; @@ -209,7 +209,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer public virtual void DeserializeIndexes(string savePath, Dictionary typesDb) { - string indexPath = Path.Combine(savePath, Name, $"{Name}.idx"); + var indexPath = Path.Combine(savePath, Name, $"{Name}.idx"); _entities ??= []; @@ -295,7 +295,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer ctors[hash] = ctor = GetConstructorFor(typeName, AssemblyHandler.FindTypeByHash(hash), ctorArguments); } - Serial serial = (Serial)dataReader.ReadUInt(); + var serial = (Serial)dataReader.ReadUInt(); var created = version == 0 ? now : new DateTime(dataReader.ReadLong(), DateTimeKind.Utc); if (version is > 0 and < 3) { @@ -330,7 +330,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer public override void Deserialize(string savePath, Dictionary typesDb) { - string dataPath = Path.Combine(savePath, Name, $"{Name}.bin"); + var dataPath = Path.Combine(savePath, Name, $"{Name}.bin"); var fi = new FileInfo(dataPath); if (!fi.Exists) @@ -354,7 +354,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer byte* ptr = null; accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr); - UnmanagedDataReader dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb); + var dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb); Deserialize(dataReader); @@ -362,7 +362,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer foreach (var entry in _entities[index]) { - T t = entry.Entity; + var t = entry.Entity; if (entry.Length == 0) { @@ -527,7 +527,7 @@ public class GenericEntityPersistence : GenericPersistence, IGenericEntityPer case WorldState.PendingSave: case WorldState.Running: { - ref var entityEntry = ref CollectionsMarshal.GetValueRefOrAddDefault(EntitiesBySerial, entity.Serial, out bool exists); + ref var entityEntry = ref CollectionsMarshal.GetValueRefOrAddDefault(EntitiesBySerial, entity.Serial, out var exists); if (exists) { if (entityEntry == entity) diff --git a/Projects/Server/Serialization/IGenericReader.cs b/Projects/Server/Serialization/IGenericReader.cs index 4e59e4e98..e55522ac6 100644 --- a/Projects/Server/Serialization/IGenericReader.cs +++ b/Projects/Server/Serialization/IGenericReader.cs @@ -70,7 +70,7 @@ public interface IGenericReader } IPAddress ReadIPAddress() { - byte length = ReadByte(); + var length = ReadByte(); // Either 2 ushorts, or 8 ushorts Span integer = stackalloc byte[length]; Read(integer); @@ -120,8 +120,8 @@ public interface IGenericReader public BitArray ReadBitArray() { - int bitLength = ReadEncodedInt(); - int byteLength = (bitLength + 7) / 8; + var bitLength = ReadEncodedInt(); + var byteLength = (bitLength + 7) / 8; var buffer = ArrayPool.Shared.Rent(byteLength); try diff --git a/Projects/Server/Serialization/IGenericWriter.cs b/Projects/Server/Serialization/IGenericWriter.cs index 72a8728d0..d2ddb582e 100644 --- a/Projects/Server/Serialization/IGenericWriter.cs +++ b/Projects/Server/Serialization/IGenericWriter.cs @@ -163,8 +163,8 @@ public interface IGenericWriter public void Write(BitArray bitArray) { - int bitLength = bitArray.Length; - int byteLength = (bitLength + 7) / 8; + var bitLength = bitArray.Length; + var byteLength = (bitLength + 7) / 8; WriteEncodedInt(bitLength); diff --git a/Projects/Server/Serialization/Persistence.cs b/Projects/Server/Serialization/Persistence.cs index 3c41c564e..e1a331123 100644 --- a/Projects/Server/Serialization/Persistence.cs +++ b/Projects/Server/Serialization/Persistence.cs @@ -56,7 +56,7 @@ public abstract class Persistence { var db = new Dictionary(); - string typesPath = Path.Combine(path, "SerializedTypes.db"); + var typesPath = Path.Combine(path, "SerializedTypes.db"); if (!File.Exists(typesPath)) { return db; @@ -96,7 +96,7 @@ public abstract class Persistence public static void WriteSerializedTypesSnapshot(string path, HashSet types) { - string typesPath = Path.Combine(path, "SerializedTypes.db"); + var typesPath = Path.Combine(path, "SerializedTypes.db"); using var fs = new FileStream(typesPath, FileMode.Create); using var writer = new MemoryMapFileWriter(fs, 1024 * 1024 * 4); diff --git a/Projects/Server/Serialization/SerializationExtensions.cs b/Projects/Server/Serialization/SerializationExtensions.cs index 198837dc0..1dcdd9992 100644 --- a/Projects/Server/Serialization/SerializationExtensions.cs +++ b/Projects/Server/Serialization/SerializationExtensions.cs @@ -31,7 +31,7 @@ public static class SerializationExtensions public static T ReadEntity(this IGenericReader reader) where T : class, ISerializable { - Serial serial = reader.ReadSerial(); + var serial = reader.ReadSerial(); var typeT = typeof(T); T entity; diff --git a/Projects/Server/Skills.cs b/Projects/Server/Skills.cs index 2123d1e20..5b10aec52 100644 --- a/Projects/Server/Skills.cs +++ b/Projects/Server/Skills.cs @@ -873,7 +873,7 @@ public class Skills [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool MoveNext() { - Skill[] localList = _skills; + var localList = _skills; while ((uint)_index < (uint)localList.Length) { diff --git a/Projects/Server/Targeting/Target.cs b/Projects/Server/Targeting/Target.cs index bf263b156..f544f3cce 100644 --- a/Projects/Server/Targeting/Target.cs +++ b/Projects/Server/Targeting/Target.cs @@ -161,7 +161,7 @@ public abstract class Target Mobile mobile = null; var isValidTargetType = true; - bool valid = targeted switch + var valid = targeted switch { LandTarget landTarget => CanTarget(from, landTarget, ref loc, ref map), StaticTarget staticTarget => CanTarget(from, staticTarget, ref loc, ref map), diff --git a/Projects/Server/Text/HexStringConverter.cs b/Projects/Server/Text/HexStringConverter.cs index ba2154fdc..e2b25cbca 100644 --- a/Projects/Server/Text/HexStringConverter.cs +++ b/Projects/Server/Text/HexStringConverter.cs @@ -64,7 +64,7 @@ public static class HexStringConverter var charsWritten = 0; fixed (char* resultP = result) { - for (int i = 0; i < bytes.Length; i++) + for (var i = 0; i < bytes.Length; i++) { var resultP2 = (uint*)(resultP + charsWritten); *resultP2 = m_Lookup32Chars[bytes[i]]; diff --git a/Projects/Server/Text/StringHelpers.cs b/Projects/Server/Text/StringHelpers.cs index 2b9349f6c..12882e945 100644 --- a/Projects/Server/Text/StringHelpers.cs +++ b/Projects/Server/Text/StringHelpers.cs @@ -83,7 +83,7 @@ public static class StringHelpers return ""; } - char[] chrs = STArrayPool.Shared.Rent(a.Length); + var chrs = STArrayPool.Shared.Rent(a.Length); var span = chrs.AsSpan(0, a.Length); a.Remove(b, comparison, span, out var size); @@ -102,7 +102,7 @@ public static class StringHelpers return value; } - char[] chrs = STArrayPool.Shared.Rent(value.Length); + var chrs = STArrayPool.Shared.Rent(value.Length); var span = chrs.AsSpan(0, value.Length); var sliced = value.AsSpan(); diff --git a/Projects/Server/Text/TextEncoding.cs b/Projects/Server/Text/TextEncoding.cs index b2f290f78..8e18d81f1 100644 --- a/Projects/Server/Text/TextEncoding.cs +++ b/Projects/Server/Text/TextEncoding.cs @@ -125,7 +125,7 @@ public static class TextEncoding var charCount = encoding.GetMaxCharCount(span.Length); char[] rentedChars = null; - Span chars = charCount <= 256 + var chars = charCount <= 256 ? stackalloc char[charCount] : rentedChars = STArrayPool.Shared.Rent(charCount); diff --git a/Projects/Server/Timer/Timer.DelayCall.cs b/Projects/Server/Timer/Timer.DelayCall.cs index c5fc44037..13e0c55c3 100644 --- a/Projects/Server/Timer/Timer.DelayCall.cs +++ b/Projects/Server/Timer/Timer.DelayCall.cs @@ -44,7 +44,7 @@ public partial class Timer [MethodImpl(MethodImplOptions.AggressiveInlining)] public static DelayCallTimer DelayCall(TimeSpan delay, TimeSpan interval, int count, Action callback) { - DelayCallTimer t = new DelayCallTimer(delay, interval, count, callback); + var t = new DelayCallTimer(delay, interval, count, callback); t.Start(); #if DEBUG_TIMERS t._allowFinalization = true; @@ -70,7 +70,7 @@ public partial class Timer [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void StartTimer(TimeSpan delay, TimeSpan interval, int count, Action callback) { - DelayCallTimer t = DelayCallTimer.GetTimer(delay, interval, count, callback); + var t = DelayCallTimer.GetTimer(delay, interval, count, callback); t._returnOnDetach = true; t.Start(); @@ -98,7 +98,7 @@ public partial class Timer [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void StartTimer(TimeSpan delay, TimeSpan interval, int count, Action callback, out TimerExecutionToken token) { - DelayCallTimer t = DelayCallTimer.GetTimer(delay, interval, count, callback); + var t = DelayCallTimer.GetTimer(delay, interval, count, callback); t.Start(); #if DEBUG_TIMERS diff --git a/Projects/Server/Timer/Timer.TimerWheel.cs b/Projects/Server/Timer/Timer.TimerWheel.cs index f8524a759..c6cff063c 100644 --- a/Projects/Server/Timer/Timer.TimerWheel.cs +++ b/Projects/Server/Timer/Timer.TimerWheel.cs @@ -44,7 +44,7 @@ public partial class Timer { _lastTickTurned = tickCount; - for (int i = 0; i < _rings.Length; i++) + for (var i = 0; i < _rings.Length; i++) { _rings[i] = new Timer[_ringSize]; _ringIndexes[i] = 0; diff --git a/Projects/Server/Utilities/ActivatorExtensions.cs b/Projects/Server/Utilities/ActivatorExtensions.cs index 96c116304..98213ce15 100644 --- a/Projects/Server/Utilities/ActivatorExtensions.cs +++ b/Projects/Server/Utilities/ActivatorExtensions.cs @@ -45,9 +45,9 @@ public static class ActivatorExtensions try { - for (int i = 0; i < ctors.Length; i++) + for (var i = 0; i < ctors.Length; i++) { - ConstructorInfo info = ctors[i]; + var info = ctors[i]; if (predicate?.Invoke(info) == false) { @@ -62,12 +62,12 @@ public static class ActivatorExtensions continue; } - bool validated = true; + var validated = true; // Check that all args match params for (var j = 0; j < parameters.Length; j++) { - ParameterInfo param = parameters[j]; + var param = parameters[j]; // All extra parameters must be optional if (j >= args.Length) @@ -124,7 +124,7 @@ public static class ActivatorExtensions var argLength = args?.Length ?? 0; var types = argLength > 0 ? new Type[argLength] : []; - for (int i = 0; i < types.Length; i++) + for (var i = 0; i < types.Length; i++) { types[i] = args![i]?.GetType(); } @@ -148,7 +148,7 @@ public static class ActivatorExtensions else { paramArgs = new object[paramCount]; - for (int i = 0; i < paramCount; i++) + for (var i = 0; i < paramCount; i++) { paramArgs[i] = i < argLength ? args![i] : Type.Missing; } diff --git a/Projects/Server/Utilities/HashUtility.cs b/Projects/Server/Utilities/HashUtility.cs index 9f4b6c58c..72b25c0ae 100644 --- a/Projects/Server/Utilities/HashUtility.cs +++ b/Projects/Server/Utilities/HashUtility.cs @@ -76,10 +76,10 @@ public static class HashUtility fixed (char* src = &str.GetPinnableReference()) { uint hash1 = (5381 << 16) + 5381; - uint hash2 = hash1; + var hash2 = hash1; - uint* ptr = (uint*)src; - int length = str.Length; + var ptr = (uint*)src; + var length = str.Length; while (length > 2) { diff --git a/Projects/Server/Utilities/Html.cs b/Projects/Server/Utilities/Html.cs index 907b90812..79115a491 100644 --- a/Projects/Server/Utilities/Html.cs +++ b/Projects/Server/Utilities/Html.cs @@ -167,14 +167,14 @@ public static class Html return string.Empty; } - int indexOfAny = input.IndexOfAny(_htmlSearchValues); + var indexOfAny = input.IndexOfAny(_htmlSearchValues); if (indexOfAny < 0) { return input.ToString(); } using var builder = ValueStringBuilder.Create(input.Length * 2); - int lastIndex = 0; + var lastIndex = 0; while (indexOfAny >= 0) { @@ -183,7 +183,7 @@ public static class Html builder.Append(input[lastIndex..indexOfAny]); } - char c = input[indexOfAny]; + var c = input[indexOfAny]; var replacement = c switch { '&' => "&", diff --git a/Projects/Server/Utilities/PathUtility.cs b/Projects/Server/Utilities/PathUtility.cs index 11f5fa1af..7f86285b8 100644 --- a/Projects/Server/Utilities/PathUtility.cs +++ b/Projects/Server/Utilities/PathUtility.cs @@ -75,17 +75,17 @@ public static class PathUtility Directory.CreateDirectory(destDir); - foreach (FileInfo file in dir.GetFiles()) + foreach (var file in dir.GetFiles()) { - string targetFilePath = Path.Combine(destDir, file.Name); + var targetFilePath = Path.Combine(destDir, file.Name); file.CopyTo(targetFilePath, true); } if (recursive) { - foreach (DirectoryInfo subdir in dir.GetDirectories()) + foreach (var subdir in dir.GetDirectories()) { - string destSubDir = Path.Combine(destDir, subdir.Name); + var destSubDir = Path.Combine(destDir, subdir.Name); CopyDirectoryContents(subdir.FullName, destSubDir); } } @@ -102,16 +102,16 @@ public static class PathUtility Directory.CreateDirectory(destDir); - foreach (FileInfo file in dir.GetFiles()) + foreach (var file in dir.GetFiles()) { file.MoveTo(Path.Combine(destDir, file.Name)); } if (recursive) { - foreach (DirectoryInfo subdir in dir.GetDirectories()) + foreach (var subdir in dir.GetDirectories()) { - string destSubDir = Path.Combine(destDir, subdir.Name); + var destSubDir = Path.Combine(destDir, subdir.Name); MoveDirectoryContents(subdir.FullName, destSubDir); } } diff --git a/Projects/Server/Utilities/Utility.cs b/Projects/Server/Utilities/Utility.cs index d405fabe8..f68ff9ffb 100644 --- a/Projects/Server/Utilities/Utility.cs +++ b/Projects/Server/Utilities/Utility.cs @@ -93,16 +93,16 @@ public static partial class Utility if (prefixLength < 64) { - int bitsToFlip = 64 - prefixLength; - ulong highMask = isMax ? ~0UL >> bitsToFlip : ~0UL << (bitsToFlip + 1); + var bitsToFlip = 64 - prefixLength; + var highMask = isMax ? ~0UL >> bitsToFlip : ~0UL << (bitsToFlip + 1); high = isMax ? high | highMask : high & highMask; low = isMax ? ~0UL : 0UL; } else { - int bitsToFlip = 128 - prefixLength; - ulong lowMask = isMax ? ~0UL >> (64 - bitsToFlip) : ~0UL << bitsToFlip; + var bitsToFlip = 128 - prefixLength; + var lowMask = isMax ? ~0UL >> (64 - bitsToFlip) : ~0UL << bitsToFlip; low = isMax ? low | lowMask : low & lowMask; } @@ -125,8 +125,8 @@ public static partial class Utility return 0; } - ulong high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]); - ulong low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8)); + var high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]); + var low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8)); return new UInt128(high, low); } @@ -150,8 +150,8 @@ public static partial class Utility [MethodImpl(MethodImplOptions.AggressiveInlining)] public static UInt128 CreateCidrAddress(ReadOnlySpan bytes, int prefixLength, bool isMax) { - ulong high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]); - ulong low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8)); + var high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]); + var low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8)); if (prefixLength < 128) { @@ -588,7 +588,7 @@ public static partial class Utility while (amount > 0) { // Range is 2^amount exclusively, maximum of 62 bits can be used - ulong num = amount >= 62 + var num = amount >= 62 ? (ulong)BuiltInRng.NextLong() : (ulong)BuiltInRng.Next(1L << amount); @@ -612,7 +612,7 @@ public static partial class Utility while (amount > 0) { // Range is 2^amount exclusively, maximum of 62 bits can be used - ulong num = amount >= 62 + var num = amount >= 62 ? (ulong)BuiltInRng.NextLong() : (ulong)BuiltInRng.Next(1L << amount); @@ -1059,7 +1059,7 @@ public static partial class Utility [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void Tidy(this List list) where T : ISerializable { - for (int i = list.Count - 1; i >= 0; i--) + for (var i = list.Count - 1; i >= 0; i--) { var entry = list[i]; if (entry?.Deleted != false) @@ -1127,7 +1127,7 @@ public static partial class Utility [MethodImpl(MethodImplOptions.AggressiveInlining)] public static int Abs(this int value) { - int mask = value >> 31; + var mask = value >> 31; return (value + mask) ^ mask; } diff --git a/Projects/Server/World/World.cs b/Projects/Server/World/World.cs index a8ecb665d..4d1c4a23d 100644 --- a/Projects/Server/World/World.cs +++ b/Projects/Server/World/World.cs @@ -125,7 +125,7 @@ public static class World { var length = OutgoingMessagePackets.GetMaxMessageLength(text); - Span buffer = stackalloc byte[length].InitializePacket(); + var buffer = stackalloc byte[length].InitializePacket(); foreach (var ns in NetState.Instances) { @@ -153,7 +153,7 @@ public static class World { var length = OutgoingMessagePackets.GetMaxMessageLength(text); - Span buffer = stackalloc byte[length].InitializePacket(); + var buffer = stackalloc byte[length].InitializePacket(); foreach (var ns in NetState.Instances) { diff --git a/Projects/UOContent.Tests/Tests/Engines/Events/EventSchedulerTests.cs b/Projects/UOContent.Tests/Tests/Engines/Events/EventSchedulerTests.cs index 65da0271c..addfea7d0 100644 --- a/Projects/UOContent.Tests/Tests/Engines/Events/EventSchedulerTests.cs +++ b/Projects/UOContent.Tests/Tests/Engines/Events/EventSchedulerTests.cs @@ -74,7 +74,7 @@ public class EventSchedulerTests try { - bool called = false; + var called = false; var evt = EventScheduler.Shared.ScheduleEvent( Core._now, TimeOnly.FromDateTime(Core._now), @@ -154,7 +154,7 @@ public class EventSchedulerTests try { - int callCount = 0; + var callCount = 0; // Create a recurrence pattern that fires every 10 seconds, up to 3 times var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10), 3); @@ -191,8 +191,8 @@ public class EventSchedulerTests try { - bool failedEventCalled = false; - bool laterEventCalled = false; + var failedEventCalled = false; + var laterEventCalled = false; // Event that throws exception var failedEvt = EventScheduler.Shared.ScheduleEvent( @@ -234,7 +234,7 @@ public class EventSchedulerTests try { - bool eventCalled = false; + var eventCalled = false; var evt = EventScheduler.Shared.ScheduleEvent( Core._now.AddSeconds(10), @@ -264,7 +264,7 @@ public class EventSchedulerTests try { - int callCount = 0; + var callCount = 0; // Create a recurrence pattern that fires every 10 seconds var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10)); diff --git a/Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs b/Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs index 9fc00f711..fd9b3095f 100644 --- a/Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs @@ -12,7 +12,7 @@ public class PartyPacketTests [Fact] public void TestPartyEmptyList() { - Serial m = (Serial)0x1024u; + var m = (Serial)0x1024u; var expected = new PartyEmptyList(m).Compile(); @@ -70,7 +70,7 @@ public class PartyPacketTests [InlineData(false)] public void TestPartyTextMessage(bool toAll) { - Serial serial = (Serial)0x1024u; + var serial = (Serial)0x1024u; var text = "[Party] Stuff Happens"; var expected = new PartyTextMessage(toAll, serial, text).Compile(); @@ -85,7 +85,7 @@ public class PartyPacketTests [Fact] public void TestPartyInvitation() { - Serial m = (Serial)0x1024u; + var m = (Serial)0x1024u; var expected = new PartyInvitation(m).Compile(); diff --git a/Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs b/Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs index ed1903f3b..788471d5f 100644 --- a/Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs @@ -42,7 +42,7 @@ public class BookPacketTests var m = new Mobile((Serial)0x1); m.DefaultMobileInit(); - Serial serial = (Serial)0x1001; + var serial = (Serial)0x1001; var book = new TestBook(serial) { Author = author, Title = title }; var expected = new BookHeader(m, book).Compile(); @@ -60,7 +60,7 @@ public class BookPacketTests var m = new Mobile((Serial)0x1); m.DefaultMobileInit(); - Serial serial = (Serial)0x1001; + var serial = (Serial)0x1001; var book = new TestBook(serial) { Author = "Some Author", Title = "Some Title" }; book.Pages[0].Lines = new[] { diff --git a/Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs b/Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs index c141f7397..6cd6cf1b9 100644 --- a/Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs @@ -12,7 +12,7 @@ public class MahjongPacketTests [Fact] public void TestMahjongJoinGame() { - Serial game = (Serial)0x1024u; + var game = (Serial)0x1024u; var expected = new MahjongJoinGame(game).Compile(); @@ -104,7 +104,7 @@ public class MahjongPacketTests [Fact] public void TestMahjongRelieve() { - Serial game = (Serial)0x1024u; + var game = (Serial)0x1024u; var expected = new MahjongRelieve(game).Compile(); diff --git a/Projects/UOContent.Tests/Tests/Multis/Houses/HousePacketTests.cs b/Projects/UOContent.Tests/Tests/Multis/Houses/HousePacketTests.cs index cd49ed2e7..4051727f2 100644 --- a/Projects/UOContent.Tests/Tests/Multis/Houses/HousePacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Multis/Houses/HousePacketTests.cs @@ -53,7 +53,7 @@ public class HousePacketTests [Fact] public void TestHouseDesignStateDetailed() { - Serial serial = (Serial)0x40000001; + var serial = (Serial)0x40000001; var revision = 10; var tiles = new MultiTileEntry[250]; for (var i = 0; i < tiles.Length; i++) diff --git a/Projects/UOContent.Tests/Tests/Multis/Houses/HousePackets.cs b/Projects/UOContent.Tests/Tests/Multis/Houses/HousePackets.cs index 5bd132a13..b981d9f86 100644 --- a/Projects/UOContent.Tests/Tests/Multis/Houses/HousePackets.cs +++ b/Projects/UOContent.Tests/Tests/Multis/Houses/HousePackets.cs @@ -200,7 +200,7 @@ public sealed class DesignStateDetailed : Packet ++planeCount; - int size = i switch + var size = i switch { 0 => width * height * 2, < 5 => (width - 1) * (height - 2) * 2, diff --git a/Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs b/Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs index b85f34887..111be1f67 100644 --- a/Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs @@ -38,7 +38,7 @@ public class ArrowPacketTests [InlineData(100000, 100000)] public void TestCancelArrowHS(int x, int y) { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new CancelArrowHS(x, y, serial).Compile(); @@ -56,7 +56,7 @@ public class ArrowPacketTests [InlineData(100000, 100000)] public void TestSetArrowHS(int x, int y) { - Serial serial = (Serial)0x1024; + var serial = (Serial)0x1024; var expected = new SetArrowHS(x, y, serial).Compile(); diff --git a/Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs b/Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs index 1d31aa4e9..8f9d48f56 100644 --- a/Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs +++ b/Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs @@ -30,7 +30,7 @@ public class BuffIconPacketTests [Fact] public void TestRemoveBuffIcon() { - Serial m = (Serial)0x1024; + var m = (Serial)0x1024; var buffIcon = BuffIcon.Disguised; var expected = new RemoveBuffPacket(m, buffIcon).Compile(); diff --git a/Projects/UOContent.Tests/Tests/Utilities/TryParseTests.cs b/Projects/UOContent.Tests/Tests/Utilities/TryParseTests.cs index 518146d27..fa6de64a5 100644 --- a/Projects/UOContent.Tests/Tests/Utilities/TryParseTests.cs +++ b/Projects/UOContent.Tests/Tests/Utilities/TryParseTests.cs @@ -10,7 +10,7 @@ public class TryParseTests [InlineData("Alakazam", "Not a valid boolean string.", true)] public void TestTryParseBool(string value, string returned, bool parsedAs) { - string actualReturned = Server.Types.TryParse(typeof(bool), value, out object constructed); + var actualReturned = Server.Types.TryParse(typeof(bool), value, out var constructed); Assert.Equal(returned, actualReturned); if (returned == null) diff --git a/Projects/UOContent/Accounting/Account.Migrations.cs b/Projects/UOContent/Accounting/Account.Migrations.cs index cd28d22d9..d89389305 100644 --- a/Projects/UOContent/Accounting/Account.Migrations.cs +++ b/Projects/UOContent/Accounting/Account.Migrations.cs @@ -86,28 +86,28 @@ public partial class Account var length = reader.ReadInt(); _mobiles = new Mobile[length]; - for (int i = 0; i < length; i++) + for (var i = 0; i < length; i++) { _mobiles[i] = reader.ReadEntity(); } length = reader.ReadInt(); _comments = length > 0 ? new List(length) : null; - for (int i = 0; i < length; i++) + for (var i = 0; i < length; i++) { _comments!.Add(new AccountComment(reader)); } length = reader.ReadInt(); _tags = length > 0 ? new List(length) : null; - for (int i = 0; i < length; i++) + for (var i = 0; i < length; i++) { _tags!.Add(new AccountTag(reader)); } length = reader.ReadInt(); _loginIPs = new IPAddress[length]; - for (int i = 0; i < length; i++) + for (var i = 0; i < length; i++) { if (version < 2) { @@ -123,7 +123,7 @@ public partial class Account } length = reader.ReadInt(); - for (int i = 0; i < length; i++) + for (var i = 0; i < length; i++) { reader.ReadString(); // IP Restrictions } diff --git a/Projects/UOContent/Accounting/Account.cs b/Projects/UOContent/Accounting/Account.cs index c33e459f2..3770b5b88 100644 --- a/Projects/UOContent/Accounting/Account.cs +++ b/Projects/UOContent/Accounting/Account.cs @@ -1134,7 +1134,7 @@ public partial class Account : IAccount, IComparable [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool MoveNext() { - Mobile[] localList = _mobiles; + var localList = _mobiles; while ((uint)_index < (uint)localList.Length) { diff --git a/Projects/UOContent/Accounting/Security/HashAlgorithmPasswordProtection.cs b/Projects/UOContent/Accounting/Security/HashAlgorithmPasswordProtection.cs index f50888675..124ea254b 100644 --- a/Projects/UOContent/Accounting/Security/HashAlgorithmPasswordProtection.cs +++ b/Projects/UOContent/Accounting/Security/HashAlgorithmPasswordProtection.cs @@ -30,7 +30,7 @@ public class HashAlgorithmPasswordProtection : IPasswordProtection public string EncryptPassword(string plainPassword) { - byte[] bytes = plainPassword.AsSpan(0, Math.Min(256, plainPassword.Length)).GetBytesAscii(); + var bytes = plainPassword.AsSpan(0, Math.Min(256, plainPassword.Length)).GetBytesAscii(); return _hashAlgorithm.ComputeHash(bytes).ToHexString(); } diff --git a/Projects/UOContent/Assistants/AssistantHandler.cs b/Projects/UOContent/Assistants/AssistantHandler.cs index a42e50224..12ffd2d32 100644 --- a/Projects/UOContent/Assistants/AssistantHandler.cs +++ b/Projects/UOContent/Assistants/AssistantHandler.cs @@ -79,7 +79,7 @@ public static class AssistantHandler private static void HandshakeResponse(NetState state, SpanReader reader) { - Mobile m = state.Mobile; + var m = state.Mobile; if (m == null || !_handshakes.TryGetValue(m, out var t)) { diff --git a/Projects/UOContent/Commands/AddonGenerator.cs b/Projects/UOContent/Commands/AddonGenerator.cs index 001363e28..3e166ebd9 100644 --- a/Projects/UOContent/Commands/AddonGenerator.cs +++ b/Projects/UOContent/Commands/AddonGenerator.cs @@ -113,41 +113,41 @@ public class AddonGenerator (start.Y, end.Y) = (end.Y, start.Y); } - Point2D startPoint2D = new Point2D(start.X, start.Y); - Point2D endPoint2D = new Point2D(end.X, end.Y); - Rectangle2D bounds = new Rectangle2D(startPoint2D, endPoint2D); + var startPoint2D = new Point2D(start.X, start.Y); + var endPoint2D = new Point2D(end.X, end.Y); + var bounds = new Rectangle2D(startPoint2D, endPoint2D); - string name = pickerState.Name; - string ns = pickerState.Namespace; - bool items = pickerState.Items; - bool statics = pickerState.Statics; - bool range = pickerState.Range; - sbyte min = pickerState.Min; - sbyte max = pickerState.Max; + var name = pickerState.Name; + var ns = pickerState.Namespace; + var items = pickerState.Items; + var statics = pickerState.Statics; + var range = pickerState.Range; + var min = pickerState.Min; + var max = pickerState.Max; // Get center - Point3D center = new Point3D(); + var center = new Point3D(); center.Z = 127; - int x1 = bounds.End.X; - int y1 = bounds.End.Y; - int x2 = bounds.Start.X; - int y2 = bounds.Start.Y; + var x1 = bounds.End.X; + var y1 = bounds.End.Y; + var x2 = bounds.Start.X; + var y2 = bounds.Start.Y; - Dictionary> tiles = new Dictionary>(); + var tiles = new Dictionary>(); if (statics) { - for (int x = start.X; x <= end.X; x++) + for (var x = start.X; x <= end.X; x++) { - for (int y = start.Y; y <= end.Y; y++) + for (var y = start.Y; y <= end.Y; y++) { - TileMatrix tileMatrix = map.Tiles; + var tileMatrix = map.Tiles; List list = []; if (items) { - foreach (Item item in map.GetItemsAt(x, y)) + foreach (var item in map.GetItemsAt(x, y)) { if (range && item.Z >= min && item.Z <= max) { @@ -174,7 +174,7 @@ public class AddonGenerator using var target = PooledRefList.Create(); - foreach (Static s in map.GetItemsInBounds(bounds)) + foreach (var s in map.GetItemsInBounds(bounds)) { if (!range || s.Z >= min && s.Z <= max) { @@ -189,7 +189,7 @@ public class AddonGenerator } // Get correct bounds - foreach (Item item in target) + foreach (var item in target) { if (item.Z < center.Z) { @@ -202,11 +202,11 @@ public class AddonGenerator y2 = Math.Max(y2, item.Y); } - foreach (Point2D p in tiles.Keys) + foreach (var p in tiles.Keys) { - List list = tiles[p]; + var list = tiles[p]; - foreach (StaticTile t in list) + foreach (var t in list) { if (t.Z < center.Z) { @@ -225,27 +225,27 @@ public class AddonGenerator using var sb = ValueStringBuilder.Create(); - foreach (Point2D p in tiles.Keys) + foreach (var p in tiles.Keys) { - List list = tiles[p]; + var list = tiles[p]; - int xOffset = p.X - center.X; - int yOffset = p.Y - center.Y; + var xOffset = p.X - center.X; + var yOffset = p.Y - center.Y; - foreach (StaticTile t in list) + foreach (var t in list) { - int zOffset = t.Z - center.Z; - int id = t.ID - 16384; + var zOffset = t.Z - center.Z; + var id = t.ID - 16384; sb.Append($" AddComponent(new AddonComponent({id}), {xOffset}, {yOffset}, {zOffset});\n"); } } - foreach (Item item in target) + foreach (var item in target) { - int xOffset = item.X - center.X; - int yOffset = item.Y - center.Y; - int zOffset = item.Z - center.Z; + var xOffset = item.X - center.X; + var yOffset = item.Y - center.Y; + var zOffset = item.Z - center.Z; var light = (item.ItemData.Flags & TileFlag.LightSource) == TileFlag.LightSource ? item.Light : LightType.Empty; var hue = item.Hue; @@ -275,13 +275,13 @@ public class AddonGenerator sb.Append(" )\n"); } - string output = _template.Replace("{name}", name); + var output = _template.Replace("{name}", name); output = output.Replace("{namespace}", ns); output = output.Replace("{components}", sb.ToString()); var path = Path.Combine(_outputDirectory, $"{name}Addon.cs"); - string folder = Path.GetDirectoryName(path); + var folder = Path.GetDirectoryName(path); PathUtility.EnsureDirectory(folder); using var writer = new StreamWriter(path, false); @@ -374,13 +374,13 @@ public class AddonGenerator var fail = !_state.Items && !_state.Statics; - if (!sbyte.TryParse(info.GetTextEntry(2), out sbyte min)) + if (!sbyte.TryParse(info.GetTextEntry(2), out var min)) { min = sbyte.MinValue; fail = true; } - if (!sbyte.TryParse(info.GetTextEntry(3), out sbyte max)) + if (!sbyte.TryParse(info.GetTextEntry(3), out var max)) { max = sbyte.MaxValue; fail = true; diff --git a/Projects/UOContent/Commands/BoundingBoxPicker.cs b/Projects/UOContent/Commands/BoundingBoxPicker.cs index 4212c87fa..62bd16d11 100644 --- a/Projects/UOContent/Commands/BoundingBoxPicker.cs +++ b/Projects/UOContent/Commands/BoundingBoxPicker.cs @@ -42,7 +42,7 @@ namespace Server return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs b/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs index 4d5a79d92..581189698 100644 --- a/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs +++ b/Projects/UOContent/Commands/Generic/Commands/BaseCommand.cs @@ -36,7 +36,7 @@ namespace Server.Commands.Generic return true; } - Mobile mob = obj switch + var mob = obj switch { Mobile m => m, Item item => item.RootParent as Mobile, diff --git a/Projects/UOContent/Commands/Generic/Commands/Commands.cs b/Projects/UOContent/Commands/Generic/Commands/Commands.cs index 5150595dc..c6480db9f 100644 --- a/Projects/UOContent/Commands/Generic/Commands/Commands.cs +++ b/Projects/UOContent/Commands/Generic/Commands/Commands.cs @@ -551,7 +551,7 @@ namespace Server.Commands.Generic return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs b/Projects/UOContent/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs index 416d4bc46..6f5af48d4 100644 --- a/Projects/UOContent/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs +++ b/Projects/UOContent/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs @@ -267,7 +267,7 @@ namespace Server.Commands.Generic { var inverse = false; - Type type = m_IgnoreCase ? typeof(InsensitiveStringHelpers) : typeof(OrdinalStringHelpers); + var type = m_IgnoreCase ? typeof(InsensitiveStringHelpers) : typeof(OrdinalStringHelpers); string methodName; switch (m_Operator) diff --git a/Projects/UOContent/Commands/Generic/Implementors/SerialCommandImplementor.cs b/Projects/UOContent/Commands/Generic/Implementors/SerialCommandImplementor.cs index fca4324dd..f9b1032a3 100644 --- a/Projects/UOContent/Commands/Generic/Implementors/SerialCommandImplementor.cs +++ b/Projects/UOContent/Commands/Generic/Implementors/SerialCommandImplementor.cs @@ -15,7 +15,7 @@ namespace Server.Commands.Generic { if (e.Length >= 2) { - Serial serial = (Serial)e.GetUInt32(0); + var serial = (Serial)e.GetUInt32(0); object obj = null; diff --git a/Projects/UOContent/Commands/Handlers.cs b/Projects/UOContent/Commands/Handlers.cs index d1c56d339..c790948b9 100644 --- a/Projects/UOContent/Commands/Handlers.cs +++ b/Projects/UOContent/Commands/Handlers.cs @@ -300,7 +300,7 @@ namespace Server.Commands $"{m.AccessLevel} {CommandLogging.Format(m)} playing sound {index} (toAll={toAll})" ); - Span buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); foreach (var state in m.GetClientsInRange(12)) { diff --git a/Projects/UOContent/Commands/Object Creation/AddGump.cs b/Projects/UOContent/Commands/Object Creation/AddGump.cs index 7e8bfb33e..22a832f22 100644 --- a/Projects/UOContent/Commands/Object Creation/AddGump.cs +++ b/Projects/UOContent/Commands/Object Creation/AddGump.cs @@ -291,7 +291,7 @@ public class AddGump : DynamicGump return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Commands/Object Creation/CAGLoader.cs b/Projects/UOContent/Commands/Object Creation/CAGLoader.cs index add061da8..8880fe73a 100644 --- a/Projects/UOContent/Commands/Object Creation/CAGLoader.cs +++ b/Projects/UOContent/Commands/Object Creation/CAGLoader.cs @@ -118,7 +118,7 @@ public static class CAGLoader if (cagObj.Hue == null) { - int hue = item.Hue & 0x7FFF; + var hue = item.Hue & 0x7FFF; hue = (hue & 0x4000) != 0 ? 0 : hue; cagObj.Hue = hue == 0 ? null : hue; } @@ -133,7 +133,7 @@ public static class CAGLoader if (cagObj.Hue == null) { - int hue = m.Hue & 0x7FFF; + var hue = m.Hue & 0x7FFF; hue = (hue & 0x4000) != 0 ? 0 : hue; cagObj.Hue = hue == 0 ? null : hue; } diff --git a/Projects/UOContent/Commands/StaffAccess.cs b/Projects/UOContent/Commands/StaffAccess.cs index af355866d..25eabf4a7 100644 --- a/Projects/UOContent/Commands/StaffAccess.cs +++ b/Projects/UOContent/Commands/StaffAccess.cs @@ -65,7 +65,7 @@ public static class StaffAccess } var accessLevelArgument = e.GetString(0)?.Trim().ToLower(); - AccessLevel newAccessLevel = AccessLevel.Player; + var newAccessLevel = AccessLevel.Player; var validAccessLevel = !string.IsNullOrEmpty(accessLevelArgument) && _accessLevelByString.TryGetValue(accessLevelArgument, out newAccessLevel); diff --git a/Projects/UOContent/Commands/VisibilityList.cs b/Projects/UOContent/Commands/VisibilityList.cs index 0026398bb..b9c448abc 100644 --- a/Projects/UOContent/Commands/VisibilityList.cs +++ b/Projects/UOContent/Commands/VisibilityList.cs @@ -74,7 +74,7 @@ namespace Server.Commands if (list.Count > 0) { - Span removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); + var removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket(); for (var i = 0; i < list.Count; ++i) { diff --git a/Projects/UOContent/Compression/TarArchive.cs b/Projects/UOContent/Compression/TarArchive.cs index db37a7de5..ecab56bed 100755 --- a/Projects/UOContent/Compression/TarArchive.cs +++ b/Projects/UOContent/Compression/TarArchive.cs @@ -53,11 +53,11 @@ namespace Server.Compression var libarchiveFile = Path.Combine(tempDir, "libarchive.zip"); // This isn't called often so we don't need to optimize - using (HttpClient hc = new HttpClient()) + using (var hc = new HttpClient()) { var result = hc.Send(new HttpRequestMessage(HttpMethod.Get, new Uri(_libArchiveWindowsUrl))); using var stream = result.Content.ReadAsStream(); - using FileStream fs = new FileStream(libarchiveFile, FileMode.Create, FileAccess.Write, FileShare.None); + using var fs = new FileStream(libarchiveFile, FileMode.Create, FileAccess.Write, FileShare.None); stream.CopyTo(fs); } diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs index 6b3048b89..58a7f73a9 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs @@ -301,8 +301,8 @@ public class AdvancedSearchGump : Gump ); // Count the number of selected objects - int count = 0; - foreach (AdvancedSearchResult e in SearchResults) + var count = 0; + foreach (var e in SearchResults) { if (e.Selected) { @@ -319,7 +319,7 @@ public class AdvancedSearchGump : Gump var allDisplayedSelected = true; - for (int i = 0; i < MaxEntries; i++) + for (var i = 0; i < MaxEntries; i++) { var offset = SortDescending ? MaxEntries - 1 - i : i; var index = offset + DisplayFrom; @@ -896,7 +896,7 @@ public class AdvancedSearchGump : Gump var commandSpan = commandString.AsSpan().Trim(); string command = null; - string[] commandArgs = new string[commandSpan.Count(" ")]; + var commandArgs = new string[commandSpan.Count(" ")]; var index = 0; foreach (var part in commandSpan.Tokenize(' ')) @@ -933,9 +933,9 @@ public class AdvancedSearchGump : Gump return; } - CommandEventArgs cmdEventArgs = new CommandEventArgs(from, command, commandString, commandArgs); + var cmdEventArgs = new CommandEventArgs(from, command, commandString, commandArgs); - bool flushToLog = false; + var flushToLog = false; // execute the command on the objects in the list diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs index fd042d9ea..3056e7796 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchThreadWorker.cs @@ -65,7 +65,7 @@ public class AdvancedSearchThreadWorker private static void Execute(object obj) { - AdvancedSearchThreadWorker worker = (AdvancedSearchThreadWorker)obj; + var worker = (AdvancedSearchThreadWorker)obj; var reader = worker._entities; @@ -73,7 +73,7 @@ public class AdvancedSearchThreadWorker { while (true) { - bool pauseRequested = Volatile.Read(ref worker._pause); + var pauseRequested = Volatile.Read(ref worker._pause); if (reader.TryDequeue(out var entity)) { var result = worker.DoEntitySearch(entity); @@ -268,7 +268,7 @@ public class AdvancedSearchThreadWorker // Keys don't have a backreference, so we just ignore them for now if (entity is KeyRing keyring && keyring.Keys?.Count > 0) { - foreach (Key k in keyring.Keys) + foreach (var k in keyring.Keys) { _ignoreQueue.Enqueue(k); } @@ -278,7 +278,7 @@ public class AdvancedSearchThreadWorker if (entity is BaseHouse house) { - foreach (RelocatedEntity relEntity in house.RelocatedEntities) + foreach (var relEntity in house.RelocatedEntities) { if (relEntity.Entity is Item) { @@ -286,9 +286,9 @@ public class AdvancedSearchThreadWorker } } - foreach (VendorInventory inventory in house.VendorInventories) + foreach (var inventory in house.VendorInventories) { - foreach (Item subItem in inventory.Items) + foreach (var subItem in inventory.Items) { _ignoreQueue.Enqueue(subItem); } @@ -298,16 +298,16 @@ public class AdvancedSearchThreadWorker private static bool EvaluateRecursive(IEntity entity, ReadOnlySpan span) { - int atIndex = span.IndexOf('@'); - int orIndex = span.IndexOf('|'); + var atIndex = span.IndexOf('@'); + var orIndex = span.IndexOf('|'); if (atIndex == -1 && orIndex == -1) { return EvaluateSingleExpression(entity, span); } - bool result = atIndex != -1; - int splitIndex = result ? atIndex : orIndex; + var result = atIndex != -1; + var splitIndex = result ? atIndex : orIndex; var left = EvaluateRecursive(entity, span.Slice(0, splitIndex)); var right = EvaluateRecursive(entity, span.Slice(splitIndex + 1)); @@ -356,7 +356,7 @@ public class AdvancedSearchThreadWorker } var propertyValue = property.GetValue(entity); - bool result = AdvancedSearchUtilities.CompareValues(property.PropertyType, propertyValue, valuePart, operatorSpan); + var result = AdvancedSearchUtilities.CompareValues(property.PropertyType, propertyValue, valuePart, operatorSpan); return negate ? !result : result; } diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchUtilities.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchUtilities.cs index 68813cba6..8d7dae3c4 100644 --- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchUtilities.cs +++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchUtilities.cs @@ -151,7 +151,7 @@ public static class AdvancedSearchUtilities ReadOnlySpan operatorSpan ) { - double epsilon = CalculateEpsilon(originalValue); + var epsilon = CalculateEpsilon(originalValue); return operatorSpan switch { @@ -167,7 +167,7 @@ public static class AdvancedSearchUtilities public static double CalculateEpsilon(ReadOnlySpan value) { - int decimalPlace = value.IndexOf('.'); + var decimalPlace = value.IndexOf('.'); if (decimalPlace == -1) { @@ -253,7 +253,7 @@ public static class AdvancedSearchUtilities // Special handling for boolean and hexadecimal values if (typeof(T) == typeof(bool)) { - string val = valuePart.ToString().ToLower(); + var val = valuePart.ToString().ToLower(); if (val is "true" or "1" or "enabled" or "on") { return (T)(object)true; diff --git a/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs b/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs index 074f11cf2..e9abcab53 100644 --- a/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/LargeBODAcceptGump.cs @@ -81,7 +81,7 @@ namespace Server.Engines.BulkOrders public override void OnResponse(NetState sender, in RelayInfo info) { - Mobile from = sender.Mobile; + var from = sender.Mobile; if (info.ButtonID == 1) // Ok { diff --git a/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs b/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs index 4c5938e54..b66335a4a 100644 --- a/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/LargeBODGump.cs @@ -89,7 +89,7 @@ namespace Server.Engines.BulkOrders public override void OnResponse(NetState sender, in RelayInfo info) { - Mobile from = sender.Mobile; + var from = sender.Mobile; if (_deed.Deleted || !_deed.IsChildOf(from.Backpack)) { diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs b/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs index 4c7bd2ee2..63f3c97e7 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallBODAcceptGump.cs @@ -68,7 +68,7 @@ namespace Server.Engines.BulkOrders public override void OnResponse(NetState sender, in RelayInfo info) { - Mobile from = sender.Mobile; + var from = sender.Mobile; if (info.ButtonID == 1) // Ok { diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs b/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs index d7d25aaa3..de4c40eea 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallBODGump.cs @@ -68,7 +68,7 @@ namespace Server.Engines.BulkOrders public override void OnResponse(NetState sender, in RelayInfo info) { - Mobile from = sender.Mobile; + var from = sender.Mobile; if (_deed.Deleted || !_deed.IsChildOf(from.Backpack)) { diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallSmithBOD.cs b/Projects/UOContent/Engines/Bulk Orders/SmallSmithBOD.cs index d91f2a84e..caf495db0 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallSmithBOD.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallSmithBOD.cs @@ -85,7 +85,7 @@ namespace Server.Engines.BulkOrders var theirSkill = m.Skills.Blacksmith.Base; - int amountMax = theirSkill switch + var amountMax = theirSkill switch { >= 70.1 => Utility.RandomList(10, 15, 20, 20), >= 50.1 => Utility.RandomList(10, 15, 15, 20), diff --git a/Projects/UOContent/Engines/Bulk Orders/SmallTailorBOD.cs b/Projects/UOContent/Engines/Bulk Orders/SmallTailorBOD.cs index 9a0c6ed13..4e4fc6427 100644 --- a/Projects/UOContent/Engines/Bulk Orders/SmallTailorBOD.cs +++ b/Projects/UOContent/Engines/Bulk Orders/SmallTailorBOD.cs @@ -83,7 +83,7 @@ namespace Server.Engines.BulkOrders if (entries.Length > 0) { - int amountMax = theirSkill switch + var amountMax = theirSkill switch { >= 70.1 => Utility.RandomList(10, 15, 20, 20), >= 50.1 => Utility.RandomList(10, 15, 15, 20), diff --git a/Projects/UOContent/Engines/CannedEvil/ChampionCommands.cs b/Projects/UOContent/Engines/CannedEvil/ChampionCommands.cs index 772e03e34..1e6bde7a9 100644 --- a/Projects/UOContent/Engines/CannedEvil/ChampionCommands.cs +++ b/Projects/UOContent/Engines/CannedEvil/ChampionCommands.cs @@ -46,7 +46,7 @@ namespace Server.Engines.CannedEvil return; } - ChampionSpawn spawn = targ switch + var spawn = targ switch { ChampionSpawn championSpawn => championSpawn, IdolOfTheChampion champion => champion.Spawn, diff --git a/Projects/UOContent/Engines/CannedEvil/ChampionPlatform.cs b/Projects/UOContent/Engines/CannedEvil/ChampionPlatform.cs index 97c78fea3..41ddf2b60 100755 --- a/Projects/UOContent/Engines/CannedEvil/ChampionPlatform.cs +++ b/Projects/UOContent/Engines/CannedEvil/ChampionPlatform.cs @@ -61,7 +61,7 @@ public partial class ChampionPlatform : BaseAddon public void AddComponent(int id, int x, int y, int z) { - AddonComponent ac = new AddonComponent(id) { Hue = 0x497 }; + var ac = new AddonComponent(id) { Hue = 0x497 }; AddComponent(ac, x, y, z); } diff --git a/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs b/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs index 032ece7f0..4e490f7d8 100755 --- a/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs +++ b/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs @@ -184,15 +184,15 @@ public partial class ChampionSpawn : Item get => _level; set { - for (int i = _redSkulls.Count - 1; i >= value; --i) + for (var i = _redSkulls.Count - 1; i >= value; --i) { _redSkulls[i].Delete(); _redSkulls.RemoveAt(i); } - for (int i = _redSkulls.Count; i < Math.Min(value, 16); ++i) + for (var i = _redSkulls.Count; i < Math.Min(value, 16); ++i) { - Item skull = new Item(0x1854) { Hue = 0x26, Movable = false, Light = LightType.Circle150 }; + var skull = new Item(0x1854) { Hue = 0x26, Movable = false, Light = LightType.Circle150 }; skull.MoveToWorld(GetRedSkullLocation(i), Map); _redSkulls.Add(skull); } @@ -235,8 +235,8 @@ public partial class ChampionSpawn : Item _kills = value; this.MarkDirty(); - double n = _kills / (double)MaxKills; - int p = (int)(n * 100); + var n = _kills / (double)MaxKills; + var p = (int)(n * 100); if (p < 90) { @@ -292,15 +292,15 @@ public partial class ChampionSpawn : Item public void SetWhiteSkullCount(int val) { - for (int i = _whiteSkulls.Count - 1; i >= val; --i) + for (var i = _whiteSkulls.Count - 1; i >= val; --i) { _whiteSkulls[i].Delete(); _whiteSkulls.RemoveAt(i); } - for (int i = _whiteSkulls.Count; i < val; ++i) + for (var i = _whiteSkulls.Count; i < val; ++i) { - Item skull = new Item(0x1854) + var skull = new Item(0x1854) { Movable = false, Light = LightType.Circle150 @@ -531,11 +531,11 @@ public partial class ChampionSpawn : Item return; } - int kills = _kills; + var kills = _kills; for (var i = 0; i < _creatures.Count; ++i) { - Mobile m = _creatures[i]; + var m = _creatures[i]; if (!m.Deleted) { @@ -551,7 +551,7 @@ public partial class ChampionSpawn : Item --i; ++_kills; - Mobile killer = m.FindMostRecentDamager(false); + var killer = m.FindMostRecentDamager(false); RegisterDamageTo(m); @@ -565,13 +565,13 @@ public partial class ChampionSpawn : Item continue; } - int mobSubLevel = GetSubLevelfor(m) + 1; + var mobSubLevel = GetSubLevelfor(m) + 1; if (mobSubLevel >= 0) { - bool gainedPath = false; + var gainedPath = false; - int pointsToGain = mobSubLevel * 40; + var pointsToGain = mobSubLevel * 40; if (VirtueSystem.Award(pm, VirtueName.Valor, pointsToGain, ref gainedPath)) { @@ -631,8 +631,8 @@ public partial class ChampionSpawn : Item InvalidateProperties(); } - double n = _kills / (double)MaxKills; - int p = (int)(n * 100); + var n = _kills / (double)MaxKills; + var p = (int)(n * 100); if (p >= 99) { @@ -723,13 +723,13 @@ public partial class ChampionSpawn : Item bc.Home = bc.Location; bc.HomeMap = bc.Map; - Point2D xWall1 = new Point2D(_spawnArea.X, bc.Y); - Point2D xWall2 = new Point2D(_spawnArea.X + _spawnArea.Width, bc.Y); - Point2D yWall1 = new Point2D(bc.X, _spawnArea.Y); - Point2D yWall2 = new Point2D(bc.X, _spawnArea.Y + _spawnArea.Height); + var xWall1 = new Point2D(_spawnArea.X, bc.Y); + var xWall2 = new Point2D(_spawnArea.X + _spawnArea.Width, bc.Y); + var yWall1 = new Point2D(bc.X, _spawnArea.Y); + var yWall2 = new Point2D(bc.X, _spawnArea.Y + _spawnArea.Height); - double minXDist = Math.Min(bc.GetDistanceToSqrt(xWall1), bc.GetDistanceToSqrt(xWall2)); - double minYDist = Math.Min(bc.GetDistanceToSqrt(yWall1), bc.GetDistanceToSqrt(yWall2)); + var minXDist = Math.Min(bc.GetDistanceToSqrt(xWall1), bc.GetDistanceToSqrt(xWall2)); + var minYDist = Math.Min(bc.GetDistanceToSqrt(yWall1), bc.GetDistanceToSqrt(yWall2)); bc.RangeHome = (int)Math.Min(minXDist, minYDist); } @@ -752,14 +752,14 @@ public partial class ChampionSpawn : Item while (_creatures.Count < MaxSpawn) { - Mobile m = Spawn(); + var m = Spawn(); if (m == null) { return; } - Point3D loc = GetSpawnLocation(); + var loc = GetSpawnLocation(); // Allow creatures to turn into Paragons at Ilshenar champions. m.OnBeforeSpawn(loc, Map); @@ -782,13 +782,13 @@ public partial class ChampionSpawn : Item bc.Home = bc.Location; bc.HomeMap = bc.Map; - Point2D xWall1 = new Point2D(_spawnArea.X, bc.Y); - Point2D xWall2 = new Point2D(_spawnArea.X + _spawnArea.Width, bc.Y); - Point2D yWall1 = new Point2D(bc.X, _spawnArea.Y); - Point2D yWall2 = new Point2D(bc.X, _spawnArea.Y + _spawnArea.Height); + var xWall1 = new Point2D(_spawnArea.X, bc.Y); + var xWall2 = new Point2D(_spawnArea.X + _spawnArea.Width, bc.Y); + var yWall1 = new Point2D(bc.X, _spawnArea.Y); + var yWall2 = new Point2D(bc.X, _spawnArea.Y + _spawnArea.Height); - double minXDist = Math.Min(bc.GetDistanceToSqrt(xWall1), bc.GetDistanceToSqrt(xWall2)); - double minYDist = Math.Min(bc.GetDistanceToSqrt(yWall1), bc.GetDistanceToSqrt(yWall2)); + var minXDist = Math.Min(bc.GetDistanceToSqrt(xWall1), bc.GetDistanceToSqrt(xWall2)); + var minYDist = Math.Min(bc.GetDistanceToSqrt(yWall1), bc.GetDistanceToSqrt(yWall2)); bc.RangeHome = (int)Math.Min(minXDist, minYDist); } @@ -798,7 +798,7 @@ public partial class ChampionSpawn : Item public Point3D GetSpawnLocation() { - Map map = Map; + var map = Map; if (map == null) { @@ -806,12 +806,12 @@ public partial class ChampionSpawn : Item } // Try 20 times to find a spawnable location. - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { - int x = Utility.Random(_spawnArea.X, _spawnArea.Width); - int y = Utility.Random(_spawnArea.Y, _spawnArea.Height); + var x = Utility.Random(_spawnArea.X, _spawnArea.Width); + var y = Utility.Random(_spawnArea.Y, _spawnArea.Height); - int z = Map.GetAverageZ(x, y); + var z = Map.GetAverageZ(x, y); if (Map.CanSpawnMobile(new Point2D(x, y), z)) { @@ -828,21 +828,21 @@ public partial class ChampionSpawn : Item public int GetSubLevel() { - int level = Level; + var level = Level; return level <= Level1 ? 0 : level <= Level2 ? 1 : level <= Level3 ? 2 : 3; } public int GetSubLevelfor (Mobile m) { - Type[][] types = ChampionSpawnInfo.GetInfo(_type).SpawnTypes; - Type t = m.GetType(); + var types = ChampionSpawnInfo.GetInfo(_type).SpawnTypes; + var t = m.GetType(); - for (int i = 0; i < types.GetLength(0); i++) + for (var i = 0; i < types.GetLength(0); i++) { - Type[] individualTypes = types[i]; + var individualTypes = types[i]; - for (int j = 0; j < individualTypes.Length; j++) + for (var j = 0; j < individualTypes.Length; j++) { if (t == individualTypes[j]) { @@ -856,9 +856,9 @@ public partial class ChampionSpawn : Item public Mobile Spawn() { - Type[][] types = ChampionSpawnInfo.GetInfo(_type).SpawnTypes; + var types = ChampionSpawnInfo.GetInfo(_type).SpawnTypes; - int v = GetSubLevel(); + var v = GetSubLevel(); if (v >= 0 && v < types.Length) { @@ -1032,7 +1032,7 @@ public partial class ChampionSpawn : Item if (_whiteSkulls != null) { - for (int i = 0; i < _whiteSkulls.Count; ++i) + for (var i = 0; i < _whiteSkulls.Count; ++i) { _whiteSkulls[i].Location = GetWhiteSkullLocation(i); } @@ -1068,7 +1068,7 @@ public partial class ChampionSpawn : Item if (_redSkulls != null) { - for (int i = 0; i < _redSkulls.Count; ++i) + for (var i = 0; i < _redSkulls.Count; ++i) { _redSkulls[i].Map = Map; } @@ -1076,7 +1076,7 @@ public partial class ChampionSpawn : Item if (_whiteSkulls != null) { - for (int i = 0; i < _whiteSkulls.Count; ++i) + for (var i = 0; i < _whiteSkulls.Count; ++i) { _whiteSkulls[i].Map = Map; } @@ -1097,7 +1097,7 @@ public partial class ChampionSpawn : Item if (_redSkulls != null) { - for (int i = 0; i < _redSkulls.Count; ++i) + for (var i = 0; i < _redSkulls.Count; ++i) { _redSkulls[i].Delete(); } @@ -1107,7 +1107,7 @@ public partial class ChampionSpawn : Item if (_whiteSkulls != null) { - for (int i = 0; i < _whiteSkulls.Count; ++i) + for (var i = 0; i < _whiteSkulls.Count; ++i) { _whiteSkulls[i].Delete(); } @@ -1139,9 +1139,9 @@ public partial class ChampionSpawn : Item { if (_creatures != null) { - for (int i = 0; i < _creatures.Count; ++i) + for (var i = 0; i < _creatures.Count; ++i) { - Mobile mob = _creatures[i]; + var mob = _creatures[i]; if (!mob.Player) { @@ -1160,15 +1160,15 @@ public partial class ChampionSpawn : Item return; } - foreach (DamageEntry de in m.DamageEntries) + foreach (var de in m.DamageEntries) { if (de.HasExpired) { continue; } - Mobile damager = de.Damager; - Mobile master = damager.GetDamageMaster(m); + var damager = de.Damager; + var master = damager.GetDamageMaster(m); if (master != null) { @@ -1205,9 +1205,9 @@ public partial class ChampionSpawn : Item return; } - int totalDamage = 0; + var totalDamage = 0; - Dictionary validEntries = new Dictionary(); + var validEntries = new Dictionary(); foreach (var (key, value) in DamageEntries) { @@ -1218,13 +1218,13 @@ public partial class ChampionSpawn : Item } } - bool artifactGiven = false; + var artifactGiven = false; do { - int randomDamage = Utility.RandomMinMax(1, totalDamage); + var randomDamage = Utility.RandomMinMax(1, totalDamage); - int checkDamage = 0; + var checkDamage = 0; foreach (var (key, value) in validEntries) { @@ -1260,7 +1260,7 @@ public partial class ChampionSpawn : Item return false; } - Container pack = to.Backpack; + var pack = to.Backpack; if (pack?.TryDropItem(to, artifact, false) != true) { @@ -1285,8 +1285,8 @@ public partial class ChampionSpawn : Item _maxLevel = reader.ReadInt(); _activatedByValor = reader.ReadBool(); - int entries = reader.ReadInt(); - for (int i = 0; i < entries; ++i) + var entries = reader.ReadInt(); + for (var i = 0; i < entries; ++i) { var m = reader.ReadEntity(); var damage = reader.ReadInt(); diff --git a/Projects/UOContent/Engines/CannedEvil/GenChamps.cs b/Projects/UOContent/Engines/CannedEvil/GenChamps.cs index 3d94a9fc3..1cfc43c4e 100644 --- a/Projects/UOContent/Engines/CannedEvil/GenChamps.cs +++ b/Projects/UOContent/Engines/CannedEvil/GenChamps.cs @@ -68,7 +68,7 @@ public static class ChampionGenerator //We assume that all champion spawns are generated here. using var spawns = PooledRefQueue.Create(); - foreach (Item item in World.Items.Values) + foreach (var item in World.Items.Values) { if (item is ChampionSpawn spawn) { @@ -89,9 +89,9 @@ public static class ChampionGenerator private static void Process(ChampionEntry[] entries) { - for (int i = 0; i < entries.Length; i++) + for (var i = 0; i < entries.Length; i++) { - ChampionEntry entry = entries[i]; + var entry = entries[i]; try { diff --git a/Projects/UOContent/Engines/Character Creation/CharacterCreation.cs b/Projects/UOContent/Engines/Character Creation/CharacterCreation.cs index 87204e7fc..404fdc3e9 100644 --- a/Projects/UOContent/Engines/Character Creation/CharacterCreation.cs +++ b/Projects/UOContent/Engines/Character Creation/CharacterCreation.cs @@ -348,7 +348,7 @@ public static partial class CharacterCreation } case "samurai": { - bool haotisAndTokunoAccessible = + var haotisAndTokunoAccessible = (flags & ClientFlags.Tokuno) == ClientFlags.Tokuno && (flags & ClientFlags.Malas) == ClientFlags.Malas && availableMaps.Includes(MapSelectionFlags.Malas | MapSelectionFlags.Tokuno); @@ -370,7 +370,7 @@ public static partial class CharacterCreation } case "ninja": { - bool enimosAndTokunoAccessible = + var enimosAndTokunoAccessible = (flags & ClientFlags.Tokuno) == ClientFlags.Tokuno && (flags & ClientFlags.Malas) == ClientFlags.Malas && availableMaps.Includes(MapSelectionFlags.Malas | MapSelectionFlags.Tokuno); @@ -993,7 +993,7 @@ public static partial class CharacterCreation } case SkillName.ArmsLore: { - Item item = Utility.Random(3) switch + var item = Utility.Random(3) switch { 0 => FencingWeapon(raceFlag), 1 => MacingWeapon(raceFlag), diff --git a/Projects/UOContent/Engines/ConPVP/DuelContext.cs b/Projects/UOContent/Engines/ConPVP/DuelContext.cs index 15fd66b07..a01e24058 100644 --- a/Projects/UOContent/Engines/ConPVP/DuelContext.cs +++ b/Projects/UOContent/Engines/ConPVP/DuelContext.cs @@ -134,7 +134,7 @@ namespace Server.Engines.ConPVP return false; } - string title = move switch + var title = move switch { NinjaMove => "Bushido", SamuraiMove => "Ninjitsu", @@ -1898,7 +1898,7 @@ namespace Server.Engines.ConPVP var rx = dx - dy; var ry = dx + dy; - bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0; + var eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0; Effects.PlaySound(wall, Arena.Facet, 0x1F6); @@ -2043,7 +2043,7 @@ namespace Server.Engines.ConPVP pack.DropItem(item); // TODO: Use Layer instead of Type - int number = item switch + var number = item switch { BaseWeapon _ => 1062001, // You can no longer wield your ~1_WEAPON~ not BaseShield when item is BaseArmor or BaseClothing => 1062002, // You can no longer wear your ~1_ARMOR~ diff --git a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs index 3843d07d1..4d5ed00b7 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs @@ -432,11 +432,11 @@ namespace Server.Engines.Craft public static bool IsQuantityType(Type[][] types) { - for (int i = 0; i < types.Length; ++i) + for (var i = 0; i < types.Length; ++i) { - Type[] check = types[i]; + var check = types[i]; - for (int j = 0; j < check.Length; ++j) + for (var j = 0; j < check.Length; ++j) { if (typeof(IHasQuantity).IsAssignableFrom(check[j])) { @@ -883,7 +883,7 @@ namespace Server.Engines.Craft var minChance = craftSystem.GetChanceAtMin(this); - double chance = minChance + (valMainSkill - minMainSkill) / (maxMainSkill - minMainSkill) * (1.0 - minChance); + var chance = minChance + (valMainSkill - minMainSkill) / (maxMainSkill - minMainSkill) * (1.0 - minChance); if (from.Talisman is BaseTalisman talisman && talisman.Skill == craftSystem.MainSkill) { diff --git a/Projects/UOContent/Engines/Craft/Core/Enhance.cs b/Projects/UOContent/Engines/Craft/Core/Enhance.cs index 58f4280cc..342027665 100644 --- a/Projects/UOContent/Engines/Craft/Core/Enhance.cs +++ b/Projects/UOContent/Engines/Craft/Core/Enhance.cs @@ -85,8 +85,8 @@ namespace Server.Engines.Craft return EnhanceResult.BadResource; } - int resHue = 0; - int maxAmount = 0; + var resHue = 0; + var maxAmount = 0; var consumeRes = craftItem.ConsumeRes( from, diff --git a/Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs b/Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs index 9f4e9c028..598032120 100644 --- a/Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs +++ b/Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs @@ -502,7 +502,7 @@ public partial class LeverPuzzleController : Item /* I cant find any better way to send "speech" using fonts other than default */ public static void POHMessage(Mobile from, int index) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])].InitializePacket(); foreach (var state in from.Map.GetClientsInRange(from.Location)) { diff --git a/Projects/UOContent/Engines/Factions/Core/Faction.cs b/Projects/UOContent/Engines/Factions/Core/Faction.cs index 7368ebe05..2935ebabf 100644 --- a/Projects/UOContent/Engines/Factions/Core/Faction.cs +++ b/Projects/UOContent/Engines/Factions/Core/Faction.cs @@ -283,8 +283,8 @@ public abstract class Faction : IComparable public static bool IsNearType(Mobile mob, Type[] types, int range) { - bool mobs = false; - bool items = false; + var mobs = false; + var items = false; for (var i = 0; !(mobs && items) && i < types.Length; i++) { var type = types[i]; diff --git a/Projects/UOContent/Engines/Factions/Mobiles/Guards/GuardAI.cs b/Projects/UOContent/Engines/Factions/Mobiles/Guards/GuardAI.cs index 6caaf9dfc..32e8566cb 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/Guards/GuardAI.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/Guards/GuardAI.cs @@ -778,7 +778,7 @@ namespace Server.Factions if (spell != null && m_Guard.HitsMax - m_Guard.Hits + 10 > Utility.Random(100)) { - Type type = spell switch + var type = spell switch { GreaterHealSpell _ => typeof(BaseHealPotion), CureSpell _ => typeof(BaseCurePotion), diff --git a/Projects/UOContent/Engines/Harvest/Fishing.cs b/Projects/UOContent/Engines/Harvest/Fishing.cs index df46fe9fc..6b3ef49ae 100644 --- a/Projects/UOContent/Engines/Harvest/Fishing.cs +++ b/Projects/UOContent/Engines/Harvest/Fishing.cs @@ -194,7 +194,7 @@ namespace Server.Engines.Harvest public override bool CheckResources(Mobile from, Item tool, HarvestDefinition def, Map map, Point3D loc, bool timed) { - Container pack = from.Backpack; + var pack = from.Backpack; if (pack != null) { diff --git a/Projects/UOContent/Engines/ML Quests/Mobiles/SirHelper.cs b/Projects/UOContent/Engines/ML Quests/Mobiles/SirHelper.cs index 87f69716a..e7f3ffd75 100644 --- a/Projects/UOContent/Engines/ML Quests/Mobiles/SirHelper.cs +++ b/Projects/UOContent/Engines/ML Quests/Mobiles/SirHelper.cs @@ -95,7 +95,7 @@ namespace Server.Engines.MLQuests.Mobiles return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")].InitializePacket(); foreach (var state in GetClientsInRange(12)) { diff --git a/Projects/UOContent/Engines/Party/Party.cs b/Projects/UOContent/Engines/Party/Party.cs index d20d80948..21c69c797 100644 --- a/Projects/UOContent/Engines/Party/Party.cs +++ b/Projects/UOContent/Engines/Party/Party.cs @@ -52,7 +52,7 @@ namespace Server.Engines.PartySystem public void OnStamChanged(Mobile m) { - Span p = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); + var p = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); OutgoingMobilePackets.CreateMobileStam(p, m, true); for (var i = 0; i < Members.Count; ++i) @@ -69,7 +69,7 @@ namespace Server.Engines.PartySystem public void OnManaChanged(Mobile m) { - Span p = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); + var p = stackalloc byte[OutgoingMobilePackets.MobileAttributePacketLength].InitializePacket(); OutgoingMobilePackets.CreateMobileMana(p, m, true); for (var i = 0; i < Members.Count; ++i) @@ -198,9 +198,9 @@ namespace Server.Engines.PartySystem Members.Add(new PartyMemberInfo(m)); m.Party = this; - Span memberList = + var memberList = stackalloc byte[PartyPackets.GetPartyMemberListPacketLength(Count)].InitializePacket(); - Span attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength].InitializePacket(); + var attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength].InitializePacket(); for (var i = 0; i < Members.Count; ++i) { @@ -230,7 +230,7 @@ namespace Server.Engines.PartySystem return; } - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(from.Name, "")] + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(from.Name, "")] .InitializePacket(); var length = OutgoingMessagePackets.CreateMessageLocalizedAffix( buffer, @@ -302,7 +302,7 @@ namespace Server.Engines.PartySystem if (removed) { - Span removeMember = + var removeMember = stackalloc byte[PartyPackets.GetPartyRemoveMemberPacketLength(Count)].InitializePacket(); // Send empty party to the player removed @@ -386,7 +386,7 @@ namespace Server.Engines.PartySystem public void SendToAll(int number, string args = "", int hue = 0x3B2) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket(); var length = OutgoingMessagePackets.CreateMessageLocalized( buffer, @@ -401,7 +401,7 @@ namespace Server.Engines.PartySystem public void SendPublicMessage(Mobile from, string text) { - Span textMessagePacket = + var textMessagePacket = stackalloc byte[PartyPackets.GetPartyTextMessagePacketLength(text)].InitializePacket(); PartyPackets.CreatePartyTextMessage(textMessagePacket, from.Serial, text, true); SendToAll(textMessagePacket); @@ -419,7 +419,7 @@ namespace Server.Engines.PartySystem private void SendToStaffMessage(Mobile from, string text) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); foreach (var ns in from.GetClientsInRange(8)) { @@ -458,7 +458,7 @@ namespace Server.Engines.PartySystem return; } - Span buffer = + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); OutgoingMessagePackets.CreateMessage( buffer, Serial.MinusOne, -1, MessageType.Regular, 0x3B2, @@ -504,9 +504,9 @@ namespace Server.Engines.PartySystem m_Mobile.SendLocalizedMessage(1005437); // You have rejoined the party. m_Mobile.NetState.SendPartyMemberList(p); - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")] + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")] .InitializePacket(); - Span attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength].InitializePacket(); + var attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength].InitializePacket(); var ns = m_Mobile.NetState; diff --git a/Projects/UOContent/Engines/Party/PartyPackets.cs b/Projects/UOContent/Engines/Party/PartyPackets.cs index b27162c4a..a669b5fe8 100644 --- a/Projects/UOContent/Engines/Party/PartyPackets.cs +++ b/Projects/UOContent/Engines/Party/PartyPackets.cs @@ -54,7 +54,7 @@ namespace Server.Engines.PartySystem return; } - Span buffer = stackalloc byte[GetPartyMemberListPacketLength(p.Count)].InitializePacket(); + var buffer = stackalloc byte[GetPartyMemberListPacketLength(p.Count)].InitializePacket(); CreatePartyMemberList(buffer, p); ns.Send(buffer); @@ -70,7 +70,7 @@ namespace Server.Engines.PartySystem return; } - Span buffer = stackalloc byte[GetPartyRemoveMemberPacketLength(p?.Count ?? 0)].InitializePacket(); + var buffer = stackalloc byte[GetPartyRemoveMemberPacketLength(p?.Count ?? 0)].InitializePacket(); CreatePartyRemoveMember(buffer, m, p); ns.Send(buffer); @@ -110,7 +110,7 @@ namespace Server.Engines.PartySystem return; } - Span buffer = stackalloc byte[GetPartyTextMessagePacketLength(text)].InitializePacket(); + var buffer = stackalloc byte[GetPartyTextMessagePacketLength(text)].InitializePacket(); CreatePartyTextMessage(buffer, m, text, toAll); ns.Send(buffer); diff --git a/Projects/UOContent/Engines/Plants/PlantSystem.cs b/Projects/UOContent/Engines/Plants/PlantSystem.cs index cbbd0cb9c..c21f53e0e 100644 --- a/Projects/UOContent/Engines/Plants/PlantSystem.cs +++ b/Projects/UOContent/Engines/Plants/PlantSystem.cs @@ -443,7 +443,7 @@ namespace Server.Engines.Plants [OnEvent(nameof(PlayerMobile.PlayerLoginEvent))] public static void OnLogin(PlayerMobile from) { - Container cont = from.Backpack; + var cont = from.Backpack; if (cont != null) { foreach (var plant in cont.FindItemsByType()) diff --git a/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs b/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs index 31b4a6bc3..e83967424 100644 --- a/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs +++ b/Projects/UOContent/Engines/Player Murder System/ReportMurdererGump.cs @@ -36,7 +36,7 @@ public class ReportMurdererGump : StaticGump HashSet toGive = null; // Guards won't take reports of the death of a thief! - bool notInThievesGuild = m.NpcGuild != NpcGuild.ThievesGuild; + var notInThievesGuild = m.NpcGuild != NpcGuild.ThievesGuild; foreach (var ai in m.Aggressors) { diff --git a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs index f224d8747..99b0243cf 100644 --- a/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs +++ b/Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs @@ -154,7 +154,7 @@ public partial class EnchantedSextant : Item } } - int moonMsg = moongateDistance switch + var moonMsg = moongateDistance switch { double.MaxValue => 1048021, // The sextant fails to find a Moongate nearby. > LongDistance => 1046449 + (int)from.GetDirectionTo(closestMoongate), // A moongate is * from here @@ -164,7 +164,7 @@ public partial class EnchantedSextant : Item from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x482, 3, moonMsg); - int bankMsg = bankDistance switch + var bankMsg = bankDistance switch { double.MaxValue => 1048020, // The sextant fails to find a Bank nearby. > LongDistance => 1046462 + (int)from.GetDirectionTo(closestBank), // A town is * from here diff --git a/Projects/UOContent/Engines/Quests/Regions/QuestOfferRegion.cs b/Projects/UOContent/Engines/Quests/Regions/QuestOfferRegion.cs index 6cd9ea3aa..b9707bfd8 100644 --- a/Projects/UOContent/Engines/Quests/Regions/QuestOfferRegion.cs +++ b/Projects/UOContent/Engines/Quests/Regions/QuestOfferRegion.cs @@ -32,7 +32,7 @@ public class QuestOfferRegion : BaseRegion { try { - QuestSystem qs = Quest.CreateInstance(player); + var qs = Quest.CreateInstance(player); qs.SendOffer(); } catch (Exception ex) diff --git a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/NestArea.cs b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/NestArea.cs index 2a14b34db..19468c67f 100644 --- a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/NestArea.cs +++ b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/NestArea.cs @@ -40,7 +40,7 @@ namespace Server.Engines.Quests.Naturalist { get { - int count = 0; + var count = 0; foreach (var area in m_Areas) { if (!area.Special) diff --git a/Projects/UOContent/Engines/Spawners/Commands/ExportSpawnersCommand.cs b/Projects/UOContent/Engines/Spawners/Commands/ExportSpawnersCommand.cs index 9b596b546..c590c4910 100644 --- a/Projects/UOContent/Engines/Spawners/Commands/ExportSpawnersCommand.cs +++ b/Projects/UOContent/Engines/Spawners/Commands/ExportSpawnersCommand.cs @@ -42,8 +42,8 @@ public class ExportSpawnersCommand : BaseCommand public override void ExecuteList(CommandEventArgs e, List list) { - string path = e.Arguments.Length == 0 ? string.Empty : e.Arguments[0].Trim(); - string condition = e.Arguments.Length == 2 ? e.Arguments[1].Trim() : string.Empty; + var path = e.Arguments.Length == 0 ? string.Empty : e.Arguments[0].Trim(); + var condition = e.Arguments.Length == 2 ? e.Arguments[1].Trim() : string.Empty; if (string.IsNullOrEmpty(path)) { diff --git a/Projects/UOContent/Engines/Spawners/Commands/ImportSpawnersCommand.cs b/Projects/UOContent/Engines/Spawners/Commands/ImportSpawnersCommand.cs index 8b89298c4..2bb574498 100644 --- a/Projects/UOContent/Engines/Spawners/Commands/ImportSpawnersCommand.cs +++ b/Projects/UOContent/Engines/Spawners/Commands/ImportSpawnersCommand.cs @@ -117,10 +117,10 @@ public static class ImportSpawnersCommand ref int totalFailures ) { - XmlDocument doc = new XmlDocument(); + var doc = new XmlDocument(); doc.Load(file.FullName); - XmlElement root = doc["spawners"]; + var root = doc["spawners"]; if (root == null) { @@ -132,15 +132,15 @@ public static class ImportSpawnersCommand { try { - int count = int.Parse(Utility.GetText(node["count"], "1")); - int homeRange = int.Parse(Utility.GetText(node["homerange"], "4")); + var count = int.Parse(Utility.GetText(node["count"], "1")); + var homeRange = int.Parse(Utility.GetText(node["homerange"], "4")); - int walkingRange = int.Parse(Utility.GetText(node["walkingrange"], "-1")); + var walkingRange = int.Parse(Utility.GetText(node["walkingrange"], "-1")); - int team = int.Parse(Utility.GetText(node["team"], "0")); + var team = int.Parse(Utility.GetText(node["team"], "0")); - TimeSpan maxDelay = TimeSpan.Parse(Utility.GetText(node["maxdelay"], "10:00")); - TimeSpan minDelay = TimeSpan.Parse(Utility.GetText(node["mindelay"], "05:00")); + var maxDelay = TimeSpan.Parse(Utility.GetText(node["maxdelay"], "10:00")); + var minDelay = TimeSpan.Parse(Utility.GetText(node["mindelay"], "05:00")); var creaturesNameNode = node["creaturesname"]; List creatureNames = []; if (creaturesNameNode != null) @@ -154,11 +154,11 @@ public static class ImportSpawnersCommand } } - string name = Utility.GetText(node["name"], "Spawner"); - Point3D location = Point3D.Parse(Utility.GetText(node["location"], "Error")); - Map map = Map.Parse(Utility.GetText(node["map"], "Error")); + var name = Utility.GetText(node["name"], "Spawner"); + var location = Point3D.Parse(Utility.GetText(node["location"], "Error")); + var map = Map.Parse(Utility.GetText(node["map"], "Error")); - Spawner spawner = new Spawner(count, minDelay, maxDelay, team, spawnedNames: creatureNames.ToArray()); + var spawner = new Spawner(count, minDelay, maxDelay, team, spawnedNames: creatureNames.ToArray()); if (walkingRange >= 0) { spawner.WalkingRange = walkingRange; @@ -303,9 +303,9 @@ public static class ImportSpawnersCommand { var lines = File.ReadAllLines(file.FullName); - TimeSpan minTimeOverride = TimeSpan.MinValue; - TimeSpan maxTimeOverride = TimeSpan.MinValue; - int mapIdOverride = -1; + var minTimeOverride = TimeSpan.MinValue; + var maxTimeOverride = TimeSpan.MinValue; + var mapIdOverride = -1; string spawnerIdOverride = null; for (var i = 0; i < lines.Length; i++) diff --git a/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs b/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs index f5a4e81f8..b63405667 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnPropsGump.cs @@ -96,7 +96,7 @@ public class SpawnPropsGump : PropertiesGump case 3: // Apply { using var propsBuilder = ValueStringBuilder.Create(); - bool first = true; + var first = true; foreach (var attr in MobileAttributes) { var prop = GetPropValue(m_Object, attr); diff --git a/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs b/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs index f2d98ecdf..62862e0db 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnerControllerGump.cs @@ -60,7 +60,7 @@ public class SpawnerControllerGump : GumpGrid AddImageTiled(0, row1Y + 21, _main.Width, 3, 9357); AddAlphaRegion(0, row1Y + 21, _main.Width, 3); - for (int i = 0; i < list.ColsCount - 1; i++) + for (var i = 0; i < list.ColsCount - 1; i++) { var x = list.Header.Cols[i].HEnd - 8; var y = list.Header.Y + 10; @@ -159,7 +159,7 @@ public class SpawnerControllerGump : GumpGrid continue; } - bool enqueue = _search.Type switch + var enqueue = _search.Type switch { SpawnSearchType.Creature => SearchSpawnerCreatures(spawner, _search.SearchPattern), SpawnSearchType.Coords => _mobile.InRange(spawner.Location, range), @@ -238,7 +238,7 @@ public class SpawnerControllerGump : GumpGrid public void DrawSpawner(ListView list) { - for (int i = 0; i < list.Items.Length; i++) + for (var i = 0; i < list.Items.Length; i++) { const int vCenter = 15; const int perItem = 45; @@ -381,7 +381,7 @@ public class SpawnerControllerGump : GumpGrid { target.Entries?.Clear(); - for (int i = 0; i < spawner.Entries.Count; i++) + for (var i = 0; i < spawner.Entries.Count; i++) { var item = spawner.Entries[i]; var targetEntry = target.AddEntry(item.SpawnedName, item.SpawnedProbability, item.SpawnedMaxCount); diff --git a/Projects/UOContent/Engines/Spawners/SpawnerGump.cs b/Projects/UOContent/Engines/Spawners/SpawnerGump.cs index 22357221f..e22782228 100644 --- a/Projects/UOContent/Engines/Spawners/SpawnerGump.cs +++ b/Projects/UOContent/Engines/Spawners/SpawnerGump.cs @@ -160,7 +160,7 @@ public class SpawnerGump : Gump var totalSpawned = 0; var totalWeight = 0; - foreach (SpawnerEntry spawnerEntry in _spawner.Entries) + foreach (var spawnerEntry in _spawner.Entries) { totalSpawned += spawner.CountSpawns(spawnerEntry); totalWeight += spawnerEntry.SpawnedProbability; diff --git a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs index fb08fb590..7725806c5 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatue.cs @@ -370,7 +370,7 @@ public partial class CharacterStatue : Mobile, IRewardItem } ProcessDelta(); - Span animPacket = stackalloc byte[CharacterStatuePackets.StatueAnimationPacketLength].InitializePacket(); + var animPacket = stackalloc byte[CharacterStatuePackets.StatueAnimationPacketLength].InitializePacket(); foreach (var state in Map.GetClientsInRange(Location)) { diff --git a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePackets.cs b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePackets.cs index a1788057a..2c8b871ca 100644 --- a/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePackets.cs +++ b/Projects/UOContent/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePackets.cs @@ -52,7 +52,7 @@ namespace Server.Engines.VeteranRewards return; } - Span buffer = stackalloc byte[StatueAnimationPacketLength].InitializePacket(); + var buffer = stackalloc byte[StatueAnimationPacketLength].InitializePacket(); CreateStatueAnimation(buffer, serial, status, anim, frame); ns.Send(buffer); } diff --git a/Projects/UOContent/Engines/Virtues/Honor.cs b/Projects/UOContent/Engines/Virtues/Honor.cs index 51fe093ac..45a909947 100644 --- a/Projects/UOContent/Engines/Virtues/Honor.cs +++ b/Projects/UOContent/Engines/Virtues/Honor.cs @@ -75,7 +75,7 @@ public static class HonorVirtue var duration = GetHonorDuration(pm); var virtues = VirtueSystem.GetOrCreateVirtues(pm); - int usedPoints = virtues.Honor switch + var usedPoints = virtues.Honor switch { < 4399 => 400, < 10599 => 600, diff --git a/Projects/UOContent/Engines/Virtues/Sacrifice.cs b/Projects/UOContent/Engines/Virtues/Sacrifice.cs index 0cf9d612f..51d48ed91 100644 --- a/Projects/UOContent/Engines/Virtues/Sacrifice.cs +++ b/Projects/UOContent/Engines/Virtues/Sacrifice.cs @@ -130,7 +130,7 @@ public static class SacrificeVirtue } else { - int toGain = from.Fame switch + var toGain = from.Fame switch { < 5000 => 500, < 10000 => 1000, diff --git a/Projects/UOContent/Engines/Virtues/VirtueGump.cs b/Projects/UOContent/Engines/Virtues/VirtueGump.cs index 7beb2f401..3d0ac833e 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueGump.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueGump.cs @@ -124,7 +124,7 @@ public class VirtueGump : Gump value = 20000; } - int vl = value switch + var vl = value switch { < 10000 => 0, >= 20000 when index == 5 => 2, diff --git a/Projects/UOContent/Engines/Virtues/VirtueSystem.cs b/Projects/UOContent/Engines/Virtues/VirtueSystem.cs index 737770dc0..89c5fa3b5 100644 --- a/Projects/UOContent/Engines/Virtues/VirtueSystem.cs +++ b/Projects/UOContent/Engines/Virtues/VirtueSystem.cs @@ -119,7 +119,7 @@ public class VirtueSystem : GenericPersistence return null; } - ref VirtueContext context = ref CollectionsMarshal.GetValueRefOrAddDefault(_playerVirtues, from, out bool exists); + ref var context = ref CollectionsMarshal.GetValueRefOrAddDefault(_playerVirtues, from, out var exists); if (!exists) { context = new VirtueContext(); diff --git a/Projects/UOContent/Gumps/Base/DynamicGump.cs b/Projects/UOContent/Gumps/Base/DynamicGump.cs index 34f580050..0c8b46837 100644 --- a/Projects/UOContent/Gumps/Base/DynamicGump.cs +++ b/Projects/UOContent/Gumps/Base/DynamicGump.cs @@ -43,7 +43,7 @@ public abstract class DynamicGump : BaseGump writer.Write(X); writer.Write(Y); - DynamicGumpBuilder gumpBuilder = new DynamicGumpBuilder(); + var gumpBuilder = new DynamicGumpBuilder(); BuildLayout(ref gumpBuilder); gumpBuilder.FinalizeLayout(); diff --git a/Projects/UOContent/Gumps/Base/DynamicGumpBuilder.cs b/Projects/UOContent/Gumps/Base/DynamicGumpBuilder.cs index 198ac16fa..382bce879 100644 --- a/Projects/UOContent/Gumps/Base/DynamicGumpBuilder.cs +++ b/Projects/UOContent/Gumps/Base/DynamicGumpBuilder.cs @@ -278,11 +278,11 @@ public ref struct DynamicGumpBuilder } var newSize = Math.Max(_stringBytesWritten + needed, _stringsBuffer.Length * 2); - byte[] poolArray = STArrayPool.Shared.Rent(newSize); + var poolArray = STArrayPool.Shared.Rent(newSize); _stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray); - byte[] toReturn = _stringsBuffer; + var toReturn = _stringsBuffer; _stringsBuffer = poolArray; if (toReturn != null && toReturn != _staticStringsBuffer) diff --git a/Projects/UOContent/Gumps/Base/GumpLayoutBuilder.cs b/Projects/UOContent/Gumps/Base/GumpLayoutBuilder.cs index 8732b74bf..bbb639328 100644 --- a/Projects/UOContent/Gumps/Base/GumpLayoutBuilder.cs +++ b/Projects/UOContent/Gumps/Base/GumpLayoutBuilder.cs @@ -584,7 +584,7 @@ public ref struct GumpLayoutBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] private void WriteValue(T value, ReadOnlySpan format = default) where T : IUtf8SpanFormattable { - if (!value.TryFormat(_layoutBuffer.AsSpan(_bytesWritten), out int bytesWritten, format, null)) + if (!value.TryFormat(_layoutBuffer.AsSpan(_bytesWritten), out var bytesWritten, format, null)) { throw new InvalidOperationException($"Failed to format '{value}' with the given format '{format}'"); } @@ -616,11 +616,11 @@ public ref struct GumpLayoutBuilder } var newSize = Math.Max(_bytesWritten + count, _layoutBuffer.Length * 2); - byte[] poolArray = STArrayPool.Shared.Rent(newSize); + var poolArray = STArrayPool.Shared.Rent(newSize); _layoutBuffer.AsSpan(0, _bytesWritten).CopyTo(poolArray); - byte[] toReturn = _layoutBuffer; + var toReturn = _layoutBuffer; _layoutBuffer = poolArray; if (toReturn != _staticLayoutBuffer) diff --git a/Projects/UOContent/Gumps/Base/GumpStringsBuilder.cs b/Projects/UOContent/Gumps/Base/GumpStringsBuilder.cs index a5d8de052..d19d6965f 100644 --- a/Projects/UOContent/Gumps/Base/GumpStringsBuilder.cs +++ b/Projects/UOContent/Gumps/Base/GumpStringsBuilder.cs @@ -51,11 +51,11 @@ public ref struct GumpStringsBuilder } var newSize = Math.Max(newLength, _stringsBuffer.Length * 2); - byte[] poolArray = STArrayPool.Shared.Rent(newSize); + var poolArray = STArrayPool.Shared.Rent(newSize); _stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray); - byte[] toReturn = _stringsBuffer; + var toReturn = _stringsBuffer; _stringsBuffer = poolArray; if (toReturn != _staticStringsBuffer) diff --git a/Projects/UOContent/Gumps/Base/GumpSystem.IncomingPackets.cs b/Projects/UOContent/Gumps/Base/GumpSystem.IncomingPackets.cs index b0d2427c8..06e1a8d5d 100644 --- a/Projects/UOContent/Gumps/Base/GumpSystem.IncomingPackets.cs +++ b/Projects/UOContent/Gumps/Base/GumpSystem.IncomingPackets.cs @@ -95,10 +95,10 @@ public static partial class GumpSystem return; } - int switchByteCount = switchCount * 4; + var switchByteCount = switchCount * 4; // Read all the integers - ReadOnlySpan switchBlock = + var switchBlock = MemoryMarshal.Cast(reader.Buffer.Slice(reader.Position, switchByteCount)); reader.Seek(switchByteCount, SeekOrigin.Current); diff --git a/Projects/UOContent/Gumps/Base/GumpSystem.cs b/Projects/UOContent/Gumps/Base/GumpSystem.cs index c0243a08d..c8c9d7728 100644 --- a/Projects/UOContent/Gumps/Base/GumpSystem.cs +++ b/Projects/UOContent/Gumps/Base/GumpSystem.cs @@ -45,7 +45,7 @@ public static partial class GumpSystem { if (_gumps.TryGetValue(ns, out var gumps)) { - for (int i = 0; i < gumps.Count; i++) + for (var i = 0; i < gumps.Count; i++) { if (gumps[i] == gump) { @@ -63,7 +63,7 @@ public static partial class GumpSystem return new NetStateGumps(null, null); } - ref List list = ref CollectionsMarshal.GetValueRefOrAddDefault(_gumps, ns, out bool exists); + ref var list = ref CollectionsMarshal.GetValueRefOrAddDefault(_gumps, ns, out var exists); if (!exists) { diff --git a/Projects/UOContent/Gumps/Base/Legacy/GumpGrid.cs b/Projects/UOContent/Gumps/Base/Legacy/GumpGrid.cs index dfa0dcc78..e66f393eb 100644 --- a/Projects/UOContent/Gumps/Base/Legacy/GumpGrid.cs +++ b/Projects/UOContent/Gumps/Base/Legacy/GumpGrid.cs @@ -40,7 +40,7 @@ public class GumpGrid : Gump private void InitColumn(string name, int column, int w, int x) { var width = w / column; - for (int i = 0; i < column; i++) + for (var i = 0; i < column; i++) { AddColumn(name, i * width + x, width); } @@ -49,7 +49,7 @@ public class GumpGrid : Gump private void InitRow(string name, int row, int h, int y) { var height = h / row; - for (int i = 0; i < row; i++) + for (var i = 0; i < row; i++) { AddRow(name, i * height + y, height); } @@ -57,7 +57,7 @@ public class GumpGrid : Gump private static Swap Exist(ref PooledRefList list, int index) { - for (int i = 0; i < list.Count; i++) + for (var i = 0; i < list.Count; i++) { var item = list[i]; if (item.Index == index) @@ -73,7 +73,7 @@ public class GumpGrid : Gump { var cropSize = 0; - for (int i = 0; i < column; i++) + for (var i = 0; i < column; i++) { if (sizes[i] == "*") { @@ -96,7 +96,7 @@ public class GumpGrid : Gump var cropHeight = CalculateCustom(row, height, sizes, ref list); var Height = height - cropHeight; var factor = row - list.Count; - for (int i = 0; i < row; i++) + for (var i = 0; i < row; i++) { var swap = Exist(ref list, i); if (swap != null) @@ -137,7 +137,7 @@ public class GumpGrid : Gump var Width = width - cropWidth; var factor = column - list.Count; - for (int i = 0; i < column; i++) + for (var i = 0; i < column; i++) { var swap = Exist(ref list, i); if (swap != null) @@ -300,7 +300,7 @@ public class GumpGrid : Gump if (_grids.TryGetValue(name, out var grid)) { var count = columnSpan == 0 ? column + 1 : row + columnSpan; - for (int i = column; i < count; i++) + for (var i = column; i < count; i++) { if (i >= grid.Columns.Count) { @@ -317,7 +317,7 @@ public class GumpGrid : Gump } count = rowSpan == 0 ? row + 1 : row + rowSpan; - for (int i = row; i < count; i++) + for (var i = row; i < count; i++) { if (i >= grid.Rows.Count) { @@ -423,7 +423,7 @@ public class GumpGrid : Gump }; var length = x + marginX; - for (int col = 0; col < columns; col++) + for (var col = 0; col < columns; col++) { Header.Cols[col] = new Col(); Header.Cols[col].Width = ColWidth[col]; @@ -433,7 +433,7 @@ public class GumpGrid : Gump Items = new ListItem[itemsPerPageCount]; - for (int i = 0; i < itemsPerPageCount; i++) + for (var i = 0; i < itemsPerPageCount; i++) { Items[i] = new ListItem { @@ -470,11 +470,11 @@ public class GumpGrid : Gump w = width > 0 ? width : w; h = height > 0 ? height : h; - int[] colWidth = new int[createColumn]; + var colWidth = new int[createColumn]; if (colSize == string.Empty) { - for (int i = 0; i < createColumn; i++) + for (var i = 0; i < createColumn; i++) { colWidth[i] = w / createColumn; } diff --git a/Projects/UOContent/Gumps/Base/NetStateGumps.cs b/Projects/UOContent/Gumps/Base/NetStateGumps.cs index ba21804d0..7a7cafed7 100644 --- a/Projects/UOContent/Gumps/Base/NetStateGumps.cs +++ b/Projects/UOContent/Gumps/Base/NetStateGumps.cs @@ -43,7 +43,7 @@ public readonly ref struct NetStateGumps return false; } - for (int i = 0; i < _gumps.Count; i++) + for (var i = 0; i < _gumps.Count; i++) { if (_gumps[i] is T tGump) { @@ -65,7 +65,7 @@ public readonly ref struct NetStateGumps return null; } - for (int i = 0; i < _gumps.Count; i++) + for (var i = 0; i < _gumps.Count; i++) { if (_gumps[i] is T tGump) { @@ -87,9 +87,9 @@ public readonly ref struct NetStateGumps if (singleton || gump.Singleton) { - for (int i = 0; i < _gumps.Count; i++) + for (var i = 0; i < _gumps.Count; i++) { - BaseGump old = _gumps[i]; + var old = _gumps[i]; if (old.TypeID == gump.TypeID) { diff --git a/Projects/UOContent/Gumps/Base/RelayInfo.cs b/Projects/UOContent/Gumps/Base/RelayInfo.cs index c92d6043c..fc5ecb14d 100644 --- a/Projects/UOContent/Gumps/Base/RelayInfo.cs +++ b/Projects/UOContent/Gumps/Base/RelayInfo.cs @@ -47,7 +47,7 @@ public readonly ref struct RelayInfo public string GetTextEntry(int entryId) { - int index = _textIds.IndexOf((ushort)entryId); + var index = _textIds.IndexOf((ushort)entryId); return index == -1 ? default : TextEncoding.GetString(_textBlock[_textRanges[index]], TextEncoding.Unicode, true); diff --git a/Projects/UOContent/Gumps/Base/StaticGump.cs b/Projects/UOContent/Gumps/Base/StaticGump.cs index 8b428ab0b..475e7af4a 100644 --- a/Projects/UOContent/Gumps/Base/StaticGump.cs +++ b/Projects/UOContent/Gumps/Base/StaticGump.cs @@ -112,7 +112,7 @@ public abstract class StaticGump : BaseGump where TSelf : StaticGump.Shared.Rent(newSize); + var poolArray = STArrayPool.Shared.Rent(newSize); _stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray); - byte[] toReturn = _stringsBuffer; + var toReturn = _stringsBuffer; _stringsBuffer = poolArray; if (toReturn != _staticStringsBuffer) diff --git a/Projects/UOContent/Gumps/Go/GoGump.cs b/Projects/UOContent/Gumps/Go/GoGump.cs index cacc8619c..44b1d1f33 100644 --- a/Projects/UOContent/Gumps/Go/GoGump.cs +++ b/Projects/UOContent/Gumps/Go/GoGump.cs @@ -162,7 +162,7 @@ public class GoGump : Gump public static void DisplayTo(Mobile from) { - LocationTree tree = GoLocations.GetLocations(from.Map); + var tree = GoLocations.GetLocations(from.Map); if (!tree.LastBranch.TryGetValue(from, out var branch)) { diff --git a/Projects/UOContent/Gumps/Guilds/GuildListGump.cs b/Projects/UOContent/Gumps/Guilds/GuildListGump.cs index c69761f95..68c6df49c 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildListGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildListGump.cs @@ -50,7 +50,7 @@ namespace Server.Gumps var g = m_List[i]; - string name = g.Name?.Trim().DefaultIfNullOrEmpty("(empty)"); + var name = g.Name?.Trim().DefaultIfNullOrEmpty("(empty)"); AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name); } } diff --git a/Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs b/Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs index 9041044e6..f4b098357 100644 --- a/Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs +++ b/Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs @@ -51,7 +51,7 @@ namespace Server.Gumps var m = m_List[i]; - string name = m.Name?.Trim().DefaultIfNullOrEmpty("(empty)"); + var name = m.Name?.Trim().DefaultIfNullOrEmpty("(empty)"); AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name); } } diff --git a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index acbc1ec48..3bbec04c6 100644 --- a/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -113,7 +113,7 @@ public partial class FirefliesDeed : Item return; } - int itemId = info.ButtonID switch + var itemId = info.ButtonID switch { (int)Buttons.East => 0x2332, (int)Buttons.South => 0x2336, @@ -202,7 +202,7 @@ public partial class FirefliesDeed : Item return; } - foreach (Fireflies fireflies in Map.Malas.GetItemsAt(p3d)) + foreach (var fireflies in Map.Malas.GetItemsAt(p3d)) { if (fireflies.Z == p3d.Z) { diff --git a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs index 19ac684a0..6c6a3eff8 100644 --- a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs +++ b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs @@ -91,7 +91,7 @@ namespace Server.Items public override void SendWorldPacketTo(NetState ns, ReadOnlySpan world = default) { - Span buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); var length = OutgoingItemPackets.CreateWorldItem(buffer, this); // Use an itemid of a real container BinaryPrimitives.WriteUInt16BigEndian(buffer[7..9], (ushort)(_addon?.ItemID ?? 0x9AB)); diff --git a/Projects/UOContent/Items/Addons/DartBoard.cs b/Projects/UOContent/Items/Addons/DartBoard.cs index 73c532091..36b9f33b2 100644 --- a/Projects/UOContent/Items/Addons/DartBoard.cs +++ b/Projects/UOContent/Items/Addons/DartBoard.cs @@ -72,7 +72,7 @@ namespace Server.Items var rand = Utility.RandomDouble(); - int message = rand switch + var message = rand switch { < 0.05 => 500752, < 0.20 => 500753, diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs index b546a3774..2ca6eefe8 100644 --- a/Projects/UOContent/Items/Armor/BaseArmor.cs +++ b/Projects/UOContent/Items/Armor/BaseArmor.cs @@ -825,7 +825,7 @@ namespace Server.Items public int ComputeStatReq(StatType type) { - int v = type switch + var v = type switch { StatType.Str => StrRequirement, StatType.Dex => DexRequirement, diff --git a/Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs b/Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs index c88e5e396..051498fd7 100644 --- a/Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs +++ b/Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs @@ -224,7 +224,7 @@ namespace Server.Network if (content) { maxLength += 2 + equipLength * 4; // We have an extra 4 from the thread serial - for (int i = 0; i < linesLength; i++) + for (var i = 0; i < linesLength; i++) { msg.Lines[i].UpdateLengthCounters(ref maxLength, ref longestTextLine, true); } diff --git a/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs b/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs index 07796c900..dc3449c24 100644 --- a/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs +++ b/Projects/UOContent/Items/Construction/Doors/BaseDoor.cs @@ -231,8 +231,8 @@ public abstract partial class BaseDoor : Item, ILockable, ITelekinesisable return; } - int x = m.X; - int y = m.Y; + var x = m.X; + var y = m.Y; CalcMoves.Offset(m.Direction, ref x, ref y); diff --git a/Projects/UOContent/Items/Containers/Fillable Containers/FillableContent.cs b/Projects/UOContent/Items/Containers/Fillable Containers/FillableContent.cs index f9752d9b7..482c4641f 100644 --- a/Projects/UOContent/Items/Containers/Fillable Containers/FillableContent.cs +++ b/Projects/UOContent/Items/Containers/Fillable Containers/FillableContent.cs @@ -69,7 +69,7 @@ public partial class FillableContent public static FillableContentType Acquire(Point3D loc, Map map) { - FillableContentType content = FillableContentType.None; + var content = FillableContentType.None; if (map == null || map == Map.Internal) { diff --git a/Projects/UOContent/Items/Containers/LockableContainer.cs b/Projects/UOContent/Items/Containers/LockableContainer.cs index eae0e25da..76287f472 100644 --- a/Projects/UOContent/Items/Containers/LockableContainer.cs +++ b/Projects/UOContent/Items/Containers/LockableContainer.cs @@ -155,7 +155,7 @@ public abstract partial class LockableContainer : TrappableContainer, ILockable, var inaccessible = from.AccessLevel < AccessLevel.GameMaster; - int number = inaccessible + var number = inaccessible ? 501747 // It appears to be locked. : 502502; // That is locked, but you open it with your godly powers. diff --git a/Projects/UOContent/Items/Games/BaseBoard.cs b/Projects/UOContent/Items/Games/BaseBoard.cs index d18cbc60d..b13d7dde2 100644 --- a/Projects/UOContent/Items/Games/BaseBoard.cs +++ b/Projects/UOContent/Items/Games/BaseBoard.cs @@ -71,7 +71,7 @@ public abstract partial class BaseBoard : Container, ISecurable } else { - Span buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket(); foreach (var state in GetClientsInRange(2)) { diff --git a/Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs b/Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs index eaf22be58..d68429781 100644 --- a/Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs +++ b/Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs @@ -465,7 +465,7 @@ namespace Server.Engines.Mahjong return; } - Span buffer = stackalloc byte[MahjongGeneralInfoPacketLength].InitializePacket(); + var buffer = stackalloc byte[MahjongGeneralInfoPacketLength].InitializePacket(); CreateMahjongGeneralInfo(buffer, game); ns.Send(buffer); @@ -508,7 +508,7 @@ namespace Server.Engines.Mahjong return; } - Span buffer = stackalloc byte[MahjongRelievePacketLength].InitializePacket(); + var buffer = stackalloc byte[MahjongRelievePacketLength].InitializePacket(); CreateMahjongRelieve(buffer, game); ns.Send(buffer); diff --git a/Projects/UOContent/Items/Games/Mahjong/MahjongPlayers.cs b/Projects/UOContent/Items/Games/Mahjong/MahjongPlayers.cs index 2627ec27e..fd5d613f3 100644 --- a/Projects/UOContent/Items/Games/Mahjong/MahjongPlayers.cs +++ b/Projects/UOContent/Items/Games/Mahjong/MahjongPlayers.cs @@ -187,7 +187,7 @@ public partial class MahjongPlayers { var removed = false; - Span relievePacket = stackalloc byte[MahjongPackets.MahjongRelievePacketLength].InitializePacket(); + var relievePacket = stackalloc byte[MahjongPackets.MahjongRelievePacketLength].InitializePacket(); for (var i = 0; i < _players.Length; i++) { @@ -543,7 +543,7 @@ public partial class MahjongPlayers return; } - Span generalInfo = stackalloc byte[MahjongPackets.MahjongGeneralInfoPacketLength].InitializePacket(); + var generalInfo = stackalloc byte[MahjongPackets.MahjongGeneralInfoPacketLength].InitializePacket(); foreach (var mobile in mobiles) { @@ -577,7 +577,7 @@ public partial class MahjongPlayers return; } - Span relievePacket = stackalloc byte[MahjongPackets.MahjongRelievePacketLength].InitializePacket(); + var relievePacket = stackalloc byte[MahjongPackets.MahjongRelievePacketLength].InitializePacket(); foreach (var mobile in mobiles) { diff --git a/Projects/UOContent/Items/Misc/Blocker.cs b/Projects/UOContent/Items/Misc/Blocker.cs index cadefcb1a..cc1d5cf54 100644 --- a/Projects/UOContent/Items/Misc/Blocker.cs +++ b/Projects/UOContent/Items/Misc/Blocker.cs @@ -31,7 +31,7 @@ public partial class Blocker : Item private void SendGMItem(NetState ns) { // GM Packet - Span buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); int length; diff --git a/Projects/UOContent/Items/Misc/ClockworkAssembly.cs b/Projects/UOContent/Items/Misc/ClockworkAssembly.cs index 9c72aa240..208775a2f 100644 --- a/Projects/UOContent/Items/Misc/ClockworkAssembly.cs +++ b/Projects/UOContent/Items/Misc/ClockworkAssembly.cs @@ -64,7 +64,7 @@ public partial class ClockworkAssembly : Item return; } - double scalar = tinkerSkill switch + var scalar = tinkerSkill switch { >= 100.0 => 1.0, >= 90.0 => 0.9, diff --git a/Projects/UOContent/Items/Misc/LOSBlocker.cs b/Projects/UOContent/Items/Misc/LOSBlocker.cs index c439b2162..3866cfa87 100644 --- a/Projects/UOContent/Items/Misc/LOSBlocker.cs +++ b/Projects/UOContent/Items/Misc/LOSBlocker.cs @@ -41,7 +41,7 @@ public partial class LOSBlocker : Item private void SendGMItem(NetState ns) { // GM Packet - Span buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket(); int length; diff --git a/Projects/UOContent/Items/Misc/PublicMoongate.cs b/Projects/UOContent/Items/Misc/PublicMoongate.cs index 8d1f193e2..fd8aa2857 100644 --- a/Projects/UOContent/Items/Misc/PublicMoongate.cs +++ b/Projects/UOContent/Items/Misc/PublicMoongate.cs @@ -375,7 +375,7 @@ public class MoongateGump : Gump } } - int mapCount = filteredBySelectedMaps.Count; + var mapCount = filteredBySelectedMaps.Count; _lists = new PMList[mapCount]; for (var i = 0; i < mapCount; i++) { diff --git a/Projects/UOContent/Items/Quivers/BaseQuiver.cs b/Projects/UOContent/Items/Quivers/BaseQuiver.cs index e392ffdcb..427871f16 100644 --- a/Projects/UOContent/Items/Quivers/BaseQuiver.cs +++ b/Projects/UOContent/Items/Quivers/BaseQuiver.cs @@ -180,7 +180,7 @@ public partial class BaseQuiver : Container, ICraftable, IAosItem return false; } - Item ammo = Ammo; + var ammo = Ammo; return ammo?.Deleted == false && ammo.Amount + item.Amount <= _capacity; } diff --git a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs index 8915c06f1..3713056c0 100644 --- a/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs +++ b/Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs @@ -124,7 +124,7 @@ public partial class TaxidermyKit : Item from.SendLocalizedMessage(1042278); from.SendLocalizedMessage(1042602); // You use your kit up making the trophy. - Mobile hunter = fish?.Fisher; + var hunter = fish?.Fisher; var weight = (int)(fish?.Weight ?? 0); fish?.Consume(); diff --git a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs index f94d27aa5..5d745e92b 100644 --- a/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs +++ b/Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs @@ -309,7 +309,7 @@ public partial class HouseRaffleStone : Item var xLong = 0; var yLat = 0; - int xMins = 0; + var xMins = 0; var yMins = 0; bool xEast = false, ySouth = false; diff --git a/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs b/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs index 0accc3b50..9b5a288b7 100644 --- a/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs +++ b/Projects/UOContent/Items/Special/Special Scrolls/PowerScroll.cs @@ -136,7 +136,7 @@ public partial class PowerScroll : SpecialScroll _skills = new SkillName[totalSkills]; Array.Copy(_preAosSkills, 0, _skills, 0, _preAosSkills.Length); - int pos = 0; + var pos = 0; if (Core.AOS) { diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs index 8559b4af1..384747e14 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs @@ -328,7 +328,7 @@ public partial class BannerDeed : Item, IRewardItem return; } - Banner banner = new Banner(_itemId + (info.ButtonID == (int)Buttons.East ? 1 : 0)); + var banner = new Banner(_itemId + (info.ButtonID == (int)Buttons.East ? 1 : 0)); _house.Addons.Add(banner); banner.IsRewardItem = _banner.IsRewardItem; diff --git a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs index 9d7c7d691..ca7ee3ae0 100644 --- a/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs +++ b/Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs @@ -198,7 +198,7 @@ public partial class CannonAddon : BaseAddon for (var count = Utility.Random(3); count > 0; count--) { - Point3D location = new Point3D( + var location = new Point3D( target.X + Utility.RandomMinMax(-1, 1), target.Y + Utility.RandomMinMax(-1, 1), target.Z diff --git a/Projects/UOContent/Items/Weapons/Abilities/ForceArrow.cs b/Projects/UOContent/Items/Weapons/Abilities/ForceArrow.cs index c554b8c3b..144b35f37 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/ForceArrow.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/ForceArrow.cs @@ -30,7 +30,7 @@ namespace Server.Items defender.Warmode = false; } - ForceArrowInfo info = GetInfo(attacker, defender); + var info = GetInfo(attacker, defender); if (info == null) { @@ -55,7 +55,7 @@ namespace Server.Items public static void BeginForceArrow(Mobile attacker, Mobile defender) { - ForceArrowInfo info = new ForceArrowInfo(attacker, defender); + var info = new ForceArrowInfo(attacker, defender); info.Timer = new ForceArrowTimer(info); if (_table.TryGetValue(attacker, out var list)) @@ -79,7 +79,7 @@ namespace Server.Items return; } - Mobile attacker = info.Attacker; + var attacker = info.Attacker; if (_table.TryGetValue(attacker, out var list) && list.Remove(info) && list.Count == 0) { @@ -93,7 +93,7 @@ namespace Server.Items { if (_table.TryGetValue(attacker, out var list)) { - foreach (ForceArrowInfo info in list) + foreach (var info in list) { if (info.Defender == defender) { @@ -109,7 +109,7 @@ namespace Server.Items { if (_table.TryGetValue(attacker, out var list)) { - foreach (ForceArrowInfo info in list) + foreach (var info in list) { if (info.Defender == defender) { diff --git a/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs b/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs index f38a6fef1..1600342cd 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/ForceOfNature.cs @@ -73,7 +73,7 @@ public class ForceOfNature : WeaponAbility if (t.Hits % 12 == 0) { - int duration = target.Skills[SkillName.MagicResist].Value >= 90.0 ? 1 : 2; + var duration = target.Skills[SkillName.MagicResist].Value >= 90.0 ? 1 : 2; target.Paralyze(TimeSpan.FromSeconds(duration)); target.FixedEffect(0x376A, 9, 32); diff --git a/Projects/UOContent/Items/Weapons/Abilities/FrenziedWhirlwind.cs b/Projects/UOContent/Items/Weapons/Abilities/FrenziedWhirlwind.cs index 9750f5f02..0ab3e130f 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/FrenziedWhirlwind.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/FrenziedWhirlwind.cs @@ -37,7 +37,7 @@ namespace Server.Items attacker.Skills.Ninjitsu.Value ) - 50.0) / 70.0 + 5)); - bool didEffect = false; + var didEffect = false; foreach (var m in attacker.GetMobilesInRange(1)) { diff --git a/Projects/UOContent/Items/Weapons/Abilities/InfusedThrow.cs b/Projects/UOContent/Items/Weapons/Abilities/InfusedThrow.cs index b5c7aa60a..05d9d48ae 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/InfusedThrow.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/InfusedThrow.cs @@ -26,7 +26,7 @@ public class InfusedThrow : WeaponAbility AOS.Damage(defender, attacker, 15, false, 0, 0, 0, 0, 0, 100); - IMount mount = defender.Mount; + var mount = defender.Mount; if ((defender.Mounted || defender.Flying || AnimalForm.UnderTransformation(defender)) && !attacker.Mounted && !attacker.Flying && defender is not ChaosDragoon && defender is not ChaosDragoonElite) diff --git a/Projects/UOContent/Items/Weapons/Abilities/LightningArrow.cs b/Projects/UOContent/Items/Weapons/Abilities/LightningArrow.cs index 5805fb406..0a88bc9a9 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/LightningArrow.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/LightningArrow.cs @@ -17,7 +17,7 @@ namespace Server.Items ClearCurrentAbility(attacker); - Map map = attacker.Map; + var map = attacker.Map; if (map == null || attacker.Weapon is not BaseWeapon weapon || !CheckMana(attacker, true)) { @@ -25,7 +25,7 @@ namespace Server.Items } using var list = PooledRefList.Create(); - foreach (Mobile m in worldLocation.Map.GetMobilesInRange(worldLocation.Location, 5)) + foreach (var m in worldLocation.Map.GetMobilesInRange(worldLocation.Location, 5)) { if (m != defender && m != attacker && SpellHelper.ValidIndirectTarget(attacker, m) && m is { Deleted: false, Alive: true } && attacker.CanSee(m) && attacker.CanBeHarmful(m) && diff --git a/Projects/UOContent/Items/Weapons/Abilities/MysticArc.cs b/Projects/UOContent/Items/Weapons/Abilities/MysticArc.cs index 560bafff2..d5be5a7d6 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/MysticArc.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/MysticArc.cs @@ -20,7 +20,7 @@ public class MysticArc : WeaponAbility return; } - BaseThrown weapon = attacker.Weapon as BaseThrown; + var weapon = attacker.Weapon as BaseThrown; if (weapon == null) { @@ -28,7 +28,7 @@ public class MysticArc : WeaponAbility } using var queue = PooledRefQueue.Create(); - foreach (Mobile m in attacker.GetMobilesInRange(weapon.MaxRange)) + foreach (var m in attacker.GetMobilesInRange(weapon.MaxRange)) { if (m == defender) { diff --git a/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs b/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs index 819b6543b..4508a16f5 100644 --- a/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs +++ b/Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs @@ -240,11 +240,11 @@ public abstract class WeaponAbility } var reqSecondarySkill = GetRequiredSecondarySkill(from); - SkillName secondarySkill = GetSecondarySkillName(from); + var secondarySkill = GetSecondarySkillName(from); if (RequiresSecondarySkill(from) && from.Skills[secondarySkill].Base < reqSecondarySkill) { - int loc = GetSkillLocalization(secondarySkill); + var loc = GetSkillLocalization(secondarySkill); if (loc == 1060184) { @@ -359,7 +359,7 @@ public abstract class WeaponAbility return false; } - string option = this switch + var option = this switch { ArmorIgnore _ => "Armor Ignore", ArmorPierce _ => "Armor Pierce", diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs index badb4ce1d..641cc8125 100644 --- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs +++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs @@ -1633,7 +1633,7 @@ public abstract partial class BaseWeapon { var positionChance = Utility.RandomDouble(); - Item armorItem = positionChance switch + var armorItem = positionChance switch { < 0.07 => defender.NeckArmor, < 0.14 => defender.HandArmor, @@ -1666,7 +1666,7 @@ public abstract partial class BaseWeapon var chance = Utility.RandomDouble(); - Item armorItem = chance switch + var armorItem = chance switch { < 0.07 => defender.NeckArmor, < 0.14 => defender.HandArmor, @@ -1685,7 +1685,7 @@ public abstract partial class BaseWeapon if (virtualArmor > 0) { - double scalar = chance switch + var scalar = chance switch { < 0.14 => 0.07, < 0.28 => 0.14, diff --git a/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs b/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs index 1c99668ad..66821f385 100644 --- a/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs +++ b/Projects/UOContent/Items/Weapons/Throwing/BaseThrown.cs @@ -18,7 +18,7 @@ public abstract partial class BaseThrown : BaseRanged { get { - int baseRange = MaxThrowRange; + var baseRange = MaxThrowRange; return Parent is Mobile attacker ? baseRange - 3 + (attacker.Str - AosStrengthReq) / ((140 - AosStrengthReq) / 3) diff --git a/Projects/UOContent/Misc/ClientVerification.cs b/Projects/UOContent/Misc/ClientVerification.cs index 893dc80b3..cbcc61360 100644 --- a/Projects/UOContent/Misc/ClientVerification.cs +++ b/Projects/UOContent/Misc/ClientVerification.cs @@ -128,8 +128,8 @@ namespace Server.Misc state.Mobile is PlayerMobile mobile && mobile.GameTime > _gameTimeLeniency; - bool shouldKick = false; - bool isKRClient = version.Type == ClientType.KR; + var shouldKick = false; + var isKRClient = version.Type == ClientType.KR; if (!isKRClient && UOClient.MinRequired != null && version < UOClient.MinRequired) { diff --git a/Projects/UOContent/Misc/CrashGuard.cs b/Projects/UOContent/Misc/CrashGuard.cs index b8c291bc8..1a6e12cc1 100644 --- a/Projects/UOContent/Misc/CrashGuard.cs +++ b/Projects/UOContent/Misc/CrashGuard.cs @@ -65,19 +65,19 @@ namespace Server.Misc private static void DirectoryCopy(string sourceDirName, string destDirName) { // Get the subdirectories for the specified directory. - DirectoryInfo dir = new DirectoryInfo(sourceDirName); - DirectoryInfo[] dirs = dir.GetDirectories(); + var dir = new DirectoryInfo(sourceDirName); + var dirs = dir.GetDirectories(); - FileInfo[] files = dir.GetFiles(); - foreach (FileInfo file in files) + var files = dir.GetFiles(); + foreach (var file in files) { - string tempPath = Path.Combine(destDirName, file.Name); + var tempPath = Path.Combine(destDirName, file.Name); file.CopyTo(tempPath, false); } - foreach (DirectoryInfo subdir in dirs) + foreach (var subdir in dirs) { - string tempPath = Path.Combine(destDirName, subdir.Name); + var tempPath = Path.Combine(destDirName, subdir.Name); DirectoryCopy(subdir.FullName, tempPath); } } diff --git a/Projects/UOContent/Misc/Guild.cs b/Projects/UOContent/Misc/Guild.cs index 66e4d5e2d..ca905ec4a 100644 --- a/Projects/UOContent/Misc/Guild.cs +++ b/Projects/UOContent/Misc/Guild.cs @@ -311,7 +311,7 @@ namespace Server.Guilds public void AllianceChat(Mobile from, int hue, string text) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); for (var i = 0; i < m_Members.Count; i++) { @@ -1115,7 +1115,7 @@ namespace Server.Guilds public static void Tidy(List list) { - for (int i = list.Count - 1; i >= 0; i--) + for (var i = list.Count - 1; i >= 0; i--) { var entry = list[i]; if (entry?.Disbanded != false) @@ -1468,7 +1468,7 @@ namespace Server.Guilds public void GuildChat(Mobile from, int hue, string text) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); for (var i = 0; i < Members.Count; i++) { diff --git a/Projects/UOContent/Misc/PacketThrottles.cs b/Projects/UOContent/Misc/PacketThrottles.cs index 9bd76ee75..fe0af280a 100644 --- a/Projects/UOContent/Misc/PacketThrottles.cs +++ b/Projects/UOContent/Misc/PacketThrottles.cs @@ -45,7 +45,7 @@ public static class PacketThrottles Delays[0x75] = 500; // Rename request } - for (int i = 0; i < 0x100; i++) + for (var i = 0; i < 0x100; i++) { if (Delays[i] > 0) { @@ -66,7 +66,7 @@ public static class PacketThrottles return; } - int packetID = e.GetInt32(0); + var packetID = e.GetInt32(0); if (packetID is < 0 or > 0x100) { @@ -87,8 +87,8 @@ public static class PacketThrottles return; } - int packetID = e.GetInt32(0); - int delay = e.GetInt32(1); + var packetID = e.GetInt32(0); + var delay = e.GetInt32(1); if (packetID is < 0 or > 0x100) { diff --git a/Projects/UOContent/Misc/ServerList.cs b/Projects/UOContent/Misc/ServerList.cs index 56cbaad2a..edf2aa800 100644 --- a/Projects/UOContent/Misc/ServerList.cs +++ b/Projects/UOContent/Misc/ServerList.cs @@ -212,7 +212,7 @@ namespace Server.Misc try { // This isn't called often so we don't need to optimize - using HttpClient hc = new HttpClient(); + using var hc = new HttpClient(); hc.Timeout = TimeSpan.FromSeconds(1); // Only wait 1 second var ipAddress = hc.GetStringAsync(_ipifyUrl).Result; return IPAddress.Parse(ipAddress); diff --git a/Projects/UOContent/Misc/ShrinkTable.cs b/Projects/UOContent/Misc/ShrinkTable.cs index 2c4f71093..956be85de 100644 --- a/Projects/UOContent/Misc/ShrinkTable.cs +++ b/Projects/UOContent/Misc/ShrinkTable.cs @@ -37,7 +37,7 @@ namespace Server throw new JsonException($"Failed to deserialize {path}."); } - int length = 0; + var length = 0; foreach (var key in table.Keys) { diff --git a/Projects/UOContent/Misc/StaminaSystem.cs b/Projects/UOContent/Misc/StaminaSystem.cs index e4704e310..a9afc9522 100644 --- a/Projects/UOContent/Misc/StaminaSystem.cs +++ b/Projects/UOContent/Misc/StaminaSystem.cs @@ -358,7 +358,7 @@ public static class StaminaSystem if (from is PlayerMobile pm) { - ref StepsTaken stepsTaken = ref GetOrCreateStepsTaken(pm, out var created); + ref var stepsTaken = ref GetOrCreateStepsTaken(pm, out var created); if (!created) { RegenSteps(ref stepsTaken, removeOnInvalidation: false); @@ -474,7 +474,7 @@ public static class StaminaSystem { using var queue = PooledRefQueue.Create(); - ref StepsTaken stepsTaken = ref Unsafe.NullRef(); + ref var stepsTaken = ref Unsafe.NullRef(); foreach (var m in _resetHash) { stepsTaken = ref GetStepsTaken(m, out var exists); diff --git a/Projects/UOContent/Misc/TreasureMapProtection.cs b/Projects/UOContent/Misc/TreasureMapProtection.cs index 0fc5d1283..6741edd62 100644 --- a/Projects/UOContent/Misc/TreasureMapProtection.cs +++ b/Projects/UOContent/Misc/TreasureMapProtection.cs @@ -23,7 +23,7 @@ namespace Server public static void Initialize() { var filePath = Path.Combine(Core.BaseDirectory, "Data/treasure.cfg"); - int i = 0; + var i = 0; if (File.Exists(filePath)) { diff --git a/Projects/UOContent/Mobiles/AI/BaseAI/DebugInterpolatedStringHandler.cs b/Projects/UOContent/Mobiles/AI/BaseAI/DebugInterpolatedStringHandler.cs index da1f80019..05630d2f8 100644 --- a/Projects/UOContent/Mobiles/AI/BaseAI/DebugInterpolatedStringHandler.cs +++ b/Projects/UOContent/Mobiles/AI/BaseAI/DebugInterpolatedStringHandler.cs @@ -106,7 +106,7 @@ public ref struct DebugInterpolatedStringHandler [MethodImpl(MethodImplOptions.AggressiveInlining)] // used only on a few hot paths public void Clear() { - char[]? toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; this = default; // defensive clear if (toReturn is not null) { @@ -129,8 +129,8 @@ public ref struct DebugInterpolatedStringHandler if (value.Length == 1) { - Span chars = _chars; - int pos = _pos; + var chars = _chars; + var pos = _pos; if ((uint)pos < (uint)chars.Length) { chars[pos] = value[0]; @@ -354,7 +354,7 @@ public ref struct DebugInterpolatedStringHandler return; } - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value); if (alignment != 0) { @@ -373,7 +373,7 @@ public ref struct DebugInterpolatedStringHandler return; } - int startingPos = _pos; + var startingPos = _pos; AppendFormatted(value, format); if (alignment != 0) { @@ -414,14 +414,14 @@ public ref struct DebugInterpolatedStringHandler return; } - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingRequired = alignment - value.Length; + var paddingRequired = alignment - value.Length; if (paddingRequired <= 0) { // The value is as large or larger than the required amount of padding, @@ -539,7 +539,7 @@ public ref struct DebugInterpolatedStringHandler Debug.Assert(_hasCustomFormatter); Debug.Assert(_provider != null); - ICustomFormatter? formatter = (ICustomFormatter?)_provider.GetFormat(typeof(ICustomFormatter)); + var formatter = (ICustomFormatter?)_provider.GetFormat(typeof(ICustomFormatter)); Debug.Assert(formatter != null, "An incorrectly written provider said it implemented ICustomFormatter, and then didn't"); if (formatter?.Format(format, value, _provider) is string customFormatted) @@ -556,16 +556,16 @@ public ref struct DebugInterpolatedStringHandler Debug.Assert(startingPos >= 0 && startingPos <= _pos); Debug.Assert(alignment != 0); - int charsWritten = _pos - startingPos; + var charsWritten = _pos - startingPos; - bool leftAlign = false; + var leftAlign = false; if (alignment < 0) { leftAlign = true; alignment = -alignment; } - int paddingNeeded = alignment - charsWritten; + var paddingNeeded = alignment - charsWritten; if (paddingNeeded > 0) { EnsureCapacityForAdditionalChars(paddingNeeded); @@ -645,13 +645,13 @@ public ref struct DebugInterpolatedStringHandler // ints that could technically overflow if someone tried to, for example, append a huge string to a huge string, we also clamp to int.MaxValue. // Even if the array creation fails in such a case, we may later fail in ToStringAndClear. - uint newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_chars.Length * 2, 0x3FFFFFDF)); - int arraySize = (int)Math.Clamp(newCapacity, MinimumArrayPoolLength, int.MaxValue); + var newCapacity = Math.Max(requiredMinCapacity, Math.Min((uint)_chars.Length * 2, 0x3FFFFFDF)); + var arraySize = (int)Math.Clamp(newCapacity, MinimumArrayPoolLength, int.MaxValue); - char[] newArray = STArrayPool.Shared.Rent(arraySize); + var newArray = STArrayPool.Shared.Rent(arraySize); _chars[.._pos].CopyTo(newArray); - char[]? toReturn = _arrayToReturnToPool; + var toReturn = _arrayToReturnToPool; _chars = _arrayToReturnToPool = newArray; if (toReturn is not null) diff --git a/Projects/UOContent/Mobiles/AI/BaseAI/PetOrders.cs b/Projects/UOContent/Mobiles/AI/BaseAI/PetOrders.cs index 807fba3ca..bc82d001c 100644 --- a/Projects/UOContent/Mobiles/AI/BaseAI/PetOrders.cs +++ b/Projects/UOContent/Mobiles/AI/BaseAI/PetOrders.cs @@ -354,8 +354,8 @@ public abstract partial class BaseAI continue; } - bool isAttackingPet = aggr.Combatant == Mobile; - bool isAttackingMaster = controlMaster != null && aggr.Combatant == controlMaster; + var isAttackingPet = aggr.Combatant == Mobile; + var isAttackingMaster = controlMaster != null && aggr.Combatant == controlMaster; if (isAttackingPet || isAttackingMaster) { diff --git a/Projects/UOContent/Mobiles/AI/ThiefAI.cs b/Projects/UOContent/Mobiles/AI/ThiefAI.cs index 2d67de801..0fa37bbc9 100644 --- a/Projects/UOContent/Mobiles/AI/ThiefAI.cs +++ b/Projects/UOContent/Mobiles/AI/ThiefAI.cs @@ -73,7 +73,7 @@ public class ThiefAI : BaseAI { this.DebugSayFormatted($"Trying to steal from {combatant.Name}."); - bool didSteal = TryStealFrom(combatant); + var didSteal = TryStealFrom(combatant); didSteal = TryStealFrom(combatant) || didSteal; didSteal = TryStealFrom(combatant) || didSteal; didSteal = TryStealFrom(combatant) || didSteal; diff --git a/Projects/UOContent/Mobiles/Abilities/Summon Undead/SummonUndeadCounter.cs b/Projects/UOContent/Mobiles/Abilities/Summon Undead/SummonUndeadCounter.cs index 0e634dcca..3666d21ef 100644 --- a/Projects/UOContent/Mobiles/Abilities/Summon Undead/SummonUndeadCounter.cs +++ b/Projects/UOContent/Mobiles/Abilities/Summon Undead/SummonUndeadCounter.cs @@ -27,7 +27,7 @@ public abstract class SummonUndeadCounter : MonsterAbility var amount = AmountToSummon - source.Followers; var distance = SummonRange; - int willTransform = !source.Paralyzed && ChanceToPolymorph > 0 && ChanceToPolymorph > Utility.RandomDouble() + var willTransform = !source.Paralyzed && ChanceToPolymorph > 0 && ChanceToPolymorph > Utility.RandomDouble() ? Utility.Random(amount) : -1; diff --git a/Projects/UOContent/Mobiles/BaseCreature.cs b/Projects/UOContent/Mobiles/BaseCreature.cs index b32ea2aff..8138d497a 100644 --- a/Projects/UOContent/Mobiles/BaseCreature.cs +++ b/Projects/UOContent/Mobiles/BaseCreature.cs @@ -3161,7 +3161,7 @@ namespace Server.Mobiles var topDamage = rights[0].m_Damage; - int minDamage = hitsMax switch + var minDamage = hitsMax switch { >= 3000 => topDamage / 16, >= 1000 => topDamage / 8, @@ -3840,7 +3840,7 @@ namespace Server.Mobiles IsDeadPet = false; - Span buffer = stackalloc byte[OutgoingMobilePackets.BondedStatusPacketLength].InitializePacket(); + var buffer = stackalloc byte[OutgoingMobilePackets.BondedStatusPacketLength].InitializePacket(); OutgoingMobilePackets.CreateBondedStatus(buffer, Serial, false); Effects.SendPacket(Location, Map, buffer); @@ -4233,7 +4233,7 @@ namespace Server.Mobiles if (amount > 0) { - int stamGain = dropped switch + var stamGain = dropped switch { Gold => amount - 50, _ => amount * 15 - 50 @@ -4254,7 +4254,7 @@ namespace Server.Mobiles else if (m_Loyalty < MaxLoyalty) { // Calculate the loyalty increase - int loyaltyIncrease = Utility.CoinFlips(amount, MaxLoyaltyIncrease) * 10; + var loyaltyIncrease = Utility.CoinFlips(amount, MaxLoyaltyIncrease) * 10; if (loyaltyIncrease > 0) // Only update if there's an actual increase { diff --git a/Projects/UOContent/Mobiles/Hireables/BaseHire.cs b/Projects/UOContent/Mobiles/Hireables/BaseHire.cs index aa4ba1cda..e3fbadd97 100644 --- a/Projects/UOContent/Mobiles/Hireables/BaseHire.cs +++ b/Projects/UOContent/Mobiles/Hireables/BaseHire.cs @@ -111,7 +111,7 @@ public partial class BaseHire : BaseCreature public virtual bool AddHire(Mobile m) { - Mobile owner = GetOwner(); + var owner = GetOwner(); if (owner != null) { @@ -259,7 +259,7 @@ public partial class BaseHire : BaseCreature hire.NextPay = Core.Now + GetInterval(); - int pay = hire.Pay; + var pay = hire.Pay; if (hire.HoldGold <= pay) { diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs index f25f03497..8fbfc9a15 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/SavageShaman.cs @@ -235,7 +235,7 @@ namespace Server.Mobiles total -= (dist - 3.0) * 10.0; } - int level = total switch + var level = total switch { >= 200.0 => Utility.Random(10) == 0 ? 3 : 2, > 170.0 => 2, diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs index 89f7f3d8b..e9a878c95 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerEternal.cs @@ -96,7 +96,7 @@ namespace Server.Mobiles return; } - double scalar = queue.Count switch + var scalar = queue.Count switch { 1 => 0.75, 2 => 0.50, diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs index 1da9656cd..ffc5f3812 100644 --- a/Projects/UOContent/Mobiles/PlayerMobile.cs +++ b/Projects/UOContent/Mobiles/PlayerMobile.cs @@ -855,7 +855,7 @@ namespace Server.Mobiles if (Core.AOS) { - foreach (Mobile m in Map.GetMobilesAt(location)) + foreach (var m in Map.GetMobilesAt(location)) { if (m.Z >= location.Z && m.Z < location.Z + 16 && (!m.Hidden || m.AccessLevel == AccessLevel.Player)) { @@ -2731,7 +2731,7 @@ namespace Server.Mobiles private static void SendToStaffMessage(PlayerMobile from, string text) { - Span buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); + var buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket(); foreach (var ns in from.GetClientsInRange(8)) { @@ -2841,7 +2841,7 @@ namespace Server.Mobiles base.Deserialize(reader); var version = reader.ReadInt(); - VirtueContext virtues = version < 32 ? Virtues : null; + var virtues = version < 32 ? Virtues : null; switch (version) { diff --git a/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs b/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs index 5c0187da0..462307be3 100644 --- a/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs +++ b/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs @@ -857,7 +857,7 @@ public class EscortDestinationInfo _table = new Dictionary(); - foreach (Region r in list) + foreach (var r in list) { if (r is DungeonRegion or TownRegion && r.Name != null) { diff --git a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs index a1496d07c..87f5591e4 100644 --- a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs @@ -1191,7 +1191,7 @@ namespace Server.Mobiles return false; } - long totalCostLong = (long)totalCost + bii.Price * amount; + var totalCostLong = (long)totalCost + bii.Price * amount; if (totalCostLong > int.MaxValue) { diff --git a/Projects/UOContent/Multis/Boats/BaseBoat.cs b/Projects/UOContent/Multis/Boats/BaseBoat.cs index 6a6d68666..167ae2202 100644 --- a/Projects/UOContent/Multis/Boats/BaseBoat.cs +++ b/Projects/UOContent/Multis/Boats/BaseBoat.cs @@ -1372,7 +1372,7 @@ namespace Server.Multis } // Changing the interval or flipping between commands: "Forward" and "Forward One" - TimeSpan delay = TimeSpan.Zero; + var delay = TimeSpan.Zero; if (interval.TotalMilliseconds > Math.Abs(moverTimerNext)) { var addedDelay = (int)(interval.TotalMilliseconds - Math.Abs(moverTimerNext)); @@ -1789,7 +1789,7 @@ namespace Server.Multis list.Add(e); } - Span moveBoatPacket = stackalloc byte[BoatPackets.GetMoveBoatHSPacketLength(list.Count)] + var moveBoatPacket = stackalloc byte[BoatPackets.GetMoveBoatHSPacketLength(list.Count)] .InitializePacket(); // Packet must be sent before actual locations are changed diff --git a/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs b/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs index 69ddadd88..7c859a046 100644 --- a/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs +++ b/Projects/UOContent/Multis/Boats/BaseDockedBoat.cs @@ -146,7 +146,7 @@ public abstract partial class BaseDockedBoat : Item return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Multis/Boats/BoatPackets.cs b/Projects/UOContent/Multis/Boats/BoatPackets.cs index c5512f225..3ff450564 100644 --- a/Projects/UOContent/Multis/Boats/BoatPackets.cs +++ b/Projects/UOContent/Multis/Boats/BoatPackets.cs @@ -74,7 +74,7 @@ public static class BoatPackets return; } - Span moveBoatPacket = stackalloc byte[GetMoveBoatHSPacketLength(entities.Count)] + var moveBoatPacket = stackalloc byte[GetMoveBoatHSPacketLength(entities.Count)] .InitializePacket(); CreateMoveBoatHS(moveBoatPacket, boat, entities, d, speed, xOffset, yOffset); @@ -113,7 +113,7 @@ public static class BoatPackets continue; } - Span buffer = builder.GetSpan(OutgoingEntityPackets.MaxWorldEntityPacketLength).InitializePacket(); + var buffer = builder.GetSpan(OutgoingEntityPackets.MaxWorldEntityPacketLength).InitializePacket(); var bytesWritten = OutgoingEntityPackets.CreateWorldEntity(buffer, entity, true); builder.Advance(bytesWritten); } diff --git a/Projects/UOContent/Multis/HousePlacementTarget.cs b/Projects/UOContent/Multis/HousePlacementTarget.cs index 142d80052..98b1653bb 100644 --- a/Projects/UOContent/Multis/HousePlacementTarget.cs +++ b/Projects/UOContent/Multis/HousePlacementTarget.cs @@ -16,7 +16,7 @@ public class HousePlacementTarget : MultiTarget return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Multis/Houses/BaseHouse.cs b/Projects/UOContent/Multis/Houses/BaseHouse.cs index 4be71dc51..e70e81650 100644 --- a/Projects/UOContent/Multis/Houses/BaseHouse.cs +++ b/Projects/UOContent/Multis/Houses/BaseHouse.cs @@ -793,8 +793,8 @@ namespace Server.Multis public List AvailableVendorsFor(Mobile m) { - List list = new List(); - foreach (PlayerVendor vendor in PlayerVendors) + var list = new List(); + foreach (var vendor in PlayerVendors) { if (vendor.CanInteractWith(m, false)) { diff --git a/Projects/UOContent/Multis/Houses/HousePackets.cs b/Projects/UOContent/Multis/Houses/HousePackets.cs index 7f8308c0d..587a8650a 100644 --- a/Projects/UOContent/Multis/Houses/HousePackets.cs +++ b/Projects/UOContent/Multis/Houses/HousePackets.cs @@ -119,7 +119,7 @@ public static class HousePackets int z = mte.OffsetZ; var floor = TileData.ItemTable[mte.ItemId & TileData.MaxItemValue].Height <= 0; - int plane = z switch + var plane = z switch { 0 => 0, 7 => 1, @@ -195,7 +195,7 @@ public static class HousePackets continue; } - int size = i switch + var size = i switch { 0 => planeLength, < 5 => (width - 1) * (height - 2) * 2, @@ -208,7 +208,7 @@ public static class HousePackets writer.Write((byte)(0x20 | i)); writer.Write((byte)size); - WritePacked(source, ref writer, out int destLength); + WritePacked(source, ref writer, out var destLength); totalLength += 4 + destLength; } @@ -224,7 +224,7 @@ public static class HousePackets writer.Write((byte)(9 + index++)); writer.Write((byte)size); - WritePacked(source, ref writer, out int destLength); + WritePacked(source, ref writer, out var destLength); totalLength += 4 + destLength; totalPlanes++; } diff --git a/Projects/UOContent/Multis/Houses/HousePlacement.cs b/Projects/UOContent/Multis/Houses/HousePlacement.cs index 972b43f2e..13760a318 100644 --- a/Projects/UOContent/Multis/Houses/HousePlacement.cs +++ b/Projects/UOContent/Multis/Houses/HousePlacement.cs @@ -377,10 +377,10 @@ namespace Server.Multis var absYOffset = Math.Abs(yOffset); var yardPoint = new Point2D(tileX + xOffset, tileY + yOffset); - bool inSouthYard = yOffset > 0 && yOffset <= yardSize && absXOffset <= 1; - bool inEastYard = xOffset > 0 && xOffset <= yardSize && absYOffset <= 1; - bool inNorthYard = yOffset < 0 && yOffset >= -yardSize && absXOffset <= 1; - bool inWestYard = xOffset < 0 && xOffset >= -yardSize && absYOffset <= 1; + var inSouthYard = yOffset > 0 && yOffset <= yardSize && absXOffset <= 1; + var inEastYard = xOffset > 0 && xOffset <= yardSize && absYOffset <= 1; + var inNorthYard = yOffset < 0 && yOffset >= -yardSize && absXOffset <= 1; + var inWestYard = xOffset < 0 && xOffset >= -yardSize && absYOffset <= 1; // Check each house at this point foreach (var house in map.GetMultisInSector(yardPoint)) diff --git a/Projects/UOContent/Multis/Houses/HousePlacementTool.cs b/Projects/UOContent/Multis/Houses/HousePlacementTool.cs index 31007b322..7b8f241a9 100644 --- a/Projects/UOContent/Multis/Houses/HousePlacementTool.cs +++ b/Projects/UOContent/Multis/Houses/HousePlacementTool.cs @@ -234,7 +234,7 @@ public class NewHousePlacementTarget : MultiTarget return; } - Point3D p = ip switch + var p = ip switch { Item item => item.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Network/EntityPackets.cs b/Projects/UOContent/Network/EntityPackets.cs index 190026e65..a58fd2341 100644 --- a/Projects/UOContent/Network/EntityPackets.cs +++ b/Projects/UOContent/Network/EntityPackets.cs @@ -38,7 +38,7 @@ namespace Server.Network using var builder = new PacketContainerBuilder(stackalloc byte[minLength]); - Span buffer = builder.GetSpan(OutgoingEntityPackets.MaxWorldEntityPacketLength); + var buffer = builder.GetSpan(OutgoingEntityPackets.MaxWorldEntityPacketLength); foreach (var entity in entities) { diff --git a/Projects/UOContent/Network/MapUO.cs b/Projects/UOContent/Network/MapUO.cs index 695d9fd01..521e16d34 100644 --- a/Projects/UOContent/Network/MapUO.cs +++ b/Projects/UOContent/Network/MapUO.cs @@ -31,14 +31,14 @@ public static class MapUO public static void QueryGuildMemberLocations(NetState state, SpanReader reader) { - Mobile from = state.Mobile; + var from = state.Mobile; state.SendGuildMemberLocations(from, from.Guild as Guild, reader.ReadBoolean()); } public static void QueryPartyMemberLocations(NetState state, SpanReader reader) { - Mobile from = state.Mobile; + var from = state.Mobile; var party = Party.Get(from); if (party != null) @@ -62,7 +62,7 @@ public static class MapUO writer.Write((byte)0x02); // Command writer.Write(count > 0 && sendLocations); - bool sendPacket = false; + var sendPacket = false; for (var i = 0; i < count; i++) { var m = guild!.Members[i]; @@ -121,11 +121,11 @@ public static class MapUO writer.Seek(2, SeekOrigin.Current); writer.Write((byte)0x01); // Command - bool sendPacket = false; + var sendPacket = false; for (var i = 0; i < count; i++) { var pmi = party!.Members[i]; - Mobile mob = pmi?.Mobile; + var mob = pmi?.Mobile; if (mob?.NetState == null || mob == from) { diff --git a/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs b/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs index 1026c986a..8711d3f7f 100644 --- a/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingAccountPackets.cs @@ -116,7 +116,7 @@ public static class IncomingAccountPackets var female = genderRace % 2 != 0; var raceID = state.StygianAbyss ? (byte)(genderRace < 4 ? 0 : genderRace / 2 - 1) : (byte)(genderRace / 2); - Race race = Race.Races[raceID] ?? Race.DefaultRace; + var race = Race.Races[raceID] ?? Race.DefaultRace; var info = state.CityInfo; var a = state.Account; diff --git a/Projects/UOContent/Network/Packets/IncomingEntityPackets.cs b/Projects/UOContent/Network/Packets/IncomingEntityPackets.cs index 2ad4bb7db..91686cde9 100644 --- a/Projects/UOContent/Network/Packets/IncomingEntityPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingEntityPackets.cs @@ -72,7 +72,7 @@ public static class IncomingEntityPackets } else { - Serial s = (Serial)value; + var s = (Serial)value; if (s.IsMobile) { @@ -106,7 +106,7 @@ public static class IncomingEntityPackets { var from = state.Mobile; - Serial s = (Serial)reader.ReadUInt32(); + var s = (Serial)reader.ReadUInt32(); if (s.IsMobile) { @@ -169,7 +169,7 @@ public static class IncomingEntityPackets while (reader.Remaining > 0) { - Serial s = (Serial)reader.ReadUInt32(); + var s = (Serial)reader.ReadUInt32(); if (s.IsMobile) { diff --git a/Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs b/Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs index c593a56a2..dfc3382d3 100644 --- a/Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingExtendedCommandPackets.cs @@ -263,7 +263,7 @@ public static partial class IncomingExtendedCommandPackets return; } - Item spellbook = reader.ReadInt16() == 1 ? World.FindItem((Serial)reader.ReadUInt32()) : null; + var spellbook = reader.ReadInt16() == 1 ? World.FindItem((Serial)reader.ReadUInt32()) : null; var spellID = reader.ReadInt16() - 1; Spellbook.CastSpellRequest(from, spellID, spellbook); @@ -361,7 +361,7 @@ public static partial class IncomingExtendedCommandPackets var from = state.Mobile; - Serial s = (Serial)reader.ReadUInt32(); + var s = (Serial)reader.ReadUInt32(); if (s.IsMobile) { diff --git a/Projects/UOContent/Network/Packets/IncomingItemPackets.cs b/Projects/UOContent/Network/Packets/IncomingItemPackets.cs index db47dbb31..2b3c46e6c 100644 --- a/Projects/UOContent/Network/Packets/IncomingItemPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingItemPackets.cs @@ -78,7 +78,7 @@ public static class IncomingItemPackets reader.ReadByte(); // Grid Location? } - Serial dest = (Serial)reader.ReadUInt32(); + var dest = (Serial)reader.ReadUInt32(); var loc = new Point3D(x, y, z); diff --git a/Projects/UOContent/Network/Packets/IncomingMovementPackets.cs b/Projects/UOContent/Network/Packets/IncomingMovementPackets.cs index 7f4884e07..0b4134212 100644 --- a/Projects/UOContent/Network/Packets/IncomingMovementPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingMovementPackets.cs @@ -37,7 +37,7 @@ public static class IncomingMovementPackets } var steps = reader.ReadByte(); - for (int i = 0; i < steps; i++) + for (var i = 0; i < steps; i++) { var t1 = reader.ReadUInt64(); // start time? var t2 = reader.ReadUInt64(); // end time? diff --git a/Projects/UOContent/Network/Packets/IncomingTargetingPackets.cs b/Projects/UOContent/Network/Packets/IncomingTargetingPackets.cs index 9d68bccf8..a48ca4db3 100644 --- a/Projects/UOContent/Network/Packets/IncomingTargetingPackets.cs +++ b/Projects/UOContent/Network/Packets/IncomingTargetingPackets.cs @@ -86,7 +86,7 @@ public static class IncomingTargetingPackets } } - int hue = 0; + var hue = 0; var valid = false; var eable = t.DisallowMultis diff --git a/Projects/UOContent/Network/ProtocolExtensions.cs b/Projects/UOContent/Network/ProtocolExtensions.cs index abbec8b46..73ddc91e5 100644 --- a/Projects/UOContent/Network/ProtocolExtensions.cs +++ b/Projects/UOContent/Network/ProtocolExtensions.cs @@ -39,7 +39,7 @@ namespace Server.Network { int cmd = reader.ReadByte(); - PacketHandler ph = packetHandlers[cmd]; + var ph = packetHandlers[cmd]; if (ph == null) { diff --git a/Projects/UOContent/Skills/AntiMacroSystem.cs b/Projects/UOContent/Skills/AntiMacroSystem.cs index ffc4e0bc0..60fcc899f 100644 --- a/Projects/UOContent/Skills/AntiMacroSystem.cs +++ b/Projects/UOContent/Skills/AntiMacroSystem.cs @@ -203,7 +203,7 @@ public static class AntiMacroSystem _antiMacroTable ??= new Dictionary(); // Hot path so use optimized code - ref PlayerAntiMacro antiMacro = ref CollectionsMarshal.GetValueRefOrAddDefault(_antiMacroTable, pm, out var exists); + ref var antiMacro = ref CollectionsMarshal.GetValueRefOrAddDefault(_antiMacroTable, pm, out var exists); if (!exists) { antiMacro = new PlayerAntiMacro(); @@ -241,8 +241,8 @@ public static class AntiMacroSystem var now = Core.Now; // Potential hot path, so use optimized code - ref CountAndTimeStamp _countTimeStamp = - ref CollectionsMarshal.GetValueRefOrAddDefault(_antiMacroTracking, (skill, obj), out bool exists); + ref var _countTimeStamp = + ref CollectionsMarshal.GetValueRefOrAddDefault(_antiMacroTracking, (skill, obj), out var exists); _countTimeStamp._count++; diff --git a/Projects/UOContent/Skills/Begging.cs b/Projects/UOContent/Skills/Begging.cs index 50a5e1a9d..83180baca 100644 --- a/Projects/UOContent/Skills/Begging.cs +++ b/Projects/UOContent/Skills/Begging.cs @@ -165,8 +165,8 @@ namespace Server.SkillHandlers const int SkillCooldown = 10000; // 10s // Calculate how much time has passed since the targeter was opened - int ticksSinceTargeter = (int)(Core.TickCount - (_from.NextSkillTime - TargeterCooldown)); - int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); + var ticksSinceTargeter = (int)(Core.TickCount - (_from.NextSkillTime - TargeterCooldown)); + var remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); _from.NextSkillTime = Core.TickCount + remainingCooldown; } } diff --git a/Projects/UOContent/Skills/DetectHidden.cs b/Projects/UOContent/Skills/DetectHidden.cs index b53aef996..85f73c085 100644 --- a/Projects/UOContent/Skills/DetectHidden.cs +++ b/Projects/UOContent/Skills/DetectHidden.cs @@ -36,7 +36,7 @@ namespace Server.SkillHandlers { var foundAnyone = false; - Point3D p = targ switch + var p = targ switch { Mobile mobile => mobile.Location, Item item => item.Location, @@ -118,8 +118,8 @@ namespace Server.SkillHandlers const int SkillCooldown = 10000; // 10s // Calculate how much time has passed since the targeter was opened - int ticksSinceTargeter = (int)(Core.TickCount - (src.NextSkillTime - TargeterCooldown)); - int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); + var ticksSinceTargeter = (int)(Core.TickCount - (src.NextSkillTime - TargeterCooldown)); + var remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); src.NextSkillTime = Core.TickCount + remainingCooldown; } } diff --git a/Projects/UOContent/Skills/ForensicEval.cs b/Projects/UOContent/Skills/ForensicEval.cs index b2fd41939..32a04a2f4 100644 --- a/Projects/UOContent/Skills/ForensicEval.cs +++ b/Projects/UOContent/Skills/ForensicEval.cs @@ -72,7 +72,7 @@ namespace Server.SkillHandlers if (c.Looters.Count > 0) { var sb = ValueStringBuilder.Create(128); - int i = 0; + var i = 0; foreach (var looter in c.Looters) { if (i == c.Looters.Count - 1) diff --git a/Projects/UOContent/Skills/ItemIdentification.cs b/Projects/UOContent/Skills/ItemIdentification.cs index 9d09208fb..19ddf585d 100644 --- a/Projects/UOContent/Skills/ItemIdentification.cs +++ b/Projects/UOContent/Skills/ItemIdentification.cs @@ -37,7 +37,7 @@ public static class ItemIdentification return; } - bool identified = false; + var identified = false; if (o is Item item) { diff --git a/Projects/UOContent/Skills/Stealing.cs b/Projects/UOContent/Skills/Stealing.cs index 04aa3e278..a7cd5eb7f 100644 --- a/Projects/UOContent/Skills/Stealing.cs +++ b/Projects/UOContent/Skills/Stealing.cs @@ -414,8 +414,8 @@ public static class Stealing const int SkillCooldown = 10000; // 10s // Calculate how much time has passed since the targeter was opened - int ticksSinceTargeter = (int)(Core.TickCount - (from.NextSkillTime - TargeterCooldown)); - int remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); + var ticksSinceTargeter = (int)(Core.TickCount - (from.NextSkillTime - TargeterCooldown)); + var remainingCooldown = Math.Max(0, SkillCooldown - ticksSinceTargeter); from.NextSkillTime = Core.TickCount + remainingCooldown; } } diff --git a/Projects/UOContent/Spells/Base/SpecialMove.cs b/Projects/UOContent/Spells/Base/SpecialMove.cs index c7dc2092e..cd77acb88 100644 --- a/Projects/UOContent/Spells/Base/SpecialMove.cs +++ b/Projects/UOContent/Spells/Base/SpecialMove.cs @@ -153,7 +153,7 @@ namespace Server.Spells return false; } - string option = this switch + var option = this switch { Backstab => "Backstab", DeathStrike => "Death Strike", diff --git a/Projects/UOContent/Spells/Base/Spell.cs b/Projects/UOContent/Spells/Base/Spell.cs index 16af9faf8..de8d8563c 100644 --- a/Projects/UOContent/Spells/Base/Spell.cs +++ b/Projects/UOContent/Spells/Base/Spell.cs @@ -163,7 +163,7 @@ namespace Server.Spells { _contextTable[type] = context = new DelayedDamageContextWrapper(); - for (int i = 0; i < damageStacking.Length; i++) + for (var i = 0; i < damageStacking.Length; i++) { _contextTable.Add(damageStacking[i], context); } diff --git a/Projects/UOContent/Spells/Base/SpellHelper.cs b/Projects/UOContent/Spells/Base/SpellHelper.cs index 82de9a522..ccdf9b69d 100644 --- a/Projects/UOContent/Spells/Base/SpellHelper.cs +++ b/Projects/UOContent/Spells/Base/SpellHelper.cs @@ -1017,7 +1017,7 @@ namespace Server.Spells bcTarget?.AlterSpellDamageFrom(from, ref dmg); - if (Feint.GetDamageReduction(from, target, out int feintReduction)) + if (Feint.GetDamageReduction(from, target, out var feintReduction)) { // example: 35 damage * 50 / 100 = 17 damage dmg -= dmg * feintReduction / 100; diff --git a/Projects/UOContent/Spells/Bushido/MomentumStrike.cs b/Projects/UOContent/Spells/Bushido/MomentumStrike.cs index 9a0883d71..d6164d8e7 100644 --- a/Projects/UOContent/Spells/Bushido/MomentumStrike.cs +++ b/Projects/UOContent/Spells/Bushido/MomentumStrike.cs @@ -41,7 +41,7 @@ namespace Server.Spells.Bushido return; } - Mobile target = queue.PeekRandom(); + var target = queue.PeekRandom(); var damageBonus = attacker.Skills.Bushido.Value / 100.0; diff --git a/Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs b/Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs index 4af9d1fa8..c34207646 100644 --- a/Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs +++ b/Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs @@ -81,7 +81,7 @@ namespace Server.Spells.Chivalry } else { - bool sendEffect = false; + var sendEffect = false; if (m.Poisoned && m.CurePoison(Caster)) { diff --git a/Projects/UOContent/Spells/Chivalry/RemoveCurse.cs b/Projects/UOContent/Spells/Chivalry/RemoveCurse.cs index 6137433b9..0913c0a27 100644 --- a/Projects/UOContent/Spells/Chivalry/RemoveCurse.cs +++ b/Projects/UOContent/Spells/Chivalry/RemoveCurse.cs @@ -49,7 +49,7 @@ namespace Server.Spells.Chivalry * Chance of removing curse is affected by Caster's Karma. */ - int chance = Caster.Karma switch + var chance = Caster.Karma switch { < -5000 => 0, < 0 => (int)Math.Sqrt(20000 + Caster.Karma) - 122, diff --git a/Projects/UOContent/Spells/Mysticism/BombardSpell.cs b/Projects/UOContent/Spells/Mysticism/BombardSpell.cs index 1847ac421..baaea9c0c 100644 --- a/Projects/UOContent/Spells/Mysticism/BombardSpell.cs +++ b/Projects/UOContent/Spells/Mysticism/BombardSpell.cs @@ -67,7 +67,7 @@ public class BombardSpell : MysticSpell, ITargetingSpell var damageSkill = GetDamageSkill(Caster); var resist = GetResistSkill(m); - int secs = Math.Max(0, (int)(damageSkill / 10 - resist / 10)); + var secs = Math.Max(0, (int)(damageSkill / 10 - resist / 10)); if (secs > 0) { diff --git a/Projects/UOContent/Spells/Mysticism/CleansingWindsSpell.cs b/Projects/UOContent/Spells/Mysticism/CleansingWindsSpell.cs index dbb9011c0..d54a33ece 100644 --- a/Projects/UOContent/Spells/Mysticism/CleansingWindsSpell.cs +++ b/Projects/UOContent/Spells/Mysticism/CleansingWindsSpell.cs @@ -53,7 +53,7 @@ public class CleansingWindsSpell : MysticSpell, ITargetingSpell var casterParty = Party.Get(Caster); if (casterParty != null) { - foreach (Mobile mob in Caster.Map.GetMobilesInRange(m.Location, 2)) + foreach (var mob in Caster.Map.GetMobilesInRange(m.Location, 2)) { if (mob != m && casterParty.Contains(mob) && Caster.CanBeBeneficial(mob, false)) { diff --git a/Projects/UOContent/Spells/Necromancy/AnimateDeadSpell.cs b/Projects/UOContent/Spells/Necromancy/AnimateDeadSpell.cs index b2359dbf4..6aceab235 100644 --- a/Projects/UOContent/Spells/Necromancy/AnimateDeadSpell.cs +++ b/Projects/UOContent/Spells/Necromancy/AnimateDeadSpell.cs @@ -134,7 +134,7 @@ public class AnimateDeadSpell : NecromancerSpell, ITargetingSpell } else { - Type type = c.Owner?.GetType(); + var type = c.Owner?.GetType(); if (c.ItemID != 0x2006 || c.Animated || type == typeof(PlayerMobile) || type == null || c.Owner?.Fame < 100 || diff --git a/Projects/UOContent/Spells/Necromancy/PoisonStrike.cs b/Projects/UOContent/Spells/Necromancy/PoisonStrike.cs index ec358c8b1..9b68c83b5 100644 --- a/Projects/UOContent/Spells/Necromancy/PoisonStrike.cs +++ b/Projects/UOContent/Spells/Necromancy/PoisonStrike.cs @@ -80,7 +80,7 @@ public class PoisonStrikeSpell : NecromancerSpell, ITargetingSpell var cbc = Caster as BaseCreature; var isMonster = cbc?.Controlled == false && (cbc.IsAnimatedDead || !cbc.Summoned); - foreach (Mobile targ in m.GetMobilesInRange(2)) + foreach (var targ in m.GetMobilesInRange(2)) { if (targ == Caster || m == targ || !SpellHelper.ValidIndirectTarget(Caster, targ) || !Caster.CanBeHarmful(targ, false)) diff --git a/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs b/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs index d65d3b135..f7722cfef 100644 --- a/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs +++ b/Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs @@ -386,15 +386,15 @@ public class AnimalForm : NinjaSpell builder.AddButton(10, 374, 0xFB1, 0xFB2, 0); builder.AddHtmlLocalized(45, 376, 450, 20, 1011012, 0x7FFF); // CANCEL - int ninjitsu = _caster.Skills[SkillName.Ninjitsu].Fixed; - int current = 0; + var ninjitsu = _caster.Skills[SkillName.Ninjitsu].Fixed; + var current = 0; - for (int i = 0; i < _entries.Length; ++i) + for (var i = 0; i < _entries.Length; ++i) { - bool enabled = ninjitsu >= _entries[i].ReqSkill && BaseFormTalisman.EntryEnabled(_caster, _entries[i].Type); + var enabled = ninjitsu >= _entries[i].ReqSkill && BaseFormTalisman.EntryEnabled(_caster, _entries[i].Type); - int page = current / 10 + 1; - int pos = current % 10; + var page = current / 10 + 1; + var pos = current % 10; if (pos == 0) { @@ -418,11 +418,11 @@ public class AnimalForm : NinjaSpell continue; } - AnimalFormEntry entry = _entries[i]; + var entry = _entries[i]; - int y = Math.DivRem(pos, 2, out var rem) * 64 + 44; - int x = rem == 0 ? 14 : 264; - Rectangle2D b = ItemBounds.Bounds[entry.ItemID]; + var y = Math.DivRem(pos, 2, out var rem) * 64 + 44; + var x = rem == 0 ? 14 : 264; + var b = ItemBounds.Bounds[entry.ItemID]; builder.AddImageTiledButton(x, y, 0x918, 0x919, i + 1, GumpButtonType.Reply, 0, entry.ItemID, entry.Hue, 40 - b.Width / 2 - b.X, 30 - b.Height / 2 - b.Y, entry.Tooltip); diff --git a/Projects/UOContent/Spells/Second/Protection.cs b/Projects/UOContent/Spells/Second/Protection.cs index 0d4ceca48..424900fba 100644 --- a/Projects/UOContent/Spells/Second/Protection.cs +++ b/Projects/UOContent/Spells/Second/Protection.cs @@ -137,9 +137,9 @@ namespace Server.Spells.Second { if (Caster.BeginAction()) { - double value = (Caster.Skills.EvalInt.Value + - Caster.Skills.Meditation.Value + - Caster.Skills.Inscribe.Value) * 10 / 4; + var value = (Caster.Skills.EvalInt.Value + + Caster.Skills.Meditation.Value + + Caster.Skills.Inscribe.Value) * 10 / 4; Registry.Add(Caster, Math.Clamp((int)value, 0, 750)); // 75.0% protection from disruption new InternalTimer(Caster).Start(); diff --git a/Projects/UOContent/Spells/Seventh/EnergyField.cs b/Projects/UOContent/Spells/Seventh/EnergyField.cs index a6fc1b116..5e3ea1149 100644 --- a/Projects/UOContent/Spells/Seventh/EnergyField.cs +++ b/Projects/UOContent/Spells/Seventh/EnergyField.cs @@ -41,7 +41,7 @@ public class EnergyFieldSpell : MagerySpell, ITargetingSpell Effects.PlaySound(loc, Caster.Map, 0x20B); - TimeSpan duration = Core.AOS + var duration = Core.AOS ? TimeSpan.FromSeconds((15 + Caster.Skills.Magery.Value * 2) / 7.0) : TimeSpan.FromSeconds(Caster.Skills.Magery.Value * 0.28 + 2.0); diff --git a/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs b/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs index adb35a827..f73fb3111 100644 --- a/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs +++ b/Projects/UOContent/Spells/Seventh/MeteorSwarm.cs @@ -63,7 +63,7 @@ namespace Server.Spells.Seventh ? GetNewAosDamage(51, 1, 5, playerVsPlayer) : Utility.Random(27, 22); - int count = queue.Count; + var count = queue.Count; if (count > 0) { diff --git a/Projects/UOContent/Spells/Sixth/Explosion.cs b/Projects/UOContent/Spells/Sixth/Explosion.cs index f6f49ce0e..9e101f03e 100644 --- a/Projects/UOContent/Spells/Sixth/Explosion.cs +++ b/Projects/UOContent/Spells/Sixth/Explosion.cs @@ -34,7 +34,7 @@ namespace Server.Spells.Sixth if (Caster.CanBeHarmful(m) && CheckSequence()) { - Mobile defender = m; + var defender = m; SpellHelper.Turn(Caster, m); SpellHelper.CheckReflect((int)Circle, Caster, ref m); diff --git a/Projects/UOContent/Spells/UnsummonTimer.cs b/Projects/UOContent/Spells/UnsummonTimer.cs index 169517411..77dd3eccd 100644 --- a/Projects/UOContent/Spells/UnsummonTimer.cs +++ b/Projects/UOContent/Spells/UnsummonTimer.cs @@ -25,7 +25,7 @@ public class UnsummonTimer : Timer _onUnsummon = onUnsummon; _creature = creature; - ref var timer = ref CollectionsMarshal.GetValueRefOrAddDefault(_timers, creature, out bool exists); + ref var timer = ref CollectionsMarshal.GetValueRefOrAddDefault(_timers, creature, out var exists); if (exists) { timer.Stop(); diff --git a/Projects/UOContent/Targets/MoveTarget.cs b/Projects/UOContent/Targets/MoveTarget.cs index 8b344552a..53c2f8fc3 100644 --- a/Projects/UOContent/Targets/MoveTarget.cs +++ b/Projects/UOContent/Targets/MoveTarget.cs @@ -23,7 +23,7 @@ namespace Server.Targets return; } - Point3D p = ip switch + var p = ip switch { Item i => i.GetWorldTop(), Mobile m => m.Location, diff --git a/Projects/UOContent/Utilities/Types.cs b/Projects/UOContent/Utilities/Types.cs index 4860f2269..810ff0310 100644 --- a/Projects/UOContent/Utilities/Types.cs +++ b/Projects/UOContent/Utilities/Types.cs @@ -190,7 +190,7 @@ namespace Server if (IsType(type, OfBool)) { - if (bool.TryParse(value, out bool parsed)) + if (bool.TryParse(value, out var parsed)) { constructed = parsed; return null;