diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index d8d5002d..3be20ad4 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -2008,7 +2008,7 @@ namespace TShockAPI
 						foreach (TSPlayer tsplr in TShock.Players)
 						{
 							if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp))
-								tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
+								tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
 						}
                     }
                     else
@@ -2090,7 +2090,7 @@ namespace TShockAPI
                 }
 
                 string warpName = args.Parameters[2];
-                var warp = TShock.Warps.Find(warpName);
+                var warp = TShock.Warps.FindWarp(warpName);
                 var plr = foundplr[0];
 				if (warp.Position != Point.Zero)
 				{
@@ -2109,7 +2109,7 @@ namespace TShockAPI
             else
             {
                 string warpName = String.Join(" ", args.Parameters);
-                var warp = TShock.Warps.Find(warpName);
+                var warp = TShock.Warps.FindWarp(warpName);
                 if (warp != null)
                 {
 					if (args.Player.Teleport(warp.Position.X * 16, warp.Position.Y * 16))
diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs
index 9d735ae7..c532ab2a 100644
--- a/TShockAPI/DB/WarpsManager.cs
+++ b/TShockAPI/DB/WarpsManager.cs
@@ -126,7 +126,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="warpName">The name.</param>
 		/// <returns>The warp, if it exists, or else null.</returns>
-		public Warp Find(string warpName)
+		public Warp FindWarp(string warpName)
 		{
 			return Warps.FirstOrDefault(w => String.Equals(w.Name, warpName, StringComparison.OrdinalIgnoreCase));
 		}
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 9d076029..9d3b5b8e 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -3481,14 +3481,14 @@ namespace TShockAPI
 						int y = args.Data.ReadInt32();
 						string warpName = args.Data.ReadString();
 
-						Warp warp = TShock.Warps.Find(warpName);
+						Warp warp = TShock.Warps.FindWarp(warpName);
 						if (warp == null)
 						{
 							TShock.Warps.Add(x, y, warpName);
 							foreach (TSPlayer tsplr in TShock.Players)
 							{
 								if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.managewarp) && tsplr != args.Player)
-									tsplr.SendRaptorWarp(TShock.Warps.Find(warpName));
+									tsplr.SendRaptorWarp(TShock.Warps.FindWarp(warpName));
 							}
 							Log.Info("{0} added warp \"{1}\".", args.Player.UserAccountName, warpName);
 						}
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 557b18b1..f90361bc 100755
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -458,6 +458,8 @@ namespace TShockAPI
 			get { return (int) (Y/16); }
 		}
 
+		public bool TpLock;
+
 		public bool InventorySlotAvailable
 		{
 			get