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

Fixed merge issues

Browse Source
This commit is contained in:
Valentin Barat
2024-02-12 11:46:16 +01:00
parent 9cecc19060
commit 778c93b170
1 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CS2-SimpleAdmin.cs
View File

@@ -527,15 +527,16 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
{ {
if (caller!.CanTarget(player)) if (caller!.CanTarget(player))
{ {
Gag(caller, player, time, reason, _muteManager); Gag(caller, player, time, reason, _muteManager, playerPenaltyManager);
} }
}); });
} }
internal void Gag(CCSPlayerController? caller, CCSPlayerController player, int time, string reason = null, MuteManager muteManager = null) internal void Gag(CCSPlayerController? caller, CCSPlayerController player, int time, string reason = null, MuteManager muteManager = null, PlayerPenaltyManager playerPenaltyManager = null)
{ {
reason ??= "Unknown"; reason ??= "Unknown";
muteManager ??= new(_database); muteManager ??= new(_database);
playerPenaltyManager ??= new PlayerPenaltyManager();
PlayerInfo playerInfo = new PlayerInfo PlayerInfo playerInfo = new PlayerInfo
{ {
@@ -553,7 +554,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
Task.Run(async () => Task.Run(async () =>
{ {
await _muteManager.MutePlayer(playerInfo, adminInfo, reason, time); await muteManager.MutePlayer(playerInfo, adminInfo, reason, time);
}); });
if (TagsDetected) if (TagsDetected)
@@ -617,7 +618,6 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
} }
} }
} }
} }
[ConsoleCommand("css_addgag")] [ConsoleCommand("css_addgag")]
@@ -860,10 +860,11 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
}); });
} }
internal void Mute(CCSPlayerController? caller, CCSPlayerController player, int time, string reason = null, MuteManager muteManager = null) internal void Mute(CCSPlayerController? caller, CCSPlayerController player, int time, string reason = null, MuteManager muteManager = null, PlayerPenaltyManager playerPenaltyManager = null)
{ {
reason ??= "Unknown"; reason ??= "Unknown";
muteManager ??= new(_database); muteManager ??= new(_database);
playerPenaltyManager ??= new PlayerPenaltyManager();
PlayerInfo playerInfo = new PlayerInfo PlayerInfo playerInfo = new PlayerInfo
{ {
@@ -883,7 +884,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
Task.Run(async () => Task.Run(async () =>
{ {
await _muteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1); 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);
@@ -1509,7 +1510,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
Task.Run(async () => Task.Run(async () =>
{ {
await _banManager.BanPlayer(playerInfo, adminInfo, reason, time); await banManager.BanPlayer(playerInfo, adminInfo, reason, time);
}); });
AddTimer(Config.KickTime, () => Helper.KickPlayer((ushort)player!.UserId!), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE); AddTimer(Config.KickTime, () => Helper.KickPlayer((ushort)player!.UserId!), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);