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

Merge pull request #1417 from aarongoulet/logout-permissions-change

Browse source 
Issue #1371: Grant logout permissions by default
This commit is contained in:
Chris 2017-04-15 12:26:38 +09:30 • committed by GitHub
commit 263177a62c
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/DB/GroupManager.cs
View file

@ -55,7 +55,7 @@ namespace TShockAPI.DB
Permissions.cantalkinthird, Permissions.canchat)); Permissions.cantalkinthird, Permissions.canchat));
AddDefaultGroup("default", "guest", AddDefaultGroup("default", "guest",
string.Join(",", Permissions.warp, Permissions.canchangepassword)); string.Join(",", Permissions.warp, Permissions.canchangepassword, Permissions.canlogout));
AddDefaultGroup("newadmin", "default", AddDefaultGroup("newadmin", "default",
string.Join(",", Permissions.kick, Permissions.editspawn, Permissions.reservedslot)); string.Join(",", Permissions.kick, Permissions.editspawn, Permissions.reservedslot));
@ -228,7 +228,7 @@ namespace TShockAPI.DB
var group = TShock.Utils.GetGroup(name); var group = TShock.Utils.GetGroup(name);
var oldperms = group.Permissions; // Store old permissions in case of error var oldperms = group.Permissions; // Store old permissions in case of error
permissions.ForEach(p => group.AddPermission(p)); permissions.ForEach(p => group.AddPermission(p));
if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1)
return "Group " + name + " has been modified successfully."; return "Group " + name + " has been modified successfully.";
@ -248,7 +248,7 @@ namespace TShockAPI.DB
if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1) if (database.Query("UPDATE GroupList SET Commands=@0 WHERE GroupName=@1", group.Permissions, name) == 1)
return "Group " + name + " has been modified successfully."; return "Group " + name + " has been modified successfully.";
// Restore old permissions so DB and internal object are in a consistent state // Restore old permissions so DB and internal object are in a consistent state
group.Permissions = oldperms; group.Permissions = oldperms;
return ""; return "";
@ -319,7 +319,7 @@ namespace TShockAPI.DB
if (group.Parent == null) if (group.Parent == null)
{ {
TShock.Log.ConsoleError( TShock.Log.ConsoleError(
"ERROR: Group \"{0}\" is referencing non existent parent group \"{1}\", parent reference was removed.", "ERROR: Group \"{0}\" is referencing non existent parent group \"{1}\", parent reference was removed.",
group.Name, parentGroupName); group.Name, parentGroupName);
} }
else else
@ -391,4 +391,4 @@ namespace TShockAPI.DB
{ {
} }
} }
} }