Merge branch 'group-mgr-ee' into general-devel

TShockAPI/DB/GroupManager.cs

@@ -47,11 +47,8 @@ namespace TShockAPI.DB
 			                                  db.GetSqlType() == SqlType.Sqlite
 			                                  	? (IQueryBuilder) new SqliteQueryCreator()
 			                                  	: new MysqlQueryCreator());
-			creator.EnsureExists(table);
-
-			// Load Permissions from the DB
-			LoadPermisions();
-
+			if (creator.EnsureExists(table))
+			{
 				// Add default groups if they don't exist
 				AddDefaultGroup("guest", "",
 					string.Join(",", Permissions.canbuild, Permissions.canregister, Permissions.canlogin, Permissions.canpartychat,
@@ -74,6 +71,10 @@ namespace TShockAPI.DB
 						Permissions.heal, Permissions.immunetoban, Permissions.usebanneditem));
 
 				AddDefaultGroup("vip", "default", string.Join(",", Permissions.reservedslot));
+			}
+
+			// Load Permissions from the DB
+			LoadPermisions();
 
 			Group.DefaultGroup = GetGroupByName(TShock.Config.DefaultGuestGroupName);
 		}

TShockAPI/DB/SqlTable.cs

@@ -52,7 +52,8 @@ namespace TShockAPI.DB
 			creator = provider;
 		}
 
-		public void EnsureExists(SqlTable table)
+		// Returns true if the table was created; false if it was not.
+		public bool EnsureExists(SqlTable table)
 		{
 			var columns = GetColumns(table);
 			if (columns.Count > 0)
@@ -66,7 +67,9 @@ namespace TShockAPI.DB
 			else
 			{
 				database.Query(creator.CreateTable(table));
+				return true;
 			}
+			return false;
 		}
 
 		public List<string> GetColumns(SqlTable table)