themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Update config field check to correctly check TSettings fields

Browse source
This commit is contained in:
Chris 2020-12-23 01:48:23 +10:30
parent 51f179f84a
commit 7bbc647b2f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/FileTools.cs
View file

@ -210,14 +210,17 @@ namespace TShockAPI
internal static TSettings LoadConfigAndCheckForMissingFields<TSettings>(JObject jObject, out bool anyMissingFields) where TSettings : new() internal static TSettings LoadConfigAndCheckForMissingFields<TSettings>(JObject jObject, out bool anyMissingFields) where TSettings : new()
{ {
anyMissingFields = false; anyMissingFields = false;
var configFields = new HashSet<string>(typeof(Configuration.ConfigFile<TSettings>).GetFields()
var configFields = new HashSet<string>(typeof(TSettings).GetFields()
.Where(field => !field.IsStatic) .Where(field => !field.IsStatic)
.Select(field => field.Name)); .Select(field => field.Name));
var jsonFields = new HashSet<string>(jObject
var jsonFields = new HashSet<string>(jObject.SelectToken("Settings")
.Children() .Children()
.Select(field => field as JProperty) .Select(field => field as JProperty)
.Where(field => field != null) .Where(field => field != null)
.Select(field => field.Name)); .Select(field => field.Name));
anyMissingFields = !configFields.SetEquals(jsonFields); anyMissingFields = !configFields.SetEquals(jsonFields);
return jObject.SelectToken("Settings").ToObject<TSettings>(); return jObject.SelectToken("Settings").ToObject<TSettings>();