GarpBot/CS2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-03-03 14:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: GarpBot:build-1.7.8-beta-4
Branches Tags
GarpBot:main
GarpBot:build-1.7.8-beta-10b1 GarpBot:build-1.7.8-beta-10b GarpBot:build-1.7.8-beta-10a GarpBot:build-1.7.8-beta-10 GarpBot:build-1.7.8-beta-9 GarpBot:build-1.7.8-beta-8 GarpBot:build-1.7.8-beta-7 GarpBot:build-1.7.8-beta-6 GarpBot:build-1.7.8-beta-5 GarpBot:build-1.7.8-beta-4 GarpBot:build-1.7.8-beta-3 GarpBot:build-1.7.8-beta-2 GarpBot:build-1.7.8-beta-1 GarpBot:build-1.7.7-alpha-10 GarpBot:build-1.7.7-alpha-9 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-9 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-8 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-7 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-6 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-5 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-4 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-3 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-2 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-1 GarpBot:CS2-SimpleAdmin-1.7.7-alpha
...
compare: GarpBot:build-1.7.8-beta-5
Branches Tags
GarpBot:main
GarpBot:build-1.7.8-beta-10b1 GarpBot:build-1.7.8-beta-10b GarpBot:build-1.7.8-beta-10a GarpBot:build-1.7.8-beta-10 GarpBot:build-1.7.8-beta-9 GarpBot:build-1.7.8-beta-8 GarpBot:build-1.7.8-beta-7 GarpBot:build-1.7.8-beta-6 GarpBot:build-1.7.8-beta-5 GarpBot:build-1.7.8-beta-4 GarpBot:build-1.7.8-beta-3 GarpBot:build-1.7.8-beta-2 GarpBot:build-1.7.8-beta-1 GarpBot:build-1.7.7-alpha-10 GarpBot:build-1.7.7-alpha-9 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-9 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-8 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-7 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-6 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-5 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-4 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-3 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-2 GarpBot:CS2-SimpleAdmin-1.7.7-alpha-1 GarpBot:CS2-SimpleAdmin-1.7.7-alpha

2 Commits
build-1.7. ... build-1.7.

Author SHA1 Message Date
Dawid Bepierszcz
0dded66e5d Fix closure issues in menus and update dependencies 
Captured player and duration variables in menu callbacks to prevent closure-related bugs. Updated package versions in project files and bumped plugin version to 1.7.8-beta-5. Improved player validation and message localization logic.
 2025-11-06 02:24:43 +01:00
Dawid Bepierszcz
038641dbdf Comment out MySQL index migration and remove Sqlite optimization 
Commented out all index creation statements in the MySQL migration 016 for table and index optimization. Removed the corresponding Sqlite migration 016 entirely. Also replaced TRUNCATE TABLE with DELETE FROM in Sqlite migration 013 for sa_players_ips to improve compatibility.
 2025-10-30 18:17:47 +01:00
13 changed files with 141 additions and 149 deletions
Expand all files Collapse all files

2
CS2-SimpleAdmin/CS2-SimpleAdmin.cs
View File

@@ -22,7 +22,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)"); public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
public override string ModuleAuthor => "daffyy & Dliix66"; public override string ModuleAuthor => "daffyy & Dliix66";
public override string ModuleVersion => "1.7.8-beta-4"; public override string ModuleVersion => "1.7.8-beta-5";
public override void Load(bool hotReload) public override void Load(bool hotReload)
{ {

8
CS2-SimpleAdmin/CS2-SimpleAdmin.csproj
View File

@@ -19,16 +19,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.340"> <PackageReference Include="CounterStrikeSharp.API" Version="1.0.346">
<PrivateAssets>none</PrivateAssets> <PrivateAssets>none</PrivateAssets>
<ExcludeAssets>runtime</ExcludeAssets> <ExcludeAssets>runtime</ExcludeAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Dapper" Version="2.1.66" /> <PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="MySqlConnector" Version="2.4.0" /> <PackageReference Include="MySqlConnector" Version="2.5.0-beta.1" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
<PackageReference Include="System.Linq.Async" Version="6.0.3" /> <PackageReference Include="System.Linq.Async" Version="7.0.0-preview.1.g24680b5469" />
<PackageReference Include="ZLinq" Version="1.5.2" /> <PackageReference Include="ZLinq" Version="1.5.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

54
CS2-SimpleAdmin/Database/Migrations/Mysql/016_OptimizeTablesAndIndexes.sql
View File

@@ -1,33 +1,33 @@
-- Migration 016: Optimize tables and indexes -- -- Migration 016: Optimize tables and indexes
-- Add proper indexes for all tables to improve query performance -- -- Add proper indexes for all tables to improve query performance
-- Optimize sa_players_ips table indexes -- -- Optimize sa_players_ips table indexes
-- Add index on used_at for efficient date-based queries -- -- Add index on used_at for efficient date-based queries
ALTER TABLE `sa_players_ips` ADD INDEX IF NOT EXISTS `idx_used_at` (`used_at` DESC); -- ALTER TABLE `sa_players_ips` ADD INDEX IF NOT EXISTS `idx_used_at` (`used_at` DESC);
-- Optimize sa_bans table indexes -- -- Optimize sa_bans table indexes
-- Add composite indexes for common query patterns -- -- Add composite indexes for common query patterns
CREATE INDEX IF NOT EXISTS `idx_bans_steamid_status` ON `sa_bans` (`player_steamid`, `status`); -- CREATE INDEX IF NOT EXISTS `idx_bans_steamid_status` ON `sa_bans` (`player_steamid`, `status`);
CREATE INDEX IF NOT EXISTS `idx_bans_ip_status` ON `sa_bans` (`player_ip`, `status`); -- CREATE INDEX IF NOT EXISTS `idx_bans_ip_status` ON `sa_bans` (`player_ip`, `status`);
CREATE INDEX IF NOT EXISTS `idx_bans_status_ends` ON `sa_bans` (`status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_bans_status_ends` ON `sa_bans` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_bans_server_status` ON `sa_bans` (`server_id`, `status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_bans_server_status` ON `sa_bans` (`server_id`, `status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_bans_created` ON `sa_bans` (`created` DESC); -- CREATE INDEX IF NOT EXISTS `idx_bans_created` ON `sa_bans` (`created` DESC);
-- Optimize sa_admins table indexes -- -- Optimize sa_admins table indexes
CREATE INDEX IF NOT EXISTS `idx_admins_steamid` ON `sa_admins` (`player_steamid`); -- CREATE INDEX IF NOT EXISTS `idx_admins_steamid` ON `sa_admins` (`player_steamid`);
CREATE INDEX IF NOT EXISTS `idx_admins_server_ends` ON `sa_admins` (`server_id`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_admins_server_ends` ON `sa_admins` (`server_id`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_admins_ends` ON `sa_admins` (`ends`); -- CREATE INDEX IF NOT EXISTS `idx_admins_ends` ON `sa_admins` (`ends`);
-- Optimize sa_mutes table indexes (in addition to migration 014) -- -- Optimize sa_mutes table indexes (in addition to migration 014)
-- Add index for expire queries -- -- Add index for expire queries
CREATE INDEX IF NOT EXISTS `idx_mutes_status_ends` ON `sa_mutes` (`status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_mutes_status_ends` ON `sa_mutes` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_mutes_server_status` ON `sa_mutes` (`server_id`, `status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_mutes_server_status` ON `sa_mutes` (`server_id`, `status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_mutes_created` ON `sa_mutes` (`created` DESC); -- CREATE INDEX IF NOT EXISTS `idx_mutes_created` ON `sa_mutes` (`created` DESC);
-- Optimize sa_warns table indexes (if exists) -- -- Optimize sa_warns table indexes (if exists)
CREATE INDEX IF NOT EXISTS `idx_warns_steamid_status` ON `sa_warns` (`player_steamid`, `status`); -- CREATE INDEX IF NOT EXISTS `idx_warns_steamid_status` ON `sa_warns` (`player_steamid`, `status`);
CREATE INDEX IF NOT EXISTS `idx_warns_status_ends` ON `sa_warns` (`status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_warns_status_ends` ON `sa_warns` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_warns_server_status` ON `sa_warns` (`server_id`, `status`, `ends`); -- CREATE INDEX IF NOT EXISTS `idx_warns_server_status` ON `sa_warns` (`server_id`, `status`, `ends`);
-- Add index on sa_servers for faster lookups -- -- Add index on sa_servers for faster lookups
CREATE INDEX IF NOT EXISTS `idx_servers_hostname` ON `sa_servers` (`hostname`); -- CREATE INDEX IF NOT EXISTS `idx_servers_hostname` ON `sa_servers` (`hostname`);

2
CS2-SimpleAdmin/Database/Migrations/Sqlite/013_AddNameColumnToSaPlayerIpsTable.sql
View File

@@ -1,4 +1,4 @@
TRUNCATE TABLE `sa_players_ips`; DELETE FROM sa_players_ips;
ALTER TABLE `sa_players_ips` ADD `name` VARCHAR(64) NULL DEFAULT NULL; ALTER TABLE `sa_players_ips` ADD `name` VARCHAR(64) NULL DEFAULT NULL;
CREATE INDEX IF NOT EXISTS `idx_sa_players_ips_used_at` ON `sa_players_ips` (`used_at` DESC); CREATE INDEX IF NOT EXISTS `idx_sa_players_ips_used_at` ON `sa_players_ips` (`used_at` DESC);

33
CS2-SimpleAdmin/Database/Migrations/Sqlite/016_OptimizeTablesAndIndexes.sql
View File

@@ -1,33 +0,0 @@
-- Migration 016: Optimize tables and indexes
-- Add proper indexes for all tables to improve query performance
-- Optimize sa_players_ips table indexes
-- Add index on used_at for efficient date-based queries
CREATE INDEX IF NOT EXISTS `idx_used_at` ON `sa_players_ips` (`used_at` DESC);
-- Optimize sa_bans table indexes
-- Add composite indexes for common query patterns
CREATE INDEX IF NOT EXISTS `idx_bans_steamid_status` ON `sa_bans` (`player_steamid`, `status`);
CREATE INDEX IF NOT EXISTS `idx_bans_ip_status` ON `sa_bans` (`player_ip`, `status`);
CREATE INDEX IF NOT EXISTS `idx_bans_status_ends` ON `sa_bans` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_bans_server_status` ON `sa_bans` (`server_id`, `status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_bans_created` ON `sa_bans` (`created` DESC);
-- Optimize sa_admins table indexes
CREATE INDEX IF NOT EXISTS `idx_admins_steamid` ON `sa_admins` (`player_steamid`);
CREATE INDEX IF NOT EXISTS `idx_admins_server_ends` ON `sa_admins` (`server_id`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_admins_ends` ON `sa_admins` (`ends`);
-- Optimize sa_mutes table indexes (in addition to migration 014)
-- Add index for expire queries
CREATE INDEX IF NOT EXISTS `idx_mutes_status_ends` ON `sa_mutes` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_mutes_server_status` ON `sa_mutes` (`server_id`, `status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_mutes_created` ON `sa_mutes` (`created` DESC);
-- Optimize sa_warns table indexes (if exists)
CREATE INDEX IF NOT EXISTS `idx_warns_steamid_status` ON `sa_warns` (`player_steamid`, `status`);
CREATE INDEX IF NOT EXISTS `idx_warns_status_ends` ON `sa_warns` (`status`, `ends`);
CREATE INDEX IF NOT EXISTS `idx_warns_server_status` ON `sa_warns` (`server_id`, `status`, `ends`);
-- Add index on sa_servers for faster lookups
CREATE INDEX IF NOT EXISTS `idx_servers_hostname` ON `sa_servers` (`hostname`);

9
CS2-SimpleAdmin/Helper.cs
View File

@@ -64,7 +64,7 @@ internal static class Helper
public static List<CCSPlayerController> GetValidPlayers() public static List<CCSPlayerController> GetValidPlayers()
{ {
return CS2_SimpleAdmin.CachedPlayers.AsValueEnumerable().ToList(); return CS2_SimpleAdmin.CachedPlayers.AsValueEnumerable().Where(p => p.Connected == PlayerConnectedState.PlayerConnected).ToList();
} }
public static List<CCSPlayerController> GetValidPlayersWithBots() public static List<CCSPlayerController> GetValidPlayersWithBots()
@@ -590,20 +590,25 @@ internal static class Helper
{ {
if (CS2_SimpleAdmin._localizer == null) return; if (CS2_SimpleAdmin._localizer == null) return;
// Determine the localized message key
var localizedMessageKey = $"{messageKey}"; var localizedMessageKey = $"{messageKey}";
var formattedMessageArgs = messageArgs.Select(arg => arg?.ToString() ?? string.Empty).ToArray(); var formattedMessageArgs = messageArgs.Select(arg => arg?.ToString() ?? string.Empty).ToArray();
// Replace placeholder based on showActivityType
for (var i = 0; i < formattedMessageArgs.Length; i++) for (var i = 0; i < formattedMessageArgs.Length; i++)
{ {
var arg = formattedMessageArgs[i]; var arg = formattedMessageArgs[i]; // Convert argument to string if not null
// Replace "CALLER" placeholder in the argument string
formattedMessageArgs[i] = CS2_SimpleAdmin.Instance.Config.OtherSettings.ShowActivityType switch formattedMessageArgs[i] = CS2_SimpleAdmin.Instance.Config.OtherSettings.ShowActivityType switch
{ {
1 => arg.Replace("CALLER", CS2_SimpleAdmin._localizer["sa_admin"]), 1 => arg.Replace("CALLER", CS2_SimpleAdmin._localizer["sa_admin"]),
2 => arg.Replace("CALLER", callerName ?? "Console"),
_ => arg _ => arg
}; };
} }
// Print the localized message to the center of the screen for the player
using (new WithTemporaryCulture(player.GetLanguage())) using (new WithTemporaryCulture(player.GetLanguage()))
{ {
player.PrintToCenter(CS2_SimpleAdmin._localizer[localizedMessageKey, formattedMessageArgs.Cast<object>().ToArray()]); player.PrintToCenter(CS2_SimpleAdmin._localizer[localizedMessageKey, formattedMessageArgs.Cast<object>().ToArray()]);

7
CS2-SimpleAdmin/Managers/PlayerManager.cs
View File

@@ -364,7 +364,12 @@ internal class PlayerManager
foreach (var player in bannedPlayers) foreach (var player in bannedPlayers)
{ {
if (!player.UserId.HasValue) continue; if (!player.UserId.HasValue) continue;
await Server.NextWorldUpdateAsync(() => Helper.KickPlayer((int)player.UserId, NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)); await Server.NextWorldUpdateAsync(() =>
{
if (Helper.GetPlayerFromSteamid64(player.SteamID) != null)
Helper.KickPlayer((int)player.UserId,
NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED);
});
} }
} }

103
CS2-SimpleAdmin/Menus/BasicMenu.cs
View File

@@ -57,8 +57,9 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
slapMenu.AddSubMenu(playerName, () => CreateSlapDamageMenu(admin, player)); var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
slapMenu.AddSubMenu(playerName, () => CreateSlapDamageMenu(admin, capturedPlayer));
} }
return slapMenu.WithBackButton(); return slapMenu.WithBackButton();
@@ -112,12 +113,13 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
slayMenu.AddOption(playerName, _ => slayMenu.AddOption(playerName, _ =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Slay(admin, player); CS2_SimpleAdmin.Slay(admin, capturedPlayer);
} }
}); });
} }
@@ -139,13 +141,14 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
kickMenu.AddSubMenu(playerName, () => CreateReasonMenu(admin, player, "Kick", PenaltyType.Kick, var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
kickMenu.AddSubMenu(playerName, () => CreateReasonMenu(admin, capturedPlayer, "Kick", PenaltyType.Kick,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Kick(admin, player, reason, admin.PlayerName); CS2_SimpleAdmin.Instance.Kick(admin, capturedPlayer, reason, admin.PlayerName);
} }
})); }));
} }
@@ -167,14 +170,15 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
warnMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, player, "Warn", var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
(_, _, duration) => CreateReasonMenu(admin, player, "Warn", PenaltyType.Warn, warnMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, capturedPlayer, "Warn",
(_, _, duration) => CreateReasonMenu(admin, capturedPlayer, "Warn", PenaltyType.Warn,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Warn(admin, player, duration, reason, admin.PlayerName); CS2_SimpleAdmin.Instance.Warn(admin, capturedPlayer, duration, reason, admin.PlayerName);
} }
}))); })));
} }
@@ -196,14 +200,15 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
banMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, player, "Ban", var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
(_, _, duration) => CreateReasonMenu(admin, player, "Ban", PenaltyType.Ban, banMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, capturedPlayer, "Ban",
(_, _, duration) => CreateReasonMenu(admin, capturedPlayer, "Ban", PenaltyType.Ban,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Ban(admin, player, duration, reason, admin.PlayerName); CS2_SimpleAdmin.Instance.Ban(admin, capturedPlayer, duration, reason, admin.PlayerName);
} }
}))); })));
} }
@@ -225,14 +230,15 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
gagMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, player, "Gag", var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
(_, _, duration) => CreateReasonMenu(admin, player, "Gag", PenaltyType.Gag, gagMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, capturedPlayer, "Gag",
(_, _, duration) => CreateReasonMenu(admin, capturedPlayer, "Gag", PenaltyType.Gag,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Gag(admin, player, duration, reason); CS2_SimpleAdmin.Instance.Gag(admin, capturedPlayer, duration, reason);
} }
}))); })));
} }
@@ -254,14 +260,15 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
muteMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, player, "Mute", var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
(_, _, duration) => CreateReasonMenu(admin, player, "Mute", PenaltyType.Mute, muteMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, capturedPlayer, "Mute",
(_, _, duration) => CreateReasonMenu(admin, capturedPlayer, "Mute", PenaltyType.Mute,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Mute(admin, player, duration, reason); CS2_SimpleAdmin.Instance.Mute(admin, capturedPlayer, duration, reason);
} }
}))); })));
} }
@@ -283,14 +290,15 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
silenceMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, player, "Silence", var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
(_, _, duration) => CreateReasonMenu(admin, player, "Silence", PenaltyType.Silence, silenceMenu.AddSubMenu(playerName, () => CreateDurationMenu(admin, capturedPlayer, "Silence",
(_, _, duration) => CreateReasonMenu(admin, capturedPlayer, "Silence", PenaltyType.Silence,
(_, _, reason) => (_, _, reason) =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.Silence(admin, player, duration, reason); CS2_SimpleAdmin.Instance.Silence(admin, capturedPlayer, duration, reason);
} }
}))); })));
} }
@@ -312,8 +320,9 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
teamMenu.AddSubMenu(playerName, () => CreateTeamSelectionMenu(admin, player)); var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
teamMenu.AddSubMenu(playerName, () => CreateTeamSelectionMenu(admin, capturedPlayer));
} }
return teamMenu.WithBackButton(); return teamMenu.WithBackButton();
@@ -488,8 +497,9 @@ public abstract class BasicMenu
foreach (var player in players) foreach (var player in players)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
addAdminMenu.AddSubMenu(playerName, () => CreateAdminFlagsMenu(admin, player)); var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
addAdminMenu.AddSubMenu(playerName, () => CreateAdminFlagsMenu(admin, capturedPlayer));
} }
return addAdminMenu.WithBackButton(); return addAdminMenu.WithBackButton();
@@ -546,12 +556,13 @@ public abstract class BasicMenu
foreach (var player in adminPlayers) foreach (var player in adminPlayers)
{ {
var playerName = player.PlayerName.Length > 26 ? player.PlayerName[..26] : player.PlayerName; var capturedPlayer = player; // Capture to local variable to avoid closure issue
var playerName = capturedPlayer.PlayerName.Length > 26 ? capturedPlayer.PlayerName[..26] : capturedPlayer.PlayerName;
removeAdminMenu.AddOption(playerName, _ => removeAdminMenu.AddOption(playerName, _ =>
{ {
if (player.IsValid) if (capturedPlayer.IsValid)
{ {
CS2_SimpleAdmin.Instance.RemoveAdmin(admin, player.SteamID.ToString()); CS2_SimpleAdmin.Instance.RemoveAdmin(admin, capturedPlayer.SteamID.ToString());
} }
}); });
} }
@@ -583,10 +594,10 @@ public abstract class BasicMenu
/// <param name="admin">The admin player selecting duration.</param> /// <param name="admin">The admin player selecting duration.</param>
/// <param name="player">The target player for the penalty.</param> /// <param name="player">The target player for the penalty.</param>
/// <param name="actionName">The name of the penalty action (e.g., "Kick", "Ban").</param> /// <param name="actionName">The name of the penalty action (e.g., "Kick", "Ban").</param>
/// <param name="onSelectAction">Callback action executed when duration is selected.</param> /// <param name="onSelectAction">Callback function that returns the next menu when duration is selected.</param>
/// <returns>A MenuBuilder instance for the duration menu.</returns> /// <returns>A MenuBuilder instance for the duration menu.</returns>
private static MenuBuilder CreateDurationMenu(CCSPlayerController admin, CCSPlayerController player, string actionName, private static MenuBuilder CreateDurationMenu(CCSPlayerController admin, CCSPlayerController player, string actionName,
Action<CCSPlayerController, CCSPlayerController, int> onSelectAction) Func<CCSPlayerController, CCSPlayerController, int, MenuBuilder> onSelectAction)
{ {
var localizer = CS2_SimpleAdmin._localizer; var localizer = CS2_SimpleAdmin._localizer;
@@ -614,10 +625,8 @@ public abstract class BasicMenu
foreach (var durationItem in CS2_SimpleAdmin.Instance.Config.MenuConfigs.Durations) foreach (var durationItem in CS2_SimpleAdmin.Instance.Config.MenuConfigs.Durations)
{ {
durationMenu.AddOption(durationItem.Name, _ => var capturedDuration = durationItem.Duration; // Capture to avoid closure issue
{ durationMenu.AddSubMenu(durationItem.Name, () => onSelectAction(admin, player, capturedDuration));
onSelectAction(admin, player, durationItem.Duration);
});
} }
return durationMenu.WithBackButton(); return durationMenu.WithBackButton();

22
CS2-SimpleAdmin/Menus/DurationMenu.cs
View File

@@ -8,12 +8,28 @@ public static class DurationMenu
public static void OpenMenu(CCSPlayerController admin, string menuName, CCSPlayerController player, Action<CCSPlayerController, CCSPlayerController, int> onSelectAction) public static void OpenMenu(CCSPlayerController admin, string menuName, CCSPlayerController player, Action<CCSPlayerController, CCSPlayerController, int> onSelectAction)
{ {
var menu = AdminMenu.CreateMenu(menuName); var menu = AdminMenu.CreateMenu(menuName);
foreach (var durationItem in CS2_SimpleAdmin.Instance.Config.MenuConfigs.Durations) if (menu == null)
return;
var durations = CS2_SimpleAdmin.Instance.Config.MenuConfigs.Durations;
// Capture admin and player to avoid closure issues
var capturedAdmin = admin;
var capturedPlayer = player;
var capturedAction = onSelectAction;
foreach (var durationItem in durations)
{ {
menu?.AddMenuOption(durationItem.Name, (_, _) => { onSelectAction(admin, player, durationItem.Duration); }); var duration = durationItem.Duration; // Capture in local variable
var name = durationItem.Name;
menu.AddMenuOption(name, (controller, option) =>
{
capturedAction(capturedAdmin, capturedPlayer, duration);
});
} }
if (menu != null) AdminMenu.OpenMenu(admin, menu); AdminMenu.OpenMenu(admin, menu);
} }
public static void OpenMenu(CCSPlayerController admin, string menuName, DisconnectedPlayer player, Action<CCSPlayerController, DisconnectedPlayer, int> onSelectAction) public static void OpenMenu(CCSPlayerController admin, string menuName, DisconnectedPlayer player, Action<CCSPlayerController, DisconnectedPlayer, int> onSelectAction)

25
CS2-SimpleAdmin/Menus/ManagePlayersMenu.cs
View File

@@ -49,25 +49,27 @@ public static class ManagePlayersMenu
if (AdminManager.CommandIsOverriden("css_warn") if (AdminManager.CommandIsOverriden("css_warn")
? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_warn")) ? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_warn"))
: AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/kick")) : AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/kick"))
options.Add(new ChatMenuOptionData(localizer?["sa_warn"] ?? "Warn", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_warn"] ?? "Warn", (admin, player) => DurationMenu.OpenMenu(admin, $"{localizer?["sa_warn"] ?? "Warn"}: {player.PlayerName}", player, WarnMenu)))); options.Add(new ChatMenuOptionData(localizer?["sa_warn"] ?? "Warn", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_warn"] ?? "Warn", (a, p) => DurationMenu.OpenMenu(a, $"{localizer?["sa_warn"] ?? "Warn"}: {p.PlayerName}", p, WarnMenu))));
if (hasBan) if (hasBan)
options.Add(new ChatMenuOptionData(localizer?["sa_ban"] ?? "Ban", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_ban"] ?? "Ban", (admin, player) => DurationMenu.OpenMenu(admin, $"{localizer?["sa_ban"] ?? "Ban"}: {player.PlayerName}", player, BanMenu)))); options.Add(new ChatMenuOptionData(localizer?["sa_ban"] ?? "Ban", () =>
PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_ban"] ?? "Ban", (a, p) =>
DurationMenu.OpenMenu(a, $"{localizer?["sa_ban"] ?? "Ban"}: {p.PlayerName}", p, BanMenu))));
if (hasChat) if (hasChat)
{ {
if (AdminManager.CommandIsOverriden("css_gag") if (AdminManager.CommandIsOverriden("css_gag")
? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_gag")) ? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_gag"))
: AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat")) : AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat"))
options.Add(new ChatMenuOptionData(localizer?["sa_gag"] ?? "Gag", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_gag"] ?? "Gag", (admin, player) => DurationMenu.OpenMenu(admin, $"{localizer?["sa_gag"] ?? "Gag"}: {player.PlayerName}", player, GagMenu)))); options.Add(new ChatMenuOptionData(localizer?["sa_gag"] ?? "Gag", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_gag"] ?? "Gag", (a, p) => DurationMenu.OpenMenu(a, $"{localizer?["sa_gag"] ?? "Gag"}: {p.PlayerName}", p, GagMenu))));
if (AdminManager.CommandIsOverriden("css_mute") if (AdminManager.CommandIsOverriden("css_mute")
? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_mute")) ? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_mute"))
: AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat")) : AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat"))
options.Add(new ChatMenuOptionData(localizer?["sa_mute"] ?? "Mute", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_mute"] ?? "Mute", (admin, player) => DurationMenu.OpenMenu(admin, $"{localizer?["sa_mute"] ?? "Mute"}: {player.PlayerName}", player, MuteMenu)))); options.Add(new ChatMenuOptionData(localizer?["sa_mute"] ?? "Mute", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_mute"] ?? "Mute", (a, p) => DurationMenu.OpenMenu(a, $"{localizer?["sa_mute"] ?? "Mute"}: {p.PlayerName}", p, MuteMenu))));
if (AdminManager.CommandIsOverriden("css_silence") if (AdminManager.CommandIsOverriden("css_silence")
? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_silence")) ? AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), AdminManager.GetPermissionOverrides("css_silence"))
: AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat")) : AdminManager.PlayerHasPermissions(new SteamID(admin.SteamID), "@css/chat"))
options.Add(new ChatMenuOptionData(localizer?["sa_silence"] ?? "Silence", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_silence"] ?? "Silence", (admin, player) => DurationMenu.OpenMenu(admin, $"{localizer?["sa_silence"] ?? "Silence"}: {player.PlayerName}", player, SilenceMenu)))); options.Add(new ChatMenuOptionData(localizer?["sa_silence"] ?? "Silence", () => PlayersMenu.OpenRealPlayersMenu(admin, localizer?["sa_silence"] ?? "Silence", (a, p) => DurationMenu.OpenMenu(a, $"{localizer?["sa_silence"] ?? "Silence"}: {p.PlayerName}", p, SilenceMenu))));
} }
if (AdminManager.CommandIsOverriden("css_team") if (AdminManager.CommandIsOverriden("css_team")
@@ -162,19 +164,6 @@ public static class ManagePlayersMenu
CS2_SimpleAdmin.MenuApi?.CloseMenu(admin); CS2_SimpleAdmin.MenuApi?.CloseMenu(admin);
}); });
// var menu = AdminMenu.CreateMenu($"{CS2_SimpleAdmin._localizer?["sa_ban"] ?? "Ban"}: {player?.PlayerName}");
//
// foreach (var option in CS2_SimpleAdmin.Instance.Config.MenuConfigs.BanReasons)
// {
// menu?.AddMenuOption(option, (_, _) =>
// {
// if (player is { IsValid: true })
// Ban(admin, player, duration, option);
// });
// }
//
// if (menu != null) AdminMenu.OpenMenu(admin, menu);
} }
private static void Ban(CCSPlayerController admin, CCSPlayerController player, int duration, string reason) private static void Ban(CCSPlayerController admin, CCSPlayerController player, int duration, string reason)

5
CS2-SimpleAdmin/Menus/PlayersMenu.cs
View File

@@ -41,11 +41,12 @@ public static class PlayersMenu
continue; continue;
var enabled = admin.CanTarget(player); var enabled = admin.CanTarget(player);
var capturedPlayer = player; // Capture in local variable to avoid closure issues
if (optionName != null) if (optionName != null)
menu?.AddMenuOption(optionName, (_, _) => menu?.AddMenuOption(optionName, (controller, option) =>
{ {
if (player != null) onSelectAction.Invoke(admin, player); if (capturedPlayer != null) onSelectAction.Invoke(admin, capturedPlayer);
}, },
!enabled); !enabled);
} }

2
CS2-SimpleAdmin/VERSION
View File

@@ -1 +1 @@
1.7.8-beta-4 1.7.8-beta-5

2
CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj
View File

@@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.340" /> <PackageReference Include="CounterStrikeSharp.API" Version="1.0.346" />
</ItemGroup> </ItemGroup>
</Project> </Project>