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

Removed FetchHashedPasswordAndGroup, now just uses GetUserByName

Browse source
This commit is contained in:
high 2011-08-07 02:49:09 -04:00
parent 56eca71853
commit 1f4792b71c
3 changed files with 9 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/Commands.cs
View file

@ -316,10 +316,10 @@ namespace TShockAPI
try
{
string encrPass = Tools.HashPassword(args.Parameters[1]);
string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Parameters[0]);
if (exr[0].ToUpper() == encrPass.ToUpper())
var user = TShock.Users.GetUserByName(args.Parameters[0]);
if (user.Password.ToUpper() == encrPass.ToUpper())
{
args.Player.Group = Tools.GetGroup(exr[1]);
args.Player.Group = Tools.GetGroup(user.Group);
args.Player.UserAccountName = args.Parameters[0];
args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName);
args.Player.IsLoggedIn = true;
@ -351,8 +351,7 @@ namespace TShockAPI
{
var user = TShock.Users.GetUserByName(args.Player.UserAccountName);
string encrPass = Tools.HashPassword(args.Parameters[0]);
string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Player.UserAccountName);
if (exr[0].ToUpper() == encrPass.ToUpper())
if (user.Password.ToUpper() == encrPass.ToUpper())
{
args.Player.SendMessage("You changed your password!", Color.Green);
TShock.Users.SetUserPassword(user, args.Parameters[1]); // SetUserPassword will hash it for you.