Skip to content

feat: release v1.2.4 with bug fixes #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiruwiru merged 2 commits into from
Jun 3, 2025
Merged

feat: release v1.2.4 with bug fixes #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c143a6
fix: resolved bug preventing server variables from being accessible o…
wiruwiru Jun 3, 2025
f561105
fix: resolved bug with `onlyInWarmup` variable preventing all announc…
wiruwiru Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Services/AdService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private bool IsWarmupStateValid(AdConfig ad)
if (ad.OnlyInWarmup)
return isWarmup;

return !isWarmup;
return true;
}

private bool IsIntervalElapsed(AdConfig ad)
Expand Down
20 changes: 13 additions & 7 deletions Utils/MessageFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,21 +243,27 @@ private string ReplacePlayerVariables(string message, PlayerInfo playerInfo)

public Dictionary<string, string> GetServerVariables()
{
if ((DateTime.Now - _lastServerVarUpdate).TotalSeconds > 5)
bool needsUpdate = (DateTime.Now - _lastServerVarUpdate).TotalSeconds > 5 || _cachedServerVariables.Count == 0;

if (needsUpdate)
{
Server.NextFrame(() =>
try
{
try
var newVariables = GetServerVariablesInternal();
if (newVariables.Count > 0)
{
_cachedServerVariables = GetServerVariablesInternal();
_cachedServerVariables = newVariables;
_lastServerVarUpdate = DateTime.Now;
}
catch (Exception ex)
}
catch (Exception ex)
{
Console.WriteLine($"[AutomaticAds] Error updating server variables: {ex.Message}");
if (_cachedServerVariables.Count == 0)
{
Console.WriteLine($"[AutomaticAds] Error updating server variables: {ex.Message}");
_cachedServerVariables = GetFallbackServerVariables();
}
});
}
}

return _cachedServerVariables.Count > 0 ? _cachedServerVariables : GetFallbackServerVariables();
Expand Down