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

Merge branch 'general-devel' into crp

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 17:32:07 -07:00 • committed by GitHub
commit abb9aa1881
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/TShock.cs
View file

@ -73,11 +73,6 @@ namespace TShockAPI
/// <summary>LogClear - Determines whether or not the log file should be cleared on initialization.</summary> /// <summary>LogClear - Determines whether or not the log file should be cleared on initialization.</summary>
private static bool LogClear; private static bool LogClear;
/// <summary>
/// Set by the command line, disables the '/restart' command.
/// </summary>
internal static bool NoRestart;
/// <summary>Will be set to true once Utils.StopServer() is called.</summary> /// <summary>Will be set to true once Utils.StopServer() is called.</summary>
public static bool ShuttingDown; public static bool ShuttingDown;
@ -768,8 +763,7 @@ namespace TShockAPI
.AddFlag("-logclear", () => LogClear = true) .AddFlag("-logclear", () => LogClear = true)
.AddFlag("-autoshutdown", () => Main.instance.EnableAutoShutdown()) .AddFlag("-autoshutdown", () => Main.instance.EnableAutoShutdown())
.AddFlag("-dump", () => Utils.Dump()) .AddFlag("-dump", () => Utils.Dump())
.AddFlag("--stats-optout", () => StatTracker.OptOut = true) .AddFlag("--stats-optout", () => StatTracker.OptOut = true);
.AddFlag("--no-restart", () => NoRestart = true);
CliParser.ParseFromSource(parms); CliParser.ParseFromSource(parms);
} }