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

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

Browse Source 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
This commit is contained in:
Tiger Wang
2014-02-09 00:14:42 +00:00
parent f86f066615 d2bc39ba84
commit 9d1c9097e3
38 changed files with 2325 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Entities/Player.cpp
View File

@@ -1261,19 +1261,6 @@ void cPlayer::RemoveFromGroup( const AString & a_GroupName )
bool cPlayer::CanUseCommand( const AString & a_Command )
{
for( GroupList::iterator itr = m_Groups.begin(); itr != m_Groups.end(); ++itr )
{
if( (*itr)->HasCommand( a_Command ) ) return true;
}
return false;
}
bool cPlayer::HasPermission(const AString & a_Permission)
{
if (a_Permission.empty())