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

Renamed TShockAPI.DB 'User' to 'UserAccount'

Browse source
This commit is contained in:
Edgar Luque 2017-12-08 01:38:15 +01:00
parent 27ac4c6318
commit 6589531868
12 changed files with 335 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/GetDataHandlers.cs
View file

@ -1518,7 +1518,7 @@ namespace TShockAPI
private static bool HandleConnecting(GetDataHandlerArgs args)
{
var user = TShock.Users.GetUserByName(args.Player.Name);
var user = TShock.UserAccounts.GetUserAccountByName(args.Player.Name);
args.Player.DataWhenJoined = new PlayerData(args.Player);
args.Player.DataWhenJoined.CopyCharacter(args.Player);
@ -1536,7 +1536,7 @@ namespace TShockAPI
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.Account = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
@ -1592,7 +1592,7 @@ namespace TShockAPI
if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, password))
return true;
var user = TShock.Users.GetUserByName(args.Player.Name);
var user = TShock.UserAccounts.GetUserAccountByName(args.Player.Name);
if (user != null && !TShock.Config.DisableLoginBeforeJoin)
{
if (user.VerifyPassword(password))
@ -1608,7 +1608,7 @@ namespace TShockAPI
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.Account = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
@ -1632,7 +1632,7 @@ namespace TShockAPI
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen);
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
TShock.Users.SetUserUUID(user, args.Player.UUID);
TShock.UserAccounts.SetUserAccountUUID(user, args.Player.UUID);
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true;
}
@ -2963,9 +2963,9 @@ namespace TShockAPI
if (args.TPlayer.difficulty == 2 && Main.ServerSideCharacter && args.Player.IsLoggedIn)
{
if (TShock.CharacterDB.RemovePlayer(args.Player.User.ID))
if (TShock.CharacterDB.RemovePlayer(args.Player.Account.ID))
{
TShock.CharacterDB.SeedInitialData(args.Player.User);
TShock.CharacterDB.SeedInitialData(args.Player.Account);
}
}
@ -3029,9 +3029,9 @@ namespace TShockAPI
if (args.TPlayer.difficulty == 2 && Main.ServerSideCharacter && args.Player.IsLoggedIn)
{
if (TShock.CharacterDB.RemovePlayer(args.Player.User.ID))
if (TShock.CharacterDB.RemovePlayer(args.Player.Account.ID))
{
TShock.CharacterDB.SeedInitialData(args.Player.User);
TShock.CharacterDB.SeedInitialData(args.Player.Account);
}
}