mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.1' into release/3.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-09-14 17:09:41 +01:00
commit c83d12790e
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/permission/PermissibleBase.php
View File

@ -166,9 +166,7 @@ class PermissibleBase implements Permissible{
public function clearPermissions(){
$permManager = PermissionManager::getInstance();
foreach(array_keys($this->permissions) as $name){
$permManager->unsubscribeFromPermission($name, $this->parent ?? $this);
}
$permManager->unsubscribeFromAllPermissions($this->parent ?? $this);
$permManager->unsubscribeFromDefaultPerms(false, $this->parent ?? $this);
$permManager->unsubscribeFromDefaultPerms(true, $this->parent ?? $this);

12
src/pocketmine/permission/PermissionManager.php
View File

@ -160,6 +160,18 @@ class PermissionManager{
}
}
/**
* @param Permissible $permissible
*/
public function unsubscribeFromAllPermissions(Permissible $permissible) : void{
foreach($this->permSubs as $permission => &$subs){
unset($subs[spl_object_hash($permissible)]);
if(empty($subs)){
unset($this->permSubs[$permission]);
}
}
}
/**
* @param string $permission
*

10
src/pocketmine/plugin/PluginManager.php
View File

@ -475,6 +475,16 @@ class PluginManager{
PermissionManager::getInstance()->unsubscribeFromPermission($permission, $permissible);
}
/**
* @deprecated
* @see PermissionManager::unsubscribeFromAllPermissions()
*
* @param Permissible $permissible
*/
public function unsubscribeFromAllPermissions(Permissible $permissible) : void{
PermissionManager::getInstance()->unsubscribeFromAllPermissions($permissible);
}
/**
* @deprecated
* @see PermissionManager::getPermissionSubscriptions()