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

Merge pull request #422 from stevenh/general-devel

Browse source 
Signature Fix & protection against down stream errors
This commit is contained in:
Steven Hartland 2012-02-28 03:48:45 -08:00
commit ab9004df66
2 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
TShockAPI/SaveManager.cs
View file

@ -31,7 +31,17 @@ namespace TShockAPI
/// </summary>
public void OnSaveWorld(bool resettime = false, HandledEventArgs e = null)
{
TShock.Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
// Protect against internal errors causing save failures
// These can be caused by an unexpected error such as a bad or out of date plugin
try
{
TShock.Utils.Broadcast("Saving world. Momentary lag might result from this.", Color.Red);
}
catch (Exception ex)
{
Log.Error("World saved notification failed");
Log.Error(ex.ToString());
}
}
/// <summary>
@ -88,15 +98,25 @@ namespace TShockAPI
return;
else
{
if (task.direct)
// Ensure that save handler errors don't bubble up and cause a recursive call
// These can be caused by an unexpected error such as a bad or out of date plugin
try
{
OnSaveWorld();
WorldGen.realsaveWorld(task.resetTime);
if (task.direct)
{
OnSaveWorld();
WorldGen.realsaveWorld(task.resetTime);
}
else
WorldGen.saveWorld(task.resetTime);
TShock.Utils.Broadcast("World saved.", Color.Yellow);
Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
}
catch (Exception e)
{
Log.Error("World saved failed");
Log.Error(e.ToString());
}
else
WorldGen.saveWorld(task.resetTime);
TShock.Utils.Broadcast("World saved.", Color.Yellow);
Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
}
}
}

6
TShockAPI/Utils.cs
View file

@ -532,9 +532,9 @@ namespace TShockAPI
#if COMPAT_SIGS
[Obsolete("This method is for signature compatibility for external code only")]
public bool ForceKick(TSPlayer player, string reason)
public void ForceKick(TSPlayer player, string reason)
{
return Kick(player, reason, true, false, string.Empty);
Kick(player, reason, true, false, string.Empty);
}
#endif
/// <summary>
@ -801,4 +801,4 @@ namespace TShockAPI
return new string(returnstr);
}
}
}
}