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

Merge branch 'master' of github.com:TShock/TShock into general-devel

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-06-29 21:45:15 -04:00
commit 4c05496222
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/BackupManager.cs
View file

@ -67,6 +67,7 @@ namespace TShockAPI
if (worldpath != null && !Directory.Exists(worldpath))
Directory.CreateDirectory(worldpath);
Tools.Broadcast("Server map saving, potential lag spike");
WorldGen.saveWorld();
Console.WriteLine("World backed up");

1
TShockAPI/Commands.cs
View file

@ -911,6 +911,7 @@ namespace TShockAPI
private static void Save(CommandArgs args)
{
Tools.Broadcast("Server map saving, potential lag spike");
WorldGen.saveWorld();
args.Player.SendMessage("World saved.");
}

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.0.0628")]
[assembly: AssemblyFileVersion("2.3.0.0628")]
[assembly: AssemblyVersion("2.3.0.0629")]
[assembly: AssemblyFileVersion("2.3.0.0629")]