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

Fix wrong OnDeath trigger actually

Browse Source
This commit is contained in:
glax 2024-01-15 02:48:08 +01:00
parent 0367d079c6
commit 281d73eb6b
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

@ -29,24 +29,20 @@ internal class CS2MessageHandler
Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>()); Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>());
Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>()); Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>());
if(winnerTeam != Team.None && playerTeam == winnerTeam) if(winnerTeam != Team.None && playerTeam != Team.None && playerTeam == winnerTeam)
OnRoundWin?.Invoke(); OnRoundWin?.Invoke();
else if(winnerTeam != Team.None && playerTeam != winnerTeam) else if(winnerTeam != Team.None && playerTeam != Team.None && playerTeam != winnerTeam)
OnRoundLoss?.Invoke(); OnRoundLoss?.Invoke();
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(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentDeaths > previousDeaths) if(previousSteamId is null && currentSteamId == mySteamId && currentDeaths > previousDeaths)
OnDeath?.Invoke(); OnDeath?.Invoke();
else if(currentSteamId != mySteamId)
Console.WriteLine("Not my SteamId");
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(currentSteamId == mySteamId && previousSteamId == currentSteamId && currentKills > previousKills) if(previousSteamId is null && currentSteamId == mySteamId && currentKills > previousKills)
OnKill?.Invoke(); OnKill?.Invoke();
else if(currentSteamId != mySteamId)
Console.WriteLine("Not my SteamId");
} }
private RoundState ParseRoundStateFromString(string? str) private RoundState ParseRoundStateFromString(string? str)