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

Delegate /tphere * to a separate permission. Also made teleports more exact

Browse source
This commit is contained in:
MarioE 2014-06-24 00:18:41 -04:00
parent f4bce20d50
commit 5225a55e76
2 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

48
TShockAPI/Commands.cs
View file

@ -1960,7 +1960,7 @@ namespace TShockAPI
else else
{ {
var plr = players[0]; 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)); args.Player.SendSuccessMessage(string.Format("Teleported to {0}.", plr.Name));
if (!args.Player.Group.HasPermission(Permissions.tphide)) if (!args.Player.Group.HasPermission(Permissions.tphide))
@ -1976,30 +1976,36 @@ namespace TShockAPI
{ {
if (args.Parameters.Count < 1) 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; return;
} }
string plStr = String.Join(" ", args.Parameters); string playerName = String.Join(" ", args.Parameters);
var players = TShock.Utils.FindPlayer(playerName);
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);
if (players.Count == 0) 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) else if (players.Count > 1)
{ {
@ -2008,7 +2014,7 @@ namespace TShockAPI
else else
{ {
var plr = players[0]; 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); plr.SendInfoMessage("You were teleported to {0}.", args.Player.Name);
args.Player.SendSuccessMessage("You teleported {0} here.", plr.Name); args.Player.SendSuccessMessage("You teleported {0} here.", plr.Name);

3
TShockAPI/Permissions.cs
View file

@ -198,6 +198,9 @@ namespace TShockAPI
// tshock.tp nodes // tshock.tp nodes
[Description("User can teleport *everyone* to them.")]
public static readonly string tpallothers = "tshock.tp.allothers";
[Description("User can teleport to others.")] [Description("User can teleport to others.")]
public static readonly string tp = "tshock.tp.self"; public static readonly string tp = "tshock.tp.self";