Update queue

space-syndicate · Oct 2, 2023 · 2f7b33c · 2f7b33c
1 parent a550442
commit 2f7b33c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
@@ -145,7 +145,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
 
             // Corvax-Queue-Start
-            var isQueueEnabled = _cfg.GetCVar(CCCVars.QueueEnabled);
+            var isQueueEnabled = IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out var mgr) && mgr.IsEnabled;
             if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled)
             // Corvax-Queue-End
             {

diff --git a/Content.Shared/Corvax/CCCVars/CCCVars.cs b/Content.Shared/Corvax/CCCVars/CCCVars.cs
@@ -9,16 +9,6 @@ namespace Content.Shared.Corvax.CCCVars;
 // ReSharper disable once InconsistentNaming
 public sealed class CCCVars
 {
-    /*
-     * Queue
-     */
-
-    /// <summary>
-    ///     Controls if the connections queue is enabled. If enabled stop kicking new players after `SoftMaxPlayers` cap and instead add them to queue.
-    /// </summary>
-    public static readonly CVarDef<bool>
-        QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
-
     /**
      * TTS (Text-To-Speech)
      */

diff --git a/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs b/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs
@@ -2,7 +2,9 @@
 
 public interface IServerJoinQueueManager
 {
+    public bool IsEnabled { get; }
     public int PlayerInQueueCount { get; }
     public int ActualPlayersCount { get; }
     public void Initialize();
+    public void PostInitialize();
 }
diff --git a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl
@@ -3,3 +3,7 @@ queue-quit = Выйти
 queue-position = Ваша позиция:
 queue-total = Всего в очереди:
 queue-priority-join = Приоритетный вход
+queue-server-title = Вы можете подключиться к:
+queue-server-not-available = Нет доступных серверов
+queue-server-online = Онлайн:
+queue-server-connect = Подключиться
diff --git a/Secrets b/Secrets