SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix UDMUX detection in client log parser

Browse Source
This commit is contained in:
pizzaboxer 2023-03-09 11:07:53 +00:00
parent db21afaaeb
commit d5d95872bb
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bloxstrap/Integrations/DiscordRichPresence.cs
View File

@ -69,9 +69,7 @@ namespace Bloxstrap.Integrations
else if (_logEntriesRead % 100 == 0) else if (_logEntriesRead % 100 == 0)
App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Read {_logEntriesRead} log entries"); App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Read {_logEntriesRead} log entries");
if (!_activityInGame && _activityPlaceId == 0) if (entry.Contains(GameJoiningEntry) && !_activityInGame && _activityPlaceId == 0)
{
if (entry.Contains(GameJoiningEntry))
{ {
Match match = Regex.Match(entry, GameJoiningEntryPattern); Match match = Regex.Match(entry, GameJoiningEntryPattern);
@ -89,7 +87,9 @@ namespace Bloxstrap.Integrations
App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Joining Game ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})"); App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Joining Game ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})");
} }
else if (entry.Contains(GameJoiningUDMUXEntry)) else if (!_activityInGame && _activityPlaceId != 0)
{
if (entry.Contains(GameJoiningUDMUXEntry))
{ {
Match match = Regex.Match(entry, GameJoiningUDMUXPattern); Match match = Regex.Match(entry, GameJoiningUDMUXPattern);
@ -104,8 +104,7 @@ namespace Bloxstrap.Integrations
App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Server is UDMUX protected ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})"); App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Server is UDMUX protected ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})");
} }
} else if (entry.Contains(GameJoinedEntry))
else if (entry.Contains(GameJoinedEntry) && !_activityInGame && _activityPlaceId != 0)
{ {
Match match = Regex.Match(entry, GameJoinedEntryPattern); Match match = Regex.Match(entry, GameJoinedEntryPattern);
@ -121,6 +120,7 @@ namespace Bloxstrap.Integrations
_activityInGame = true; _activityInGame = true;
await SetPresence(); await SetPresence();
} }
}
else if (entry.Contains(GameDisconnectedEntry) && _activityInGame && _activityPlaceId != 0) else if (entry.Contains(GameDisconnectedEntry) && _activityInGame && _activityPlaceId != 0)
{ {
App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Disconnected from Game ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})"); App.Logger.WriteLine($"[DiscordRichPresence::ExamineLogEntry] Disconnected from Game ({_activityPlaceId}/{_activityJobId}/{_activityMachineAddress})");