From bd817d6652ea134cd21992ff701bcbc5215ae911 Mon Sep 17 00:00:00 2001
From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com>
Date: Sun, 29 Sep 2024 20:55:03 +0200
Subject: [PATCH] 1.6.1b

- Fixed rare problem when system uses other timezone than plugin
- Fixed time type in discord webhook
---
 CS2-SimpleAdmin/CS2-SimpleAdmin.cs    | 2 +-
 CS2-SimpleAdmin/Commands/basecomms.cs | 6 +++---
 CS2-SimpleAdmin/Events.cs             | 4 ++--
 CS2-SimpleAdmin/Helper.cs             | 4 ++--
 CS2-SimpleAdmin/VERSION               | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CS2-SimpleAdmin/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin/CS2-SimpleAdmin.cs
index 405d6e4..2811b12 100644
--- a/CS2-SimpleAdmin/CS2-SimpleAdmin.cs
+++ b/CS2-SimpleAdmin/CS2-SimpleAdmin.cs
@@ -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 ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     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();
 
diff --git a/CS2-SimpleAdmin/Commands/basecomms.cs b/CS2-SimpleAdmin/Commands/basecomms.cs
index 99ad0a9..1c32117 100644
--- a/CS2-SimpleAdmin/Commands/basecomms.cs
+++ b/CS2-SimpleAdmin/Commands/basecomms.cs
@@ -64,7 +64,7 @@ public partial class CS2_SimpleAdmin
         });
 
         // 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)
         var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0
@@ -283,7 +283,7 @@ public partial class CS2_SimpleAdmin
         });
 
         // 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)
         var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0
@@ -501,7 +501,7 @@ public partial class CS2_SimpleAdmin
         });
 
         // 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)
         var (messageKey, activityMessageKey, playerArgs, adminActivityArgs) = time == 0
diff --git a/CS2-SimpleAdmin/Events.cs b/CS2-SimpleAdmin/Events.cs
index 3747c07..db48ca5 100644
--- a/CS2-SimpleAdmin/Events.cs
+++ b/CS2-SimpleAdmin/Events.cs
@@ -59,11 +59,11 @@ public partial class CS2_SimpleAdmin
             {
                 disconnectedPlayer.Name = player.PlayerName;
                 disconnectedPlayer.IpAddress = player.IpAddress?.Split(":")[0];
-                disconnectedPlayer.DisconnectTime = DateTime.Now;
+                disconnectedPlayer.DisconnectTime = Time.ActualDateTime();
             }
             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);
diff --git a/CS2-SimpleAdmin/Helper.cs b/CS2-SimpleAdmin/Helper.cs
index 4fff2d0..aef9635 100644
--- a/CS2-SimpleAdmin/Helper.cs
+++ b/CS2-SimpleAdmin/Helper.cs
@@ -364,12 +364,12 @@ internal static class Helper
         var targetName = target != null ? target.PlayerName : 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();
 
         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"];
         else
             time = duration != 0 ? ConvertMinutesToTime(duration) : localizer["sa_permanent"];
diff --git a/CS2-SimpleAdmin/VERSION b/CS2-SimpleAdmin/VERSION
index ccf77ab..e91cefb 100644
--- a/CS2-SimpleAdmin/VERSION
+++ b/CS2-SimpleAdmin/VERSION
@@ -1 +1 @@
-1.6.1a
\ No newline at end of file
+1.6.1b
\ No newline at end of file