From cc70a37af06bac23a57503ddbaf248f190ffebd3 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Sun, 22 Sep 2013 23:33:36 -0400 Subject: [PATCH] spaces: 0 tabs: 1 --- TShockAPI/DB/GroupManager.cs | 27 ++++++++++++++++----------- TShockAPI/TShock.cs | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 32967aed..5f445577 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -53,24 +53,29 @@ namespace TShockAPI.DB LoadPermisions(); // Add default groups if they don't exist - AddDefaultGroup(TShock.Config.DefaultGuestGroupName, "", - string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat, - Permissions.cantalkinthird)); + AddDefaultGroup(TShock.Config.DefaultGuestGroupName, "", + string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat, + 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, - Permissions.spawnmob, Permissions.managewarp, Permissions.time, Permissions.tp, Permissions.pvpfun, Permissions.kill, Permissions.logs, - Permissions.immunetokick, Permissions.tphere)); + AddDefaultGroup("admin", "newadmin", + string.Join(",", Permissions.ban, Permissions.whitelist, Permissions.causeevents, Permissions.spawnboss, + 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, - Permissions.heal, Permissions.immunetoban, Permissions.usebanneditem)); + AddDefaultGroup("trustedadmin", "admin", + string.Join(",", Permissions.maintenance, Permissions.cfg, Permissions.butcher, Permissions.item, + Permissions.heal, Permissions.immunetoban, Permissions.usebanneditem)); 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) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 35d03033..d86ccb5d 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -771,7 +771,7 @@ namespace TShockAPI { 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); handler.Handled = true;