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

spaces: 0 tabs: 1

Browse source
This commit is contained in:
Zack Piispanen 2013-09-22 23:33:36 -04:00
parent b7019d8267
commit cc70a37af0
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
TShockAPI/DB/GroupManager.cs
View file

@ -53,24 +53,29 @@ namespace TShockAPI.DB
LoadPermisions(); LoadPermisions();
// Add default groups if they don't exist // Add default groups if they don't exist
AddDefaultGroup(TShock.Config.DefaultGuestGroupName, "", AddDefaultGroup(TShock.Config.DefaultGuestGroupName, "",
string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat, string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat,
Permissions.cantalkinthird)); Permissions.cantalkinthird));
AddDefaultGroup("default", TShock.Config.DefaultGuestGroupName, string.Join(",", Permissions.warp, Permissions.canchangepassword)); AddDefaultGroup("default", TShock.Config.DefaultGuestGroupName,
string.Join(",", Permissions.warp, Permissions.canchangepassword));
AddDefaultGroup("newadmin", "default", string.Join(",", Permissions.kick, Permissions.editspawn, Permissions.reservedslot)); AddDefaultGroup("newadmin", "default",
string.Join(",", Permissions.kick, Permissions.editspawn, Permissions.reservedslot));
AddDefaultGroup("admin", "newadmin", string.Join(",", Permissions.ban, Permissions.whitelist, Permissions.causeevents, Permissions.spawnboss, AddDefaultGroup("admin", "newadmin",
Permissions.spawnmob, Permissions.managewarp, Permissions.time, Permissions.tp, Permissions.pvpfun, Permissions.kill, Permissions.logs, string.Join(",", Permissions.ban, Permissions.whitelist, Permissions.causeevents, Permissions.spawnboss,
Permissions.immunetokick, Permissions.tphere)); Permissions.spawnmob, Permissions.managewarp, Permissions.time, Permissions.tp, Permissions.pvpfun,
Permissions.kill, Permissions.logs,
Permissions.immunetokick, Permissions.tphere));
AddDefaultGroup("trustedadmin", "admin", string.Join(",", Permissions.maintenance, Permissions.cfg, Permissions.butcher, Permissions.item, AddDefaultGroup("trustedadmin", "admin",
Permissions.heal, Permissions.immunetoban, Permissions.usebanneditem)); string.Join(",", Permissions.maintenance, Permissions.cfg, Permissions.butcher, Permissions.item,
Permissions.heal, Permissions.immunetoban, Permissions.usebanneditem));
AddDefaultGroup("vip", "default", string.Join(",", Permissions.reservedslot)); AddDefaultGroup("vip", "default", string.Join(",", Permissions.reservedslot));
Group.DefaultGroup = GetGroupByName(TShock.Config.DefaultGuestGroupName); Group.DefaultGroup = GetGroupByName(TShock.Config.DefaultGuestGroupName);
} }
private void AddDefaultGroup(string name, string parent, string permissions) private void AddDefaultGroup(string name, string parent, string permissions)

2
TShockAPI/TShock.cs
View file

@ -771,7 +771,7 @@ namespace TShockAPI
{ {
var player = new TSPlayer(ply); var player = new TSPlayer(ply);
if (Utils.ActivePlayers() + 1 > Config.MaxSlots + Config.ReservedSlots) if (Utils.ActivePlayers() + 1 > Config.MaxSlots + Config.ReservedSlots)
{ {
Utils.ForceKick(player, Config.ServerFullNoReservedReason, true, false); Utils.ForceKick(player, Config.ServerFullNoReservedReason, true, false);
handler.Handled = true; handler.Handled = true;