warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Some computers are missing timezones apparently (#1322)

Browse source 
Some windows servers are not updated properly. Specifically Windows 10/2016 and older that is missing the September 2020 rollup will throw an error:

See [here](https://support.microsoft.com/en-us/topic/dst-changes-in-windows-for-yukon-canada-september-8-2020-ae74d7b8-82ed-1d35-e131-fb0796b73b10) for information about this update and how to get it.
This commit is contained in:
Kamron Batman 2023-01-21 19:12:53 -08:00 • committed by GitHub
parent 68bd9529f9
commit 4f67b1174f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Projects/Server/TimeZones/TimeZoneHandler.cs
View file

@ -18,6 +18,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using Server.Json; using Server.Json;
using Server.Logging;
namespace Server; namespace Server;
@ -39,6 +40,8 @@ namespace Server;
*/ */
public static class TimeZoneHandler public static class TimeZoneHandler
{ {
private static readonly ILogger logger = LogFactory.GetLogger(typeof(TimeZoneHandler));
private static readonly Dictionary<string, TimeZoneInfo> _timeZoneById = new(); private static readonly Dictionary<string, TimeZoneInfo> _timeZoneById = new();
public static TimeZoneInfo SystemTimeZone { get; private set; } public static TimeZoneInfo SystemTimeZone { get; private set; }
@ -47,17 +50,24 @@ public static class TimeZoneHandler
var timezones = JsonConfig.Deserialize<TimeZoneWithRegions[]>(Path.Combine(Core.BaseDirectory, "Data/timezones.json")); var timezones = JsonConfig.Deserialize<TimeZoneWithRegions[]>(Path.Combine(Core.BaseDirectory, "Data/timezones.json"));
foreach (var tz in timezones) foreach (var tz in timezones)
{ {
// Get the timezone if we are on Windows try
var tzInfo = Core.IsWindows ? TimeZoneInfo.FindSystemTimeZoneById(tz.TimeZone) : null;
foreach (var region in tz.Regions)
{ {
// Get the timezone by region if we are on linux // Get the timezone if we are on Windows
tzInfo ??= TimeZoneInfo.FindSystemTimeZoneById(region); var tzInfo = Core.IsWindows ? TimeZoneInfo.FindSystemTimeZoneById(tz.TimeZone) : null;
_timeZoneById[region] = tzInfo;
}
_timeZoneById[tz.TimeZone] = tzInfo; foreach (var region in tz.Regions)
{
// Get the timezone by region if we are on linux
tzInfo ??= TimeZoneInfo.FindSystemTimeZoneById(region);
_timeZoneById[region] = tzInfo;
}
_timeZoneById[tz.TimeZone] = tzInfo;
}
catch (TimeZoneNotFoundException e)
{
logger.Warning(e, $"Timezone '{tz.TimeZone}' was not found.");
}
} }
} }