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

Removal of permission defaults (in favour of permission cascading) (#3937)

Browse Source
This commit is contained in:
Dylan T
2020-12-01 17:13:54 +00:00
committed by GitHub
parent 1eabc3fe75
commit 6d8833ccd3
13 changed files with 215 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/permission/PermissionManager.php
View File

@ -23,7 +23,6 @@ declare(strict_types=1);
namespace pocketmine\permission;
use pocketmine\timings\Timings;
use function count;
use function spl_object_id;
@ -41,16 +40,8 @@ class PermissionManager{
/** @var Permission[] */
protected $permissions = [];
/** @var Permission[] */
protected $defaultPerms = [];
/** @var Permission[] */
protected $defaultPermsOp = [];
/** @var Permissible[][] */
protected $permSubs = [];
/** @var Permissible[] */
protected $defSubs = [];
/** @var Permissible[] */
protected $defSubsOp = [];
public function getPermission(string $name) : ?Permission{
return $this->permissions[$name] ?? null;
@ -59,7 +50,6 @@ class PermissionManager{
public function addPermission(Permission $permission) : bool{
if(!isset($this->permissions[$permission->getName()])){
$this->permissions[$permission->getName()] = $permission;
$this->calculatePermissionDefault($permission);
return true;
}
@ -78,45 +68,6 @@ class PermissionManager{
}
}
/**
* @return Permission[]
*/
public function getDefaultPermissions(bool $op) : array{
if($op){
return $this->defaultPermsOp;
}else{
return $this->defaultPerms;
}
}
public function recalculatePermissionDefaults(Permission $permission) : void{
if(isset($this->permissions[$permission->getName()])){
unset($this->defaultPermsOp[$permission->getName()]);
unset($this->defaultPerms[$permission->getName()]);
$this->calculatePermissionDefault($permission);
}
}
private function calculatePermissionDefault(Permission $permission) : void{
Timings::$permissionDefaultTimer->startTiming();
if($permission->getDefault() === Permission::DEFAULT_OP or $permission->getDefault() === Permission::DEFAULT_TRUE){
$this->defaultPermsOp[$permission->getName()] = $permission;
$this->dirtyPermissibles(true);
}
if($permission->getDefault() === Permission::DEFAULT_NOT_OP or $permission->getDefault() === Permission::DEFAULT_TRUE){
$this->defaultPerms[$permission->getName()] = $permission;
$this->dirtyPermissibles(false);
}
Timings::$permissionDefaultTimer->stopTiming();
}
private function dirtyPermissibles(bool $op) : void{
foreach($this->getDefaultPermSubscriptions($op) as $p){
$p->recalculatePermissions();
}
}
public function subscribeToPermission(string $permission, Permissible $permissible) : void{
if(!isset($this->permSubs[$permission])){
$this->permSubs[$permission] = [];
@ -149,33 +100,6 @@ class PermissionManager{
return $this->permSubs[$permission] ?? [];
}
public function subscribeToDefaultPerms(bool $op, Permissible $permissible) : void{
if($op){
$this->defSubsOp[spl_object_id($permissible)] = $permissible;
}else{
$this->defSubs[spl_object_id($permissible)] = $permissible;
}
}
public function unsubscribeFromDefaultPerms(bool $op, Permissible $permissible) : void{
if($op){
unset($this->defSubsOp[spl_object_id($permissible)]);
}else{
unset($this->defSubs[spl_object_id($permissible)]);
}
}
/**
* @return Permissible[]
*/
public function getDefaultPermSubscriptions(bool $op) : array{
if($op){
return $this->defSubsOp;
}
return $this->defSubs;
}
/**
* @return Permission[]
*/
@ -185,7 +109,5 @@ class PermissionManager{
public function clearPermissions() : void{
$this->permissions = [];
$this->defaultPerms = [];
$this->defaultPermsOp = [];
}
}