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

Merge remote-tracking branch 'origin/master' into portals

Browse Source
This commit is contained in:
Tiger Wang
2014-06-04 13:14:38 +01:00
parent 576f89c1d5 2de36c8ccc
commit 86e5273cd1
130 changed files with 22645 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entities/Player.cpp
View File

@@ -1669,13 +1669,6 @@ bool cPlayer::LoadFromDisk(cWorld * a_World)
LoadPermissionsFromDisk();
// Log player permissions, cause it's what the cool kids do
LOGINFO("Player %s has permissions:", GetName().c_str() );
for( PermissionMap::iterator itr = m_ResolvedPermissions.begin(); itr != m_ResolvedPermissions.end(); ++itr )
{
if( itr->second ) LOG(" - %s", itr->first.c_str() );
}
AString SourceFile;
Printf(SourceFile, "players/%s.json", GetName().c_str() );