From 07da3d5f5813731be9bbdcba04392f3fde7791d0 Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Fri, 8 Dec 2017 01:48:08 +0100 Subject: [PATCH] missed some more declarations --- TShockAPI/DB/CharacterManager.cs | 4 ++-- TShockAPI/GetDataHandlers.cs | 30 +++++++++++++++--------------- TShockAPI/Hooks/AccountHooks.cs | 12 ++++++------ TShockAPI/TShock.cs | 4 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/TShockAPI/DB/CharacterManager.cs b/TShockAPI/DB/CharacterManager.cs index 132ab6ef..1a399da8 100644 --- a/TShockAPI/DB/CharacterManager.cs +++ b/TShockAPI/DB/CharacterManager.cs @@ -120,7 +120,7 @@ namespace TShockAPI.DB return playerData; } - public bool SeedInitialData(UserAccount user) + public bool SeedInitialData(UserAccount account) { var inventory = new StringBuilder(); @@ -132,7 +132,7 @@ namespace TShockAPI.DB try { database.Query("INSERT INTO tsCharacter (Account, Health, MaxHealth, Mana, MaxMana, Inventory, spawnX, spawnY, questsCompleted) VALUES (@0, @1, @2, @3, @4, @5, @6, @7, @8);", - user.ID, + account.ID, TShock.ServerSideCharacterConfig.StartingHealth, TShock.ServerSideCharacterConfig.StartingHealth, TShock.ServerSideCharacterConfig.StartingMana, diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 17d27519..f3dc33e5 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1518,25 +1518,25 @@ namespace TShockAPI private static bool HandleConnecting(GetDataHandlerArgs args) { - var user = TShock.UserAccounts.GetUserAccountByName(args.Player.Name); + var account = TShock.UserAccounts.GetUserAccountByName(args.Player.Name); args.Player.DataWhenJoined = new PlayerData(args.Player); args.Player.DataWhenJoined.CopyCharacter(args.Player); - if (user != null && !TShock.Config.DisableUUIDLogin) + if (account != null && !TShock.Config.DisableUUIDLogin) { - if (user.UUID == args.Player.UUID) + if (account.UUID == args.Player.UUID) { if (args.Player.State == 1) args.Player.State = 2; NetMessage.SendData((int)PacketTypes.WorldInfo, args.Player.Index); - args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, user.ID); + args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID); - var group = TShock.Utils.GetGroup(user.Group); + var group = TShock.Utils.GetGroup(account.Group); args.Player.Group = group; args.Player.tempGroup = null; - args.Player.Account = user; + args.Player.Account = account; args.Player.IsLoggedIn = true; args.Player.IgnoreActionsForInventory = "none"; @@ -1557,13 +1557,13 @@ namespace TShockAPI if (args.Player.HasPermission(Permissions.usebanneditem)) args.Player.IgnoreActionsForDisabledArmor = "none"; - args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully."); + args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); return true; } } - else if (user != null && !TShock.Config.DisableLoginBeforeJoin) + else if (account != null && !TShock.Config.DisableLoginBeforeJoin) { args.Player.RequiresPassword = true; NetMessage.SendData((int)PacketTypes.PasswordRequired, args.Player.Index); @@ -1592,23 +1592,23 @@ namespace TShockAPI if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, password)) return true; - var user = TShock.UserAccounts.GetUserAccountByName(args.Player.Name); - if (user != null && !TShock.Config.DisableLoginBeforeJoin) + var account = TShock.UserAccounts.GetUserAccountByName(args.Player.Name); + if (account != null && !TShock.Config.DisableLoginBeforeJoin) { - if (user.VerifyPassword(password)) + if (account.VerifyPassword(password)) { args.Player.RequiresPassword = false; - args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, user.ID); + args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID); if (args.Player.State == 1) args.Player.State = 2; NetMessage.SendData((int)PacketTypes.WorldInfo, args.Player.Index); - var group = TShock.Utils.GetGroup(user.Group); + var group = TShock.Utils.GetGroup(account.Group); args.Player.Group = group; args.Player.tempGroup = null; - args.Player.Account = user; + args.Player.Account = account; 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.UserAccounts.SetUserAccountUUID(user, args.Player.UUID); + TShock.UserAccounts.SetUserAccountUUID(account, args.Player.UUID); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); return true; } diff --git a/TShockAPI/Hooks/AccountHooks.cs b/TShockAPI/Hooks/AccountHooks.cs index 86aebbc6..356a90c1 100644 --- a/TShockAPI/Hooks/AccountHooks.cs +++ b/TShockAPI/Hooks/AccountHooks.cs @@ -21,21 +21,21 @@ namespace TShockAPI.Hooks { public class AccountDeleteEventArgs { - public UserAccount User { get; private set; } + public UserAccount Account { get; private set; } - public AccountDeleteEventArgs(UserAccount user) + public AccountDeleteEventArgs(UserAccount account) { - this.User = user; + this.Account = account; } } public class AccountCreateEventArgs { - public UserAccount User { get; private set; } + public UserAccount Account { get; private set; } - public AccountCreateEventArgs(UserAccount user) + public AccountCreateEventArgs(UserAccount account) { - this.User = user; + this.Account = account; } } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index df3f58c8..ee403eab 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -500,14 +500,14 @@ namespace TShockAPI /// args - The AccountDeleteEventArgs object. private void OnAccountDelete(Hooks.AccountDeleteEventArgs args) { - CharacterDB.RemovePlayer(args.User.ID); + CharacterDB.RemovePlayer(args.Account.ID); } /// OnAccountCreate - Internal hook fired on account creation. /// args - The AccountCreateEventArgs object. private void OnAccountCreate(Hooks.AccountCreateEventArgs args) { - CharacterDB.SeedInitialData(UserAccounts.GetUserAccount(args.User)); + CharacterDB.SeedInitialData(UserAccounts.GetUserAccount(args.Account)); } /// OnPlayerPreLogin - Internal hook fired when on player pre login.