diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index ac07b4e7..d2faceb2 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -135,6 +135,7 @@ namespace TShockAPI
             ChatCommands.Add(new Command("warp", UseWarp, "warp"));
             ChatCommands.Add(new Command("managewarp", SetWarp, "setwarp"));
             ChatCommands.Add(new Command("managewarp", DeleteWarp, "delwarp"));
+            ChatCommands.Add(new Command("cfg", SetSpawn, "setspawn"));
             ChatCommands.Add(new Command("cfg", Reload, "reload"));
             ChatCommands.Add(new Command("cfg", DebugConfiguration, "debug-config"));
             ChatCommands.Add(new Command("cfg", Password, "password"));
@@ -962,6 +963,16 @@ namespace TShockAPI
 
         #region Server Config Commands
 
+        private static void SetSpawn(CommandArgs args)
+        {
+            Main.spawnTileX = args.Player.TileX + 1;
+            Main.spawnTileY = args.Player.TileY + 3;
+
+            Tools.Broadcast("Server map saving, potential lag spike");
+            Thread SaveWorld = new Thread(Tools.SaveWorld);
+            SaveWorld.Start();
+        }
+
         private static void DebugConfiguration(CommandArgs args)
         {
             args.Player.SendMessage("TShock Config:");
@@ -1004,9 +1015,9 @@ namespace TShockAPI
 
         private static void Save(CommandArgs args)
         {
-            //Tools.Broadcast("Server map saving, potential lag spike");
-            WorldGen.saveWorld();
-            //args.Player.SendMessage("World saved.");
+            Tools.Broadcast("Server map saving, potential lag spike");
+            Thread SaveWorld = new Thread(Tools.SaveWorld);
+            SaveWorld.Start();
         }
 
         private static void MaxSpawns(CommandArgs args)
diff --git a/TShockAPI/WarpsManager.cs b/TShockAPI/WarpsManager.cs
index a034587a..e111872d 100644
--- a/TShockAPI/WarpsManager.cs
+++ b/TShockAPI/WarpsManager.cs
@@ -34,7 +34,7 @@ namespace TShockAPI
         {
             foreach (Warp nametest in Warps)
             {
-                if (name.ToLower() == nametest.WarpName.ToLower())
+                if (name.ToLower() == nametest.WarpName.ToLower() && worldname == nametest.WorldWarpName)
                 {
                     return false;
                 }