Merge remote-tracking branch 'origin/general-devel' into general-devel

This commit is contained in:
Deathmax 2012-01-07 19:35:10 +08:00
commit 75be35ac22

View file

@ -201,7 +201,6 @@ namespace TShockAPI
NpcHooks.SetDefaultsInt += OnNpcSetDefaults;
ProjectileHooks.SetDefaults += OnProjectileSetDefaults;
WorldHooks.StartHardMode += OnStartHardMode;
WorldHooks.SaveWorld += OnSaveWorld;
GetDataHandlers.InitGetDataHandler();
Commands.InitCommands();
@ -977,14 +976,6 @@ namespace TShockAPI
}
}
private void OnSaveWorld(bool resettime, HandledEventArgs e)
{
Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
Thread SaveWorld = new Thread(Utils.SaveWorld);
SaveWorld.Start();
e.Handled = true;
}
private void OnStartHardMode(HandledEventArgs e)
{
if (Config.DisableHardmode)