NOTE! THIS SHOULD BE REVERTED LATER! Removed WeakRef dependency

This commit is contained in:
Shoghi Cervantes
2015-08-12 21:14:39 +02:00
parent d7d05c20a9
commit 34dc6ea0d6
5 changed files with 11 additions and 20 deletions

View File

@ -433,7 +433,7 @@ class PluginManager{
if(!isset($this->permSubs[$permission])){
$this->permSubs[$permission] = [];
}
$this->permSubs[$permission][spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->permSubs[$permission][spl_object_hash($permissible)] = $permissible;
}
/**
@ -456,6 +456,7 @@ class PluginManager{
*/
public function getPermissionSubscriptions($permission){
if(isset($this->permSubs[$permission])){
return $this->permSubs[$permission];
$subs = [];
foreach($this->permSubs[$permission] as $k => $perm){
/** @var \WeakRef $perm */
@ -479,9 +480,9 @@ class PluginManager{
*/
public function subscribeToDefaultPerms($op, Permissible $permissible){
if($op === true){
$this->defSubsOp[spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->defSubsOp[spl_object_hash($permissible)] = $permissible;
}else{
$this->defSubs[spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->defSubs[spl_object_hash($permissible)] = $permissible;
}
}
@ -506,6 +507,7 @@ class PluginManager{
$subs = [];
if($op === true){
return $this->defSubsOp;
foreach($this->defSubsOp as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
@ -516,6 +518,7 @@ class PluginManager{
}
}
}else{
return $this->defSubs;
foreach($this->defSubs as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){