diff --git a/TShockAPI/SaveManager.cs b/TShockAPI/SaveManager.cs
index 0f610503..e737491c 100644
--- a/TShockAPI/SaveManager.cs
+++ b/TShockAPI/SaveManager.cs
@@ -17,10 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Threading;
 using Terraria;
-using Terraria.Map;
+using Terraria.IO;
 using TerrariaApi.Server;
 
 namespace TShockAPI
@@ -126,10 +125,10 @@ namespace TShockAPI
 								if (task.direct)
 								{
 									OnSaveWorld(new WorldSaveEventArgs());
-									Main.Map.Save();
+									WorldFile.saveWorld(WorldFile.IsWorldOnCloud, task.resetTime);
 								}
 								else
-									Main.Map.Save();
+									WorldFile.saveWorld(WorldFile.IsWorldOnCloud, task.resetTime);
 									TShock.Utils.Broadcast("World saved.", Color.Yellow);
 									TShock.Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
 							}