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

Corrected json parsing for messagehandling

Browse Source
This commit is contained in:
glax 2024-01-14 01:10:36 +01:00
parent 47b721d419
commit 0303efac16
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenCS2hock/CS2MessageHandler.cs
View File

@ -15,30 +15,28 @@ public class CS2MessageHandler
public void HandleCS2Message(string message) public void HandleCS2Message(string message)
{ {
JObject messageJson = JObject.Parse(message); JObject messageJson = JObject.Parse(message);
JToken? previously = messageJson.GetValue("previously");
RoundState currentRoundState = ParseRoundStateFromString(messageJson["round"]?.Value<string>("phase")); RoundState currentRoundState = ParseRoundStateFromString(messageJson.SelectToken("round.phase", false)?.Value<string>());
RoundState previousRoundState = ParseRoundStateFromString(previously?["round"]?.Value<string>("phase")); RoundState previousRoundState = ParseRoundStateFromString(messageJson.SelectToken("previously.round.phase", false)?.Value<string>());
if(previousRoundState == RoundState.FreezeTime && currentRoundState == RoundState.Live) if(previousRoundState == RoundState.FreezeTime && currentRoundState == RoundState.Live)
OnRoundStart?.Invoke(); OnRoundStart?.Invoke();
if(previousRoundState == RoundState.Live && currentRoundState == RoundState.FreezeTime) if(previousRoundState == RoundState.Live && currentRoundState == RoundState.FreezeTime)
OnRoundEnd?.Invoke(); OnRoundEnd?.Invoke();
Team playerTeam = ParseTeamFromString(messageJson["player"]?.Value<string>("team")); Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>());
Team winnerTeam = ParseTeamFromString(messageJson["round"]?.Value<string>("win_team")); Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>());
if(winnerTeam != Team.None && playerTeam == winnerTeam) if(winnerTeam != Team.None && playerTeam == winnerTeam)
OnRoundWin?.Invoke(); OnRoundWin?.Invoke();
else if(winnerTeam != Team.None && playerTeam != winnerTeam) else if(winnerTeam != Team.None && playerTeam != winnerTeam)
OnRoundLoss?.Invoke(); OnRoundLoss?.Invoke();
int? previousDeaths = previously?["player"]?["match_stats"]?.Value<int>("deaths"); int? previousDeaths = messageJson.SelectToken("previously.player.match_stats.deaths", false)?.Value<int>();
int? currentDeaths = messageJson["player"]?["match_stats"]?.Value<int>("deaths"); int? currentDeaths = messageJson.SelectToken("player.match_stats.deaths", false)?.Value<int>();
if(currentDeaths > previousDeaths) if(currentDeaths > previousDeaths)
OnDeath?.Invoke(); OnDeath?.Invoke();
int? previousKills = previously?["player"]?["match_stats"]?.Value<int>("kills"); int? previousKills = messageJson.SelectToken("previously.player.match_stats.kills", false)?.Value<int>();
int? currentKills = messageJson["player"]?["match_stats"]?.Value<int>("kills"); int? currentKills = messageJson.SelectToken("player.match_stats.kills", false)?.Value<int>();
if(currentKills > previousKills) if(currentKills > previousKills)
OnKill?.Invoke(); OnKill?.Invoke();
} }