From deb4113c73be332a634e91eec081dd8028543735 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 21 Feb 2015 17:50:19 -0700 Subject: [PATCH] /user group has proper error handling This blast of commits fixes #543 --- TShockAPI/Commands.cs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 4aaa9d8c..ec378ae0 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1000,23 +1000,31 @@ namespace TShockAPI var user = new User(); user.Name = args.Parameters[1]; - try + if (args.Parameters.Count == 3) { - if (args.Parameters.Count == 3) + try { - args.Player.SendSuccessMessage("Account " + user.Name + " has been changed to group " + args.Parameters[2] + "!"); TShock.Users.SetUserGroup(user, args.Parameters[2]); Log.ConsoleInfo(args.Player.Name + " changed account " + user.Name + " to group " + args.Parameters[2] + "."); + args.Player.SendSuccessMessage("Account " + user.Name + " has been changed to group " + args.Parameters[2] + "!"); } - else + catch (GroupNotExistsException e) { - args.Player.SendErrorMessage("Invalid user group syntax. Try /user help."); + args.Player.SendErrorMessage("That group does not exist!"); } + catch (UserNotExistException e) + { + args.Player.SendErrorMessage("User " + user.Name + " does not exist!"); + } + catch (UserManagerException e) + { + args.Player.SendErrorMessage("User " + user.Name + " could not be added. Check console for details."); + } + } - catch (UserManagerException ex) + else { - args.Player.SendMessage(ex.Message, Color.Green); - Log.ConsoleError(ex.ToString()); + args.Player.SendErrorMessage("Invalid user group syntax. Try /user help."); } } else if (subcmd == "help")