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

Merge remote-tracking branch 'origin/general-devel' into general-devel

Browse source
This commit is contained in:
Deathmax 2011-07-04 21:30:34 +08:00
commit 01c90dd269
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/Commands.cs
View file

@ -135,6 +135,7 @@ namespace TShockAPI
ChatCommands.Add(new Command("warp", UseWarp, "warp")); ChatCommands.Add(new Command("warp", UseWarp, "warp"));
ChatCommands.Add(new Command("managewarp", SetWarp, "setwarp")); ChatCommands.Add(new Command("managewarp", SetWarp, "setwarp"));
ChatCommands.Add(new Command("managewarp", DeleteWarp, "delwarp")); 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", Reload, "reload"));
ChatCommands.Add(new Command("cfg", DebugConfiguration, "debug-config")); ChatCommands.Add(new Command("cfg", DebugConfiguration, "debug-config"));
ChatCommands.Add(new Command("cfg", Password, "password")); ChatCommands.Add(new Command("cfg", Password, "password"));
@ -962,6 +963,16 @@ namespace TShockAPI
#region Server Config Commands #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) private static void DebugConfiguration(CommandArgs args)
{ {
args.Player.SendMessage("TShock Config:"); args.Player.SendMessage("TShock Config:");
@ -1004,9 +1015,9 @@ namespace TShockAPI
private static void Save(CommandArgs args) private static void Save(CommandArgs args)
{ {
//Tools.Broadcast("Server map saving, potential lag spike"); Tools.Broadcast("Server map saving, potential lag spike");
WorldGen.saveWorld(); Thread SaveWorld = new Thread(Tools.SaveWorld);
//args.Player.SendMessage("World saved."); SaveWorld.Start();
} }
private static void MaxSpawns(CommandArgs args) private static void MaxSpawns(CommandArgs args)

2
TShockAPI/WarpsManager.cs
View file

@ -34,7 +34,7 @@ namespace TShockAPI
{ {
foreach (Warp nametest in Warps) foreach (Warp nametest in Warps)
{ {
if (name.ToLower() == nametest.WarpName.ToLower()) if (name.ToLower() == nametest.WarpName.ToLower() && worldname == nametest.WorldWarpName)
{ {
return false; return false;
} }