From 2569c1082381e1080717d5d5535be91c0d787b0d Mon Sep 17 00:00:00 2001
From: k0rd <k0rd@gigganigga.net>
Date: Tue, 1 Oct 2013 02:12:05 -0400
Subject: [PATCH] fixes warps, tp [name], tphere (no longer places you below
 the target)

---
 TShockAPI/Commands.cs        | 14 +++++++-------
 TShockAPI/GetDataHandlers.cs |  2 +-
 TShockAPI/TShock.cs          |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 TShockAPI/Commands.cs
 mode change 100644 => 100755 TShockAPI/GetDataHandlers.cs
 mode change 100644 => 100755 TShockAPI/TShock.cs

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
old mode 100644
new mode 100755
index 38f338ad..a9d33958
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -484,7 +484,7 @@ namespace TShockAPI
 						if (TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP) != Vector2.Zero)
 						{
 							Vector2 pos = TShock.RememberedPos.GetLeavePos(args.Player.Name, args.Player.IP);
-							args.Player.Teleport((int)pos.X*16, (int)pos.Y *16 + 48);
+							args.Player.Teleport((int)pos.X*16, (int)pos.Y *16 );
 						}
 						args.Player.LoginHarassed = false;
 
@@ -1685,7 +1685,7 @@ namespace TShockAPI
 				else
 				{
 					var plr = players[0];
-					if (args.Player.Teleport(plr.TileX * 16, plr.TileY * 16 + 48))
+					if (args.Player.Teleport(plr.TileX * 16, plr.TileY * 16 ))
 					{
 						args.Player.SendSuccessMessage(string.Format("Teleported to {0}.", plr.Name));
 						if (!args.Player.Group.HasPermission(Permissions.tphide))
@@ -1714,7 +1714,7 @@ namespace TShockAPI
 				{
 					if (Main.player[i].active && (Main.player[i] != args.TPlayer))
 					{
-						if (TShock.Players[i].Teleport(args.Player.TileX*16, args.Player.TileY*16 + 48))
+						if (TShock.Players[i].Teleport(args.Player.TileX*16, args.Player.TileY*16 ))
 							TShock.Players[i].SendSuccessMessage(string.Format("You were teleported to {0}.", args.Player.Name) + ".");
 					}
 				}
@@ -1733,7 +1733,7 @@ namespace TShockAPI
 			else
 			{
 				var plr = players[0];
-				if (plr.Teleport(args.Player.TileX*16, args.Player.TileY*16 + 48))
+				if (plr.Teleport(args.Player.TileX*16, args.Player.TileY*16 ))
 				{
 					plr.SendInfoMessage(string.Format("You were teleported to {0}.", args.Player.Name));
 					args.Player.SendSuccessMessage(string.Format("You brought {0} here.", plr.Name));
@@ -1877,7 +1877,7 @@ namespace TShockAPI
                 var plr = foundplr[0];
                 if (warp.WarpPos != Vector2.Zero)
                 {
-                    if (plr.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 + 48))
+                    if (plr.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 ))
                     {
                         plr.SendSuccessMessage(string.Format("{0} warped you to {1}.", args.Player.Name, warpName));
                         args.Player.SendSuccessMessage(string.Format("You warped {0} to {1}.", plr.Name, warpName));
@@ -1895,7 +1895,7 @@ namespace TShockAPI
                 var warp = TShock.Warps.FindWarp(warpName);
                 if (warp.WarpPos != Vector2.Zero)
                 {
-                    if (args.Player.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 + 48))
+                    if (args.Player.Teleport((int)warp.WarpPos.X*16, (int)warp.WarpPos.Y*16 ))
                         args.Player.SendSuccessMessage("Warped to " + warpName + ".");
                 }
                 else
@@ -3073,7 +3073,7 @@ namespace TShockAPI
                           break;
                         }
 
-                        args.Player.Teleport(region.Area.Center.X*16, region.Area.Center.Y*16 + 48);
+                        args.Player.Teleport(region.Area.Center.X*16, region.Area.Center.Y*16 );
 
                         break;
                       }
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
old mode 100644
new mode 100755
index b53bef0b..1668ca9e
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2232,7 +2232,7 @@ namespace TShockAPI
 				{
 					var lastTileX = args.Player.LastNetPosition.X;
 					var lastTileY = args.Player.LastNetPosition.Y;
-					if (!args.Player.Teleport(lastTileX, lastTileY + 48))
+					if (!args.Player.Teleport(lastTileX, lastTileY ))
 					{
 						args.Player.SendErrorMessage("You got stuck in a solid object, Sent to spawn point.");
 						args.Player.Spawn();
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
old mode 100644
new mode 100755
index a66b4309..290c1a27
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1076,7 +1076,7 @@ namespace TShockAPI
 			if (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero){
 				var pos = RememberedPos.GetLeavePos(player.Name, player.IP);
 
-				player.Teleport(pos.X*16, pos.Y*16 + 48);
+				player.Teleport(pos.X*16, pos.Y*16 );
 			}}
 
 			Item i = new Item();