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

upstream to v1.6.7a

Browse source
This commit is contained in:
Sachin 2024-11-09 01:02:20 +05:30
commit 34f3a6e15a
28 changed files with 392 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

140
CS2-SimpleAdmin/Managers/PlayerManager.cs
View file

@ -2,6 +2,7 @@ using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Admin;
using CounterStrikeSharp.API.Modules.Entities;
using CounterStrikeSharp.API.Modules.Timers;
using CounterStrikeSharp.API.ValveConstants.Protobuf;
using CS2_SimpleAdminApi;
using Dapper;
@ -207,6 +208,20 @@ public class PlayerManager
public void CheckPlayersTimer()
{
CS2_SimpleAdmin.Instance.AddTimer(0.1f, () =>
{
if (CS2_SimpleAdmin.GravityPlayers.Count <= 0) return;
foreach (var value in CS2_SimpleAdmin.GravityPlayers)
{
if (value.Key is not
{ IsValid: true, Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true })
continue;
value.Key.SetGravity(value.Value);
}
}, TimerFlags.REPEAT);
CS2_SimpleAdmin.Instance.AddTimer(61.0f, () =>
{
#if DEBUG
@ -216,23 +231,50 @@ public class PlayerManager
return;
var players = Helper.GetValidPlayers();
var onlinePlayers = players
.Where(player => player.IpAddress != null)
.Select(player => (player.IpAddress, player.SteamID, player.UserId, player.Slot))
.ToList();
var onlinePlayers = new List<(string? IpAddress, ulong SteamID, int? UserId, int Slot)>();
// var onlinePlayers = players
// .Where(player => player.IpAddress != null)
// .Select(player => (player.IpAddress, player.SteamID, player.UserId, player.Slot))
// .ToList();
Task.Run(async () =>
foreach (var player in players)
{
await CS2_SimpleAdmin.Instance.MuteManager.ExpireOldMutes();
await CS2_SimpleAdmin.Instance.BanManager.ExpireOldBans();
await CS2_SimpleAdmin.Instance.WarnManager.ExpireOldWarns();
await CS2_SimpleAdmin.Instance.PermissionManager.DeleteOldAdmins();
CS2_SimpleAdmin.BannedPlayers.Clear();
if (onlinePlayers.Count > 0)
if (player.IpAddress != null)
onlinePlayers.Add((player.IpAddress, player.SteamID, player.UserId, player.Slot));
}
try
{
var expireTasks = new[]
{
try
CS2_SimpleAdmin.Instance.BanManager.ExpireOldBans(),
CS2_SimpleAdmin.Instance.MuteManager.ExpireOldMutes(),
CS2_SimpleAdmin.Instance.WarnManager.ExpireOldWarns(),
CS2_SimpleAdmin.Instance.PermissionManager.DeleteOldAdmins()
};
Task.WhenAll(expireTasks).ContinueWith(t =>
{
if (t is not { IsFaulted: true, Exception: not null }) return;
foreach (var ex in t.Exception.InnerExceptions)
{
CS2_SimpleAdmin._logger?.LogError($"Error expiring penalties: {ex.Message}");
}
});
}
catch (Exception ex)
{
CS2_SimpleAdmin._logger?.LogError($"Unexpected error: {ex.Message}");
}
CS2_SimpleAdmin.BannedPlayers.Clear();
if (onlinePlayers.Count > 0)
{
try
{
Task.Run(async () =>
{
await CS2_SimpleAdmin.Instance.BanManager.CheckOnlinePlayers(onlinePlayers);
@ -240,40 +282,56 @@ public class PlayerManager
{
await CS2_SimpleAdmin.Instance.MuteManager.CheckOnlineModeMutes(onlinePlayers);
}
}
catch (Exception)
}).ContinueWith(t =>
{
CS2_SimpleAdmin._logger?.LogError("Unable to check bans for online players");
}
if (t is not { IsFaulted: true, Exception: not null }) return;
foreach (var ex in t.Exception.InnerExceptions)
{
CS2_SimpleAdmin._logger?.LogError($"Error checking online players: {ex.Message}");
}
});
}
await Server.NextFrameAsync(() =>
catch (Exception ex)
{
if (onlinePlayers.Count > 0)
CS2_SimpleAdmin._logger?.LogError($"Unexpected error: {ex.Message}");
}
}
if (onlinePlayers.Count <= 0) return;
{
try
{
var penalizedSlots = players
.Where(player => PlayerPenaltyManager.IsSlotInPenalties(player.Slot))
.Select(player => new
{
Player = player,
IsMuted = PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Mute),
IsSilenced = PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Silence),
IsGagged = PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Gag)
});
foreach (var entry in penalizedSlots)
{
try
// If the player is not muted or silenced, set voice flags to normal
if (!entry.IsMuted && !entry.IsSilenced)
{
foreach (var player in players.Where(player => PlayerPenaltyManager.IsSlotInPenalties(player.Slot)))
{
if (!PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Mute) && !PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Silence) && player.VoiceFlags.HasFlag(VoiceFlags.Muted))
player.VoiceFlags &= ~VoiceFlags.Muted;
if (PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Silence) ||
PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Mute) ||
PlayerPenaltyManager.IsPenalized(player.Slot, PenaltyType.Gag)) continue;
if (player.VoiceFlags.HasFlag(VoiceFlags.Muted))
player.VoiceFlags &= ~VoiceFlags.Muted;
}
PlayerPenaltyManager.RemoveExpiredPenalties();
}
catch (Exception)
{
CS2_SimpleAdmin._logger?.LogError("Unable to remove old penalties");
entry.Player.VoiceFlags = VoiceFlags.Normal;
if (entry.Player.VoiceFlags.HasFlag(VoiceFlags.Muted))
entry.Player.VoiceFlags &= ~VoiceFlags.Muted;
}
}
});
});
PlayerPenaltyManager.RemoveExpiredPenalties();
}
catch (Exception ex)
{
CS2_SimpleAdmin._logger?.LogError($"Unable to remove old penalties: {ex.Message}");
}
}
}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
}
}

2
CS2-SimpleAdmin/Managers/ServerManager.cs
View file

@ -7,7 +7,7 @@ namespace CS2_SimpleAdmin.Managers;
public class ServerManager
{
private int _getIpTryCount = 0;
private int _getIpTryCount;
public void LoadServerData()
{