flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #709 from Howaner/GlobalFixes

Browse Source 
Add 'Group not found', when the Server load the users.ini and add auto g...
This commit is contained in:
Mattes D
2014-02-28 14:28:50 +01:00
parent e4c3d3eb6d b3339a6617
commit 6ad4b78a7b
8 changed files with 115 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Entities/Player.cpp
View File

@@ -1532,7 +1532,11 @@ void cPlayer::LoadPermissionsFromDisk()
AStringVector Split = StringSplit( Groups, "," );
for( unsigned int i = 0; i < Split.size(); i++ )
{
AddToGroup( Split[i].c_str() );
if (!cRoot::Get()->GetGroupManager()->ExistsGroup(Split[i]))
{
LOGWARNING("The group %s for player %s was not found!", Split[i].c_str(), m_PlayerName.c_str());
}
AddToGroup(Split[i].c_str());
}
}
else
@@ -1544,12 +1548,7 @@ void cPlayer::LoadPermissionsFromDisk()
}
else
{
LOGWARN("Regenerating users.ini, player %s will be added to the \"Default\" group", m_PlayerName.c_str());
IniFile.AddHeaderComment(" This is the file in which the group the player belongs to is stored");
IniFile.AddHeaderComment(" The format is: [PlayerName] | Groups=GroupName");
IniFile.SetValue(m_PlayerName, "Groups", "Default");
IniFile.WriteFile("users.ini");
cRoot::Get()->GetGroupManager()->CheckUsers();
AddToGroup("Default");
}
ResolvePermissions();