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

Merge branch 'master' of git://github.com/TShock/TShock

Browse source
This commit is contained in:
Twitchy 2011-06-22 19:52:27 +12:00
commit 2e752ca2d0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/Commands.cs
View file

@ -671,7 +671,7 @@ namespace TShockAPI
{ {
if (!args.Player.RealPlayer) if (!args.Player.RealPlayer)
{ {
args.Player.SendMessage("You cant use teleport commands!"); args.Player.SendMessage("You cannot use teleport commands!");
return; return;
} }
@ -683,21 +683,21 @@ namespace TShockAPI
{ {
if (!args.Player.RealPlayer) if (!args.Player.RealPlayer)
{ {
args.Player.SendMessage("You cant use teleport commands!"); args.Player.SendMessage("You cannot use teleport commands!");
return; return;
} }
if (args.Player.Teleport(Main.spawnTileX, Main.spawnTileY)) if (args.Player.Teleport(Main.spawnTileX, Main.spawnTileY))
args.Player.SendMessage("Teleported to the map's spawnpoint."); args.Player.SendMessage("Teleported to the map's spawnpoint.");
else else
args.Player.SendMessage("Teleport unavailable custom spawnpoint set (to unset sucide atleast once after bed is destroyed).", Color.Red); args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
} }
private static void TP(CommandArgs args) private static void TP(CommandArgs args)
{ {
if (!args.Player.RealPlayer) if (!args.Player.RealPlayer)
{ {
args.Player.SendMessage("You cant use teleport commands!"); args.Player.SendMessage("You cannot use teleport commands!");
return; return;
} }
@ -719,7 +719,7 @@ namespace TShockAPI
if (args.Player.Teleport(plr.TileX, plr.TileY)) if (args.Player.Teleport(plr.TileX, plr.TileY))
args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name)); args.Player.SendMessage(string.Format("Teleported to {0}", plr.Name));
else else
args.Player.SendMessage("Teleport unavailable custom spawnpoint set (to unset sucide atleast once after bed is destroyed).", Color.Red); args.Player.SendMessage("Teleport unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
} }
} }
@ -727,7 +727,7 @@ namespace TShockAPI
{ {
if (!args.Player.RealPlayer) if (!args.Player.RealPlayer)
{ {
args.Player.SendMessage("You cant use teleport commands!"); args.Player.SendMessage("You cannot use teleport commands!");
return; return;
} }
@ -756,7 +756,7 @@ namespace TShockAPI
args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name)); args.Player.SendMessage(string.Format("You brought {0} here.", plr.Name));
} }
else else
args.Player.SendMessage("Teleport unavailable target player has custom spawnpoint set.", Color.Red); args.Player.SendMessage("Teleport unavailable - Target player has spawn point set to Bed.", Color.Red);
} }
} }
@ -842,7 +842,7 @@ namespace TShockAPI
if (args.Player.Teleport((int)warp.X, (int)warp.Y)) if (args.Player.Teleport((int)warp.X, (int)warp.Y))
args.Player.SendMessage("Warped to " + warpName, Color.Yellow); args.Player.SendMessage("Warped to " + warpName, Color.Yellow);
else else
args.Player.SendMessage("Warp unavailable custom spawnpoint set (to unset sucide atleast once after bed is destroyed).", Color.Red); args.Player.SendMessage("Warp unavailable - Spawn point set to Bed. To unset, destroy Bed and suicide at least once.", Color.Red);
} }
else else
@ -1480,4 +1480,4 @@ namespace TShockAPI
#endregion Cheat Comamnds #endregion Cheat Comamnds
} }
} }