From 9c77553bdee9bb03fab2495de5e483b59a815e4c Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 27 Jan 2025 12:02:14 +0000 Subject: [PATCH] Fixed datetime being incorrect inside GetActiveWeatherSeason --- Libraries/Core/Services/SeasonalEventService.cs | 8 +++----- Libraries/Core/Utils/TimeUtil.cs | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Libraries/Core/Services/SeasonalEventService.cs b/Libraries/Core/Services/SeasonalEventService.cs index 58ef5a48..9be290bc 100644 --- a/Libraries/Core/Services/SeasonalEventService.cs +++ b/Libraries/Core/Services/SeasonalEventService.cs @@ -6,17 +6,15 @@ using Core.Models.Enums; using Core.Models.Spt.Config; using Core.Models.Utils; using Core.Servers; -using SptCommon.Extensions; -using Core.Models.Spt.Bots; using Core.Utils; -using static System.Net.Mime.MediaTypeNames; -using System; +using SptCommon.Extensions; namespace Core.Services; [Injectable(InjectionType.Singleton)] public class SeasonalEventService( ISptLogger _logger, + TimeUtil _timeUtil, DatabaseService _databaseService, GiftService _giftService, LocalisationService _localisationService, @@ -288,7 +286,7 @@ public class SeasonalEventService( return _weatherConfig.OverrideSeason.Value; } - var currentDate = new DateTime(); + var currentDate = _timeUtil.GetDateTimeNow(); foreach (var seasonRange in _weatherConfig.SeasonDates) { if ( diff --git a/Libraries/Core/Utils/TimeUtil.cs b/Libraries/Core/Utils/TimeUtil.cs index 318e18d3..0b863e17 100644 --- a/Libraries/Core/Utils/TimeUtil.cs +++ b/Libraries/Core/Utils/TimeUtil.cs @@ -1,4 +1,4 @@ -using SptCommon.Annotations; +using SptCommon.Annotations; namespace Core.Utils; @@ -44,6 +44,11 @@ public class TimeUtil return FormatDate(DateTimeOffset.UtcNow); } + public DateTime GetDateTimeNow() + { + return DateTime.UtcNow; + } + /// /// Gets the current time as a formatted UTC string. ///