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

Admin immunity + Discord

Browse Source 
- Fixed command logging + small refactor
- Fixed admin immunity
- Separated penalty webhook
- More customizable penalty webhook
This commit is contained in:
Dawid Bepierszcz
2024-08-05 03:28:42 +02:00
parent bb0a236f28
commit c4cb308147
12 changed files with 222 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Commands/playercommands.cs
View File

@@ -33,16 +33,11 @@ namespace CS2_SimpleAdmin
return;
if (!caller.CanTarget(player)) return;
callerName ??= caller == null ? "Console" : caller.PlayerName;
player?.CommitSuicide(false, true);
if (command != null)
{
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
Helper.LogCommand(caller, command);
}
Helper.LogCommand(caller, $"css_slay {player?.PlayerName}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -114,11 +109,7 @@ namespace CS2_SimpleAdmin
{
if (!caller.CanTarget(player)) return;
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_give {player.PlayerName} {weaponName}");
player.GiveNamedItem(weaponName);
SubGiveWeapon(caller, player, weaponName, callerName);
@@ -173,11 +164,7 @@ namespace CS2_SimpleAdmin
player.RemoveWeapons();
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_strip {player.PlayerName}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -222,11 +209,7 @@ namespace CS2_SimpleAdmin
player.SetHp(health);
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_hp {player.PlayerName} {health}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -272,11 +255,7 @@ namespace CS2_SimpleAdmin
player.SetSpeed((float)speed);
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_speed {player?.PlayerName} {speed}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -299,9 +278,7 @@ namespace CS2_SimpleAdmin
var targets = GetTarget(command);
if (targets == null) return;
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
var playersToTarget = targets.Players.Where(player => player.IsValid && player is { PawnIsAlive: true, IsHLTV: false }).ToList();
playersToTarget.ForEach(player =>
@@ -324,11 +301,7 @@ namespace CS2_SimpleAdmin
player.SetGravity((float)gravity);
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_gravity {player?.PlayerName} {gravity}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -374,11 +347,7 @@ namespace CS2_SimpleAdmin
player.SetMoney(money);
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_money {player?.PlayerName} {money}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -421,17 +390,10 @@ namespace CS2_SimpleAdmin
callerName ??= caller == null ? "Console" : caller.PlayerName;
if (player == null) return;
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_god {player.PlayerName}");
if (!GodPlayers.Contains(player.Slot))
{
GodPlayers.Add(player.Slot);
}
else
if (!GodPlayers.Add(player.Slot))
{
GodPlayers.Remove(player.Slot);
}
@@ -483,12 +445,7 @@ namespace CS2_SimpleAdmin
var callerName = caller == null ? "Console" : caller.PlayerName;
player!.Pawn.Value!.Slap(damage);
if (command != null)
{
Helper.LogCommand(caller, command);
if (_localizer != null)
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_slap {player?.PlayerName} {damage}");
if (_localizer == null)
return;
@@ -599,9 +556,7 @@ namespace CS2_SimpleAdmin
}
}
if (command == null) return;
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
Helper.LogCommand(caller, $"css_team {player?.PlayerName} {teamName}");
}
[ConsoleCommand("css_rename", "Rename a player.")]
@@ -620,7 +575,6 @@ namespace CS2_SimpleAdmin
var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
playersToTarget.ForEach(player =>
{
@@ -658,7 +612,6 @@ namespace CS2_SimpleAdmin
var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
playersToTarget.ForEach(player =>
{
@@ -728,11 +681,7 @@ namespace CS2_SimpleAdmin
VirtualFunction.CreateVoid<CCSPlayerController>(player.Handle,
GameData.GetOffset("CCSPlayerController_Respawn"))(player);
if (command != null)
{
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
}
Helper.LogCommand(caller, $"css_respawn {player?.PlayerName}");
if (caller != null && SilentPlayers.Contains(caller.Slot)) return;
foreach (var controller in Helper.GetValidPlayers().Where(controller => controller is { IsValid: true, IsBot: false }))
@@ -762,7 +711,6 @@ namespace CS2_SimpleAdmin
var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
playersToTarget.ForEach(player =>
{
@@ -806,7 +754,6 @@ namespace CS2_SimpleAdmin
var playersToTarget = targets.Players.Where(player => player is { IsValid: true, IsHLTV: false }).ToList();
Helper.LogCommand(caller, command);
Helper.SendDiscordLogMessage(caller, command, DiscordWebhookClientLog, _localizer);
playersToTarget.ForEach(player =>
{