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

Transition to spl_object_id()

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-26 15:06:38 +00:00
parent 1e708db26c
commit d378371cc8
15 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace pocketmine\permission;
use pocketmine\plugin\Plugin;
use pocketmine\plugin\PluginException;
use pocketmine\timings\Timings;
use function spl_object_hash;
use function spl_object_id;
class PermissibleBase implements Permissible{
/** @var ServerOperator */
@ -117,7 +117,7 @@ class PermissibleBase implements Permissible{
}
$result = new PermissionAttachment($plugin, $this->parent ?? $this);
$this->attachments[spl_object_hash($result)] = $result;
$this->attachments[spl_object_id($result)] = $result;
if($name !== null and $value !== null){
$result->setPermission($name, $value);
}
@ -131,8 +131,8 @@ class PermissibleBase implements Permissible{
* @param PermissionAttachment $attachment
*/
public function removeAttachment(PermissionAttachment $attachment){
if(isset($this->attachments[spl_object_hash($attachment)])){
unset($this->attachments[spl_object_hash($attachment)]);
if(isset($this->attachments[spl_object_id($attachment)])){
unset($this->attachments[spl_object_id($attachment)]);
if(($ex = $attachment->getRemovalCallback()) !== null){
$ex->attachmentRemoved($attachment);
}

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

@ -25,7 +25,7 @@ namespace pocketmine\permission;
use pocketmine\timings\Timings;
use function count;
use function spl_object_hash;
use function spl_object_id;
class PermissionManager{
/** @var PermissionManager|null */
@ -146,7 +146,7 @@ class PermissionManager{
if(!isset($this->permSubs[$permission])){
$this->permSubs[$permission] = [];
}
$this->permSubs[$permission][spl_object_hash($permissible)] = $permissible;
$this->permSubs[$permission][spl_object_id($permissible)] = $permissible;
}
/**
@ -155,7 +155,7 @@ class PermissionManager{
*/
public function unsubscribeFromPermission(string $permission, Permissible $permissible){
if(isset($this->permSubs[$permission])){
unset($this->permSubs[$permission][spl_object_hash($permissible)]);
unset($this->permSubs[$permission][spl_object_id($permissible)]);
if(count($this->permSubs[$permission]) === 0){
unset($this->permSubs[$permission]);
}
@ -167,7 +167,7 @@ class PermissionManager{
*/
public function unsubscribeFromAllPermissions(Permissible $permissible) : void{
foreach($this->permSubs as $permission => &$subs){
unset($subs[spl_object_hash($permissible)]);
unset($subs[spl_object_id($permissible)]);
if(empty($subs)){
unset($this->permSubs[$permission]);
}
@ -189,9 +189,9 @@ class PermissionManager{
*/
public function subscribeToDefaultPerms(bool $op, Permissible $permissible){
if($op){
$this->defSubsOp[spl_object_hash($permissible)] = $permissible;
$this->defSubsOp[spl_object_id($permissible)] = $permissible;
}else{
$this->defSubs[spl_object_hash($permissible)] = $permissible;
$this->defSubs[spl_object_id($permissible)] = $permissible;
}
}
@ -201,9 +201,9 @@ class PermissionManager{
*/
public function unsubscribeFromDefaultPerms(bool $op, Permissible $permissible){
if($op){
unset($this->defSubsOp[spl_object_hash($permissible)]);
unset($this->defSubsOp[spl_object_id($permissible)]);
}else{
unset($this->defSubs[spl_object_hash($permissible)]);
unset($this->defSubs[spl_object_id($permissible)]);
}
}