From e32e97b9e60d7c7404a37cf8656130210d71c8b8 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Tue, 8 Mar 2022 11:24:59 -0600 Subject: [PATCH] fix issue with loading stats config #237 --- Application/Main.cs | 2 +- Plugins/Stats/Config/StatsConfiguration.cs | 27 +++++++++++----------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Application/Main.cs b/Application/Main.cs index 7bdcb8e3..478c74e6 100644 --- a/Application/Main.cs +++ b/Application/Main.cs @@ -348,7 +348,7 @@ namespace IW4MAdmin.Application await defaultConfigHandler.BuildAsync(); var commandConfigHandler = new BaseConfigurationHandler("CommandConfiguration"); await commandConfigHandler.BuildAsync(); - var statsCommandHandler = new BaseConfigurationHandler(); + var statsCommandHandler = new BaseConfigurationHandler("StatsPluginSettings"); await statsCommandHandler.BuildAsync(); var defaultConfig = defaultConfigHandler.Configuration(); var appConfig = appConfigHandler.Configuration(); diff --git a/Plugins/Stats/Config/StatsConfiguration.cs b/Plugins/Stats/Config/StatsConfiguration.cs index 3d2f3e1a..f7bd2f61 100644 --- a/Plugins/Stats/Config/StatsConfiguration.cs +++ b/Plugins/Stats/Config/StatsConfiguration.cs @@ -18,28 +18,27 @@ namespace Stats.Config public int MostKillsClientLimit { get; set; } = 5; public bool EnableAdvancedMetrics { get; set; } = true; - public WeaponNameParserConfiguration[] WeaponNameParserConfigurations { get; set; } = new[] - { - new WeaponNameParserConfiguration() + public WeaponNameParserConfiguration[] WeaponNameParserConfigurations { get; set; } = { + new() { Game = Server.Game.IW3, WeaponSuffix = "mp", Delimiters = new[] {'_'} }, - new WeaponNameParserConfiguration() + new() { Game = Server.Game.IW4, WeaponSuffix = "mp", Delimiters = new[] {'_'} }, - new WeaponNameParserConfiguration() + new() { Game = Server.Game.IW5, WeaponSuffix = "mp", WeaponPrefix = "iw5", Delimiters = new[] {'_'} }, - new WeaponNameParserConfiguration() + new() { Game = Server.Game.T6, WeaponSuffix = "mp", @@ -48,7 +47,7 @@ namespace Stats.Config }; [Obsolete] public IDictionary ServerDetectionTypes { get; set; } - public AnticheatConfiguration AnticheatConfiguration { get; set; } = new AnticheatConfiguration(); + public AnticheatConfiguration AnticheatConfiguration { get; set; } = new(); #pragma warning disable CS0612 // Type or member is obsolete public void ApplyMigration() @@ -77,22 +76,22 @@ namespace Stats.Config Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_STATS_SETUP_ENABLEAC"].PromptBool(); KillstreakMessages = new List { - new StreakMessageConfiguration + new() { Count = -1, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_SUICIDE"] }, - new StreakMessageConfiguration + new() { Count = 5, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_5"] }, - new StreakMessageConfiguration + new() { Count = 10, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_10"] }, - new StreakMessageConfiguration + new() { Count = 25, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_STREAK_MESSAGE_25"] @@ -101,12 +100,12 @@ namespace Stats.Config DeathstreakMessages = new List() { - new StreakMessageConfiguration() + new() { Count = 5, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_DEATH_STREAK_MESSAGE_5"] }, - new StreakMessageConfiguration() + new() { Count = 10, Message = Utilities.CurrentLocalization.LocalizationIndex["STATS_DEATH_STREAK_MESSAGE_10"] @@ -119,4 +118,4 @@ namespace Stats.Config return this; } } -} \ No newline at end of file +}