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

fix: Fixes server access NPE error (#919)

Browse source
This commit is contained in:
Kamron Batman 2022-01-16 22:53:48 -08:00 • committed by GitHub
parent 1989488638
commit cf5cc247db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/UOContent/Misc/ServerAccess.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@ -18,12 +17,15 @@ public static class ServerAccess
public static void SaveConfiguration() public static void SaveConfiguration()
{ {
var path = Path.Join(Core.BaseDirectory, _serverAccessConfigurationPath); var path = Path.Join(Core.BaseDirectory, _serverAccessConfigurationPath);
JsonConfig.Serialize(path, ServerAccessConfiguration);
JsonConfig.Serialize(path, ServerAccessConfiguration ??= new ServerAccessConfiguration());
} }
public static void AddProtectedAccount(Account acct, bool save = false) public static void AddProtectedAccount(Account acct, bool save = false)
{ {
ServerAccessConfiguration.ProtectedAccounts.Add(acct.Username.ToLower()); var username = acct.Username.ToLower();
ServerAccessConfiguration.ProtectedAccounts.Add(username);
logger.Information("Protected account added: {0}", username);
if (save) if (save)
{ {
@ -33,7 +35,9 @@ public static class ServerAccess
public static void RemoveProtectedAccount(Account acct, bool save = false) public static void RemoveProtectedAccount(Account acct, bool save = false)
{ {
ServerAccessConfiguration.ProtectedAccounts.Remove(acct.Username.ToLower()); var username = acct.Username.ToLower();
ServerAccessConfiguration.ProtectedAccounts.Remove(username);
logger.Information("Protected account removed: {0}", username);
if (save) if (save)
{ {
@ -47,6 +51,7 @@ public static class ServerAccess
if (!File.Exists(path)) if (!File.Exists(path))
{ {
SaveConfiguration();
return; return;
} }
@ -89,5 +94,5 @@ public static class ServerAccess
public record ServerAccessConfiguration public record ServerAccessConfiguration
{ {
[JsonPropertyName("protectedAccounts")] [JsonPropertyName("protectedAccounts")]
public HashSet<string> ProtectedAccounts { get; init; } public HashSet<string> ProtectedAccounts { get; set; } = new();
} }