From 75c1b32513ada4b593ae0b9e7d2e6260356b69e1 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Mon, 30 Nov 2020 23:12:16 -0800 Subject: [PATCH] fix(core): NPE in Cycles per second (#331) - [X] Fixes an edge case where the cycle index goes negative and crashes - [X] Fixes average CPS calculation - [X] Fixes issue with logout delay - [X] Bumps release version --- .github/workflows/create-release.yml | 16 ++++- Projects/Server/Main.cs | 29 ++++++--- Projects/Server/Mobiles/Mobile.cs | 22 +++---- Projects/Server/Server.csproj | 1 + .../Mobiles/Vendors/BaseFactionVendor.cs | 2 +- .../Definitions/NewHavenSkillTraining.cs | 4 +- .../Engines/Quests/Core/BaseQuester.cs | 2 +- .../Treasures of Tokuno/TreasuresOfTokuno.cs | 2 +- .../Halloween/2006/Engines/TrickOrTreat.cs | 44 ++++++------- .../UOContent/Mobiles/Animals/Mounts/Hiryu.cs | 2 +- .../Mobiles/Animals/Mounts/LesserHiryu.cs | 2 +- .../UOContent/Mobiles/Healers/BaseHealer.cs | 2 +- .../Humanoid/Melee/KhaldunRevenant.cs | 2 +- .../Mobiles/Monsters/LBR/Meers/MeerMage.cs | 2 +- .../Monsters/ML/Bedlam/LadyJennifyr.cs | 2 +- .../Monsters/ML/Humanoid/Magic/Satyr.cs | 2 +- .../Mobiles/Monsters/ML/Special/Ilhenir.cs | 2 +- .../Monsters/ML/Twisted Weald/Swoop.cs | 2 +- .../Mobiles/Monsters/SE/BakeKitsune.cs | 2 +- .../Mobiles/Monsters/SE/FanDancer.cs | 2 +- .../UOContent/Mobiles/Monsters/SE/Kappa.cs | 2 +- .../Mobiles/Monsters/SE/KazeKemono.cs | 4 +- .../Mobiles/Monsters/SE/LadyOfTheSnow.cs | 2 +- .../UOContent/Mobiles/Monsters/SE/RaiJu.cs | 2 +- .../Mobiles/Monsters/SE/RuneBeetle.cs | 2 +- .../Mobiles/Monsters/SE/TsukiWolf.cs | 2 +- Projects/UOContent/Mobiles/PlayerMobile.cs | 62 +++++++++---------- .../UOContent/Mobiles/Special/Harrower.cs | 32 +++++----- Projects/UOContent/Mobiles/Townfolk/Banker.cs | 2 +- .../Mobiles/Townfolk/BaseEscortable.cs | 2 +- .../UOContent/Mobiles/Townfolk/TownCrier.cs | 2 +- .../UOContent/Mobiles/Vendors/BaseVendor.cs | 4 +- .../Mobiles/Vendors/NPC/Alchemist.cs | 2 +- .../Mobiles/Vendors/NPC/AnimalTrainer.cs | 2 +- .../Mobiles/Vendors/NPC/Architect.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Armorer.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Baker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Bard.cs | 2 +- .../Mobiles/Vendors/NPC/Barkeeper.cs | 2 +- .../Mobiles/Vendors/NPC/Beekeeper.cs | 2 +- .../Mobiles/Vendors/NPC/Blacksmith.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Bowyer.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Butcher.cs | 2 +- .../Mobiles/Vendors/NPC/Carpenter.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Cobbler.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Cook.cs | 2 +- .../Mobiles/Vendors/NPC/CustomHairstylist.cs | 18 +++--- .../UOContent/Mobiles/Vendors/NPC/Farmer.cs | 2 +- .../Mobiles/Vendors/NPC/Fisherman.cs | 2 +- .../Mobiles/Vendors/NPC/Furtrader.cs | 2 +- .../Mobiles/Vendors/NPC/Glassblower.cs | 2 +- .../Mobiles/Vendors/NPC/GolemCrafter.cs | 2 +- .../NPC/Guildmasters/BaseGuildmaster.cs | 2 +- .../Mobiles/Vendors/NPC/GypsyMaiden.cs | 2 +- .../Mobiles/Vendors/NPC/HairStylist.cs | 2 +- .../Mobiles/Vendors/NPC/Herbalist.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/HolyMage.cs | 2 +- .../Mobiles/Vendors/NPC/InnKeeper.cs | 2 +- .../Mobiles/Vendors/NPC/IronWorker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Jeweler.cs | 2 +- .../Mobiles/Vendors/NPC/KeeperOfChivalry.cs | 2 +- .../Mobiles/Vendors/NPC/LeatherWorker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Mage.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Mapmaker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Miller.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Miner.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Monk.cs | 2 +- .../Mobiles/Vendors/NPC/Provisioner.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Rancher.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Ranger.cs | 2 +- .../Mobiles/Vendors/NPC/RealEstateBroker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Scribe.cs | 2 +- .../Mobiles/Vendors/NPC/Shipwright.cs | 2 +- .../Mobiles/Vendors/NPC/StoneCrafter.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Tailor.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Tanner.cs | 2 +- .../Mobiles/Vendors/NPC/TavernKeeper.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Thief.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Tinker.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Vagabond.cs | 2 +- .../Mobiles/Vendors/NPC/VarietyDealer.cs | 2 +- .../Mobiles/Vendors/NPC/Veterinarian.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Waiter.cs | 2 +- .../Mobiles/Vendors/NPC/Weaponsmith.cs | 2 +- .../UOContent/Mobiles/Vendors/NPC/Weaver.cs | 2 +- .../Mobiles/Vendors/PlayerBarkeeper.cs | 2 +- .../Spells/Mysticism/StoneFormSpell.cs | 10 +-- .../UOContent/Spells/Necromancy/CorpseSkin.cs | 8 +-- 88 files changed, 216 insertions(+), 188 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index db4075c5b..cbb2ef1b0 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -10,6 +10,8 @@ jobs: name: Create Release if: "contains(github.event.head_commit.message, 'Release') || contains(github.event.head_commit.message, 'release')" runs-on: ubuntu-latest + outputs: + skipped: ${{ steps.changelog.outputs.skipped }} steps: - uses: actions/checkout@v2 with: @@ -20,10 +22,20 @@ jobs: dotnet-version: 5.0.100 - uses: dotnet/nbgv@master id: nbgv + - name: Conventional Changelog + id: changelog + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + output-file: false + skip-version-file: true + skip-commit: true - name: Create Release id: create_release uses: actions/create-release@v1 + if: ${{ steps.changelog.outputs.skipped == 'false' }} with: + body: ${{ steps.changelog.outputs.clean_changelog }} tag_name: ${{ steps.nbgv.outputs.Version }} release_name: ${{ steps.nbgv.outputs.Version }} draft: false @@ -31,8 +43,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Output Release URL File + if: ${{ steps.changelog.outputs.skipped == 'false' }} run: echo "${{ steps.create_release.outputs.upload_url }}" > release_url.txt - name: Save Release URL file + if: ${{ steps.changelog.outputs.skipped == 'false' }} uses: actions/upload-artifact@v1 with: name: release_url @@ -40,7 +54,7 @@ jobs: publish: name: Publish Release Asset - if: "contains(github.event.head_commit.message, 'Release')" + if: "(contains(github.event.head_commit.message, 'Release') || contains(github.event.head_commit.message, 'release')) && ${{ needs.release.outputs.skipped == 'false' }}" needs: [release] runs-on: ubuntu-latest strategy: diff --git a/Projects/Server/Main.cs b/Projects/Server/Main.cs index b38cd3557..5deb92e70 100644 --- a/Projects/Server/Main.cs +++ b/Projects/Server/Main.cs @@ -40,8 +40,8 @@ namespace Server private static TimeSpan m_ProfileTime; private static bool? m_IsRunningFromXUnit; - private static int m_CycleIndex = 1; - private static readonly float[] m_CyclesPerSecond = new float[100]; + private static long m_CycleIndex; + private static readonly float[] m_CyclesPerSecond = new float[127]; // Divisible by long.MaxValue // private static readonly AutoResetEvent m_Signal = new AutoResetEvent(true); @@ -137,9 +137,23 @@ namespace Server public static bool Closing => ClosingTokenSource.IsCancellationRequested; - public static float CyclesPerSecond => m_CyclesPerSecond[(m_CycleIndex - 1) % m_CyclesPerSecond.Length]; + public static float CyclesPerSecond => m_CyclesPerSecond[m_CycleIndex % m_CyclesPerSecond.Length]; - public static float AverageCPS => m_CyclesPerSecond.Take(m_CycleIndex).Average(); + public static float AverageCPS + { + get + { + var total = 0.0f; + var count = Math.Min(m_CycleIndex + 1, m_CyclesPerSecond.Length); + + for (int i = 0; i < count; i++) + { + total += m_CyclesPerSecond[i]; + } + + return total / count; + } + } public static string Arguments { @@ -452,7 +466,7 @@ namespace Server { try { - long last = TickCount; + long now, last = TickCount; const int sampleInterval = 100; const float ticksPerSecond = 1000.0f * sampleInterval; @@ -481,8 +495,9 @@ namespace Server continue; } - var now = TickCount; - m_CyclesPerSecond[m_CycleIndex++ % m_CyclesPerSecond.Length] = ticksPerSecond / (now - last); + now = TickCount; + m_CyclesPerSecond[m_CycleIndex % m_CyclesPerSecond.Length] = ticksPerSecond / (now - last); + m_CycleIndex = Math.Max(unchecked(m_CycleIndex + 1), 0); last = now; } } diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs index 97b994895..a0b4d8ef4 100644 --- a/Projects/Server/Mobiles/Mobile.cs +++ b/Projects/Server/Mobiles/Mobile.cs @@ -432,7 +432,6 @@ namespace Server private static readonly TimeSpan WarmodeSpamCatch = TimeSpan.FromSeconds(Core.SE ? 1.0 : 0.5); private static readonly TimeSpan WarmodeSpamDelay = TimeSpan.FromSeconds(Core.SE ? 4.0 : 2.0); private static readonly TimeSpan ExpireCombatantDelay = TimeSpan.FromMinutes(1.0); - private static readonly TimeSpan LogoutDelay = TimeSpan.FromDays(1.0); private static readonly TimeSpan ExpireAggressorsDelay = TimeSpan.FromSeconds(5.0); private static readonly Packet[][] m_MovingPacketCache = @@ -441,13 +440,13 @@ namespace Server new Packet[8] }; - private static readonly List m_MoveList = new List(); - private static readonly List m_MoveClientList = new List(); + private static readonly List m_MoveList = new(); + private static readonly List m_MoveClientList = new(); - private static readonly object m_GhostMutateContext = new object(); + private static readonly object m_GhostMutateContext = new(); - private static readonly List m_Hears = new List(); - private static readonly List m_OnSpeech = new List(); + private static readonly List m_Hears = new(); + private static readonly List m_OnSpeech = new(); private static readonly string[] m_AccessLevelNames = { @@ -469,8 +468,8 @@ namespace Server 198 }; - private static readonly Queue m_DeltaQueue = new Queue(); - private static readonly Queue m_DeltaQueueR = new Queue(); + private static readonly Queue m_DeltaQueue = new(); + private static readonly Queue m_DeltaQueueR = new(); private static bool _processing; @@ -1496,15 +1495,14 @@ namespace Server // Disconnected, start the logout timer if (m_LogoutTimer == null) { - m_LogoutTimer = Timer.DelayCall(LogoutDelay, Logout); + m_LogoutTimer = Timer.DelayCall(GetLogoutDelay(), Logout); } else { m_LogoutTimer.Stop(); + m_LogoutTimer.Delay = GetLogoutDelay(); + m_LogoutTimer.Start(); } - - m_LogoutTimer.Delay = GetLogoutDelay(); - m_LogoutTimer.Start(); } else { diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index 2943bbad3..0a8e5c9e4 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -9,6 +9,7 @@ ModernUO Server ..\..\Distribution ..\..\Distribution + 0.0.0 diff --git a/Projects/UOContent/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs b/Projects/UOContent/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs index fcf15abd8..e87899459 100644 --- a/Projects/UOContent/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs +++ b/Projects/UOContent/Engines/Factions/Mobiles/Vendors/BaseFactionVendor.cs @@ -51,7 +51,7 @@ namespace Server.Factions } } - protected override List SBInfos { get; } = new List(); + protected override List SBInfos { get; } = new(); public void Register() { diff --git a/Projects/UOContent/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs b/Projects/UOContent/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs index 2ab2b472a..20f0a664d 100644 --- a/Projects/UOContent/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs +++ b/Projects/UOContent/Engines/MLQuests/Definitions/NewHavenSkillTraining.cs @@ -1952,7 +1952,7 @@ namespace Server.Engines.MLQuests.Definitions public class Ryuichi : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Ryuichi() @@ -2200,7 +2200,7 @@ namespace Server.Engines.MLQuests.Definitions public class Hamato : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Hamato() diff --git a/Projects/UOContent/Engines/Quests/Core/BaseQuester.cs b/Projects/UOContent/Engines/Quests/Core/BaseQuester.cs index aabae6d4b..1ed0a4348 100644 --- a/Projects/UOContent/Engines/Quests/Core/BaseQuester.cs +++ b/Projects/UOContent/Engines/Quests/Core/BaseQuester.cs @@ -24,7 +24,7 @@ namespace Server.Engines.Quests public abstract class BaseQuester : BaseVendor { - protected List m_SBInfos = new List(); + protected List m_SBInfos = new(); public BaseQuester(string title = null) : base(title) { diff --git a/Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs b/Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs index 2ba8f6962..f6e985ef1 100644 --- a/Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs +++ b/Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs @@ -205,7 +205,7 @@ namespace Server.Mobiles { public class IharaSoko : BaseVendor { - protected List m_SBInfos = new List(); + protected List m_SBInfos = new(); [Constructible] public IharaSoko() : base("the Imperial Minister of Trade") diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs index f37b720c5..4a23369ef 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs @@ -234,40 +234,40 @@ namespace Server.Engines.Events { private static readonly Point3D[] Felucca_Locations = { - new Point3D(4467, 1283, 5), // Moonglow - new Point3D(1336, 1997, 5), // Britain - new Point3D(1499, 3771, 5), // Jhelom - new Point3D(771, 752, 5), // Yew - new Point3D(2701, 692, 5), // Minoc - new Point3D(1828, 2948, -20), // Trinsic - new Point3D(643, 2067, 5), // Skara Brae - new Point3D(3563, 2139, Map.Trammel.GetAverageZ(3563, 2139)) // (New) Magincia + new(4467, 1283, 5), // Moonglow + new(1336, 1997, 5), // Britain + new(1499, 3771, 5), // Jhelom + new(771, 752, 5), // Yew + new(2701, 692, 5), // Minoc + new(1828, 2948, -20), // Trinsic + new(643, 2067, 5), // Skara Brae + new(3563, 2139, Map.Trammel.GetAverageZ(3563, 2139)) // (New) Magincia }; private static readonly Point3D[] Malas_Locations = { - new Point3D(1015, 527, -65), // Luna - new Point3D(1997, 1386, -85) // Umbra + new(1015, 527, -65), // Luna + new(1997, 1386, -85) // Umbra }; private static readonly Point3D[] Ilshenar_Locations = { - new Point3D(1215, 467, -13), // Compassion - new Point3D(722, 1366, -60), // Honesty - new Point3D(744, 724, -28), // Honor - new Point3D(281, 1016, 0), // Humility - new Point3D(987, 1011, -32), // Justice - new Point3D(1174, 1286, -30), // Sacrifice - new Point3D(1532, 1340, -3), // Spirituality - new Point3D(528, 216, -45), // Valor - new Point3D(1721, 218, 96) // Chaos + new(1215, 467, -13), // Compassion + new(722, 1366, -60), // Honesty + new(744, 724, -28), // Honor + new(281, 1016, 0), // Humility + new(987, 1011, -32), // Justice + new(1174, 1286, -30), // Sacrifice + new(1532, 1340, -3), // Spirituality + new(528, 216, -45), // Valor + new(1721, 218, 96) // Chaos }; private static readonly Point3D[] Tokuno_Locations = { - new Point3D(1169, 998, 41), // Isamu-Jima - new Point3D(802, 1204, 25), // Makoto-Jima - new Point3D(270, 628, 15) // Homare-Jima + new(1169, 998, 41), // Isamu-Jima + new(802, 1204, 25), // Makoto-Jima + new(270, 628, 15) // Homare-Jima }; private readonly Mobile m_From; diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs b/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs index 1fec2112b..2b239e194 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class Hiryu : BaseMount { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public Hiryu() diff --git a/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs b/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs index 5c0201545..5b8bf098c 100644 --- a/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs +++ b/Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class LesserHiryu : BaseMount { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public LesserHiryu() diff --git a/Projects/UOContent/Mobiles/Healers/BaseHealer.cs b/Projects/UOContent/Mobiles/Healers/BaseHealer.cs index 1386b9358..4a3afd9bc 100644 --- a/Projects/UOContent/Mobiles/Healers/BaseHealer.cs +++ b/Projects/UOContent/Mobiles/Healers/BaseHealer.cs @@ -57,7 +57,7 @@ namespace Server.Mobiles { } - protected override List SBInfos { get; } = new List(); + protected override List SBInfos { get; } = new(); public override bool IsActiveVendor => false; public override bool IsInvulnerable => false; diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs index 925527280..5ac65dffa 100644 --- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs +++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class KhaldunRevenant : BaseCreature { - private static readonly HashSet m_Set = new HashSet(); + private static readonly HashSet m_Set = new(); private readonly DateTime m_ExpireTime; private readonly Mobile m_Target; diff --git a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs index a9a22cc9a..2bdd5cbd6 100644 --- a/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs +++ b/Projects/UOContent/Mobiles/Monsters/LBR/Meers/MeerMage.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class MeerMage : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); private DateTime m_NextAbilityTime; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs b/Projects/UOContent/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs index 94c699557..d4d6cf0e7 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class LadyJennifyr : SkeletalKnight { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public LadyJennifyr() diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs index 38714ac45..30dbf68b7 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/Satyr.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Satyr : BaseCreature { - private static readonly Dictionary m_Suppressed = new Dictionary(); + private static readonly Dictionary m_Suppressed = new(); private DateTime m_NextPeace; diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs b/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs index 581a8b1d2..cf6024a60 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Special/Ilhenir.cs @@ -9,7 +9,7 @@ namespace Server.Mobiles { public class Ilhenir : BaseChampion { - private static readonly HashSet m_Table = new HashSet(); + private static readonly HashSet m_Table = new(); [Constructible] public Ilhenir() diff --git a/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs b/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs index 90714c2bb..e542d6eae 100644 --- a/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs +++ b/Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Swoop : Eagle { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public Swoop() diff --git a/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs b/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs index a8bb2b555..d0931c050 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class BakeKitsune : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); private Timer m_DisguiseTimer; diff --git a/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs b/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs index 85f120932..50fba7212 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class FanDancer : BaseCreature { - private static readonly HashSet m_Table = new HashSet(); + private static readonly HashSet m_Table = new(); [Constructible] public FanDancer() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) diff --git a/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs b/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs index 6b56b71d3..78690c29f 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class Kappa : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public Kappa() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) diff --git a/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs index ed2407e17..39d2ee99c 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs @@ -5,10 +5,10 @@ namespace Server.Mobiles { public class KazeKemono : BaseCreature { - private static readonly Dictionary m_FlurryOfTwigsTable = new Dictionary(); + private static readonly Dictionary m_FlurryOfTwigsTable = new(); private static readonly Dictionary m_ChlorophylBlastTable = - new Dictionary(); + new(); [Constructible] public KazeKemono() diff --git a/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs b/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs index f002cc3e4..894e141ac 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class LadyOfTheSnow : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public LadyOfTheSnow() diff --git a/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs b/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs index 16080363b..091f960c1 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class RaiJu : BaseCreature { - private static readonly HashSet m_Table = new HashSet(); + private static readonly HashSet m_Table = new(); [Constructible] public RaiJu() : base(AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4) diff --git a/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs b/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs index ac083e332..8bb8560d1 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class RuneBeetle : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public RuneBeetle() : base(AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4) diff --git a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs index 69ecc999c..3117512c9 100644 --- a/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs +++ b/Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class TsukiWolf : BaseCreature { - private static readonly Dictionary m_Table = new Dictionary(); + private static readonly Dictionary m_Table = new(); [Constructible] public TsukiWolf() diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs index 9880755d1..544fa2d9f 100644 --- a/Projects/UOContent/Mobiles/PlayerMobile.cs +++ b/Projects/UOContent/Mobiles/PlayerMobile.cs @@ -99,47 +99,47 @@ namespace Server.Mobiles private static readonly Point3D[] m_TrammelDeathDestinations = { - new Point3D(1481, 1612, 20), - new Point3D(2708, 2153, 0), - new Point3D(2249, 1230, 0), - new Point3D(5197, 3994, 37), - new Point3D(1412, 3793, 0), - new Point3D(3688, 2232, 20), - new Point3D(2578, 604, 0), - new Point3D(4397, 1089, 0), - new Point3D(5741, 3218, -2), - new Point3D(2996, 3441, 15), - new Point3D(624, 2225, 0), - new Point3D(1916, 2814, 0), - new Point3D(2929, 854, 0), - new Point3D(545, 967, 0), - new Point3D(3665, 2587, 0) + new(1481, 1612, 20), + new(2708, 2153, 0), + new(2249, 1230, 0), + new(5197, 3994, 37), + new(1412, 3793, 0), + new(3688, 2232, 20), + new(2578, 604, 0), + new(4397, 1089, 0), + new(5741, 3218, -2), + new(2996, 3441, 15), + new(624, 2225, 0), + new(1916, 2814, 0), + new(2929, 854, 0), + new(545, 967, 0), + new(3665, 2587, 0) }; private static readonly Point3D[] m_IlshenarDeathDestinations = { - new Point3D(1216, 468, -13), - new Point3D(723, 1367, -60), - new Point3D(745, 725, -28), - new Point3D(281, 1017, 0), - new Point3D(986, 1011, -32), - new Point3D(1175, 1287, -30), - new Point3D(1533, 1341, -3), - new Point3D(529, 217, -44), - new Point3D(1722, 219, 96) + new(1216, 468, -13), + new(723, 1367, -60), + new(745, 725, -28), + new(281, 1017, 0), + new(986, 1011, -32), + new(1175, 1287, -30), + new(1533, 1341, -3), + new(529, 217, -44), + new(1722, 219, 96) }; private static readonly Point3D[] m_MalasDeathDestinations = { - new Point3D(2079, 1376, -70), - new Point3D(944, 519, -71) + new(2079, 1376, -70), + new(944, 519, -71) }; private static readonly Point3D[] m_TokunoDeathDestinations = { - new Point3D(1166, 801, 27), - new Point3D(782, 1228, 25), - new Point3D(268, 624, 15) + new(1166, 801, 27), + new(782, 1228, 25), + new(268, 624, 15) }; private readonly Dictionary> m_AntiMacroTable; @@ -590,7 +590,7 @@ namespace Server.Mobiles set => SetFlag(PlayerFlag.RefuseTrades, value); } - public Dictionary RecoverableAmmo { get; } = new Dictionary(); + public Dictionary RecoverableAmmo { get; } = new(); [CommandProperty(AccessLevel.GameMaster)] public DateTime AcceleratedStart { get; set; } @@ -4895,7 +4895,7 @@ namespace Server.Mobiles } } - public ItemInsuranceMenuGump NewInstance() => new ItemInsuranceMenuGump(m_From, m_Items, m_Insure, m_Page); + public ItemInsuranceMenuGump NewInstance() => new(m_From, m_Items, m_Insure, m_Page); public override void OnResponse(NetState sender, RelayInfo info) { diff --git a/Projects/UOContent/Mobiles/Special/Harrower.cs b/Projects/UOContent/Mobiles/Special/Harrower.cs index b4611eeef..f32a62fe5 100644 --- a/Projects/UOContent/Mobiles/Special/Harrower.cs +++ b/Projects/UOContent/Mobiles/Special/Harrower.cs @@ -10,21 +10,21 @@ namespace Server.Mobiles { private static readonly SpawnEntry[] m_Entries = { - new SpawnEntry(new Point3D(5242, 945, -40), new Point3D(1176, 2638, 0)), // Destard - new SpawnEntry(new Point3D(5225, 798, 0), new Point3D(1176, 2638, 0)), // Destard - new SpawnEntry(new Point3D(5556, 886, 30), new Point3D(1298, 1080, 0)), // Despise - new SpawnEntry(new Point3D(5187, 615, 0), new Point3D(4111, 432, 5)), // Deceit - new SpawnEntry(new Point3D(5319, 583, 0), new Point3D(4111, 432, 5)), // Deceit - new SpawnEntry(new Point3D(5713, 1334, -1), new Point3D(2923, 3407, 8)), // Fire - new SpawnEntry(new Point3D(5860, 1460, -2), new Point3D(2923, 3407, 8)), // Fire - new SpawnEntry(new Point3D(5328, 1620, 0), new Point3D(5451, 3143, -60)), // Terathan Keep - new SpawnEntry(new Point3D(5690, 538, 0), new Point3D(2042, 224, 14)), // Wrong - new SpawnEntry(new Point3D(5609, 195, 0), new Point3D(514, 1561, 0)), // Shame - new SpawnEntry(new Point3D(5475, 187, 0), new Point3D(514, 1561, 0)), // Shame - new SpawnEntry(new Point3D(6085, 179, 0), new Point3D(4721, 3822, 0)), // Hythloth - new SpawnEntry(new Point3D(6084, 66, 0), new Point3D(4721, 3822, 0)), // Hythloth - new SpawnEntry(new Point3D(5499, 2003, 0), new Point3D(2499, 919, 0)), // Covetous - new SpawnEntry(new Point3D(5579, 1858, 0), new Point3D(2499, 919, 0)) // Covetous + new(new Point3D(5242, 945, -40), new Point3D(1176, 2638, 0)), // Destard + new(new Point3D(5225, 798, 0), new Point3D(1176, 2638, 0)), // Destard + new(new Point3D(5556, 886, 30), new Point3D(1298, 1080, 0)), // Despise + new(new Point3D(5187, 615, 0), new Point3D(4111, 432, 5)), // Deceit + new(new Point3D(5319, 583, 0), new Point3D(4111, 432, 5)), // Deceit + new(new Point3D(5713, 1334, -1), new Point3D(2923, 3407, 8)), // Fire + new(new Point3D(5860, 1460, -2), new Point3D(2923, 3407, 8)), // Fire + new(new Point3D(5328, 1620, 0), new Point3D(5451, 3143, -60)), // Terathan Keep + new(new Point3D(5690, 538, 0), new Point3D(2042, 224, 14)), // Wrong + new(new Point3D(5609, 195, 0), new Point3D(514, 1561, 0)), // Shame + new(new Point3D(5475, 187, 0), new Point3D(514, 1561, 0)), // Shame + new(new Point3D(6085, 179, 0), new Point3D(4721, 3822, 0)), // Hythloth + new(new Point3D(6084, 66, 0), new Point3D(4721, 3822, 0)), // Hythloth + new(new Point3D(5499, 2003, 0), new Point3D(2499, 919, 0)), // Covetous + new(new Point3D(5579, 1858, 0), new Point3D(2499, 919, 0)) // Covetous }; private static readonly double[] m_Offsets = @@ -93,7 +93,7 @@ namespace Server.Mobiles public Type[] SharedList => new[] { typeof(TheRobeOfBritanniaAri) }; public Type[] DecorativeList => new[] { typeof(EvilIdolSkull), typeof(SkullPole) }; - public static List Instances { get; } = new List(); + public static List Instances { get; } = new(); public static bool CanSpawn => Instances.Count == 0; diff --git a/Projects/UOContent/Mobiles/Townfolk/Banker.cs b/Projects/UOContent/Mobiles/Townfolk/Banker.cs index 0d4eb20d6..3efbc67cf 100644 --- a/Projects/UOContent/Mobiles/Townfolk/Banker.cs +++ b/Projects/UOContent/Mobiles/Townfolk/Banker.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles { public class Banker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Banker() : base("the banker") diff --git a/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs b/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs index d066e9278..d2134f9b1 100644 --- a/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs +++ b/Projects/UOContent/Mobiles/Townfolk/BaseEscortable.cs @@ -127,7 +127,7 @@ namespace Server.Mobiles } } - public static Dictionary EscortTable { get; } = new Dictionary(); + public static Dictionary EscortTable { get; } = new(); protected override List ConstructQuestList() { diff --git a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs index 0193755c7..eabcebf23 100644 --- a/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs +++ b/Projects/UOContent/Mobiles/Townfolk/TownCrier.cs @@ -379,7 +379,7 @@ namespace Server.Mobiles Instances.Add(this); } - public static List Instances { get; } = new List(); + public static List Instances { get; } = new(); public List Entries { get; private set; } diff --git a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs index d5459ed68..816032c6b 100644 --- a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs @@ -26,8 +26,8 @@ namespace Server.Mobiles private static readonly TimeSpan InventoryDecayTime = TimeSpan.FromHours(1.0); - private readonly List m_ArmorBuyInfo = new List(); - private readonly List m_ArmorSellInfo = new List(); + private readonly List m_ArmorBuyInfo = new(); + private readonly List m_ArmorSellInfo = new(); public BaseVendor(string title = null) : base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2) diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Alchemist.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Alchemist.cs index e9947ceec..2f6eba7d6 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Alchemist.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Alchemist.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Alchemist : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Alchemist() : base("the alchemist") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs index 671344c22..7c8ab3e2f 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs @@ -10,7 +10,7 @@ namespace Server.Mobiles { public class AnimalTrainer : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public AnimalTrainer() : base("the animal trainer") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Architect.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Architect.cs index 24572647d..bf6eeac11 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Architect.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Architect.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Architect : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Architect() : base("the architect") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Armorer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Armorer.cs index 2034e4a59..4b3aed180 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Armorer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Armorer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Armorer : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Armorer() : base("the armorer") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Baker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Baker.cs index c0081235f..99c54ea03 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Baker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Baker.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Baker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Baker() : base("the baker") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Bard.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Bard.cs index dd69cba3c..da7326213 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Bard.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Bard.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Bard : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Bard() : base("the bard") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Barkeeper.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Barkeeper.cs index b5aa3201f..856f0cf2d 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Barkeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Barkeeper.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Barkeeper : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Barkeeper() : base("the barkeeper") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Beekeeper.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Beekeeper.cs index 4c2f88291..ab10feaec 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Beekeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Beekeeper.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Beekeeper : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Beekeeper() : base("the beekeeper") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Blacksmith.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Blacksmith.cs index 2fef4386f..fc643c672 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Blacksmith.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Blacksmith.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class Blacksmith : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Blacksmith() : base("the blacksmith") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Bowyer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Bowyer.cs index 13c4ecb27..ed72f84a7 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Bowyer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Bowyer.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles [TypeAlias("Server.Mobiles.Bower")] public class Bowyer : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Bowyer() : base("the bowyer") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Butcher.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Butcher.cs index db4838d2e..c7fe41356 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Butcher.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Butcher.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Butcher : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Butcher() : base("the butcher") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Carpenter.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Carpenter.cs index 8d187c8f2..d189262c6 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Carpenter.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Carpenter.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Carpenter : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Carpenter() : base("the carpenter") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Cobbler.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Cobbler.cs index 8696a286c..9baf2b8aa 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Cobbler.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Cobbler.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Cobbler : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Cobbler() : base("the cobbler") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Cook.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Cook.cs index 14f8a617b..a783210c9 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Cook.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Cook.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Cook : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Cook() : base("the cook") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs b/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs index d88d613d0..f12a607ac 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs @@ -15,7 +15,7 @@ namespace Server.Mobiles private static readonly HairstylistBuyInfo[] m_SellList = { - new HairstylistBuyInfo( + new( 1018357, 50000, false, @@ -23,7 +23,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, false, ChangeHairstyleEntry.HairEntries } ), - new HairstylistBuyInfo( + new( 1018358, 50000, true, @@ -31,7 +31,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, true, ChangeHairstyleEntry.BeardEntries } ), - new HairstylistBuyInfo( + new( 1018359, 50, false, @@ -39,7 +39,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, true, true, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( + new( 1018360, 500000, false, @@ -47,7 +47,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, true, true, ChangeHairHueEntry.BrightEntries } ), - new HairstylistBuyInfo( + new( 1018361, 30000, false, @@ -55,7 +55,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, true, false, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( + new( 1018362, 30000, true, @@ -63,7 +63,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, false, true, ChangeHairHueEntry.RegularEntries } ), - new HairstylistBuyInfo( + new( 1018363, 500000, false, @@ -71,7 +71,7 @@ namespace Server.Mobiles new[] { From, Vendor, Price, true, false, ChangeHairHueEntry.BrightEntries } ), - new HairstylistBuyInfo( + new( 1018364, 500000, true, @@ -90,7 +90,7 @@ namespace Server.Mobiles { } - protected override List SBInfos { get; } = new List(); + protected override List SBInfos { get; } = new(); public override bool ClickTitle => false; diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Farmer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Farmer.cs index e16efa7fc..c080d646d 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Farmer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Farmer.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Farmer : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Farmer() : base("the farmer") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Fisherman.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Fisherman.cs index 056b9a1c4..c14559d60 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Fisherman.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Fisherman.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Fisherman : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Fisherman() : base("the fisher") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Furtrader.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Furtrader.cs index 6c27ad5a8..6e840debf 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Furtrader.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Furtrader.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Furtrader : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Furtrader() : base("the furtrader") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Glassblower.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Glassblower.cs index 4f88dc1ff..f93dab97f 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Glassblower.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Glassblower.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles [TypeAlias("Server.Mobiles.GargoyleAlchemist")] public class Glassblower : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Glassblower() : base("the alchemist") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/GolemCrafter.cs b/Projects/UOContent/Mobiles/Vendors/NPC/GolemCrafter.cs index 4358dae5e..9b08642d9 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/GolemCrafter.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/GolemCrafter.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class GolemCrafter : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public GolemCrafter() : base("the golem crafter") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs index 731f1bbbb..9cb56075b 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs @@ -14,7 +14,7 @@ namespace Server.Mobiles { } - protected override List SBInfos { get; } = new List(); + protected override List SBInfos { get; } = new(); public override bool IsActiveVendor => false; diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/GypsyMaiden.cs b/Projects/UOContent/Mobiles/Vendors/NPC/GypsyMaiden.cs index b1de7055b..d286474ca 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/GypsyMaiden.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/GypsyMaiden.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class GypsyMaiden : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public GypsyMaiden() : base("the gypsy maiden") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/HairStylist.cs b/Projects/UOContent/Mobiles/Vendors/NPC/HairStylist.cs index a96727ab4..41183adf2 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/HairStylist.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/HairStylist.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class HairStylist : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public HairStylist() : base("the hair stylist") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Herbalist.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Herbalist.cs index e6aa4a87e..78ecfeb4b 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Herbalist.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Herbalist.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Herbalist : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Herbalist() : base("the herbalist") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/HolyMage.cs b/Projects/UOContent/Mobiles/Vendors/NPC/HolyMage.cs index 732c09f31..a7c0992bf 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/HolyMage.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/HolyMage.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class HolyMage : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public HolyMage() : base("the Holy Mage") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/InnKeeper.cs b/Projects/UOContent/Mobiles/Vendors/NPC/InnKeeper.cs index 44ead67cf..cac17d137 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/InnKeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/InnKeeper.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class InnKeeper : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public InnKeeper() : base("the innkeeper") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/IronWorker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/IronWorker.cs index c2740ada0..026087044 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/IronWorker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/IronWorker.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class IronWorker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public IronWorker() : base("the iron worker") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Jeweler.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Jeweler.cs index d5c5732a9..2c55faa78 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Jeweler.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Jeweler.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Jeweler : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Jeweler() : base("the jeweler") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/KeeperOfChivalry.cs b/Projects/UOContent/Mobiles/Vendors/NPC/KeeperOfChivalry.cs index f47928505..03ca4493e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/KeeperOfChivalry.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/KeeperOfChivalry.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class KeeperOfChivalry : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public KeeperOfChivalry() : base("the Keeper of Chivalry") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/LeatherWorker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/LeatherWorker.cs index 510372561..34399338e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/LeatherWorker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/LeatherWorker.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class LeatherWorker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public LeatherWorker() : base("the leather worker") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Mage.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Mage.cs index 07263f309..b1bcdf30e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Mage.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Mage.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Mage : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Mage() : base("the mage") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Mapmaker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Mapmaker.cs index 72fe68e20..732cfb7e4 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Mapmaker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Mapmaker.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Mapmaker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Mapmaker() : base("the mapmaker") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Miller.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Miller.cs index 1ade9d9f0..ac6a1ad90 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Miller.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Miller.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Miller : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Miller() : base("the miller") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Miner.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Miner.cs index 9fd1b2b17..b8f7a85d7 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Miner.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Miner.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Miner : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Miner() : base("the miner") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Monk.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Monk.cs index c1d4fdd4e..1980a6924 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Monk.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Monk.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Monk : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Monk() : base("the Monk") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Provisioner.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Provisioner.cs index 458d1cc86..918bb9196 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Provisioner.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Provisioner.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Provisioner : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Provisioner() : base("the provisioner") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Rancher.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Rancher.cs index 7ede7641e..0b914293c 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Rancher.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Rancher.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Rancher : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Rancher() : base("the rancher") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Ranger.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Ranger.cs index f39845359..a280abd72 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Ranger.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Ranger.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Ranger : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Ranger() : base("the ranger") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/RealEstateBroker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/RealEstateBroker.cs index 14afcc2a5..f0b0e9162 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/RealEstateBroker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/RealEstateBroker.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles { public class RealEstateBroker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); private DateTime m_NextCheckPack; [Constructible] diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Scribe.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Scribe.cs index 690ccdccc..a6b0d2326 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Scribe.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Scribe.cs @@ -8,7 +8,7 @@ namespace Server.Mobiles public class Scribe : BaseVendor { public static readonly TimeSpan ShushDelay = TimeSpan.FromMinutes(1); - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); private DateTime m_NextShush; diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Shipwright.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Shipwright.cs index c9c0874b8..11b67cdea 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Shipwright.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Shipwright.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Shipwright : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Shipwright() : base("the shipwright") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/StoneCrafter.cs b/Projects/UOContent/Mobiles/Vendors/NPC/StoneCrafter.cs index f1e614e42..4b36c505e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/StoneCrafter.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/StoneCrafter.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles [TypeAlias("Server.Mobiles.GargoyleStonecrafter")] public class StoneCrafter : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public StoneCrafter() : base("the stone crafter") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Tailor.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Tailor.cs index fed1e8898..89409a564 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Tailor.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Tailor.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class Tailor : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Tailor() : base("the tailor") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Tanner.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Tanner.cs index f2edfc24b..68cbb390c 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Tanner.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Tanner.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Tanner : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Tanner() : base("the tanner") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/TavernKeeper.cs b/Projects/UOContent/Mobiles/Vendors/NPC/TavernKeeper.cs index 515b1f1e6..7c83f6dc3 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/TavernKeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/TavernKeeper.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class TavernKeeper : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public TavernKeeper() : base("the tavern keeper") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Thief.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Thief.cs index 5342257fa..f1bd238fe 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Thief.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Thief.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Thief : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Thief() : base("the thief") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Tinker.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Tinker.cs index 87a583da4..5aa40de49 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Tinker.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Tinker.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Tinker : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Tinker() : base("the tinker") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Vagabond.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Vagabond.cs index f67e7b6e7..41e673cee 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Vagabond.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Vagabond.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Vagabond : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Vagabond() : base("the vagabond") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/VarietyDealer.cs b/Projects/UOContent/Mobiles/Vendors/NPC/VarietyDealer.cs index a00c96eec..5e2e7427e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/VarietyDealer.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/VarietyDealer.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class VarietyDealer : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public VarietyDealer() : base("the variety dealer") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Veterinarian.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Veterinarian.cs index ae84d61a9..36d3d5788 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Veterinarian.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Veterinarian.cs @@ -4,7 +4,7 @@ namespace Server.Mobiles { public class Veterinarian : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Veterinarian() : base("the vet") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Waiter.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Waiter.cs index 106bd3520..95d2ea198 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Waiter.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Waiter.cs @@ -5,7 +5,7 @@ namespace Server.Mobiles { public class Waiter : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Waiter() : base("the waiter") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Weaponsmith.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Weaponsmith.cs index 1f67f5c44..3f3bed4ca 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Weaponsmith.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Weaponsmith.cs @@ -7,7 +7,7 @@ namespace Server.Mobiles { public class Weaponsmith : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Weaponsmith() : base("the weaponsmith") diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Weaver.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Weaver.cs index ed480751f..6a6a82c9e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Weaver.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Weaver.cs @@ -6,7 +6,7 @@ namespace Server.Mobiles { public class Weaver : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); [Constructible] public Weaver() : base("the weaver") diff --git a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs index c8ab60372..c67a302b3 100644 --- a/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs +++ b/Projects/UOContent/Mobiles/Vendors/PlayerBarkeeper.cs @@ -141,7 +141,7 @@ namespace Server.Mobiles public class PlayerBarkeeper : BaseVendor { - private readonly List m_SBInfos = new List(); + private readonly List m_SBInfos = new(); private BaseHouse m_House; private Timer m_NewsTimer; diff --git a/Projects/UOContent/Spells/Mysticism/StoneFormSpell.cs b/Projects/UOContent/Spells/Mysticism/StoneFormSpell.cs index 81bbf2393..5cdfa8198 100644 --- a/Projects/UOContent/Spells/Mysticism/StoneFormSpell.cs +++ b/Projects/UOContent/Spells/Mysticism/StoneFormSpell.cs @@ -106,11 +106,11 @@ namespace Server.Spells.Mysticism ResistanceMod[] mods = { - new ResistanceMod(ResistanceType.Physical, offset), - new ResistanceMod(ResistanceType.Fire, offset), - new ResistanceMod(ResistanceType.Cold, offset), - new ResistanceMod(ResistanceType.Poison, offset), - new ResistanceMod(ResistanceType.Energy, offset) + new(ResistanceType.Physical, offset), + new(ResistanceType.Fire, offset), + new(ResistanceType.Cold, offset), + new(ResistanceType.Poison, offset), + new(ResistanceType.Energy, offset) }; for (var i = 0; i < mods.Length; ++i) diff --git a/Projects/UOContent/Spells/Necromancy/CorpseSkin.cs b/Projects/UOContent/Spells/Necromancy/CorpseSkin.cs index 95ee90ed6..11fa13137 100644 --- a/Projects/UOContent/Spells/Necromancy/CorpseSkin.cs +++ b/Projects/UOContent/Spells/Necromancy/CorpseSkin.cs @@ -71,10 +71,10 @@ namespace Server.Spells.Necromancy ResistanceMod[] mods = { - new ResistanceMod(ResistanceType.Fire, -15), - new ResistanceMod(ResistanceType.Poison, -15), - new ResistanceMod(ResistanceType.Cold, +10), - new ResistanceMod(ResistanceType.Physical, +10) + new(ResistanceType.Fire, -15), + new(ResistanceType.Poison, -15), + new(ResistanceType.Cold, +10), + new(ResistanceType.Physical, +10) }; timer = new ExpireTimer(m, mods, duration);