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

Entity: don't flag as closed until just before cycle destruction

Browse Source 
this allows stuff that requires a non-cycle-destroyed state to still operate during onDispose().
This commit is contained in:
Dylan K. Taylor 2021-03-19 01:00:49 +00:00
parent c092a2e836
commit 69cb0ba1bb
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/entity/Entity.php
View File

@ -177,6 +177,7 @@ abstract class Entity{
/** @var bool */ /** @var bool */
protected $closed = false; protected $closed = false;
private bool $closeInFlight = false;
/** @var bool */ /** @var bool */
private $needsDespawn = false; private $needsDespawn = false;
@ -1518,12 +1519,18 @@ abstract class Entity{
* WARNING: Entities are unusable after this has been executed! * WARNING: Entities are unusable after this has been executed!
*/ */
final public function close() : void{ final public function close() : void{
if($this->closeInFlight){
return;
}
if(!$this->closed){ if(!$this->closed){
$this->closed = true; $this->closeInFlight = true;
(new EntityDespawnEvent($this))->call(); (new EntityDespawnEvent($this))->call();
$this->onDispose(); $this->onDispose();
$this->closed = true;
$this->destroyCycles(); $this->destroyCycles();
$this->closeInFlight = false;
} }
} }