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

Re-add saveworld hook & broadcast

Browse source
This commit is contained in:
Deathmax 2012-01-13 16:50:09 +08:00
parent 3ef87534c8
commit 19aec7ffec
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/TShock.cs
View file

@ -199,6 +199,7 @@ namespace TShockAPI
NpcHooks.SetDefaultsInt += OnNpcSetDefaults; NpcHooks.SetDefaultsInt += OnNpcSetDefaults;
ProjectileHooks.SetDefaults += OnProjectileSetDefaults; ProjectileHooks.SetDefaults += OnProjectileSetDefaults;
WorldHooks.StartHardMode += OnStartHardMode; WorldHooks.StartHardMode += OnStartHardMode;
WorldHooks.SaveWorld += OnSaveWorld;
GetDataHandlers.InitGetDataHandler(); GetDataHandlers.InitGetDataHandler();
Commands.InitCommands(); Commands.InitCommands();
@ -221,7 +222,6 @@ namespace TShockAPI
} }
} }
private RestObject RestApi_Verify(string username, string password) private RestObject RestApi_Verify(string username, string password)
{ {
var userAccount = Users.GetUserByName(username); var userAccount = Users.GetUserByName(username);
@ -271,6 +271,7 @@ namespace TShockAPI
NpcHooks.SetDefaultsInt -= OnNpcSetDefaults; NpcHooks.SetDefaultsInt -= OnNpcSetDefaults;
ProjectileHooks.SetDefaults -= OnProjectileSetDefaults; ProjectileHooks.SetDefaults -= OnProjectileSetDefaults;
WorldHooks.StartHardMode -= OnStartHardMode; WorldHooks.StartHardMode -= OnStartHardMode;
WorldHooks.SaveWorld -= OnSaveWorld;
if (File.Exists(Path.Combine(SavePath, "tshock.pid"))) if (File.Exists(Path.Combine(SavePath, "tshock.pid")))
{ {
File.Delete(Path.Combine(SavePath, "tshock.pid")); File.Delete(Path.Combine(SavePath, "tshock.pid"));
@ -969,7 +970,15 @@ namespace TShockAPI
e.Handled = true; e.Handled = true;
} }
/* void OnSaveWorld(bool resettime, HandledEventArgs e)
{
Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
var SaveWorld = new Thread(Utils.SaveWorld);
SaveWorld.Start();
e.Handled = true;
}
/*
* Useful stuff: * Useful stuff:
* */ * */

2
TShockAPI/Utils.cs
View file

@ -110,7 +110,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public void SaveWorld() public void SaveWorld()
{ {
WorldGen.saveWorld(); WorldGen.realsaveWorld();
Broadcast("World saved.", Color.Yellow); Broadcast("World saved.", Color.Yellow);
Log.Info(string.Format("World saved at ({0})", Main.worldPathName)); Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
} }