Merge branch '1.3-update' of https://github.com/NyxStudios/TShock into 1.3-update

This commit is contained in:
White 2015-07-04 22:18:54 +09:30
commit 9f79c94b3c

View file

@ -20,6 +20,7 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Threading; using System.Threading;
using Terraria; using Terraria;
using Terraria.Map;
using TerrariaApi.Server; using TerrariaApi.Server;
namespace TShockAPI namespace TShockAPI
@ -125,10 +126,10 @@ namespace TShockAPI
if (task.direct) if (task.direct)
{ {
OnSaveWorld(new WorldSaveEventArgs()); OnSaveWorld(new WorldSaveEventArgs());
WorldFile.RealSaveWorld(task.resetTime); Main.Map.Save();
} }
else else
WorldFile.saveWorld(task.resetTime); Main.Map.Save();
TShock.Utils.Broadcast("World saved.", Color.Yellow); TShock.Utils.Broadcast("World saved.", Color.Yellow);
TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName)); TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
} }