From 5ef00d6daeb7d7a07b9e7577a9c7a6d7a3e07e08 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Sun, 11 Jul 2021 09:58:02 -0500 Subject: [PATCH] tweak headshot detection for CSGO --- Plugins/ScriptPlugins/ParserCSGO.js | 2 +- Plugins/ScriptPlugins/ParserCSGOSM.js | 2 +- Plugins/Stats/Client/HitCalculator.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/ScriptPlugins/ParserCSGO.js b/Plugins/ScriptPlugins/ParserCSGO.js index e6833167f..f365f6ea8 100644 --- a/Plugins/ScriptPlugins/ParserCSGO.js +++ b/Plugins/ScriptPlugins/ParserCSGO.js @@ -83,7 +83,7 @@ const plugin = { eventParser.Configuration.Kill.AddMapping(2, 7); eventParser.Configuration.Kill.AddMapping(8, 8); eventParser.Configuration.Kill.AddMapping(9, 9); - eventParser.Configuration.Kill.AddMapping(11, 11); + eventParser.Configuration.Kill.AddMapping(12, 10); eventParser.Configuration.Time.Pattern = '^L [01]\\d/[0-3]\\d/\\d+ - [0-2]\\d:[0-5]\\d:[0-5]\\d:'; diff --git a/Plugins/ScriptPlugins/ParserCSGOSM.js b/Plugins/ScriptPlugins/ParserCSGOSM.js index 4a931d24d..eeb2771b1 100644 --- a/Plugins/ScriptPlugins/ParserCSGOSM.js +++ b/Plugins/ScriptPlugins/ParserCSGOSM.js @@ -83,7 +83,7 @@ const plugin = { eventParser.Configuration.Kill.AddMapping(2, 7); eventParser.Configuration.Kill.AddMapping(8, 8); eventParser.Configuration.Kill.AddMapping(9, 9); - eventParser.Configuration.Kill.AddMapping(11, 11); + eventParser.Configuration.Kill.AddMapping(12, 10); eventParser.Configuration.Time.Pattern = '^L [01]\\d/[0-3]\\d/\\d+ - [0-2]\\d:[0-5]\\d:[0-5]\\d:'; diff --git a/Plugins/Stats/Client/HitCalculator.cs b/Plugins/Stats/Client/HitCalculator.cs index f70f50f74..ccce225ac 100644 --- a/Plugins/Stats/Client/HitCalculator.cs +++ b/Plugins/Stats/Client/HitCalculator.cs @@ -170,9 +170,9 @@ namespace IW4MAdmin.Plugins.Stats.Client return; } - var attackerHitInfo = _hitInfoBuilder.Build(match.Values.ToArray(), eventRegex, gameEvent.Origin.ClientId, + var attackerHitInfo = _hitInfoBuilder.Build(match.Values.Where(m => m.Length > 0).ToArray(), eventRegex, gameEvent.Origin.ClientId, gameEvent.Origin.ClientId == gameEvent.Target.ClientId, false, gameEvent.Owner.GameName); - var victimHitInfo = _hitInfoBuilder.Build(match.Values.ToArray(), eventRegex, gameEvent.Target.ClientId, + var victimHitInfo = _hitInfoBuilder.Build(match.Values.Where(m => m.Length > 0).ToArray(), eventRegex, gameEvent.Target.ClientId, gameEvent.Origin.ClientId == gameEvent.Target.ClientId, true, gameEvent.Owner.GameName); foreach (var hitInfo in new[] {attackerHitInfo, victimHitInfo})