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

Minor changes

Browse source
This commit is contained in:
Lucas Nicodemus 2011-12-01 22:17:07 -07:00
parent c7a8b1bb1e
commit e44c8f5294
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/TShock.cs
View file

@ -47,7 +47,7 @@ namespace TShockAPI
public class TShock : TerrariaPlugin public class TShock : TerrariaPlugin
{ {
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
public static readonly string VersionCodename = "1.1"; public static readonly string VersionCodename = "1.1 broke our API";
public static string SavePath = "tshock"; public static string SavePath = "tshock";
@ -86,7 +86,7 @@ namespace TShockAPI
public override string Author public override string Author
{ {
get { return "The TShock Team"; } get { return "The Nyx Team"; }
} }
public override string Description public override string Description
@ -104,6 +104,7 @@ 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()
{ {
Console.Title = "TerrariaShock" + VersionNum.ToString();
if (!Directory.Exists(SavePath)) if (!Directory.Exists(SavePath))
Directory.CreateDirectory(SavePath); Directory.CreateDirectory(SavePath);
@ -120,7 +121,7 @@ namespace TShockAPI
if (File.Exists(Path.Combine(SavePath, "tshock.pid"))) if (File.Exists(Path.Combine(SavePath, "tshock.pid")))
{ {
Log.ConsoleInfo("TShock was improperly shut down. Deleting invalid pid file..."); Log.ConsoleInfo("TShock was improperly shut down. Please avoid this in the future, world corruption may result from this.");
File.Delete(Path.Combine(SavePath, "tshock.pid")); File.Delete(Path.Combine(SavePath, "tshock.pid"));
} }
File.WriteAllText(Path.Combine(SavePath, "tshock.pid"), Process.GetCurrentProcess().Id.ToString()); File.WriteAllText(Path.Combine(SavePath, "tshock.pid"), Process.GetCurrentProcess().Id.ToString());
@ -182,7 +183,7 @@ namespace TShockAPI
if (Config.EnableGeoIP && File.Exists(geoippath)) if (Config.EnableGeoIP && File.Exists(geoippath))
Geo = new MaxMind.GeoIPCountry(geoippath); Geo = new MaxMind.GeoIPCountry(geoippath);
Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename)); Log.ConsoleInfo(string.Format("TerrariaShock Version {0} ({1}) now running.", Version, VersionCodename));
GameHooks.PostInitialize += OnPostInit; GameHooks.PostInitialize += OnPostInit;
GameHooks.Update += OnUpdate; GameHooks.Update += OnUpdate;
@ -253,7 +254,6 @@ namespace TShockAPI
NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc;
if (File.Exists(Path.Combine(SavePath, "tshock.pid"))) if (File.Exists(Path.Combine(SavePath, "tshock.pid")))
{ {
Console.WriteLine("Thanks for using TShock! Process ID file is now being destroyed.");
File.Delete(Path.Combine(SavePath, "tshock.pid")); File.Delete(Path.Combine(SavePath, "tshock.pid"));
} }
RestApi.Dispose(); RestApi.Dispose();
@ -386,8 +386,8 @@ namespace TShockAPI
AuthToken = 0; AuthToken = 0;
} }
Regions.ReloadAllRegions(); Regions.ReloadAllRegions();
if (Config.RestApiEnabled) //if (Config.RestApiEnabled)
RestApi.Start(); //RestApi.Start();
} }