mirror of
https://github.com/daffyyyy/CS2-SimpleAdmin.git
synced 2026-02-19 02:51:51 +00:00
1.4.2a
- Config upgrade - Translatable and customizable menu - More async - Minor changes
This commit is contained in:
@@ -4,7 +4,6 @@ using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Core.Translations;
|
||||
using CounterStrikeSharp.API.Modules.Admin;
|
||||
using CounterStrikeSharp.API.Modules.Commands;
|
||||
using CounterStrikeSharp.API.Modules.Commands.Targeting;
|
||||
using System.Text;
|
||||
|
||||
namespace CS2_SimpleAdmin
|
||||
@@ -19,41 +18,39 @@ namespace CS2_SimpleAdmin
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
|
||||
var time = 0;
|
||||
var reason = _localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
var targets = GetTarget(command);
|
||||
if (targets == null) return;
|
||||
var playersToTarget = targets!.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
var playersToTarget = targets.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
|
||||
if (playersToTarget.Count > 1 && Config.DisableDangerousCommands || playersToTarget.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
MuteManager muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
|
||||
playersToTarget.ForEach(player =>
|
||||
{
|
||||
if (caller!.CanTarget(player))
|
||||
{
|
||||
Gag(caller, player, time, reason, callerName, _muteManager, playerPenaltyManager, command);
|
||||
Gag(caller, player, time, reason, callerName, muteManager, playerPenaltyManager, command);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
internal void Gag(CCSPlayerController? caller, CCSPlayerController? player, int time, string reason, string? callerName = null, MuteManager? muteManager = null, PlayerPenaltyManager? playerPenaltyManager = null, CommandInfo? command = null)
|
||||
internal static void Gag(CCSPlayerController? caller, CCSPlayerController? player, int time, string reason, string? callerName = null, MuteManager? muteManager = null, PlayerPenaltyManager? playerPenaltyManager = null, CommandInfo? command = null)
|
||||
{
|
||||
if (_database == null) return;
|
||||
callerName ??= caller == null ? "Console" : caller.PlayerName;
|
||||
muteManager ??= new MuteManager(_database);
|
||||
playerPenaltyManager ??= new PlayerPenaltyManager();
|
||||
|
||||
var playerInfo = new PlayerInfo
|
||||
{
|
||||
@@ -80,7 +77,7 @@ namespace CS2_SimpleAdmin
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Gag, DateTime.Now.AddMinutes(time), time);
|
||||
if (time == 0)
|
||||
{
|
||||
if (!player!.IsBot && !player.IsHLTV)
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
{
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
@@ -103,11 +100,11 @@ namespace CS2_SimpleAdmin
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!player!.IsBot && !player.IsHLTV)
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
{
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,13 +149,11 @@ namespace CS2_SimpleAdmin
|
||||
return;
|
||||
}
|
||||
|
||||
var time = 0;
|
||||
var reason = _localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
@@ -187,7 +182,7 @@ namespace CS2_SimpleAdmin
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
@@ -208,7 +203,7 @@ namespace CS2_SimpleAdmin
|
||||
if (player is { IsBot: false, IsHLTV: false })
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
@@ -226,9 +221,9 @@ namespace CS2_SimpleAdmin
|
||||
}
|
||||
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_mute {player!.SteamID}");
|
||||
Server.ExecuteCommand($"css_tag_mute {player.SteamID}");
|
||||
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Gag, DateTime.Now.AddMinutes(time), time);
|
||||
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Gag, DateTime.Now.AddMinutes(time), time);
|
||||
}
|
||||
|
||||
Helper.SendDiscordPenaltyMessage(caller, player, reason, time, Helper.PenaltyType.Gag, _discordWebhookClientPenalty, _localizer);
|
||||
@@ -236,13 +231,13 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
await _muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 0);
|
||||
await muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time);
|
||||
});
|
||||
|
||||
Helper.SendDiscordLogMessage(caller, command, _discordWebhookClientLog, _localizer);
|
||||
Helper.LogCommand(caller, command);
|
||||
|
||||
command?.ReplyToCommand($"Gagged player with steamid {steamid}.");
|
||||
command.ReplyToCommand($"Gagged player with steamid {steamid}.");
|
||||
}
|
||||
|
||||
[ConsoleCommand("css_ungag")]
|
||||
@@ -251,7 +246,6 @@ namespace CS2_SimpleAdmin
|
||||
public void OnUngagCommand(CCSPlayerController? caller, CommandInfo command)
|
||||
{
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
var callerSteamId = caller?.SteamID.ToString() ?? "Console";
|
||||
|
||||
var foundPlayerName = string.Empty;
|
||||
@@ -270,9 +264,7 @@ namespace CS2_SimpleAdmin
|
||||
var found = false;
|
||||
|
||||
var pattern = command.GetArg(1);
|
||||
MuteManager _muteManager = new(_database);
|
||||
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
if (Helper.IsValidSteamId64(pattern))
|
||||
{
|
||||
@@ -282,10 +274,10 @@ namespace CS2_SimpleAdmin
|
||||
var player = matches.FirstOrDefault();
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Gag);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Gag);
|
||||
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_unmute {player!.SteamID}");
|
||||
Server.ExecuteCommand($"css_tag_unmute {player.SteamID}");
|
||||
|
||||
found = true;
|
||||
foundPlayerName = player.PlayerName;
|
||||
@@ -301,12 +293,12 @@ namespace CS2_SimpleAdmin
|
||||
var player = matches.FirstOrDefault();
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Gag);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Gag);
|
||||
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_unmute {player!.SteamID.ToString()}");
|
||||
Server.ExecuteCommand($"css_tag_unmute {player.SteamID.ToString()}");
|
||||
|
||||
pattern = player!.SteamID.ToString();
|
||||
pattern = player.SteamID.ToString();
|
||||
|
||||
found = true;
|
||||
foundPlayerName = player.PlayerName;
|
||||
@@ -317,12 +309,12 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
if (found)
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason, 0); }); // Unmute by type 0 (gag)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason); }); // Unmute by type 0 (gag)
|
||||
command.ReplyToCommand($"Ungaged player {foundPlayerName}.");
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(pattern, callerSteamId, reason, 0); }); // Unmute by type 0 (gag)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(pattern, callerSteamId, reason); }); // Unmute by type 0 (gag)
|
||||
command.ReplyToCommand($"Ungaged offline player with pattern {pattern}.");
|
||||
}
|
||||
|
||||
@@ -365,31 +357,30 @@ namespace CS2_SimpleAdmin
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
|
||||
var time = 0;
|
||||
var reason = _localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
var targets = GetTarget(command);
|
||||
if (targets == null) return;
|
||||
var playersToTarget = targets!.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
var playersToTarget = targets.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
|
||||
if (playersToTarget.Count > 1 && Config.DisableDangerousCommands || playersToTarget.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
MuteManager muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
|
||||
playersToTarget.ForEach(player =>
|
||||
{
|
||||
if (caller!.CanTarget(player))
|
||||
{
|
||||
Mute(caller, player, time, reason, callerName, _muteManager, playerPenaltyManager, command);
|
||||
Mute(caller, player, time, reason, callerName, muteManager, playerPenaltyManager, command);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -421,14 +412,14 @@ namespace CS2_SimpleAdmin
|
||||
await muteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1);
|
||||
});
|
||||
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Mute, DateTime.Now.AddMinutes(time), time);
|
||||
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Mute, DateTime.Now.AddMinutes(time), time);
|
||||
|
||||
if (time == 0)
|
||||
{
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
@@ -449,7 +440,7 @@ namespace CS2_SimpleAdmin
|
||||
if (player is { IsBot: false, IsHLTV: false })
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
{
|
||||
@@ -493,13 +484,11 @@ namespace CS2_SimpleAdmin
|
||||
return;
|
||||
}
|
||||
|
||||
var time = 0;
|
||||
var reason = _localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
@@ -523,14 +512,14 @@ namespace CS2_SimpleAdmin
|
||||
return;
|
||||
}
|
||||
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Mute, DateTime.Now.AddMinutes(time), time);
|
||||
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Mute, DateTime.Now.AddMinutes(time), time);
|
||||
|
||||
if (time == 0)
|
||||
{
|
||||
if (player is { IsBot: false, IsHLTV: false })
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
{
|
||||
@@ -550,7 +539,7 @@ namespace CS2_SimpleAdmin
|
||||
if (player is { IsBot: false, IsHLTV: false })
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
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 || !silentPlayers.Contains(caller.Slot))
|
||||
{
|
||||
@@ -572,13 +561,13 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
await _muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 1);
|
||||
await muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 1);
|
||||
});
|
||||
|
||||
Helper.SendDiscordLogMessage(caller, command, _discordWebhookClientLog, _localizer);
|
||||
Helper.LogCommand(caller, command);
|
||||
|
||||
command?.ReplyToCommand($"Muted player with steamid {steamid}.");
|
||||
command.ReplyToCommand($"Muted player with steamid {steamid}.");
|
||||
}
|
||||
|
||||
[ConsoleCommand("css_unmute")]
|
||||
@@ -587,7 +576,6 @@ namespace CS2_SimpleAdmin
|
||||
public void OnUnmuteCommand(CCSPlayerController? caller, CommandInfo command)
|
||||
{
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
var callerSteamId = caller?.SteamID.ToString() ?? "Console";
|
||||
|
||||
var foundPlayerName = string.Empty;
|
||||
@@ -605,8 +593,7 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
var pattern = command.GetArg(1);
|
||||
var found = false;
|
||||
MuteManager _muteManager = new(_database);
|
||||
PlayerPenaltyManager playerPenaltyManager = new();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
if (Helper.IsValidSteamId64(pattern))
|
||||
{
|
||||
@@ -616,7 +603,7 @@ namespace CS2_SimpleAdmin
|
||||
var player = matches.FirstOrDefault();
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Mute);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Mute);
|
||||
player.VoiceFlags = VoiceFlags.Normal;
|
||||
found = true;
|
||||
foundPlayerName = player.PlayerName;
|
||||
@@ -632,7 +619,7 @@ namespace CS2_SimpleAdmin
|
||||
var player = matches.FirstOrDefault();
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Mute);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Mute);
|
||||
player.VoiceFlags = VoiceFlags.Normal;
|
||||
pattern = player.SteamID.ToString();
|
||||
found = true;
|
||||
@@ -644,12 +631,12 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
if (found)
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason, 1); }); // Unmute by type 1 (mute)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason, 1); }); // Unmute by type 1 (mute)
|
||||
command.ReplyToCommand($"Unmuted player {foundPlayerName}.");
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(pattern, callerSteamId, reason, 1); }); // Unmute by type 1 (mute)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(pattern, callerSteamId, reason, 1); }); // Unmute by type 1 (mute)
|
||||
command.ReplyToCommand($"Unmuted offline player with pattern {pattern}.");
|
||||
}
|
||||
|
||||
@@ -687,31 +674,30 @@ namespace CS2_SimpleAdmin
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
|
||||
var time = 0;
|
||||
var reason = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
var targets = GetTarget(command);
|
||||
if (targets == null) return;
|
||||
var playersToTarget = targets!.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
var playersToTarget = targets.Players.Where(player => player.IsValid && player.SteamID.ToString().Length == 17 && !player.IsHLTV).ToList();
|
||||
|
||||
if (playersToTarget.Count > 1 && Config.DisableDangerousCommands || playersToTarget.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
MuteManager muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
|
||||
playersToTarget.ForEach(player =>
|
||||
{
|
||||
if (caller!.CanTarget(player))
|
||||
{
|
||||
Silence(caller, player, time, reason, callerName, _muteManager, playerPenaltyManager, command);
|
||||
Silence(caller, player, time, reason, callerName, muteManager, playerPenaltyManager, command);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -721,7 +707,6 @@ namespace CS2_SimpleAdmin
|
||||
if (_database == null) return;
|
||||
callerName ??= caller == null ? "Console" : caller.PlayerName;
|
||||
muteManager ??= new MuteManager(_database);
|
||||
playerPenaltyManager ??= new PlayerPenaltyManager();
|
||||
|
||||
var playerInfo = new PlayerInfo
|
||||
{
|
||||
@@ -746,11 +731,11 @@ namespace CS2_SimpleAdmin
|
||||
Server.ExecuteCommand($"css_tag_mute {player!.SteamID}");
|
||||
|
||||
player!.VoiceFlags = VoiceFlags.Muted;
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Silence, DateTime.Now.AddMinutes(time), time);
|
||||
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Silence, DateTime.Now.AddMinutes(time), time);
|
||||
|
||||
if (time == 0)
|
||||
{
|
||||
if (!player!.IsBot && !player.IsHLTV)
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
{
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
@@ -773,11 +758,11 @@ namespace CS2_SimpleAdmin
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!player!.IsBot && !player.IsHLTV)
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
{
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
player!.PrintToCenter(_localizer!["sa_player_silence_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
|
||||
player.PrintToCenter(_localizer!["sa_player_silence_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -823,13 +808,11 @@ namespace CS2_SimpleAdmin
|
||||
return;
|
||||
}
|
||||
|
||||
var time = 0;
|
||||
var reason = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown";
|
||||
var reason = _localizer?["sa_unknown"] ?? "Unknown";
|
||||
|
||||
MuteManager _muteManager = new(_database);
|
||||
var playerPenaltyManager = new PlayerPenaltyManager();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
int.TryParse(command.GetArg(2), out time);
|
||||
int.TryParse(command.GetArg(2), out var time);
|
||||
|
||||
if (command.ArgCount >= 3 && command.GetArg(3).Length > 0)
|
||||
reason = command.GetArg(3);
|
||||
@@ -854,16 +837,16 @@ namespace CS2_SimpleAdmin
|
||||
}
|
||||
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_mute {player!.SteamID}");
|
||||
Server.ExecuteCommand($"css_tag_mute {player.SteamID}");
|
||||
|
||||
PlayerPenaltyManager.AddPenalty(player!.Slot, PenaltyType.Silence, DateTime.Now.AddMinutes(time), time);
|
||||
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Silence, DateTime.Now.AddMinutes(time), time);
|
||||
|
||||
if (time == 0)
|
||||
{
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
player!.PrintToCenter(_localizer!["sa_player_silence_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
|
||||
player.PrintToCenter(_localizer!["sa_player_silence_message_perm", reason, caller == null ? "Console" : caller.PlayerName]);
|
||||
}
|
||||
if (caller == null || !silentPlayers.Contains(caller.Slot))
|
||||
{
|
||||
@@ -883,7 +866,7 @@ namespace CS2_SimpleAdmin
|
||||
if (!player.IsBot && !player.IsHLTV)
|
||||
using (new WithTemporaryCulture(player.GetLanguage()))
|
||||
{
|
||||
player!.PrintToCenter(_localizer!["sa_player_silence_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
|
||||
player.PrintToCenter(_localizer!["sa_player_silence_message_time", reason, time, caller == null ? "Console" : caller.PlayerName]);
|
||||
}
|
||||
if (caller == null || !silentPlayers.Contains(caller.Slot))
|
||||
{
|
||||
@@ -904,13 +887,13 @@ namespace CS2_SimpleAdmin
|
||||
}
|
||||
Task.Run(async () =>
|
||||
{
|
||||
await _muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 2);
|
||||
await muteManager.AddMuteBySteamid(steamid, adminInfo, reason, time, 2);
|
||||
});
|
||||
|
||||
Helper.SendDiscordLogMessage(caller, command, _discordWebhookClientLog, _localizer);
|
||||
Helper.LogCommand(caller, command);
|
||||
|
||||
command?.ReplyToCommand($"Silenced player with steamid {steamid}.");
|
||||
command.ReplyToCommand($"Silenced player with steamid {steamid}.");
|
||||
}
|
||||
|
||||
[ConsoleCommand("css_unsilence")]
|
||||
@@ -919,7 +902,6 @@ namespace CS2_SimpleAdmin
|
||||
public void OnUnsilenceCommand(CCSPlayerController? caller, CommandInfo command)
|
||||
{
|
||||
if (_database == null) return;
|
||||
var callerName = caller == null ? "Console" : caller.PlayerName;
|
||||
var callerSteamId = caller?.SteamID.ToString() ?? "Console";
|
||||
|
||||
var foundPlayerName = string.Empty;
|
||||
@@ -937,8 +919,7 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
var pattern = command.GetArg(1);
|
||||
var found = false;
|
||||
MuteManager _muteManager = new(_database);
|
||||
PlayerPenaltyManager playerPenaltyManager = new();
|
||||
MuteManager muteManager = new(_database);
|
||||
|
||||
if (Helper.IsValidSteamId64(pattern))
|
||||
{
|
||||
@@ -949,9 +930,9 @@ namespace CS2_SimpleAdmin
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_unmute {player!.SteamID}");
|
||||
Server.ExecuteCommand($"css_tag_unmute {player.SteamID}");
|
||||
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Silence);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Silence);
|
||||
player.VoiceFlags = VoiceFlags.Normal;
|
||||
found = true;
|
||||
foundPlayerName = player.PlayerName;
|
||||
@@ -968,9 +949,9 @@ namespace CS2_SimpleAdmin
|
||||
if (player != null && player.IsValid)
|
||||
{
|
||||
if (TagsDetected)
|
||||
Server.ExecuteCommand($"css_tag_unmute {player!.SteamID}");
|
||||
Server.ExecuteCommand($"css_tag_unmute {player.SteamID}");
|
||||
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player!.Slot, PenaltyType.Silence);
|
||||
PlayerPenaltyManager.RemovePenaltiesByType(player.Slot, PenaltyType.Silence);
|
||||
player.VoiceFlags = VoiceFlags.Normal;
|
||||
pattern = player.SteamID.ToString();
|
||||
found = true;
|
||||
@@ -982,15 +963,13 @@ namespace CS2_SimpleAdmin
|
||||
|
||||
if (found)
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason, 2); }); // Unmute by type 2 (silence)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(foundPlayerSteamId64, callerSteamId, reason, 2); }); // Unmute by type 2 (silence)
|
||||
command.ReplyToCommand($"Unsilenced player {foundPlayerName}.");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
Task.Run(async () => { await _muteManager.UnmutePlayer(pattern, callerSteamId, reason, 2); }); // Unmute by type 2 (silence)
|
||||
Task.Run(async () => { await muteManager.UnmutePlayer(pattern, callerSteamId, reason, 2); }); // Unmute by type 2 (silence)
|
||||
command.ReplyToCommand($"Unsilenced offline player with pattern {pattern}.");
|
||||
return;
|
||||
}
|
||||
/*
|
||||
TargetResult? targets = GetTarget(command);
|
||||
|
||||
Reference in New Issue
Block a user