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

Fixed misuse of kill() and close() when deleting entities (#1490)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-11-04 19:30:48 +00:00
committed by GitHub
parent e84ab8fec2
commit eab7b93483
10 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,6 +471,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
/** @var bool */
protected $closed = false;
/** @var bool */
private $needsDespawn = false;
/** @var TimingsHandler */
protected $timings;
@ -1280,15 +1282,20 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->lastUpdate = $currentTick;
if($this->needsDespawn){
$this->close();
return false;
}
if(!$this->isAlive()){
$this->deadTicks += $tickDiff;
if($this->deadTicks >= $this->maxDeadTicks){
$this->despawnFromAll();
if(!$this->isPlayer){
$this->close();
$this->flagForDespawn();
}
}
return $this->deadTicks < $this->maxDeadTicks;
return true;
}
@ -1930,6 +1937,13 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
}
}
/**
* Flags the entity to be removed from the world on the next tick.
*/
public function flagForDespawn() : void{
$this->needsDespawn = true;
}
/**
* Returns whether the entity has been "closed".
* @return bool