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

ForceKick now takes in TSPlayer instead of int

Browse source 
Removed Tools.GetPlayerIP, use TSPlayer.IP instead
This commit is contained in:
ricky 2011-06-16 01:04:28 +10:00
parent 921f8ad4ee
commit a976c51101
3 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

29
TShockAPI/TSPlayer.cs
View file

@ -25,15 +25,14 @@ namespace TShockAPI
public class TSPlayer
{
public static readonly TSPlayer Server = new ServerPlayer();
public static readonly TSPlayer All = new TSPlayer(new Player { name = "All", whoAmi = -1 });
public static readonly TSPlayer All = new TSPlayer("All");
public uint TileThreshold { get; set; }
public Dictionary<Vector2, Tile> TilesDestroyed { get; set; }
public bool SyncHP { get; set; }
public bool SyncMP { get; set; }
public Group Group { get; set; }
public bool ReceivedInfo { get; set; }
public int Index { get { return TPlayer.whoAmi; } }
public int Index { get; protected set; }
/// <summary>
/// Terraria Player
@ -44,14 +43,14 @@ namespace TShockAPI
{
get { return TPlayer.name; }
}
public string IP
{
get { return Tools.GetRealIP(Netplay.serverSock[Index].tcpClient.Client.RemoteEndPoint.ToString()); }
}
public bool Active
{
get { return TPlayer.active; }
}
public string IP
{
get { return Tools.GetRealIP(Netplay.serverSock[Index].tcpClient.Client.RemoteEndPoint.ToString()); }
}
public int Team
{
get { return TPlayer.team; }
@ -74,10 +73,19 @@ namespace TShockAPI
get { return (int)(X / 16); }
}
public TSPlayer(Player ply)
public TSPlayer(int index)
{
TilesDestroyed = new Dictionary<Vector2, Tile>();
TPlayer = ply;
Index = index;
TPlayer = Main.player[index];
Group = new Group("null");
}
protected TSPlayer(String playerName)
{
TilesDestroyed = new Dictionary<Vector2, Tile>();
Index = -1;
TPlayer = new Player { name = playerName, whoAmi = -1 };
Group = new Group("null");
}
@ -101,8 +109,7 @@ namespace TShockAPI
public class ServerPlayer : TSPlayer
{
public ServerPlayer()
: base(new Player { name = "Server" })
public ServerPlayer() : base("Server")
{
Group = new SuperAdminGroup();
}