mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Remove WeakRef leftovers

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-01-23 19:04:37 +00:00
parent 8e1394bf53
commit 0bf5ab76fb
1 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,23 +500,7 @@ class PluginManager{
* @return array|Permissible[] * @return array|Permissible[]
*/ */
public function getPermissionSubscriptions(string $permission) : array{ public function getPermissionSubscriptions(string $permission) : array{
if(isset($this->permSubs[$permission])){ return $this->permSubs[$permission] ?? [];
return $this->permSubs[$permission];
$subs = [];
foreach($this->permSubs[$permission] as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
$subs[] = $perm->get();
$perm->release();
}else{
unset($this->permSubs[$permission][$k]);
}
}
return $subs;
}
return [];
} }
/** /**
@ -549,33 +533,11 @@ class PluginManager{
* @return Permissible[] * @return Permissible[]
*/ */
public function getDefaultPermSubscriptions(bool $op) : array{ public function getDefaultPermSubscriptions(bool $op) : array{
$subs = [];
if($op === true){ if($op === true){
return $this->defSubsOp; return $this->defSubsOp;
foreach($this->defSubsOp as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
$subs[] = $perm->get();
$perm->release();
}else{
unset($this->defSubsOp[$k]);
}
}
}else{
return $this->defSubs;
foreach($this->defSubs as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
$subs[] = $perm->get();
$perm->release();
}else{
unset($this->defSubs[$k]);
}
}
} }
return $subs; return $this->defSubs;
} }
/** /**