Added config to automatically make joining players join the queue

README.md

@@ -64,6 +64,7 @@ When the plugin is first loaded it will create a `retakes_config.json` file in t
 | IsDebugMode                                       | Whether to enable debug output to the server console or not.                                                                                    | false      | false      | true       |
 | ShouldForceEvenTeamsWhenPlayerCountIsMultipleOf10 | Whether to force even teams when the active players is a multiple of 10 or not. (this means you will get 5v5 @ 10 players / 10v10 @ 20 players) | true       | false      | true       |
 | EnableFallbackBombsiteAnnouncement                | Whether to enable the fallback bombsite announcement.                                                                                           | true       | false      | true       |
+| AddJoiningPlayersToQueue                          | Whether to add players to the queue when they join the game.                                                                                    | false      | false      | true       |
 
 ## Commands
 | Command         | Arguments                         | Description                                                          | Permissions |

RetakesPlugin/Modules/Configs/RetakesConfigData.cs

@@ -2,7 +2,7 @@
 
 public class RetakesConfigData
 {
-    public static int CurrentVersion = 8;
+    public static int CurrentVersion = 9;
 
     public int Version { get; set; } = CurrentVersion;
     public int MaxPlayers { get; set; } = 9;
@@ -19,4 +19,5 @@ public class RetakesConfigData
     public bool IsDebugMode { get; set; } = false;
     public bool ShouldForceEvenTeamsWhenPlayerCountIsMultipleOf10 { get; set; } = true;
     public bool EnableFallbackBombsiteAnnouncement { get; set; } = true;
+    public bool AddJoiningPlayersToQueue { get; set; } = false;
 }

RetakesPlugin/Modules/Helpers.cs

@@ -137,6 +137,10 @@ mp_death_drop_gun 1
                 mp_death_drop_defuser 1
                 mp_death_drop_grenade 1
                 mp_warmuptime 15
+
+                // If AddJoiningPlayersToQueue is enabled, then the following commands are required:
+                // sv_human_autojoin_team 3
+                // mp_force_pick_time -1
 
                 echo [Retakes] Config loaded!
             ";

RetakesPlugin/RetakesPlugin.cs

@@ -20,7 +20,7 @@ namespace RetakesPlugin;
 [MinimumApiVersion(201)]
 public class RetakesPlugin : BasePlugin
 {
-    private const string Version = "2.0.2";
+    private const string Version = "2.1.0";
 
     #region Plugin info
     public override string ModuleName => "Retakes Plugin";
@@ -505,21 +505,29 @@ public HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventIn
             return HookResult.Continue;
         }
 
-        // TODO: We can make use of sv_human_autojoin_team 3 to prevent needing to do this.
-        player.TeamNum = (int)CsTeam.Spectator;
-        player.ForceTeamTime = 3600.0f;
-
-        // Create a timer to do this as it would occasionally fire too early.
-        AddTimer(1.0f, () =>
-        {
-            if (!player.IsValid)
-            {
-                return;
-            }
-
-            player.ExecuteClientCommand("teammenu");
-        });
-
+		player.TeamNum = (int)CsTeam.Spectator;
+
+		if (_retakesConfig?.RetakesConfigData?.AddJoiningPlayersToQueue ?? false)
+        {
+            _gameManager?.QueueManager.PlayerJoinedTeam(player, CsTeam.Spectator, CsTeam.CounterTerrorist);
+        }
+		else
+		{
+            // Give the player time to choose a team.
+            player.ForceTeamTime = 3600.0f;
+
+        	// Create a timer to do this as it would occasionally fire too early.
+        	AddTimer(1.0f, () =>
+        	{
+	            if (!player.IsValid)
+    	        {
+        	        return;
+        	   	}
+
+	            player.ExecuteClientCommand("teammenu");
+    	    });
+		}
+
         // Many hours of hard work went into this.
         if (new List<ulong> { 76561198028510846, 76561198044886803, 76561198414501446 }.Contains(player.SteamID))
         {