Merge pull request #188 from wiruwiru/master

B3none · web-flow · commit 47339a320750 · 2025-05-19T11:36:38.000+01:00
fix: allow team joining during warmup (closes #157)
diff --git a/RetakesPlugin/Modules/Managers/QueueManager.cs b/RetakesPlugin/Modules/Managers/QueueManager.cs
@@ -72,9 +72,9 @@ public HookResult PlayerJoinedTeam(CCSPlayerController player, CsTeam fromTeam,
                 return HookResult.Continue;
             }
 
-            if (!_shouldPreventTeamChangesMidRound)
+            if (!_shouldPreventTeamChangesMidRound || Helpers.GetGameRules().WarmupPeriod)
             {
-                Helpers.Debug($"[{player.PlayerName}] Preventing team changes mid round is disabled, allowing team change.");
+                Helpers.Debug($"[{player.PlayerName}] Preventing team changes mid round is disabled or warmup is active, allowing team change.");
                 return HookResult.Continue;
             }
 
diff --git a/RetakesPlugin/RetakesPlugin.cs b/RetakesPlugin/RetakesPlugin.cs
@@ -20,7 +20,7 @@ namespace RetakesPlugin;
 [MinimumApiVersion(220)]
 public class RetakesPlugin : BasePlugin
 {
-    private const string Version = "2.1.0";
+    private const string Version = "2.1.1";
 
     #region Plugin info
     public override string ModuleName => "Retakes Plugin";

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ public HookResult PlayerJoinedTeam(CCSPlayerController player, CsTeam fromTeam,`
`72`	`72`	`return HookResult.Continue;`
`73`	`73`	`}`
`74`	`74`
`75`		`- if (!_shouldPreventTeamChangesMidRound)`
	`75`	`+ if (!_shouldPreventTeamChangesMidRound \|\| Helpers.GetGameRules().WarmupPeriod)`
`76`	`76`	`{`
`77`		`- Helpers.Debug($"[{player.PlayerName}] Preventing team changes mid round is disabled, allowing team change.");`
	`77`	`+ Helpers.Debug($"[{player.PlayerName}] Preventing team changes mid round is disabled or warmup is active, allowing team change.");`
`78`	`78`	`return HookResult.Continue;`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace RetakesPlugin;`
`20`	`20`	`[MinimumApiVersion(220)]`
`21`	`21`	`public class RetakesPlugin : BasePlugin`
`22`	`22`	`{`
`23`		`- private const string Version = "2.1.0";`
	`23`	`+ private const string Version = "2.1.1";`
`24`	`24`
`25`	`25`	`#region Plugin info`
`26`	`26`	`public override string ModuleName => "Retakes Plugin";`