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

1.6.1b

Browse Source 
- Fixed rare problem when system uses other timezone than plugin
- Fixed time type in discord webhook
This commit is contained in:
Dawid Bepierszcz
2024-09-29 20:55:03 +02:00
parent 4206ad18b2
commit bd817d6652
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CS2-SimpleAdmin/CS2-SimpleAdmin.cs
View File

@@ -21,7 +21,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)"); public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)"; public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
public override string ModuleAuthor => "daffyy & Dliix66"; public override string ModuleAuthor => "daffyy & Dliix66";
public override string ModuleVersion => "1.6.1a"; public override string ModuleVersion => "1.6.1b";
public CS2_SimpleAdminConfig Config { get; set; } = new(); public CS2_SimpleAdminConfig Config { get; set; } = new();

6
CS2-SimpleAdmin/Commands/basecomms.cs
View File

@@ -64,7 +64,7 @@ public partial class CS2_SimpleAdmin
}); });
// Add penalty to the player's penalty manager // Add penalty to the player's penalty manager
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Gag, DateTime.Now.AddMinutes(time), time); PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Gag, Time.ActualDateTime().AddMinutes(time), time);
// Determine message keys and arguments based on gag time (permanent or timed) // Determine message keys and arguments based on gag time (permanent or timed)
var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0 var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0
@@ -283,7 +283,7 @@ public partial class CS2_SimpleAdmin
}); });
// Add penalty to the player's penalty manager // Add penalty to the player's penalty manager
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Mute, DateTime.Now.AddMinutes(time), time); PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Mute, Time.ActualDateTime().AddMinutes(time), time);
// Determine message keys and arguments based on mute time (permanent or timed) // Determine message keys and arguments based on mute time (permanent or timed)
var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0 var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0
@@ -501,7 +501,7 @@ public partial class CS2_SimpleAdmin
}); });
// Add penalty to the player's penalty manager // Add penalty to the player's penalty manager
PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Silence, DateTime.Now.AddMinutes(time), time); PlayerPenaltyManager.AddPenalty(player.Slot, PenaltyType.Silence, Time.ActualDateTime().AddMinutes(time), time);
// Determine message keys and arguments based on silence time (permanent or timed) // Determine message keys and arguments based on silence time (permanent or timed)
var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0 var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0

4
CS2-SimpleAdmin/Events.cs
View File

@@ -59,11 +59,11 @@ public partial class CS2_SimpleAdmin
{ {
disconnectedPlayer.Name = player.PlayerName; disconnectedPlayer.Name = player.PlayerName;
disconnectedPlayer.IpAddress = player.IpAddress?.Split(":")[0]; disconnectedPlayer.IpAddress = player.IpAddress?.Split(":")[0];
disconnectedPlayer.DisconnectTime = DateTime.Now; disconnectedPlayer.DisconnectTime = Time.ActualDateTime();
} }
else else
{ {
DisconnectedPlayers.Add(new DisconnectedPlayer(steamId, player.PlayerName, player.IpAddress?.Split(":")[0], DateTime.Now)); DisconnectedPlayers.Add(new DisconnectedPlayer(steamId, player.PlayerName, player.IpAddress?.Split(":")[0], Time.ActualDateTime()));
} }
PlayerPenaltyManager.RemoveAllPenalties(player.Slot); PlayerPenaltyManager.RemoveAllPenalties(player.Slot);

4
CS2-SimpleAdmin/Helper.cs
View File

@@ -364,12 +364,12 @@ internal static class Helper
var targetName = target != null ? target.PlayerName : localizer["sa_unknown"]; var targetName = target != null ? target.PlayerName : localizer["sa_unknown"];
var targetSteamId = target != null ? new SteamID(target.SteamID).SteamId64.ToString() : localizer["sa_unknown"]; var targetSteamId = target != null ? new SteamID(target.SteamID).SteamId64.ToString() : localizer["sa_unknown"];
var futureTime = DateTime.Now.AddMinutes(duration); var futureTime = Time.ActualDateTime().AddMinutes(duration);
var futureUnixTimestamp = new DateTimeOffset(futureTime).ToUnixTimeSeconds(); var futureUnixTimestamp = new DateTimeOffset(futureTime).ToUnixTimeSeconds();
string time; string time;
if (penaltySetting.FirstOrDefault(s => s.Name.Equals("Webhook"))?.Value == "{relative}") if (penaltySetting.FirstOrDefault(s => s.Name.Equals("Time"))?.Value == "{relative}")
time = duration != 0 ? $"<t:{futureUnixTimestamp}:R>" : localizer["sa_permanent"]; time = duration != 0 ? $"<t:{futureUnixTimestamp}:R>" : localizer["sa_permanent"];
else else
time = duration != 0 ? ConvertMinutesToTime(duration) : localizer["sa_permanent"]; time = duration != 0 ? ConvertMinutesToTime(duration) : localizer["sa_permanent"];

2
CS2-SimpleAdmin/VERSION
View File

@@ -1 +1 @@
1.6.1a 1.6.1b