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

Merge branch 'master' of github.com:TShock/TShock

Browse source 
Conflicts:
	TShockAPI/Group.cs
	TShockAPI/TShock.cs
This commit is contained in:
Zack Piispanen 2011-07-20 20:58:26 -04:00
commit 3ce6de9e20
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/DB/GroupManager.cs
View file

@ -160,6 +160,11 @@ namespace TShockAPI.DB
groups = new List<Group>(); groups = new List<Group>();
groups.Add(new SuperAdminGroup()); groups.Add(new SuperAdminGroup());
if (TShock.Users == null)
{
TShock.Users = new UserManager(TShock.DB);
}
try try
{ {
using (var com = database.CreateCommand()) using (var com = database.CreateCommand())

2
TShockAPI/TShock.cs
View file

@ -171,9 +171,9 @@ namespace TShockAPI
Bans = new BanManager(DB); Bans = new BanManager(DB);
Warps = new WarpManager(DB); Warps = new WarpManager(DB);
Regions = new RegionManager(DB); Regions = new RegionManager(DB);
Users = new UserManager(DB);
Groups = new GroupManager(DB); Groups = new GroupManager(DB);
Groups.LoadPermisions(); Groups.LoadPermisions();
Users = new UserManager(DB);
Itembans = new ItemManager(DB); Itembans = new ItemManager(DB);
Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename)); Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename));