From 230d9b094591b196b40aff2905e90d8bf88ec9f8 Mon Sep 17 00:00:00 2001
From: AkjaHAsLk1IALk0MasH <46046453+AgaSpace@users.noreply.github.com>
Date: Sun, 14 May 2023 12:17:47 +0700
Subject: [PATCH] Updated the `SetUserGroup` in the commands.

---
 TShockAPI/Commands.cs         | 6 +++++-
 TShockAPI/Rest/RestManager.cs | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 2214f252..164bda89 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1176,7 +1176,7 @@ namespace TShockAPI
 
 				try
 				{
-					TShock.UserAccounts.SetUserGroup(account, args.Parameters[2]);
+					TShock.UserAccounts.SetUserGroup(args.Player, account, args.Parameters[2]);
 					TShock.Log.ConsoleInfo(GetString("{0} changed account {1} to group {2}.", args.Player.Name, account.Name, args.Parameters[2]));
 					args.Player.SendSuccessMessage(GetString("Account {0} has been changed to group {1}.", account.Name, args.Parameters[2]));
 
@@ -1193,6 +1193,10 @@ namespace TShockAPI
 				{
 					args.Player.SendErrorMessage(GetString($"User {account.Name} does not exist."));
 				}
+				catch (UserGroupUpdateLockedException)
+				{
+					args.Player.SendErrorMessage(GetString("Hook blocked the attempt to change the user group."));
+				}
 				catch (UserAccountManagerException e)
 				{
 					args.Player.SendErrorMessage(GetString($"User {account.Name} could not be added. Check console for details."));
diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs
index c41e7767..0a96b004 100644
--- a/TShockAPI/Rest/RestManager.cs
+++ b/TShockAPI/Rest/RestManager.cs
@@ -555,7 +555,8 @@ namespace TShockAPI
 			{
 				try
 				{
-					TShock.UserAccounts.SetUserGroup(account, group);
+					TShock.UserAccounts.SetUserGroup(new TSRestPlayer(args.TokenData.Username, TShock.Groups.GetGroupByName(args.TokenData.UserGroupName)),
+						account, group);
 					response.Add("group-response", "Group updated successfully");
 				}
 				catch (Exception e)