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

Merge pull request #649 from mc-server/GroupsPermissions

Browse Source 
Removed deprecated HasCommand function
This commit is contained in:
Mattes D 2014-02-05 21:07:10 +01:00
commit cd634ea138
4 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Entities/Player.cpp
View File

@ -1267,19 +1267,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) bool cPlayer::HasPermission(const AString & a_Permission)
{ {
if (a_Permission.empty()) if (a_Permission.empty())

1
src/Entities/Player.h
View File

@ -211,7 +211,6 @@ public:
/// Removes a player from the group, resolves permissions and group inheritance (case sensitive) /// Removes a player from the group, resolves permissions and group inheritance (case sensitive)
void RemoveFromGroup( const AString & a_GroupName ); // tolua_export void RemoveFromGroup( const AString & a_GroupName ); // tolua_export
bool CanUseCommand( const AString & a_Command ); // tolua_export
bool HasPermission( const AString & a_Permission ); // tolua_export bool HasPermission( const AString & a_Permission ); // tolua_export
const GroupList & GetGroups() { return m_Groups; } // >> EXPORTED IN MANUALBINDINGS << const GroupList & GetGroups() { return m_Groups; } // >> EXPORTED IN MANUALBINDINGS <<
StringList GetResolvedPermissions(); // >> EXPORTED IN MANUALBINDINGS << StringList GetResolvedPermissions(); // >> EXPORTED IN MANUALBINDINGS <<

21
src/Group.cpp
View File

@ -25,26 +25,6 @@ void cGroup::AddPermission( AString a_Permission )
bool cGroup::HasCommand( AString a_Command )
{
if( m_Commands.find("*") != m_Commands.end() )
{
return true;
}
CommandMap::iterator itr = m_Commands.find( a_Command );
if( itr != m_Commands.end() )
{
if( itr->second ) return true;
}
for( GroupList::iterator itr = m_Inherits.begin(); itr != m_Inherits.end(); ++itr )
{
if( (*itr)->HasCommand( a_Command ) ) return true;
}
return false;
}
void cGroup::InheritFrom( cGroup* a_Group ) void cGroup::InheritFrom( cGroup* a_Group )
{ {
m_Inherits.remove( a_Group ); m_Inherits.remove( a_Group );
@ -54,6 +34,7 @@ void cGroup::InheritFrom( cGroup* a_Group )
void cGroup::ClearPermission() void cGroup::ClearPermission()
{ {
m_Permissions.clear(); m_Permissions.clear();

2
src/Group.h
View File

@ -18,8 +18,6 @@ public: // tolua_export
void AddPermission( AString a_Permission ); // tolua_export void AddPermission( AString a_Permission ); // tolua_export
void InheritFrom( cGroup* a_Group ); // tolua_export void InheritFrom( cGroup* a_Group ); // tolua_export
bool HasCommand( AString a_Command ); // tolua_export
typedef std::map< AString, bool > PermissionMap; typedef std::map< AString, bool > PermissionMap;
const PermissionMap & GetPermissions() const { return m_Permissions; } const PermissionMap & GetPermissions() const { return m_Permissions; }