glax/OpenCS2hock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Fix wrong OnDeath trigger

Browse Source
This commit is contained in:
glax 2024-01-15 02:22:43 +01:00
parent 8b02b334c0
commit 442956c34d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCS2hock/CS2MessageHandler.cs
View File

@ -15,12 +15,8 @@ internal class CS2MessageHandler
internal void HandleCS2Message(string message, string mySteamId) internal void HandleCS2Message(string message, string mySteamId)
{ {
JObject messageJson = JObject.Parse(message); JObject messageJson = JObject.Parse(message);
string? steamId = messageJson.SelectToken("player.steamid", false)?.Value<string>(); string? previousSteamId = messageJson.SelectToken("previously.player.steamid", false)?.Value<string>();
if (steamId is null || steamId != mySteamId) string? currentSteamId = messageJson.SelectToken("player.steamid", false)?.Value<string>();
{
Console.WriteLine("Not my steamid");
return;
}
RoundState currentRoundState = ParseRoundStateFromString(messageJson.SelectToken("round.phase", false)?.Value<string>()); RoundState currentRoundState = ParseRoundStateFromString(messageJson.SelectToken("round.phase", false)?.Value<string>());
RoundState previousRoundState = ParseRoundStateFromString(messageJson.SelectToken("previously.round.phase", false)?.Value<string>()); RoundState previousRoundState = ParseRoundStateFromString(messageJson.SelectToken("previously.round.phase", false)?.Value<string>());
@ -40,12 +36,12 @@ internal class CS2MessageHandler
int? previousDeaths = messageJson.SelectToken("previously.player.match_stats.deaths", false)?.Value<int>(); int? previousDeaths = messageJson.SelectToken("previously.player.match_stats.deaths", false)?.Value<int>();
int? currentDeaths = messageJson.SelectToken("player.match_stats.deaths", false)?.Value<int>(); int? currentDeaths = messageJson.SelectToken("player.match_stats.deaths", false)?.Value<int>();
if(currentDeaths > previousDeaths) if(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentDeaths > previousDeaths)
OnDeath?.Invoke(); OnDeath?.Invoke();
int? previousKills = messageJson.SelectToken("previously.player.match_stats.kills", false)?.Value<int>(); int? previousKills = messageJson.SelectToken("previously.player.match_stats.kills", false)?.Value<int>();
int? currentKills = messageJson.SelectToken("player.match_stats.kills", false)?.Value<int>(); int? currentKills = messageJson.SelectToken("player.match_stats.kills", false)?.Value<int>();
if(currentKills > previousKills) if(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentKills > previousKills)
OnKill?.Invoke(); OnKill?.Invoke();
} }