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

Minor refactor

Browse source 
CheckForMissingFields -> CheckForChanges
anyMissingFields -> anyChanges
This commit is contained in:
Chris 2021-01-28 19:43:03 +10:30
parent 0012bf73da
commit b5ca015d26
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/FileTools.cs
View file

@ -197,7 +197,7 @@ namespace TShockAPI
return cfg;
}
internal static TSettings LoadConfigAndCheckForMissingFields<TSettings>(string json, out bool writeConfig) where TSettings : new()
internal static TSettings LoadConfigAndCheckForChanges<TSettings>(string json, out bool writeConfig) where TSettings : new()
{
//If an empty file is attempting to be loaded as a config, instead use an empty json object. Otherwise Newtonsoft throws an exception here
if (string.IsNullOrWhiteSpace(json))
@ -205,7 +205,7 @@ namespace TShockAPI
json = "{}";
}
return LoadConfigAndCheckForMissingFields<TSettings>(JObject.Parse(json), out writeConfig);
return LoadConfigAndCheckForChanges<TSettings>(JObject.Parse(json), out writeConfig);
}
/// <summary>
@ -215,7 +215,7 @@ namespace TShockAPI
/// <param name="jObject">The json object to parse</param>
/// <param name="writeConfig">Whether the config needs to be written to disk again</param>
/// <returns>The config object</returns>
internal static TSettings LoadConfigAndCheckForMissingFields<TSettings>(JObject jObject, out bool writeConfig) where TSettings : new()
internal static TSettings LoadConfigAndCheckForChanges<TSettings>(JObject jObject, out bool writeConfig) where TSettings : new()
{
JObject cfg = AttemptConfigUpgrade(jObject, out bool requiredUpgrade);