From 5225a55e76388a48000485f4b1ad3217a7d01e97 Mon Sep 17 00:00:00 2001
From: MarioE <marioe27@hotmail.com>
Date: Tue, 24 Jun 2014 00:18:41 -0400
Subject: [PATCH] Delegate /tphere * to a separate permission. Also made
 teleports more exact

---
 TShockAPI/Commands.cs    | 48 ++++++++++++++++++++++------------------
 TShockAPI/Permissions.cs |  3 +++
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index d6dd1c9d..84afd344 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1960,7 +1960,7 @@ namespace TShockAPI
 				else
 				{
 					var plr = players[0];
-					if (args.Player.Teleport(plr.TileX * 16, plr.TileY * 16 ))
+					if (args.Player.Teleport(plr.TPlayer.position.X, plr.TPlayer.position.Y))
 					{
 						args.Player.SendSuccessMessage(string.Format("Teleported to {0}.", plr.Name));
 						if (!args.Player.Group.HasPermission(Permissions.tphide))
@@ -1976,30 +1976,36 @@ namespace TShockAPI
 		{
 			if (args.Parameters.Count < 1)
 			{
-				args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /tphere <player> ");
+				if (args.Player.Group.HasPermission(Permissions.tpallothers))
+					args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /tphere <player|*>");
+				else
+					args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /tphere <player>");
 				return;
 			}
 
-			string plStr = String.Join(" ", args.Parameters);
-
-			if (plStr == "all" || plStr == "*")
-			{
-				args.Player.SendInfoMessage(string.Format("You brought all players here."));
-				for (int i = 0; i < Main.maxPlayers; i++)
-				{
-					if (Main.player[i].active && (Main.player[i] != args.TPlayer))
-					{
-						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) + ".");
-					}
-				}
-				return;
-			}
-
-			var players = TShock.Utils.FindPlayer(plStr);
+			string playerName = String.Join(" ", args.Parameters);
+			var players = TShock.Utils.FindPlayer(playerName);
 			if (players.Count == 0)
 			{
-				args.Player.SendErrorMessage("Invalid player!");
+				if (playerName == "*")
+				{
+					if (!args.Player.Group.HasPermission(Permissions.tpallothers))
+					{
+						args.Player.SendErrorMessage("You do not have permission to use this command.");
+						return;
+					}
+					args.Player.SendInfoMessage(string.Format("You teleported everyone here."));
+					for (int i = 0; i < Main.maxPlayers; i++)
+					{
+						if (Main.player[i].active && (Main.player[i] != args.TPlayer))
+						{
+							if (TShock.Players[i].Teleport(args.TPlayer.position.X, args.TPlayer.position.Y))
+								TShock.Players[i].SendSuccessMessage(String.Format("You were teleported to {0}.", args.Player.Name));
+						}
+					}
+				}
+				else
+					args.Player.SendErrorMessage("Invalid player!");
 			}
 			else if (players.Count > 1)
 			{
@@ -2008,7 +2014,7 @@ namespace TShockAPI
 			else
 			{
 				var plr = players[0];
-				if (plr.Teleport(args.Player.TileX*16, args.Player.TileY*16 ))
+				if (plr.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y))
 				{
 					plr.SendInfoMessage("You were teleported to {0}.", args.Player.Name);
 					args.Player.SendSuccessMessage("You teleported {0} here.", plr.Name);
diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs
index 2de47323..030f1af8 100644
--- a/TShockAPI/Permissions.cs
+++ b/TShockAPI/Permissions.cs
@@ -198,6 +198,9 @@ namespace TShockAPI
 
 		// tshock.tp nodes
 
+		[Description("User can teleport *everyone* to them.")]
+		public static readonly string tpallothers = "tshock.tp.allothers";
+
 		[Description("User can teleport to others.")]
 		public static readonly string tp = "tshock.tp.self";