cs2/SimpleAdmin
1
0
Fork 0
Code Issues Pull requests Projects Releases 15 Packages Wiki Activity Actions

Targets: prefer an exact name, partial names for ungag/unmute/unsilence
Some checks are pending
Build and Publish / build (push) Waiting to run
Details
Build and Publish / publish (push) Blocked by required conditions
Details

Browse source 
Part of 1.8.2b-zio15.
This commit is contained in:
Astra 2026-10-03 00:18:04 +01:00
parent dc5ad30952
commit 8bec658db4
4 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CS2-SimpleAdmin/CS2-SimpleAdmin.cs
View file

@ -242,7 +242,13 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
if (matches.Count() == 1)
return matches;
command.ReplyToCommand($"Multiple targets found for \"{command.GetArg(argument)}\".");
// zio: a name that is exactly the pattern wins over names that only contain it, so "duck"
// still finds "Duck" when "Ducky" is also on.
var exact = matches.Players.Where(p => p.PlayerName.Equals(command.GetArg(argument), StringComparison.OrdinalIgnoreCase)).ToList();
if (exact.Count == 1)
return new TargetResult { Players = exact };
command.ReplyToCommand($"Multiple targets found for \"{command.GetArg(argument)}\": {string.Join(", ", matches.Players.Select(p => p.PlayerName))}.");
return null;
}

21
CS2-SimpleAdmin/Commands/basecomms.cs
View file

@ -292,6 +292,13 @@ public partial class CS2_SimpleAdmin
var nameMatches = Helper.GetPlayerFromName(pattern);
var namePlayer = nameMatches.Count == 1 ? nameMatches.FirstOrDefault() : null;
// zio: several online players match part of the name; don't fall through to the offline search.
if (nameMatches.Count > 1)
{
command.ReplyToCommand($"Multiple targets found for \"{pattern}\": {string.Join(", ", nameMatches.Select(p => p.PlayerName))}.");
return;
}
if (namePlayer != null && namePlayer.IsValid)
{
PlayerPenaltyManager.RemovePenaltiesByType(namePlayer.Slot, PenaltyType.Gag);
@ -604,6 +611,13 @@ public partial class CS2_SimpleAdmin
var nameMatches = Helper.GetPlayerFromName(pattern);
var namePlayer = nameMatches.Count == 1 ? nameMatches.FirstOrDefault() : null;
// zio: several online players match part of the name; don't fall through to the offline search.
if (nameMatches.Count > 1)
{
command.ReplyToCommand($"Multiple targets found for \"{pattern}\": {string.Join(", ", nameMatches.Select(p => p.PlayerName))}.");
return;
}
if (namePlayer != null && namePlayer.IsValid)
{
PlayerPenaltyManager.RemovePenaltiesByType(namePlayer.Slot, PenaltyType.Mute);
@ -919,6 +933,13 @@ public partial class CS2_SimpleAdmin
var nameMatches = Helper.GetPlayerFromName(pattern);
var namePlayer = nameMatches.Count == 1 ? nameMatches.FirstOrDefault() : null;
// zio: several online players match part of the name; don't fall through to the offline search.
if (nameMatches.Count > 1)
{
command.ReplyToCommand($"Multiple targets found for \"{pattern}\": {string.Join(", ", nameMatches.Select(p => p.PlayerName))}.");
return;
}
if (namePlayer != null && namePlayer.IsValid)
{
PlayerPenaltyManager.RemovePenaltiesByType(namePlayer.Slot, PenaltyType.Silence);

5
CS2-SimpleAdmin/Helper.cs
View file

@ -49,9 +49,12 @@ internal static class Helper
}
}
// zio: an exact (case-insensitive) name match, or else every player whose name contains it.
public static List<CCSPlayerController> GetPlayerFromName(string name)
{
return GetValidPlayers().FindAll(x => x.PlayerName.Equals(name, StringComparison.OrdinalIgnoreCase));
var players = GetValidPlayers();
var exact = players.FindAll(x => x.PlayerName.Equals(name, StringComparison.OrdinalIgnoreCase));
return exact.Count > 0 ? exact : players.FindAll(x => x.PlayerName.Contains(name, StringComparison.OrdinalIgnoreCase));
}
public static CCSPlayerController? GetPlayerFromSteamid64(ulong steamid)