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

Change to independent checks and use colour differentiation

Browse source
This commit is contained in:
stacey 2021-07-24 22:47:28 -04:00 • committed by GitHub
parent c6e6a55977
commit fc2330458e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
TShockAPI/Commands.cs
View file

@ -807,19 +807,15 @@ namespace TShockAPI
}
else
{
if (TShock.Config.Settings.DisableUUIDLogin)
{
if (TShock.Config.Settings.AllowLoginAnyUsername)
{
args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
args.Player.SendErrorMessage($" {Specifier}login <username> <password> - Logs in using your username and password");
}
else
args.Player.SendErrorMessage($"Syntax: {Specifier}login <password> - Logs in using your password and character name");
}
if (!TShock.Config.Settings.DisableUUIDLogin)
args.Player.SendMessage($"{Specifier}login - Logs in using your UUID and character name.", Color.White);
if (TShock.Config.Settings.AllowLoginAnyUsername)
args.Player.SendMessage($"{Specifier}login {"username".Color(Utils.GreenHighlight)} {"password".Color(Utils.BoldHighlight)} - Logs in using your username and password.", Color.White);
else
args.Player.SendErrorMessage($"Syntax: {Specifier}login - Logs in using your UUID and character name");
args.Player.SendErrorMessage("If you forgot your password, there is no way to recover it.");
args.Player.SendMessage($"{Specifier}login {"password".Color(Utils.BoldHighlight)} - Logs in using your password and character name.", Color.White);
args.Player.SendWarningMessage("If you forgot your password, there is no way to recover it.");
return;
}
try
@ -1001,15 +997,13 @@ namespace TShockAPI
args.Player.SendSuccessMessage("Account \"{0}\" has been registered.", account.Name);
args.Player.SendSuccessMessage("Your password is {0}.", echoPassword);
if (TShock.Config.Settings.DisableUUIDLogin)
{
if (TShock.Config.Settings.AllowLoginAnyUsername)
args.Player.SendInfoMessage($"Type {Specifier}login \"{account.Name}\" {echoPassword} to sign in to your account.");
else
args.Player.SendInfoMessage($"Type {Specifier}login {echoPassword} to sign in to your account.");
}
if (!TShock.Config.Settings.DisableUUIDLogin)
args.Player.SendMessage($"Type {Specifier}login to sign in to your account.", Color.White);
if (TShock.Config.Settings.AllowLoginAnyUsername)
args.Player.SendMessage($"Type {Specifier}login \"{account.Name.Color(Utils.GreenHighlight)}\" {echoPassword.Color(Utils.BoldHighlight)} to sign in to your account.", Color.White);
else
args.Player.SendSuccessMessage($"Type {Specifier}login to sign in to your account.");
args.Player.SendMessage($"Type {Specifier}login {echoPassword.Color(Utils.BoldHighlight)} to sign in to your account.", Color.White);
TShock.UserAccounts.AddUserAccount(account);
TShock.Log.ConsoleInfo("{0} registered an account: \"{1}\".", args.Player.Name, account.Name);