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

Fix logs and configs not following -configpath param

Browse source
This commit is contained in:
Deathmax 2011-12-15 21:04:13 +08:00
parent 4fd6276ec2
commit 97b6f77383
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.4.1213")] [assembly: AssemblyVersion("3.3.4.1215")]
[assembly: AssemblyFileVersion("3.3.4.1213")] [assembly: AssemblyFileVersion("3.3.4.1215")]

16
TShockAPI/TShock.cs
View file

@ -109,6 +109,10 @@ namespace TShockAPI
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
public override void Initialize() public override void Initialize()
{ {
try
{
HandleCommandLine(Environment.GetCommandLineArgs());
if (!Directory.Exists(SavePath)) if (!Directory.Exists(SavePath))
Directory.CreateDirectory(SavePath); Directory.CreateDirectory(SavePath);
@ -119,9 +123,6 @@ namespace TShockAPI
#endif #endif
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
try
{
if (File.Exists(Path.Combine(SavePath, "tshock.pid"))) if (File.Exists(Path.Combine(SavePath, "tshock.pid")))
{ {
Log.ConsoleInfo("TShock was improperly shut down. Please avoid this in the future, world corruption may result from this."); Log.ConsoleInfo("TShock was improperly shut down. Please avoid this in the future, world corruption may result from this.");
@ -132,7 +133,7 @@ namespace TShockAPI
ConfigFile.ConfigRead += OnConfigRead; ConfigFile.ConfigRead += OnConfigRead;
FileTools.SetupConfig(); FileTools.SetupConfig();
HandleCommandLine(Environment.GetCommandLineArgs()); HandleCommandLine_Port(Environment.GetCommandLineArgs());
if (Config.StorageType.ToLower() == "sqlite") if (Config.StorageType.ToLower() == "sqlite")
{ {
@ -384,6 +385,13 @@ namespace TShockAPI
Log.ConsoleInfo("World path has been set to " + path); Log.ConsoleInfo("World path has been set to " + path);
} }
} }
}
}
private void HandleCommandLine_Port(string[] parms)
{
for (int i = 0; i < parms.Length; i++)
{
if (parms[i].ToLower() == "-port") if (parms[i].ToLower() == "-port")
{ {
int port = Convert.ToInt32(parms[++i]); int port = Convert.ToInt32(parms[++i]);