Fix tab/space conflict pointed out by @WhiteXZ in TSPlayer

This commit is contained in:
Lucas Nicodemus 2015-03-01 12:49:03 -07:00
parent 468a5bc8dc
commit 803aa643c2

View file

@ -60,9 +60,9 @@ namespace TShockAPI
/// </summary> /// </summary>
public int PaintThreshold { get; set; } public int PaintThreshold { get; set; }
/// <summary> /// <summary>
/// The number of projectiles created by the player in the last second. /// The number of projectiles created by the player in the last second.
/// </summary> /// </summary>
public int ProjectileThreshold { get; set; } public int ProjectileThreshold { get; set; }
/// <summary> /// <summary>
@ -83,14 +83,14 @@ namespace TShockAPI
public int sX = -1; public int sX = -1;
public int sY = -1; public int sY = -1;
/// <summary> /// <summary>
/// A queue of tiles destroyed by the player for reverting. /// A queue of tiles destroyed by the player for reverting.
/// </summary> /// </summary>
public Dictionary<Vector2, Tile> TilesDestroyed { get; protected set; } public Dictionary<Vector2, Tile> TilesDestroyed { get; protected set; }
/// <summary> /// <summary>
/// A queue of tiles placed by the player for reverting. /// A queue of tiles placed by the player for reverting.
/// </summary> /// </summary>
public Dictionary<Vector2, Tile> TilesCreated { get; protected set; } public Dictionary<Vector2, Tile> TilesCreated { get; protected set; }
/// <summary> /// <summary>
@ -116,24 +116,24 @@ namespace TShockAPI
public bool ReceivedInfo { get; set; } public bool ReceivedInfo { get; set; }
/// <summary> /// <summary>
/// The players index in the player array( Main.players[] ). /// The players index in the player array( Main.players[] ).
/// </summary> /// </summary>
public int Index { get; protected set; } public int Index { get; protected set; }
/// <summary> /// <summary>
/// The last time the player changed their team or pvp status. /// The last time the player changed their team or pvp status.
/// </summary> /// </summary>
public DateTime LastPvPTeamChange; public DateTime LastPvPTeamChange;
/// <summary> /// <summary>
/// Temp points for use in regions and other plugins. /// Temp points for use in regions and other plugins.
/// </summary> /// </summary>
public Point[] TempPoints = new Point[2]; public Point[] TempPoints = new Point[2];
/// <summary> /// <summary>
/// Whether the player is waiting to place/break a tile to set as a temp point. /// Whether the player is waiting to place/break a tile to set as a temp point.
/// </summary> /// </summary>
public int AwaitingTempPoint { get; set; } public int AwaitingTempPoint { get; set; }
/// <summary> /// <summary>
@ -145,68 +145,68 @@ namespace TShockAPI
public string[] AwaitingNameParameters { get; set; } public string[] AwaitingNameParameters { get; set; }
/// <summary> /// <summary>
/// The last time a player broke a grief check. /// The last time a player broke a grief check.
/// </summary> /// </summary>
public DateTime LastThreat { get; set; } public DateTime LastThreat { get; set; }
public bool InitSpawn; public bool InitSpawn;
/// <summary> /// <summary>
/// Whether the player should see logs. /// Whether the player should see logs.
/// </summary> /// </summary>
public bool DisplayLogs = true; public bool DisplayLogs = true;
/// <summary> /// <summary>
/// The last player that the player whispered with (to or from). /// The last player that the player whispered with (to or from).
/// </summary> /// </summary>
public TSPlayer LastWhisper; public TSPlayer LastWhisper;
/// <summary> /// <summary>
/// The number of unsuccessful login attempts. /// The number of unsuccessful login attempts.
/// </summary> /// </summary>
public int LoginAttempts { get; set; } public int LoginAttempts { get; set; }
public Vector2 TeleportCoords = new Vector2(-1, -1); public Vector2 TeleportCoords = new Vector2(-1, -1);
public Vector2 LastNetPosition = Vector2.Zero; public Vector2 LastNetPosition = Vector2.Zero;
/// <summary> /// <summary>
/// The player's login name. /// The player's login name.
/// </summary> /// </summary>
public string UserAccountName { get; set; } public string UserAccountName { get; set; }
/// <summary> /// <summary>
/// Whether the player performed a valid login attempt (i.e. entered valid user name and password) but is still blocked /// Whether the player performed a valid login attempt (i.e. entered valid user name and password) but is still blocked
/// from logging in because of SSI. /// from logging in because of SSI.
/// </summary> /// </summary>
public bool LoginFailsBySsi { get; set; } public bool LoginFailsBySsi { get; set; }
/// <summary> /// <summary>
/// Whether the player is logged in or not. /// Whether the player is logged in or not.
/// </summary> /// </summary>
public bool IsLoggedIn; public bool IsLoggedIn;
/// <summary> /// <summary>
/// Whether the player has sent their whole inventory to the server while connecting. /// Whether the player has sent their whole inventory to the server while connecting.
/// </summary> /// </summary>
public bool HasSentInventory { get; set; } public bool HasSentInventory { get; set; }
/// <summary> /// <summary>
/// The player's user id( from the db ). /// The player's user id( from the db ).
/// </summary> /// </summary>
public int UserID = -1; public int UserID = -1;
/// <summary> /// <summary>
/// Whether the player has been nagged about logging in. /// Whether the player has been nagged about logging in.
/// </summary> /// </summary>
public bool HasBeenNaggedAboutLoggingIn; public bool HasBeenNaggedAboutLoggingIn;
public bool TPAllow = true; public bool TPAllow = true;
/// <summary> /// <summary>
/// Whether the player is muted or not. /// Whether the player is muted or not.
/// </summary> /// </summary>
public bool mute; public bool mute;
private Player FakePlayer; private Player FakePlayer;
@ -218,16 +218,16 @@ namespace TShockAPI
/// </summary> /// </summary>
public int RespawnTimer; public int RespawnTimer;
/// <summary> /// <summary>
/// Whether the player is dead or not. /// Whether the player is dead or not.
/// </summary> /// </summary>
public bool Dead; public bool Dead;
public string Country = "??"; public string Country = "??";
/// <summary> /// <summary>
/// The players difficulty( normal[softcore], mediumcore, hardcore ). /// The players difficulty( normal[softcore], mediumcore, hardcore ).
/// </summary> /// </summary>
public int Difficulty; public int Difficulty;
private string CacheIP; private string CacheIP;
@ -240,38 +240,38 @@ namespace TShockAPI
public bool IgnoreActionsForClearingTrashCan; public bool IgnoreActionsForClearingTrashCan;
/// <summary> /// <summary>
/// The player's server side inventory data. /// The player's server side inventory data.
/// </summary> /// </summary>
public PlayerData PlayerData; public PlayerData PlayerData;
/// <summary> /// <summary>
/// Whether the player needs to specify a password upon connection( either server or user account ). /// Whether the player needs to specify a password upon connection( either server or user account ).
/// </summary> /// </summary>
public bool RequiresPassword; public bool RequiresPassword;
public bool SilentKickInProgress; public bool SilentKickInProgress;
public bool SilentJoinInProgress; public bool SilentJoinInProgress;
/// <summary> /// <summary>
/// A list of points where ice tiles have been placed. /// A list of points where ice tiles have been placed.
/// </summary> /// </summary>
public List<Point> IceTiles; public List<Point> IceTiles;
/// <summary> /// <summary>
/// Unused, can be removed. /// Unused, can be removed.
/// </summary> /// </summary>
public long RPm = 1; public long RPm = 1;
/// <summary> /// <summary>
/// World protection message cool down. /// World protection message cool down.
/// </summary> /// </summary>
public long WPm = 1; public long WPm = 1;
/// <summary> /// <summary>
/// Spawn protection message cool down. /// Spawn protection message cool down.
/// </summary> /// </summary>
public long SPm = 1; public long SPm = 1;
/// <summary> /// <summary>
@ -284,9 +284,9 @@ namespace TShockAPI
/// </summary> /// </summary>
public long LoginMS; public long LoginMS;
/// <summary> /// <summary>
/// Whether the player has been harrassed about logging in due to server side inventory or forced login. /// Whether the player has been harrassed about logging in due to server side inventory or forced login.
/// </summary> /// </summary>
public bool LoginHarassed = false; public bool LoginHarassed = false;
/// <summary> /// <summary>
@ -304,9 +304,9 @@ namespace TShockAPI
/// </summary> /// </summary>
public int LastKilledProjectile = 0; public int LastKilledProjectile = 0;
/// <summary> /// <summary>
/// Whether the player is a real, human, player on the server. /// Whether the player is a real, human, player on the server.
/// </summary> /// </summary>
public bool RealPlayer public bool RealPlayer
{ {
get { return Index >= 0 && Index < Main.maxNetPlayers && Main.player[Index] != null; } get { return Index >= 0 && Index < Main.maxNetPlayers && Main.player[Index] != null; }