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

Merge remote-tracking branch 'origin/general-devel' into fragments

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-09 08:44:49 -07:00
commit 031398591a
13 changed files with 354 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/TSPlayer.cs
View file

@ -218,10 +218,10 @@ namespace TShockAPI
public Vector2 LastNetPosition = Vector2.Zero;
/// <summary>
/// User object associated with the player.
/// UserAccount object associated with the player.
/// Set when the player logs in.
/// </summary>
public User User { get; set; }
public UserAccount Account { get; set; }
/// <summary>
/// Whether the player performed a valid login attempt (i.e. entered valid user name and password) but is still blocked
@ -448,7 +448,7 @@ namespace TShockAPI
{
if (HasPermission(Permissions.bypassssc))
{
TShock.Log.ConsoleInfo("Skipping SSC Backup for " + User.Name); // Debug Code
TShock.Log.ConsoleInfo("Skipping SSC Backup for " + Account.Name); // Debug Code
return true;
}
PlayerData.CopyCharacter(this);
@ -656,7 +656,7 @@ namespace TShockAPI
{
tempGroupTimer.Stop();
}
User = null;
Account = null;
IsLoggedIn = false;
}