Add server config option to switch if players can join

Docs/source/admin/configuration.rst

@@ -103,21 +103,28 @@ Serverconfig
 ........................
 The Serverconfig defines server wide PugSharp settings for your server. It is loaded automatically when PugSharp is loaded.
 
+Location: /game/csgo/PugSharp/Config/server.json
+
+
+
 Serverconfig Fields
 '''''''''''''''''''''
-+--------+---------+---------------------------------------------------------------------------------------+
-| Field  | Default |                                      Description                                      |
-+========+=========+=======================================================================================+
-| locale | en      | This is the language that will be used for the messages that are printed to the users |
-+--------+---------+---------------------------------------------------------------------------------------+
++-----------------------------+---------+---------------------------------------------------------------------------------------+
+|            Field            | Default |                                      Description                                      |
++=============================+=========+=======================================================================================+
+| locale                      | en      | This is the language that will be used for the messages that are printed to the users |
++-----------------------------+---------+---------------------------------------------------------------------------------------+
+| allow_players_without_match | true    | Defines if players can join the server when no match is loaded.                       |
++-----------------------------+---------+---------------------------------------------------------------------------------------+
 
 Serverconfig Example
 '''''''''''''''''''''
 
 .. code-block:: json
 
    {
-     "none": ""
+       "locale": "en",
+       "allow_players_without_match": true
    }
 
 

PugSharp.Config/ConfigProvider.cs

@@ -138,20 +138,21 @@ public OneOf<Error<string>, ServerConfig> LoadServerConfig()
 
                 // Create default config
                 _ServerConfig = new ServerConfig();
-                using FileStream createStream = File.Create(configPath);
-                JsonSerializer.Serialize(createStream, _ServerConfig);
-                return _ServerConfig;
             }
-
-            using var loadingStream = File.OpenRead(configPath);
-            _ServerConfig = JsonSerializer.Deserialize<ServerConfig>(loadingStream);
-
-            if (_ServerConfig == null)
+            else
             {
-                _Logger.LogError("ServerConfig was deserialized to null");
-                return new Error<string>("ServerConfig couldn't be deserialized");
+                using var loadingStream = File.OpenRead(configPath);
+                _ServerConfig = JsonSerializer.Deserialize<ServerConfig>(loadingStream);
+
+                if (_ServerConfig == null)
+                {
+                    _Logger.LogError("ServerConfig was deserialized to null");
+                    return new Error<string>("ServerConfig couldn't be deserialized");
+                }
             }
 
+            using FileStream createStream = File.Create(configPath);
+            JsonSerializer.Serialize(createStream, _ServerConfig);
             return _ServerConfig;
         }
         catch (Exception ex)

PugSharp.Config/ServerConfig.cs

@@ -6,4 +6,7 @@ public class ServerConfig
 {
     [JsonPropertyName("locale")]
     public string Locale { get; init; } = "en";
+
+    [JsonPropertyName("allow_players_without_match")]
+    public bool AllowPlayersWithoutMatch { get; init; } = true;
 }

PugSharp/Application.cs

@@ -45,13 +45,14 @@
     private Match.Match? _Match;
     private bool _DisposedValue;
     private ConfigCreator _ConfigCreator;
+    private ServerConfig _ServerConfig;
     private readonly CurrentRoundState _CurrentRoundState = new();
 
     /// <summary>
     /// Create instance of Application
     /// </summary>
 #pragma warning disable S107 // Methods should not have too many parameters
     public Application(
         ILogger<Application> logger,
         IBasePlugin plugin,
         ICsServer csServer,
@@ -73,9 +74,6 @@
         PugSharpDirectory = Path.Combine(_CsServer.GameDirectory, "csgo", "PugSharp");
         _ConfigProvider.Initialize(Path.Join(PugSharpDirectory, "Config"));
 
-
-
-
         _ = Task.Run(ConfigLoaderTask, _CancellationTokenSource.Token);
     }
 
@@ -85,7 +83,11 @@
 
         serverConfigResult.Switch(
             error => { }, // Do nothing - Error already logged
-            serverConfig => SetServerCulture(serverConfig.Locale)
+            serverConfig =>
+            {
+                _ServerConfig = serverConfig;
+                SetServerCulture(serverConfig.Locale);
+            }
         );
 
         RegisterEventHandlers();
@@ -105,7 +107,7 @@
                         var results = command.CommandCallBack(args);
                         foreach (var result in results)
                         {
                             // TODO Translation?
                             c.ReplyToCommand(result);
                         }
                     }, c, p, c.GetCommandString, c.ArgString);
@@ -174,7 +176,7 @@
 
         if (userId != null && userId.IsValid)
         {
-            // // Userid will give you a reference to a CCSPlayerController class
+            // Userid will give you a reference to a CCSPlayerController class
             _Logger.LogInformation("Player {playerName} has connected!", userId.PlayerName);
 
             if (userId.IsHLTV)
@@ -208,6 +210,11 @@
                     // do nothing
                 }
             }
+            else if (_ServerConfig?.AllowPlayersWithoutMatch == false)
+            {
+                eventPlayerConnectFull.Userid.PrintToCenter("Joining without a match is not allowed!");
+                eventPlayerConnectFull.Userid.Kick();
+            }
             else
             {
                 // Do nothign if no match is loaded
@@ -318,7 +325,7 @@
         }
     }
 
     // TODO Add Round Events to RoundService?
     private HookResult OnRoundPreStart(EventRoundPrestart eventRoundPrestart, GameEventInfo info)
     {
         _Logger.LogInformation("OnRoundPreStart called");
@@ -555,7 +562,7 @@
             {
                 int maxMoneyValue = 16000;
                 //try
                 //{
                 //    // Use value from server if possible
                 //    var maxMoneyCvar = ConVar.Find("mp_maxmoney");
                 //    if (maxMoneyCvar != null)
@@ -588,7 +595,7 @@
             var killedByBomb = eventPlayerDeath.Weapon.Equals("planted_c4", StringComparison.OrdinalIgnoreCase);
             var isSuicide = (attacker == victim) && !killedByBomb;
             var isHeadshot = eventPlayerDeath.Headshot;
             var isClutcher = false; // TODO
 
             var victimStats = _CurrentRoundState.GetPlayerRoundStats(victim.SteamID, victim.PlayerName);
 
@@ -654,7 +661,7 @@
                                     break;
                             }
 
                             var hasClutched = false; // TODO
 
                             if (hasClutched)
                             {
@@ -1491,7 +1498,7 @@
             }
 
 #pragma warning disable MA0003 // Add parameter name to improve readability
             p.Pawn.Value.CommitSuicide(true, true);
 #pragma warning restore MA0003 // Add parameter name to improve readability
         },
         command,