Use max players and spectators to calculate scoreboard rows

EvoEsports · Oct 6, 2024 · e3782c2 · e3782c2
1 parent a4d1589
commit e3782c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/Modules/ScoreboardModule/Services/ScoreboardService.cs b/src/Modules/ScoreboardModule/Services/ScoreboardService.cs
@@ -30,18 +30,12 @@ public async Task SendScoreboardAsync()
     private async Task<dynamic> GetDataAsync()
     {
         var currentNextMaxPlayers = await server.Remote.GetMaxPlayersAsync();
-        var maxPlayers = 128;
+        var currentNextMaxSpectators = await server.Remote.GetMaxSpectatorsAsync();
 
-        if (currentNextMaxPlayers.CurrentValue > 0)
+        return new
         {
-            maxPlayers = currentNextMaxPlayers.CurrentValue;
-        }
-        else if (currentNextMaxPlayers.NextValue > 0)
-        {
-            maxPlayers = currentNextMaxPlayers.NextValue;
-        }
-
-        return new { settings, MaxPlayers = maxPlayers };
+            settings, MaxPlayers = currentNextMaxPlayers.CurrentValue + currentNextMaxSpectators.CurrentValue
+        };
     }
 
     public Task HideNadeoScoreboardAsync() =>

diff --git a/src/Modules/ScoreboardModule/Templates/Scoreboard.mt b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
@@ -222,6 +222,9 @@
             declare roundPointsLabel = (playerRow.GetFirstChild("round_points") as CMlLabel);
             declare customLabel = (playerRow.GetFirstChild("custom_label") as CMlLabel);
 
+            scoreLabel.Value = "";
+            roundPointsLabel.Value = "";
+
             if (!(CustomPointsEnabled && CurrentScoreMode != C_Mode_Trophy)) {
                 HideCustomLabel(playerRow);
             }