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

ConfigFile and ConfigurationManager merged into 1.

Browse source 
Check OnConfigRead for a list of variables that will now be updated when the config file is reloaded.
This commit is contained in:
high 2011-07-01 13:19:16 -04:00
parent 338292c7bf
commit 91abde27d2
10 changed files with 151 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/FileTools.cs
View file

@ -88,15 +88,10 @@ namespace TShockAPI
{
if (File.Exists(ConfigPath))
{
ConfigurationManager.ReadJsonConfiguration();
TShock.Config = ConfigFile.Read(ConfigPath);
// Add all the missing config properties in the json file
ConfigurationManager.WriteJsonConfiguration();
}
else
{
ConfigurationManager.WriteJsonConfiguration();
ConfigurationManager.ReadJsonConfiguration();
}
TShock.Config.Write(ConfigPath);
}
catch (Exception ex)
{
@ -105,7 +100,7 @@ namespace TShockAPI
Log.Error(ex.ToString());
}
Netplay.serverPort = ConfigurationManager.ServerPort;
}
/// <summary>
@ -115,7 +110,7 @@ namespace TShockAPI
/// <returns>true/false</returns>
public static bool OnWhitelist(string ip)
{
if (!ConfigurationManager.EnableWhitelist)
if (!TShock.Config.EnableWhitelist)
{
return true;
}