GarpBot/CS2-SimpleAdmin
1
0
Fork 0
mirror of https://github.com/daffyyyy/CS2-SimpleAdmin.git synced 2026-02-18 10:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.2.7e

Browse Source 
- Minor changes
This commit is contained in:
Dawid Bepierszcz
2024-01-20 17:24:18 +01:00
parent 6640d00442
commit b5600d7e73
4 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
CS2-SimpleAdmin.cs
View File

@@ -22,12 +22,12 @@ namespace CS2_SimpleAdmin;
public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig> public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdminConfig>
{ {
public static IStringLocalizer? _localizer; public static IStringLocalizer? _localizer;
public static ConcurrentBag<int> gaggedPlayers = new ConcurrentBag<int>(); public static ConcurrentBag<ushort> gaggedPlayers = new ConcurrentBag<ushort>();
//public static ConcurrentBag<int> mutedPlayers = new ConcurrentBag<int>(); //public static ConcurrentBag<int> mutedPlayers = new ConcurrentBag<int>();
public static List<int> loadedPlayers = new List<int>(); public static List<int> loadedPlayers = new List<int>();
public static Dictionary<string, int> voteAnswers = new Dictionary<string, int>(); public static Dictionary<string, int> voteAnswers = new Dictionary<string, int>();
public static HashSet<int> godPlayers = new HashSet<int>(); public static HashSet<ushort> godPlayers = new HashSet<ushort>();
public static List<int> silentPlayers = new List<int>(); public static List<ushort> silentPlayers = new List<ushort>();
public static HashSet<string> bannedPlayers = new HashSet<string>(); public static HashSet<string> bannedPlayers = new HashSet<string>();
public static bool TagsDetected = false; public static bool TagsDetected = false;
public static bool voteInProgress = false; public static bool voteInProgress = false;
@@ -37,7 +37,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin"; public override string ModuleName => "CS2-SimpleAdmin";
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"; public override string ModuleAuthor => "daffyy";
public override string ModuleVersion => "1.2.7d"; public override string ModuleVersion => "1.2.7e";
public CS2_SimpleAdminConfig Config { get; set; } = new(); public CS2_SimpleAdminConfig Config { get; set; } = new();
@@ -266,14 +266,16 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
[RequiresPermissions("@css/kick")] [RequiresPermissions("@css/kick")]
public void OnSilentModeCommand(CCSPlayerController? caller, CommandInfo command) public void OnSilentModeCommand(CCSPlayerController? caller, CommandInfo command)
{ {
if (silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller.UserId == null) return;
if (silentPlayers.Contains((ushort)caller.UserId))
{ {
silentPlayers.Remove((int)caller!.Index); silentPlayers.Remove((ushort)caller.UserId);
command.ReplyToCommand("SilentMode Deactivated"); command.ReplyToCommand("SilentMode Deactivated");
} }
else else
{ {
silentPlayers.Add((int)caller!.Index); silentPlayers.Add((ushort)caller.UserId);
command.ReplyToCommand("SilentMode Activated"); command.ReplyToCommand("SilentMode Activated");
} }
} }
@@ -440,7 +442,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
AddTimer(Config.KickTime, () => Helper.KickPlayer((ushort)player.UserId!)); AddTimer(Config.KickTime, () => Helper.KickPlayer((ushort)player.UserId!));
} }
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_kick_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_kick_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -495,10 +497,10 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
}); });
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_mute {player!.Index}"); NativeAPI.IssueServerCommand($"css_tag_mute {player!.UserId}");
if (!gaggedPlayers.Contains((int)player!.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
gaggedPlayers.Add((int)player.Index); gaggedPlayers.Add((ushort)player.UserId);
if (time > 0 && time <= 30) if (time > 0 && time <= 30)
{ {
@@ -507,11 +509,11 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return; if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player.Index}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player.UserId}");
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
@@ -526,7 +528,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_gag_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_gag_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_gag_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_gag_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -537,7 +539,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_gag_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_gag_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_gag_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_gag_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -597,7 +599,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_gag_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_gag_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_gag_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_gag_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -608,7 +610,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_gag_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_gag_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_gag_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_gag_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -617,7 +619,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
} }
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_mute {player!.Index.ToString()}"); NativeAPI.IssueServerCommand($"css_tag_mute {player!.UserId}");
if (time > 0 && time <= 30) if (time > 0 && time <= 30)
{ {
@@ -626,11 +628,11 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return; if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player.Index.ToString()}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player.UserId}");
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
@@ -640,8 +642,8 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE); }, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
} }
if (!gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
gaggedPlayers.Add((int)player.Index); gaggedPlayers.Add((ushort)player.UserId);
} }
} }
_ = _muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 0); _ = _muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 0);
@@ -672,16 +674,16 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
CCSPlayerController? player = matches.FirstOrDefault(); CCSPlayerController? player = matches.FirstOrDefault();
if (player != null && player.IsValid) if (player != null && player.IsValid)
{ {
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
} }
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player!.Index.ToString()}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player!.UserId}");
found = true; found = true;
} }
@@ -695,16 +697,16 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
CCSPlayerController? player = matches.FirstOrDefault(); CCSPlayerController? player = matches.FirstOrDefault();
if (player != null && player.IsValid) if (player != null && player.IsValid)
{ {
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
} }
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player!.Index.ToString()}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player!.UserId}");
pattern = player.AuthorizedSteamID!.SteamId64.ToString(); pattern = player.AuthorizedSteamID!.SteamId64.ToString();
@@ -732,9 +734,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
playersToTarget.ForEach(player => playersToTarget.ForEach(player =>
{ {
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
@@ -744,7 +746,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
_ = _muteManager.UnmutePlayer(player.AuthorizedSteamID.SteamId64.ToString(), 0); // Unmute by type 0 (gag) _ = _muteManager.UnmutePlayer(player.AuthorizedSteamID.SteamId64.ToString(), 0); // Unmute by type 0 (gag)
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player!.Index.ToString()}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player!.UserId}");
}); });
command.ReplyToCommand($"Ungaged player with pattern {pattern}."); command.ReplyToCommand($"Ungaged player with pattern {pattern}.");
@@ -793,8 +795,8 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
}; };
/* /*
if (!mutedPlayers.Contains((int)player!.Index)) if (!mutedPlayers.Contains((ushort)player.UserId))
mutedPlayers.Add((int)player!.Index); mutedPlayers.Add((ushort)player.UserId);
*/ */
player!.VoiceFlags = VoiceFlags.Muted; player!.VoiceFlags = VoiceFlags.Muted;
@@ -832,7 +834,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_mute_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_mute_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_mute_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_mute_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -843,7 +845,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_mute_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_mute_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_mute_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_mute_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -903,7 +905,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_mute_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_mute_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_mute_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_mute_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -914,7 +916,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_mute_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_mute_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_mute_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_mute_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -923,8 +925,8 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
} }
/* /*
if (!mutedPlayers.Contains((int)player!.Index)) if (!mutedPlayers.Contains((ushort)player.UserId))
mutedPlayers.Add((int)player!.Index); mutedPlayers.Add((ushort)player.UserId);
*/ */
if (time > 0 && time <= 30) if (time > 0 && time <= 30)
@@ -1113,7 +1115,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -1124,7 +1126,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -1187,7 +1189,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -1198,7 +1200,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -1267,7 +1269,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]); sb.Append(_localizer["sa_admin_ban_message_perm", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason]);
@@ -1278,7 +1280,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]); player!.PrintToCenter(_localizer!["sa_player_ban_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]); sb.Append(_localizer["sa_admin_ban_message_time", caller == null ? "Console" : caller.PlayerName, player.PlayerName, reason, time]);
@@ -1331,7 +1333,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player.CommitSuicide(false, true); player.CommitSuicide(false, true);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_slay_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_slay_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
@@ -1379,7 +1381,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player.GiveNamedItem(weaponName); player.GiveNamedItem(weaponName);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_give_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, weaponName]); sb.Append(_localizer["sa_admin_give_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, weaponName]);
@@ -1403,7 +1405,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
sb.Append(_localizer["sa_admin_strip_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_strip_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
@@ -1429,7 +1431,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
sb.Append(_localizer["sa_admin_hp_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_hp_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
@@ -1459,7 +1461,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
sb.Append(_localizer["sa_admin_speed_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_speed_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
@@ -1478,17 +1480,20 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
playersToTarget.ForEach(player => playersToTarget.ForEach(player =>
{ {
if (!godPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null)
godPlayers.Add((int)player.Index);
else
godPlayers.Remove((int)player.Index);
StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index))
{ {
sb.Append(_localizer["sa_admin_god_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); if (!godPlayers.Contains((ushort)player.UserId))
Server.PrintToChatAll(sb.ToString()); godPlayers.Add((ushort)player.UserId);
else
godPlayers.Remove((ushort)player.UserId);
StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller!.UserId))
{
sb.Append(_localizer["sa_admin_god_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
Server.PrintToChatAll(sb.ToString());
}
} }
}); });
} }
@@ -1514,7 +1519,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
player!.Pawn.Value!.Slap(damage); player!.Pawn.Value!.Slap(damage);
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
sb.Append(_localizer["sa_admin_slap_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_slap_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
Server.PrintToChatAll(sb.ToString()); Server.PrintToChatAll(sb.ToString());
@@ -1586,7 +1591,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
} }
} }
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_team_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, _teamName]); sb.Append(_localizer["sa_admin_team_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName, _teamName]);
@@ -1616,7 +1621,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
voteMenu.AddMenuOption(command.GetArg(i), Helper.handleVotes); voteMenu.AddMenuOption(command.GetArg(i), Helper.handleVotes);
} }
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
Helper.PrintToCenterAll(_localizer!["sa_admin_vote_message", caller == null ? "Console" : caller.PlayerName, question]); Helper.PrintToCenterAll(_localizer!["sa_admin_vote_message", caller == null ? "Console" : caller.PlayerName, question]);
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
@@ -1669,7 +1674,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
Server.ExecuteCommand($"changelevel {map}"); Server.ExecuteCommand($"changelevel {map}");
}); });
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]); sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]);
@@ -1687,7 +1692,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
var map = command.GetArg(1); var map = command.GetArg(1);
_command = ulong.TryParse(map, out var mapId) ? $"host_workshop_map {mapId}" : $"ds_workshop_changelevel {map}"; _command = ulong.TryParse(map, out var mapId) ? $"host_workshop_map {mapId}" : $"ds_workshop_changelevel {map}";
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]); sb.Append(_localizer["sa_admin_changemap_message", caller == null ? "Console" : caller.PlayerName, map]);
@@ -1794,7 +1799,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.Pawn.Value!.ToggleNoclip(); player!.Pawn.Value!.ToggleNoclip();
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_noclip_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_noclip_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
@@ -1821,7 +1826,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
if (time > 0) if (time > 0)
AddTimer(time, () => player.Pawn.Value!.Unfreeze()); AddTimer(time, () => player.Pawn.Value!.Unfreeze());
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_freeze_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_freeze_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
@@ -1842,7 +1847,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.Pawn.Value!.Unfreeze(); player!.Pawn.Value!.Unfreeze();
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_unfreeze_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_unfreeze_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);
@@ -1863,7 +1868,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
player!.Respawn(); player!.Respawn();
if (caller == null || caller != null && !silentPlayers.Contains((int)caller!.Index)) if (caller == null || caller != null && caller.UserId != null && !silentPlayers.Contains((ushort)caller.UserId))
{ {
StringBuilder sb = new(_localizer!["sa_prefix"]); StringBuilder sb = new(_localizer!["sa_prefix"]);
sb.Append(_localizer["sa_admin_respawn_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]); sb.Append(_localizer["sa_admin_respawn_message", caller == null ? "Console" : caller.PlayerName, player.PlayerName]);

4
CS2-SimpleAdmin.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
@@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.147" /> <PackageReference Include="CounterStrikeSharp.API" Version="1.0.148" />
<PackageReference Include="Dapper" Version="*" /> <PackageReference Include="Dapper" Version="*" />
<PackageReference Include="MySqlConnector" Version="*" /> <PackageReference Include="MySqlConnector" Version="*" />
</ItemGroup> </ItemGroup>

56
Events.cs
View File

@@ -36,7 +36,7 @@ public partial class CS2_SimpleAdmin
PlayerInfo playerInfo = new PlayerInfo PlayerInfo playerInfo = new PlayerInfo
{ {
UserId = player.UserId, UserId = player.UserId,
Index = (int)player.Index, Index = (ushort)player.UserId,
SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(), SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
Name = player?.PlayerName, Name = player?.PlayerName,
IpAddress = player?.IpAddress?.Split(":")[0] IpAddress = player?.IpAddress?.Split(":")[0]
@@ -63,7 +63,7 @@ public partial class CS2_SimpleAdmin
{ {
if (player == null || !player.IsValid || info.GetArg(1).Length == 0) return HookResult.Continue; if (player == null || !player.IsValid || info.GetArg(1).Length == 0) return HookResult.Continue;
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
return HookResult.Handled; return HookResult.Handled;
} }
@@ -75,7 +75,7 @@ public partial class CS2_SimpleAdmin
{ {
if (player == null || !player.IsValid || info.GetArg(1).Length == 0) return HookResult.Continue; if (player == null || !player.IsValid || info.GetArg(1).Length == 0) return HookResult.Continue;
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
return HookResult.Handled; return HookResult.Handled;
} }
@@ -129,7 +129,7 @@ public partial class CS2_SimpleAdmin
{ {
CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot); CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
if (player == null || !player.IsValid || player.IpAddress == null || loadedPlayers.Contains((int)player.Index) || player.IsBot || player.IsHLTV) if (player == null || !player.IsValid || player.IpAddress == null || player.UserId == null || loadedPlayers.Contains((ushort)player.UserId) || player.IsBot || player.IsHLTV)
return; return;
if (bannedPlayers.Contains(player.IpAddress) || player.AuthorizedSteamID != null && bannedPlayers.Contains(player.AuthorizedSteamID.SteamId64.ToString())) if (bannedPlayers.Contains(player.IpAddress) || player.AuthorizedSteamID != null && bannedPlayers.Contains(player.AuthorizedSteamID.SteamId64.ToString()))
@@ -138,7 +138,7 @@ public partial class CS2_SimpleAdmin
PlayerInfo playerInfo = new PlayerInfo PlayerInfo playerInfo = new PlayerInfo
{ {
UserId = player.UserId, UserId = player.UserId,
Index = (int)player.Index, Index = (ushort)player.UserId,
SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(), SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
Name = player?.PlayerName, Name = player?.PlayerName,
IpAddress = player?.IpAddress.Split(":")[0] IpAddress = player?.IpAddress.Split(":")[0]
@@ -179,7 +179,7 @@ public partial class CS2_SimpleAdmin
PlayerInfo playerInfo = new PlayerInfo PlayerInfo playerInfo = new PlayerInfo
{ {
UserId = player.UserId, UserId = player.UserId,
Index = (int)player.Index, Index = (ushort)player.Index,
SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(), SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
Name = player?.PlayerName, Name = player?.PlayerName,
IpAddress = player?.IpAddress?.Split(":")[0] IpAddress = player?.IpAddress?.Split(":")[0]
@@ -223,11 +223,11 @@ public partial class CS2_SimpleAdmin
if (muteType == "GAG") if (muteType == "GAG")
{ {
// Chat mute // Chat mute
if (!gaggedPlayers.Any(index => index == player.Index)) if (player.UserId != null && !gaggedPlayers.Any(index => index == (ushort)player.UserId))
gaggedPlayers.Add((int)player.Index); gaggedPlayers.Add((ushort)player.UserId);
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_mute {player.Index}"); NativeAPI.IssueServerCommand($"css_tag_mute {player.UserId}");
if (durationInSeconds != 0 && duration.Minutes >= 0 && duration.Minutes <= 30) if (durationInSeconds != 0 && duration.Minutes >= 0 && duration.Minutes <= 30)
{ {
@@ -235,16 +235,16 @@ public partial class CS2_SimpleAdmin
{ {
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return; if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (int)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
} }
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player.Index}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player!.UserId}");
MuteManager _muteManager = new(dbConnectionString); MuteManager _muteManager = new(dbConnectionString);
_ = _muteManager.UnmutePlayer(player.AuthorizedSteamID.SteamId64.ToString(), 0); _ = _muteManager.UnmutePlayer(player.AuthorizedSteamID.SteamId64.ToString(), 0);
@@ -277,9 +277,9 @@ public partial class CS2_SimpleAdmin
if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return; if (player == null || !player.IsValid || player.AuthorizedSteamID == null) return;
/* /*
if (mutedPlayers.Contains((int)player.Index)) if (mutedPlayers.Contains((ushort)player.UserId))
{ {
if (mutedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (mutedPlayers.TryTake(out int removedItem) && removedItem != (ushort)player.UserId)
{ {
mutedPlayers.Add(removedItem); mutedPlayers.Add(removedItem);
} }
@@ -329,8 +329,8 @@ public partial class CS2_SimpleAdmin
} }
*/ */
if (!loadedPlayers.Contains((int)player.Index)) if (player.UserId != null && !loadedPlayers.Contains((ushort)player.UserId))
loadedPlayers.Add((int)player.Index); loadedPlayers.Add((ushort)player.UserId);
}); });
}); });
} }
@@ -341,36 +341,36 @@ public partial class CS2_SimpleAdmin
if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return; if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
if (gaggedPlayers.Contains((int)player.Index)) if (player != null && player.UserId != null && gaggedPlayers.Contains((ushort)player.UserId))
{ {
if (gaggedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (gaggedPlayers.TryTake(out ushort removedItem) && removedItem != (ushort)player.UserId)
{ {
gaggedPlayers.Add(removedItem); gaggedPlayers.Add(removedItem);
} }
} }
/* /*
if (mutedPlayers.Contains((int)player.Index)) if (mutedPlayers.Contains((ushort)player.UserId))
{ {
if (mutedPlayers.TryTake(out int removedItem) && removedItem != (int)player.Index) if (mutedPlayers.TryTake(out int removedItem) && removedItem != (ushort)player.UserId)
{ {
mutedPlayers.Add(removedItem); mutedPlayers.Add(removedItem);
} }
} }
*/ */
if (silentPlayers.Contains((int)player.Index)) if (player.UserId != null && silentPlayers.Contains((ushort)player.UserId))
{ {
silentPlayers.Remove((int)player.Index); silentPlayers.Remove((ushort)player.UserId);
} }
if (godPlayers.Contains((int)player.Index)) if (player.UserId != null && godPlayers.Contains((ushort)player.UserId))
{ {
godPlayers.Remove((int)player.Index); godPlayers.Remove((ushort)player.UserId);
} }
if (loadedPlayers.Contains((int)player.Index)) if (player.UserId != null && loadedPlayers.Contains((ushort)player.UserId))
loadedPlayers.Remove((int)player.Index); loadedPlayers.Remove((ushort)player.UserId);
if (player.AuthorizedSteamID != null && AdminSQLManager._adminCacheSet.Contains(player.AuthorizedSteamID)) if (player.AuthorizedSteamID != null && AdminSQLManager._adminCacheSet.Contains(player.AuthorizedSteamID))
{ {
@@ -382,7 +382,7 @@ public partial class CS2_SimpleAdmin
} }
if (TagsDetected) if (TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_unmute {player!.Index}"); NativeAPI.IssueServerCommand($"css_tag_unmute {player!.UserId}");
} }
private void OnMapStart(string mapName) private void OnMapStart(string mapName)
@@ -433,7 +433,7 @@ public partial class CS2_SimpleAdmin
if (player == null || !player.IsValid) if (player == null || !player.IsValid)
return HookResult.Continue; return HookResult.Continue;
if (godPlayers.Contains((int)player.Index) && player.PawnIsAlive) if (player.UserId != null && godPlayers.Contains((ushort)player.UserId) && player.PawnIsAlive)
{ {
player.Health = 100; player.Health = 100;
player.PlayerPawn.Value!.Health = 100; player.PlayerPawn.Value!.Health = 100;

8
MuteManager.cs
View File

@@ -147,7 +147,7 @@ namespace CS2_SimpleAdmin
public async Task CheckMute(PlayerInfo player) public async Task CheckMute(PlayerInfo player)
{ {
if (player.Index == null) return; if (player.UserId == null) return;
string steamId = player.SteamId!; string steamId = player.SteamId!;
List<dynamic> activeMutes = await IsPlayerMuted(steamId); List<dynamic> activeMutes = await IsPlayerMuted(steamId);
@@ -162,11 +162,11 @@ namespace CS2_SimpleAdmin
if (muteType == "GAG") if (muteType == "GAG")
{ {
if (!CS2_SimpleAdmin.gaggedPlayers.Any(index => index == player.Index)) if (!CS2_SimpleAdmin.gaggedPlayers.Any(index => index == player.UserId))
CS2_SimpleAdmin.gaggedPlayers.Add((int)player.Index); CS2_SimpleAdmin.gaggedPlayers.Add((ushort)player.UserId);
if (CS2_SimpleAdmin.TagsDetected) if (CS2_SimpleAdmin.TagsDetected)
NativeAPI.IssueServerCommand($"css_tag_mute {player!.Index}"); NativeAPI.IssueServerCommand($"css_tag_mute {player!.UserId}");
/* /*
CCSPlayerController currentPlayer = player; CCSPlayerController currentPlayer = player;