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

Entity: Move responsibility of checking for despawn to Level

Browse Source 
this ensures that flagging for despawn will always work as intended, including when onUpdate() is overridden.
This commit is contained in:
Dylan K. Taylor 2018-06-07 12:31:21 +01:00
parent b331f8e1c9
commit c83c0eb935
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1333,11 +1333,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->lastUpdate = $currentTick; $this->lastUpdate = $currentTick;
if($this->needsDespawn){
$this->close();
return false;
}
if(!$this->isAlive()){ if(!$this->isAlive()){
if($this->onDeathUpdate($tickDiff)){ if($this->onDeathUpdate($tickDiff)){
$this->flagForDespawn(); $this->flagForDespawn();

3
src/pocketmine/level/Level.php
View File

@ -745,6 +745,9 @@ class Level implements ChunkManager, Metadatable{
if($entity->isClosed() or !$entity->onUpdate($currentTick)){ if($entity->isClosed() or !$entity->onUpdate($currentTick)){
unset($this->updateEntities[$id]); unset($this->updateEntities[$id]);
} }
if($entity->isFlaggedForDespawn()){
$entity->close();
}
} }
Timings::$tickEntityTimer->stopTiming(); Timings::$tickEntityTimer->stopTiming();
$this->timings->entityTick->stopTiming(); $this->timings->entityTick->stopTiming();