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

Fixed storing chat colors incorrectly, and prefix/suffix resets

Browse source
This commit is contained in:
MarioE 2012-06-08 21:36:34 -04:00
parent 8094a54c39
commit 53008daacb
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/DB/GroupManager.cs
View file

@ -180,11 +180,13 @@ namespace TShockAPI.DB
// NOTE: we use newgroup.XYZ to ensure any validation is also persisted to the DB // NOTE: we use newgroup.XYZ to ensure any validation is also persisted to the DB
var newgroup = new Group(name, parent, chatcolor, permissions); var newgroup = new Group(name, parent, chatcolor, permissions);
string query = "UPDATE GroupList SET Parent=@0, Commands=@1, ChatColor=@2 WHERE GroupName=@3"; string query = "UPDATE GroupList SET Parent=@0, Commands=@1, ChatColor=@2 WHERE GroupName=@3";
if (database.Query(query, parentname, newgroup.Permissions, newgroup.ChatColor, name) != 1) if (database.Query(query, parentname, newgroup.Permissions, string.Format("{0},{1},{2}", newgroup.R, newgroup.G, newgroup.B), name) != 1)
throw new GroupManagerException("Failed to update group '" + name + "'"); throw new GroupManagerException("Failed to update group '" + name + "'");
groups.Remove(TShock.Utils.GetGroup(name)); Group group = TShock.Utils.GetGroup(name);
groups.Add(newgroup); group.ChatColor = chatcolor;
group.Permissions = permissions;
group.Parent = TShock.Utils.GetGroup(parentname);
} }
#if COMPAT_SIGS #if COMPAT_SIGS

4
TShockAPI/Rest/RestManager.cs
View file

@ -576,7 +576,7 @@ namespace TShockAPI
return new RestObject() { return new RestObject() {
{"name", group.Name}, {"name", group.Name},
{"parent", group.ParentName}, {"parent", group.ParentName},
{"chatcolor", group.ChatColor}, {"chatcolor", string.Format("{0},{1},{2}", group.R, group.G, group.B)},
{"permissions", group.permissions}, {"permissions", group.permissions},
{"negatedpermissions", group.negatedpermissions}, {"negatedpermissions", group.negatedpermissions},
{"totalpermissions", group.TotalPermissions} {"totalpermissions", group.TotalPermissions}
@ -627,7 +627,7 @@ namespace TShockAPI
Group group = (Group)ret; Group group = (Group)ret;
var parent = (null == parameters["parent"]) ? group.ParentName : parameters["parent"]; var parent = (null == parameters["parent"]) ? group.ParentName : parameters["parent"];
var chatcolor = (null == parameters["chatcolor"]) ? group.ChatColor : parameters["chatcolor"]; var chatcolor = (null == parameters["chatcolor"]) ? string.Format("{0}.{1}.{2}", group.R, group.G, group.B) : parameters["chatcolor"];
var permissions = (null == parameters["permissions"]) ? group.Permissions : parameters["permissions"]; var permissions = (null == parameters["permissions"]) ? group.Permissions : parameters["permissions"];
try try
{ {