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

missed some more declarations

Browse source
This commit is contained in:
Edgar Luque 2017-12-08 01:48:08 +01:00
parent 5c24ba6f8d
commit 07da3d5f58
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/CharacterManager.cs
View file

@ -120,7 +120,7 @@ namespace TShockAPI.DB
return playerData; return playerData;
} }
public bool SeedInitialData(UserAccount user) public bool SeedInitialData(UserAccount account)
{ {
var inventory = new StringBuilder(); var inventory = new StringBuilder();
@ -132,7 +132,7 @@ namespace TShockAPI.DB
try 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);", 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.StartingHealth, TShock.ServerSideCharacterConfig.StartingHealth,
TShock.ServerSideCharacterConfig.StartingMana, TShock.ServerSideCharacterConfig.StartingMana,

30
TShockAPI/GetDataHandlers.cs
View file

@ -1518,25 +1518,25 @@ namespace TShockAPI
private static bool HandleConnecting(GetDataHandlerArgs args) 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 = new PlayerData(args.Player);
args.Player.DataWhenJoined.CopyCharacter(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) if (args.Player.State == 1)
args.Player.State = 2; args.Player.State = 2;
NetMessage.SendData((int)PacketTypes.WorldInfo, args.Player.Index); 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.Group = group;
args.Player.tempGroup = null; args.Player.tempGroup = null;
args.Player.Account = user; args.Player.Account = account;
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none"; args.Player.IgnoreActionsForInventory = "none";
@ -1557,13 +1557,13 @@ namespace TShockAPI
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; 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 + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true; return true;
} }
} }
else if (user != null && !TShock.Config.DisableLoginBeforeJoin) else if (account != null && !TShock.Config.DisableLoginBeforeJoin)
{ {
args.Player.RequiresPassword = true; args.Player.RequiresPassword = true;
NetMessage.SendData((int)PacketTypes.PasswordRequired, args.Player.Index); NetMessage.SendData((int)PacketTypes.PasswordRequired, args.Player.Index);
@ -1592,23 +1592,23 @@ namespace TShockAPI
if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, password)) if (Hooks.PlayerHooks.OnPlayerPreLogin(args.Player, args.Player.Name, password))
return true; return true;
var user = TShock.UserAccounts.GetUserAccountByName(args.Player.Name); var account = TShock.UserAccounts.GetUserAccountByName(args.Player.Name);
if (user != null && !TShock.Config.DisableLoginBeforeJoin) if (account != null && !TShock.Config.DisableLoginBeforeJoin)
{ {
if (user.VerifyPassword(password)) if (account.VerifyPassword(password))
{ {
args.Player.RequiresPassword = false; 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) if (args.Player.State == 1)
args.Player.State = 2; args.Player.State = 2;
NetMessage.SendData((int)PacketTypes.WorldInfo, args.Player.Index); 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.Group = group;
args.Player.tempGroup = null; args.Player.tempGroup = null;
args.Player.Account = user; args.Player.Account = account;
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none"; args.Player.IgnoreActionsForInventory = "none";
@ -1632,7 +1632,7 @@ namespace TShockAPI
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen); 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.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); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true; return true;
} }

12
TShockAPI/Hooks/AccountHooks.cs
View file

@ -21,21 +21,21 @@ namespace TShockAPI.Hooks
{ {
public class AccountDeleteEventArgs 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 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;
} }
} }

4
TShockAPI/TShock.cs
View file

@ -500,14 +500,14 @@ namespace TShockAPI
/// <param name="args">args - The AccountDeleteEventArgs object.</param> /// <param name="args">args - The AccountDeleteEventArgs object.</param>
private void OnAccountDelete(Hooks.AccountDeleteEventArgs args) private void OnAccountDelete(Hooks.AccountDeleteEventArgs args)
{ {
CharacterDB.RemovePlayer(args.User.ID); CharacterDB.RemovePlayer(args.Account.ID);
} }
/// <summary>OnAccountCreate - Internal hook fired on account creation.</summary> /// <summary>OnAccountCreate - Internal hook fired on account creation.</summary>
/// <param name="args">args - The AccountCreateEventArgs object.</param> /// <param name="args">args - The AccountCreateEventArgs object.</param>
private void OnAccountCreate(Hooks.AccountCreateEventArgs args) private void OnAccountCreate(Hooks.AccountCreateEventArgs args)
{ {
CharacterDB.SeedInitialData(UserAccounts.GetUserAccount(args.User)); CharacterDB.SeedInitialData(UserAccounts.GetUserAccount(args.Account));
} }
/// <summary>OnPlayerPreLogin - Internal hook fired when on player pre login.</summary> /// <summary>OnPlayerPreLogin - Internal hook fired when on player pre login.</summary>