From 90cfb8266b71768e8e6ea8b3a04f43a93936a573 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 01:43:04 +1200 Subject: [PATCH 1/3] Fixed a bug where tp-ing would delete blocks where you spawn --- TShockAPI/Commands.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 82215681..1b371826 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -717,7 +717,7 @@ namespace TShockAPI else { 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)); else args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red); @@ -751,7 +751,7 @@ namespace TShockAPI else { 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)); args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name)); @@ -840,7 +840,7 @@ namespace TShockAPI var warp = WarpsManager.FindWarp(warpName); 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); else args.Player.SendMessage("Warp unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red); From 4978e2960ca80d6f38085a9c7f409c3809378542 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 02:35:24 +1200 Subject: [PATCH 2/3] Fixed /setspawn creating spawn 3 tiles too high --- TShockAPI/Commands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index c9484630..57708fc0 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -870,7 +870,7 @@ namespace TShockAPI private static void SetSpawn(CommandArgs args) { Main.spawnTileX = args.Player.TileX; - Main.spawnTileY = args.Player.TileY; + Main.spawnTileY = args.Player.TileY + 3; ConfigurationManager.Spawn_WorldID = Main.worldID; ConfigurationManager.WriteJsonConfiguration(); args.Player.SendMessage("Set server spawn point to your position"); From efc36825a3b189442cfa65131e44979befc90134 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 02:36:02 +1200 Subject: [PATCH 3/3] Fixed remember positions to teleport you to the correct position and not create duplicates of players --- TShockAPI/TShock.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 183a8cf7..8edbf3e1 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -437,6 +437,9 @@ namespace TShockAPI if (playerIP.IP == Players[who].IP) { Players[who].Teleport((int)playerIP.Pos.X, (int)playerIP.Pos.Y); + RemeberedPosManager.RemeberedPosistions.Remove(playerIP); + RemeberedPosManager.WriteSettings(); + break; } } }