From f5723ee83443e505a06b476aa03caf862247ff74 Mon Sep 17 00:00:00 2001 From: Maverick Motherfucker Date: Fri, 3 Jun 2011 22:00:46 -0700 Subject: [PATCH] did a debug session and fixed some errors --- TShockAPI/Group.cs | 4 ++-- TShockAPI/TShock.cs | 1 + TShockAPI/Tools.cs | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/TShockAPI/Group.cs b/TShockAPI/Group.cs index 9c226640..b3375ab5 100644 --- a/TShockAPI/Group.cs +++ b/TShockAPI/Group.cs @@ -33,7 +33,7 @@ namespace TShockAPI return parent; } - public bool HasPermission(string permission) + public virtual bool HasPermission(string permission) { if (negatedPermissions.Contains(permission)) { @@ -62,7 +62,7 @@ namespace TShockAPI { } - new public bool HasPermission(string permission) + new public virtual bool HasPermission(string permission) { return true; } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 92e8e2a5..ea540aba 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -52,6 +52,7 @@ namespace TShockAPI static TShock() { + Tools.LoadGroups(); #region Blacklisted tiles BlacklistTiles = new bool[0x80]; diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs index 248c8660..064567f8 100644 --- a/TShockAPI/Tools.cs +++ b/TShockAPI/Tools.cs @@ -319,18 +319,22 @@ namespace TShockAPI tr.Close(); } - private static void LoadGroups() + public static void LoadGroups() { groups = new List(); groups.Add(new SuperAdminGroup("superadmin")); StreamReader sr = new StreamReader(FileTools.SaveDir + "groups.txt"); string data = sr.ReadToEnd(); - data = data.Replace('\r', new char()); + data = data.Replace("\r", ""); string[] lines = data.Split('\n'); for (int i = 0; i < lines.Length; i++) { + if (lines[i].StartsWith("#")) + { + continue; + } string[] args = lines[i].Split(' '); string name = args[0]; string parent = args[1];