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

Remove redundant argument checks 👌

Browse source
This commit is contained in:
Lucas Nicodemus 2015-04-12 22:02:19 -06:00
parent 8bcb3ef6bc
commit 6ed91f12c8
1 changed files with 44 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

22
TShockAPI/Commands.cs
View file

@ -975,8 +975,6 @@ namespace TShockAPI
{ {
var user = new User(); var user = new User();
if (args.Parameters.Count == 4)
{
user.Name = args.Parameters[1]; user.Name = args.Parameters[1];
user.Password = args.Parameters[2]; user.Password = args.Parameters[2];
user.Group = args.Parameters[3]; user.Group = args.Parameters[3];
@ -1000,11 +998,6 @@ namespace TShockAPI
args.Player.SendErrorMessage("User " + user.Name + " could not be added, check console for details."); args.Player.SendErrorMessage("User " + user.Name + " could not be added, check console for details.");
TShock.Log.ConsoleError(e.ToString()); TShock.Log.ConsoleError(e.ToString());
} }
}
else
{
args.Player.SendErrorMessage("Invalid syntax. Try {0}user help.", Specifier);
}
} }
// User deletion requires a username // User deletion requires a username
else if (subcmd == "del" && args.Parameters.Count == 2) else if (subcmd == "del" && args.Parameters.Count == 2)
@ -1035,8 +1028,6 @@ namespace TShockAPI
var user = new User(); var user = new User();
user.Name = args.Parameters[1]; user.Name = args.Parameters[1];
if (args.Parameters.Count == 3)
{
try try
{ {
TShock.Users.SetUserPassword(user, args.Parameters[2]); TShock.Users.SetUserPassword(user, args.Parameters[2]);
@ -1053,19 +1044,12 @@ namespace TShockAPI
TShock.Log.ConsoleError(e.ToString()); TShock.Log.ConsoleError(e.ToString());
} }
} }
else
{
args.Player.SendErrorMessage("Invalid user password syntax. Try {0}user help.", Specifier);
}
}
// Group changing requires a username or IP address, and a new group to set // Group changing requires a username or IP address, and a new group to set
else if (subcmd == "group" && args.Parameters.Count == 3) else if (subcmd == "group" && args.Parameters.Count == 3)
{ {
var user = new User(); var user = new User();
user.Name = args.Parameters[1]; user.Name = args.Parameters[1];
if (args.Parameters.Count == 3)
{
try try
{ {
TShock.Users.SetUserGroup(user, args.Parameters[2]); TShock.Users.SetUserGroup(user, args.Parameters[2]);
@ -1084,12 +1068,6 @@ namespace TShockAPI
{ {
args.Player.SendErrorMessage("User " + user.Name + " could not be added. Check console for details."); args.Player.SendErrorMessage("User " + user.Name + " could not be added. Check console for details.");
} }
}
else
{
args.Player.SendErrorMessage("Invalid user group syntax. Try {0}user help.", Specifier);
}
} }
else if (subcmd == "help") else if (subcmd == "help")
{ {