diff --git a/Plugins/AutomessageFeed/AutomessageFeed.csproj b/Plugins/AutomessageFeed/AutomessageFeed.csproj index 84758a266..bbd8c0ac4 100644 --- a/Plugins/AutomessageFeed/AutomessageFeed.csproj +++ b/Plugins/AutomessageFeed/AutomessageFeed.csproj @@ -10,7 +10,7 @@ - + diff --git a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj index 363c2e25a..068ab4fca 100644 --- a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj +++ b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj @@ -10,7 +10,7 @@ - + diff --git a/Plugins/LiveRadar/LiveRadar.csproj b/Plugins/LiveRadar/LiveRadar.csproj index 2f1eae5e7..15e9bf864 100644 --- a/Plugins/LiveRadar/LiveRadar.csproj +++ b/Plugins/LiveRadar/LiveRadar.csproj @@ -16,7 +16,7 @@ - + diff --git a/Plugins/Login/Login.csproj b/Plugins/Login/Login.csproj index ff703f783..377ed87c1 100644 --- a/Plugins/Login/Login.csproj +++ b/Plugins/Login/Login.csproj @@ -23,7 +23,7 @@ - + diff --git a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj index c53888ac6..50c0bcd2c 100644 --- a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj +++ b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj @@ -16,7 +16,7 @@ - + diff --git a/Plugins/Stats/Commands/MostKillsCommand.cs b/Plugins/Stats/Commands/MostKillsCommand.cs index f6dc99624..bb216562d 100644 --- a/Plugins/Stats/Commands/MostKillsCommand.cs +++ b/Plugins/Stats/Commands/MostKillsCommand.cs @@ -17,6 +17,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands class MostKillsCommand : Command { private readonly IDatabaseContextFactory _contextFactory; + private readonly CommandConfiguration _config; public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup, IDatabaseContextFactory contextFactory) : base(config, translationLookup) { @@ -26,12 +27,13 @@ namespace IW4MAdmin.Plugins.Stats.Commands Permission = EFClient.Permission.User; _contextFactory = contextFactory; + _config = config; } public override async Task ExecuteAsync(GameEvent E) { var mostKills = await GetMostKills(StatManager.GetIdForServer(E.Owner), Plugin.Config.Configuration(), _contextFactory, _translationLookup); - if (!E.Message.IsBroadcastCommand()) + if (!E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)) { foreach (var stat in mostKills) { diff --git a/Plugins/Stats/Commands/MostPlayedCommand.cs b/Plugins/Stats/Commands/MostPlayedCommand.cs index 45ba38055..db08a0146 100644 --- a/Plugins/Stats/Commands/MostPlayedCommand.cs +++ b/Plugins/Stats/Commands/MostPlayedCommand.cs @@ -59,6 +59,8 @@ namespace IW4MAdmin.Plugins.Stats.Commands return mostPlayed; } + private readonly CommandConfiguration _config; + public MostPlayedCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) { Name = "mostplayed"; @@ -66,12 +68,14 @@ namespace IW4MAdmin.Plugins.Stats.Commands Alias = "mp"; Permission = EFClient.Permission.User; RequiresTarget = false; + + _config = config; } public override async Task ExecuteAsync(GameEvent E) { var topStats = await GetMostPlayed(E.Owner, _translationLookup); - if (!E.Message.IsBroadcastCommand()) + if (!E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)) { foreach (var stat in topStats) { diff --git a/Plugins/Stats/Commands/TopStats.cs b/Plugins/Stats/Commands/TopStats.cs index 15afe293a..a81e1522e 100644 --- a/Plugins/Stats/Commands/TopStats.cs +++ b/Plugins/Stats/Commands/TopStats.cs @@ -65,6 +65,8 @@ namespace IW4MAdmin.Plugins.Stats.Commands return topStatsText; } + private readonly CommandConfiguration _config; + public TopStats(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup) { Name = "topstats"; @@ -72,12 +74,14 @@ namespace IW4MAdmin.Plugins.Stats.Commands Alias = "ts"; Permission = EFClient.Permission.User; RequiresTarget = false; + + _config = config; } public override async Task ExecuteAsync(GameEvent E) { var topStats = await GetTopStats(E.Owner, _translationLookup); - if (!E.Message.IsBroadcastCommand()) + if (!E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)) { foreach (var stat in topStats) { diff --git a/Plugins/Stats/Commands/ViewStats.cs b/Plugins/Stats/Commands/ViewStats.cs index f712a6dc2..188e153be 100644 --- a/Plugins/Stats/Commands/ViewStats.cs +++ b/Plugins/Stats/Commands/ViewStats.cs @@ -30,8 +30,12 @@ namespace IW4MAdmin.Plugins.Stats.Commands Required = false } }; + + _config = config; } + private readonly CommandConfiguration _config; + public override async Task ExecuteAsync(GameEvent E) { string statLine; @@ -90,7 +94,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands statLine = $"^5{pStats.Kills} ^7{_translationLookup["PLUGINS_STATS_TEXT_KILLS"]} | ^5{pStats.Deaths} ^7{_translationLookup["PLUGINS_STATS_TEXT_DEATHS"]} | ^5{pStats.KDR} ^7KDR | ^5{pStats.Performance} ^7{_translationLookup["PLUGINS_STATS_COMMANDS_PERFORMANCE"].ToUpper()} | {performanceRankingString}"; } - if (E.Message.IsBroadcastCommand()) + if (E.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)) { string name = E.Target == null ? E.Origin.Name : E.Target.Name; E.Owner.Broadcast(_translationLookup["PLUGINS_STATS_COMMANDS_VIEW_SUCCESS"].FormatExt(name)); diff --git a/Plugins/Stats/Stats.csproj b/Plugins/Stats/Stats.csproj index a504c6ca0..0c26fcd35 100644 --- a/Plugins/Stats/Stats.csproj +++ b/Plugins/Stats/Stats.csproj @@ -16,7 +16,7 @@ - + diff --git a/Plugins/Web/StatsWeb/StatsWeb.csproj b/Plugins/Web/StatsWeb/StatsWeb.csproj index 5fe5518d4..59c6853a0 100644 --- a/Plugins/Web/StatsWeb/StatsWeb.csproj +++ b/Plugins/Web/StatsWeb/StatsWeb.csproj @@ -14,7 +14,7 @@ Always - + diff --git a/Plugins/Welcome/Welcome.csproj b/Plugins/Welcome/Welcome.csproj index 7d86c8c6b..954d8a5ea 100644 --- a/Plugins/Welcome/Welcome.csproj +++ b/Plugins/Welcome/Welcome.csproj @@ -16,7 +16,7 @@ - + diff --git a/SharedLibraryCore/SharedLibraryCore.csproj b/SharedLibraryCore/SharedLibraryCore.csproj index 98b911658..dd2bfedc7 100644 --- a/SharedLibraryCore/SharedLibraryCore.csproj +++ b/SharedLibraryCore/SharedLibraryCore.csproj @@ -6,7 +6,7 @@ RaidMax.IW4MAdmin.SharedLibraryCore - 2.4.2 + 2.4.3 RaidMax Forever None Debug;Release;Prerelease @@ -20,8 +20,8 @@ true MIT Shared Library for IW4MAdmin - 2.4.2.0 - 2.4.2.0 + 2.4.3.0 + 2.4.3.0