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

PermissibleBase: more robust cycle destruction

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-01 17:57:55 +00:00
parent 87033592b1
commit c20893aa4b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/permission/PermissibleBase.php
View File

@ -152,12 +152,6 @@ class PermissibleBase implements Permissible{
Timings::$permissibleCalculationTimer->stopTiming(); Timings::$permissibleCalculationTimer->stopTiming();
} }
public function clearPermissions() : void{
PermissionManager::getInstance()->unsubscribeFromAllPermissions($this->getRootPermissible());
$this->permissions = [];
}
/** /**
* @param bool[] $children * @param bool[] $children
*/ */
@ -181,4 +175,11 @@ class PermissibleBase implements Permissible{
public function getEffectivePermissions() : array{ public function getEffectivePermissions() : array{
return $this->permissions; return $this->permissions;
} }
public function destroyCycles() : void{
PermissionManager::getInstance()->unsubscribeFromAllPermissions($this->getRootPermissible());
$this->permissions = []; //PermissionAttachmentInfo doesn't reference Permissible anymore, but it references PermissionAttachment which does
$this->attachments = []; //this might still be a problem if the attachments are still referenced, but we can't do anything about that
$this->parent = null;
}
} }

2
src/player/Player.php
View File

@ -2008,7 +2008,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->removeCurrentWindow(); $this->removeCurrentWindow();
$this->removePermanentInventories(); $this->removePermanentInventories();
$this->perm->clearPermissions(); $this->perm->destroyCycles();
$this->flagForDespawn(); $this->flagForDespawn();
} }