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-20 18:49:26 +12:00
commit 2811a68002
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/Commands.cs
View file

@ -138,6 +138,7 @@ namespace TShockAPI
ChatCommands.Add(new Command("me", "", ThirdPerson)); ChatCommands.Add(new Command("me", "", ThirdPerson));
ChatCommands.Add(new Command("p", "", PartyChat)); ChatCommands.Add(new Command("p", "", PartyChat));
ChatCommands.Add(new Command("rules", "", Rules)); ChatCommands.Add(new Command("rules", "", Rules));
ChatCommands.Add(new Command("whitelist", "maintenance", Whitelist));
if (ConfigurationManager.DistributationAgent != "terraria-online") if (ConfigurationManager.DistributationAgent != "terraria-online")
{ {
ChatCommands.Add(new Command("kill", "kill", Kill)); ChatCommands.Add(new Command("kill", "kill", Kill));
@ -176,7 +177,6 @@ namespace TShockAPI
if (cmd == null) if (cmd == null)
{ {
player.SendMessage("That command does not exist, try /help", Color.Red);
} }
else else
{ {
@ -853,6 +853,17 @@ namespace TShockAPI
#region General Commands #region General Commands
public static void Whitelist(CommandArgs args)
{
if (args.Parameters.Count == 1)
{
TextWriter tw = new StreamWriter(FileTools.WhitelistPath, true);
tw.WriteLine(args.Parameters[0]);
tw.Close();
args.Player.SendMessage("Added " + args.Parameters[0] + " to the whitelist.");
}
}
private static void Help(CommandArgs args) private static void Help(CommandArgs args)
{ {
args.Player.SendMessage("TShock Commands:"); args.Player.SendMessage("TShock Commands:");

23
TShockAPI/TShock.cs
View file

@ -412,20 +412,23 @@ namespace TShockAPI
public static void Teleport(int ply, int x, int y) public static void Teleport(int ply, int x, int y)
{ {
Main.player[ply].position.X = x; int oldSpawnX = Main.spawnTileX;
Main.player[ply].position.Y = y; int oldSpawnY = Main.spawnTileY;
NetMessage.SendData(0x0d, -1, ply, "", ply); Main.spawnTileX = x;
NetMessage.SendData(0x0d, -1, -1, "", ply); Main.spawnTileY = y;
NetMessage.syncPlayers(); //Send only that player the new spawn point data
NetMessage.SendData(7, ply, -1, "", 0, 0f, 0f, 0f);
//Force them to respawn
NetMessage.SendData(12, ply, -1, "", ply, 0.0f, 0.0f, 0.0f);
//Reset to old spawnpoint and send spawn data back to player
Main.spawnTileX = (int)oldSpawnX;
Main.spawnTileY = (int)oldSpawnY;
NetMessage.SendData(7, ply, -1, "", 0, 0f, 0f, 0f);
} }
public static void Teleport(int ply, float x, float y) public static void Teleport(int ply, float x, float y)
{ {
Main.player[ply].position.X = x; Teleport(ply, (int)x, (int)y);
Main.player[ply].position.Y = y;
NetMessage.SendData(0x0d, -1, ply, "", ply);
NetMessage.SendData(0x0d, -1, -1, "", ply);
NetMessage.syncPlayers();
} }
public static void StartInvasion() public static void StartInvasion()