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

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	TShockAPI/Commands.cs
This commit is contained in:
Deathmax 2011-06-24 22:45:34 +08:00
commit 840c91d341
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -725,7 +725,7 @@ namespace TShockAPI
else else
{ {
var plr = players[0]; var plr = players[0];
if (args.Player.Teleport(plr.TileX, plr.TileY)) if (args.Player.Teleport(plr.TileX, plr.TileY + 3))
args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name)); args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name));
else else
args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red); args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
@ -759,7 +759,7 @@ namespace TShockAPI
else else
{ {
var plr = players[0]; var plr = players[0];
if (plr.Teleport(args.Player.TileX, args.Player.TileY)) if (plr.Teleport(args.Player.TileX, args.Player.TileY + 3))
{ {
plr.SendMessage(string.Format("You were teleported to {0}.", plr.Name)); plr.SendMessage(string.Format("You were teleported to {0}.", plr.Name));
args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name)); args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name));
@ -848,7 +848,7 @@ namespace TShockAPI
var warp = WarpsManager.FindWarp(warpName); var warp = WarpsManager.FindWarp(warpName);
if (warp != Vector2.Zero) if (warp != Vector2.Zero)
{ {
if (args.Player.Teleport((int)warp.X, (int)warp.Y)) if (args.Player.Teleport((int)warp.X, (int)warp.Y + 3))
args.Player.SendMessage("Warped to " + warpName, Color.Yellow); args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
else else
args.Player.SendMessage("Warp unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red); args.Player.SendMessage("Warp unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
@ -871,7 +871,7 @@ namespace TShockAPI
private static void SetSpawn(CommandArgs args) private static void SetSpawn(CommandArgs args)
{ {
ConfigurationManager.spawnTileX = args.Player.TileX; ConfigurationManager.spawnTileX = args.Player.TileX;
ConfigurationManager.spawnTileY = args.Player.TileY; ConfigurationManager.spawnTileY = args.Player.TileY + 3;
ConfigurationManager.Spawn_WorldID = Main.worldID; ConfigurationManager.Spawn_WorldID = Main.worldID;
ConfigurationManager.WriteJsonConfiguration(); ConfigurationManager.WriteJsonConfiguration();
args.Player.SendMessage("Set server spawn point to your position"); args.Player.SendMessage("Set server spawn point to your position");

3
TShockAPI/TShock.cs
View file

@ -596,6 +596,9 @@ namespace TShockAPI
if (playerIP.IP == Players[who].IP) if (playerIP.IP == Players[who].IP)
{ {
Players[who].Teleport((int)playerIP.Pos.X, (int)playerIP.Pos.Y); Players[who].Teleport((int)playerIP.Pos.X, (int)playerIP.Pos.Y);
RemeberedPosManager.RemeberedPosistions.Remove(playerIP);
RemeberedPosManager.WriteSettings();
break;
} }
} }
} }