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

Cleaned up Entity->close() handling

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-04-18 17:23:48 +01:00
parent cc01dfe8df
commit 5913d5038b
4 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/pocketmine/entity/Entity.php
View File

@ -1897,28 +1897,42 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
*
* WARNING: Entities are unusable after this has been executed!
*/
public function close() : void{
final public function close() : void{
if(!$this->closed){
(new EntityDespawnEvent($this))->call();
$this->closed = true;
(new EntityDespawnEvent($this))->call();
$this->despawnFromAll();
$this->hasSpawned = [];
if($this->chunk !== null){
$this->chunk->removeEntity($this);
$this->chunk = null;
}
if($this->isValid()){
$this->level->removeEntity($this);
$this->setLevel(null);
}
$this->lastDamageCause = null;
$this->onDispose();
$this->destroyCycles();
}
}
/**
* Called when the entity is disposed to clean up things like viewers. This SHOULD NOT destroy internal state,
* because it may be needed by descendent classes.
*/
protected function onDispose() : void{
$this->despawnFromAll();
if($this->chunk !== null){
$this->chunk->removeEntity($this);
}
if($this->isValid()){
$this->level->removeEntity($this);
}
}
/**
* Called when the entity is disposed, after all events have been fired. This should be used to perform destructive
* circular object references and things which could impact memory usage.
*
* It is expected that the object is unusable after this is called.
*/
protected function destroyCycles() : void{
$this->chunk = null;
$this->setLevel(null);
$this->lastDamageCause = null;
}
/**
* @param int $propertyId
* @param int $flagId