- Temp fix for player.Disconnect
- Fix for no reasons
- Fix for no time used
- Added check for hibernation
- Some changes in unwarn action
This commit is contained in:
Dawid Bepierszcz
2025-01-15 12:56:03 +01:00
parent 3f1b6b3bf7
commit f2e4b84b29
9 changed files with 169 additions and 69 deletions

View File

@@ -156,12 +156,16 @@ internal static class Helper
if (!player.IsValid || player.IsHLTV)
return;
player.Disconnect(reason);
Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); Broken after last update
});
}
else
{
player.Disconnect(reason);
Server.ExecuteCommand($"kickid {player.UserId}");
player.Disconnect(reason); // Broken after last update
}
if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
@@ -196,13 +200,26 @@ internal static class Helper
{
if (!player.IsValid || player.IsHLTV)
return;
player.Disconnect(reason);
// if (!string.IsNullOrEmpty(reason))
// {
// var escapeChars = reason.IndexOfAny([';', '|']);
//
// if (escapeChars != -1)
// {
// reason = reason[..escapeChars];
// }
// }
//
Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); // Broken after last update
});
}
else
{
player.Disconnect(reason);
Server.ExecuteCommand($"kickid {player.UserId}");
// player.Disconnect(reason); // Broken after last update
}
if (CS2_SimpleAdmin.UnlockedCommands && reason == NetworkDisconnectionReason.NETWORK_DISCONNECT_REJECT_BANNED)
@@ -223,12 +240,15 @@ internal static class Helper
public static int ParsePenaltyTime(string time)
{
if (string.IsNullOrWhiteSpace(time))
if (string.IsNullOrWhiteSpace(time) || !time.Any(char.IsDigit))
{
CS2_SimpleAdmin._logger?.LogError("Time string cannot be null or empty.");
// CS2_SimpleAdmin._logger?.LogError("Time string cannot be null or empty.");
return -1;
}
if (time.Equals($"0"))
return 0;
var timeUnits = new Dictionary<string, int>
{
{ "m", 1 }, // Minute
@@ -265,8 +285,8 @@ internal static class Helper
throw new ArgumentException($"Invalid time unit '{unit}' in time string.", nameof(time));
}
}
return totalMinutes;
return totalMinutes > 0 ? totalMinutes : -1;
}
public static void PrintToCenterAll(string message)