Minplayers

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on: push
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+              with:
+                submodules: recursive
+
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v4
+              with:
+                  dotnet-version: '8.0.x'
+
+            - name: Restore dependencies
+              run: dotnet restore
+
+            - name: Build
+              run: dotnet build -c Release

.github/workflows/dotnet.yml → .github/workflows/release.yml

@@ -1,13 +1,16 @@
 name: Build and Release
 
-on: push
+on:
+  push:
+    branches:
+      - main
 
 jobs:
     build:
         runs-on: ubuntu-latest
 
         steps:
-            - name: checkout all the submodules
+            - name: Checkout repository
               uses: actions/checkout@v4
               with:
                 submodules: recursive
@@ -32,7 +35,7 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
               with:
-                  submodules: recursive
+                submodules: recursive
 
             - name: Setup .NET
               uses: actions/setup-dotnet@v4
@@ -105,4 +108,4 @@ jobs:
                   upload_url: ${{ steps.create_release.outputs.upload_url }}
                   asset_path: ./plugin/${{ github.event.repository.name }}-${{ github.sha }}.zip
                   asset_name: ${{ github.event.repository.name }}.zip
-                  asset_content_type: application/zip
+                  asset_content_type: application/zip

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "Menu"]
 	path = Menu
 	url = https://github.com/oscar-wos/Menu.git
+[submodule "CSSharpUtils"]
+	path = CSSharpUtils
+	url = https://github.com/oscar-wos/CSSharpUtils

AntiRush.sln

@@ -5,7 +5,9 @@ VisualStudioVersion = 17.10.34928.147
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntiRush", "src\AntiRush.csproj", "{9B2DEBE8-1EEF-47E8-B890-D15A3F0FF109}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Menu", ".\Menu\src\Menu.csproj", "{5AC48D94-A9F6-4566-92A4-F78C39A9FCD6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Menu", "Menu\src\Menu.csproj", "{5AC48D94-A9F6-4566-92A4-F78C39A9FCD6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSSharpUtils", "CSSharpUtils\CSSharpUtils\CSSharpUtils.csproj", "{794D24A4-83A3-4F67-94DE-09087FC9554E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{5AC48D94-A9F6-4566-92A4-F78C39A9FCD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5AC48D94-A9F6-4566-92A4-F78C39A9FCD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AC48D94-A9F6-4566-92A4-F78C39A9FCD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/AntiRush.cs

@@ -2,13 +2,17 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using AntiRush.Enums;
+using CSSharpUtils.Extensions;
 
 namespace AntiRush;
 
 public partial class AntiRush : BasePlugin, IPluginConfig<AntiRushConfig>
 {
     public void OnConfigParsed(AntiRushConfig config)
     {
+        if (config.Update())
+            config.Reload();
+
         Config = config;
         _countdown = Config.Countdown.Select(c => (float)c).ToArray();
     }

src/AntiRush.csproj

@@ -8,6 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="CounterStrikeSharp.API" Version="*" ExcludeAssets="runtime" />
+		<ProjectReference Include="..\CSSharpUtils\CSSharpUtils\CSSharpUtils.csproj" />
 		<ProjectReference Include="..\Menu\src\Menu.csproj" />
 	</ItemGroup>
 
@@ -18,9 +19,4 @@
 		</Content>
 	</ItemGroup>
 
-	<Target Name="CopyCustomContent" AfterTargets="AfterBuild" Condition=" '$(Configuration)' == 'Debug' ">
-		<Copy SourceFiles="$(OutputPath)AntiRush.dll" DestinationFolder="\\wsl.localhost\Debian\home\user\cs2\game\csgo\addons\counterstrikesharp\plugins\AntiRush" />
-		<Copy SourceFiles="$(OutputPath)lang\en.json" DestinationFolder="\\wsl.localhost\Debian\home\user\cs2\game\csgo\addons\counterstrikesharp\plugins\AntiRush\lang" />
-	</Target>
-
 </Project>

src/Config.cs

@@ -1,11 +1,11 @@
-using CounterStrikeSharp.API.Core;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
+using CounterStrikeSharp.API.Core;
 
 namespace AntiRush;
 
 public class AntiRushConfig : BasePluginConfig
 {
-    public override int Version { get; set; } = 5;
+    public override int Version { get; set; } = 6;
     [JsonPropertyName("Messages")] public string Messages { get; set; } = "simple";
     [JsonPropertyName("DrawZones")] public bool DrawZones { get; set; } = false;
     [JsonPropertyName("Warmup")] public bool Warmup { get; set; } = false;
@@ -16,4 +16,5 @@ public class AntiRushConfig : BasePluginConfig
     [JsonPropertyName("RushZones")] public int[] RushZones { get; set; } = [0, 2, 3];
     [JsonPropertyName("CampZones")] public int[] CampZones { get; set; } = [1];
     [JsonPropertyName("Countdown")] public int[] Countdown { get; set; } = [60, 30, 15, 10, 5, 3, 2, 1];
+    [JsonPropertyName("MinPlayers")] public int MinPlayers { get; set; } = 1;
 }

src/Events.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
+using CSSharpUtils.Utils;
 
 namespace AntiRush;
 
@@ -11,7 +12,8 @@ private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
         _roundStart = Server.CurrentTime;
         _bombPlanted = false;
 
-        _gameRules ??= Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules").First().GameRules!;
+        _gameRules = GameUtils.GetGameRules();
+        _minPlayers = Utilities.GetPlayers().Where(p => p.Team == (CsTeam.Terrorist | CsTeam.CounterTerrorist)).ToList().Count >= Config.MinPlayers;
 
         foreach (var zone in _zones)
         {
@@ -26,7 +28,7 @@ private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 
     private HookResult OnBombPlanted(EventBombPlanted @event, GameEventInfo info)
     {
-        if (!Config.DisableOnBombPlant)
+        if (!Config.DisableOnBombPlant || !_minPlayers)
             return HookResult.Continue;
 
         _bombPlanted = true;

src/Globals.cs

@@ -8,7 +8,7 @@ namespace AntiRush;
 public partial class AntiRush
 {
     public override string ModuleName => "AntiRush";
-    public override string ModuleVersion => "1.0.7";
+    public override string ModuleVersion => "1.0.8";
     public override string ModuleAuthor => "https://github.com/oscar-wos/AntiRush";
     public AntiRushConfig Config { get; set; } = new();
     public Menu.Menu Menu { get; } = new();
@@ -20,4 +20,5 @@ public partial class AntiRush
     private bool _bombPlanted;
     private float[] _countdown = [];
     private CCSGameRules? _gameRules;
+    private bool _minPlayers;
 }

src/Json.cs

@@ -1,5 +1,5 @@
-using CounterStrikeSharp.API.Modules.Utils;
-using System.Text.Json;
+using System.Text.Json;
+using CounterStrikeSharp.API.Modules.Utils;
 using AntiRush.Enums;
 
 namespace AntiRush;

src/Listeners.cs

@@ -1,5 +1,4 @@
 using CounterStrikeSharp.API;
-using AntiRush.Enums;
 
 namespace AntiRush;
 
@@ -10,6 +9,9 @@ private void OnTick()
         if (_gameRules is { WarmupPeriod: true } && !Config.Warmup)
             return;
 
+        if (!_minPlayers)
+            return;
+
         if (Config.NoRushTime != 0 && !_bombPlanted)
         {
             var diff = (Config.NoRushTime + _roundStart) - Server.CurrentTime;

src/Zone.cs

@@ -1,8 +1,8 @@
-using System.Drawing;
+using Microsoft.Extensions.Localization;
+using System.Drawing;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
-using Microsoft.Extensions.Localization;
 using AntiRush.Enums;
 
 namespace AntiRush;