Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor 2019-01-05 17:41:26 +00:00
commit cdf2f98e26
2 changed files with 2 additions and 5 deletions

View File

@ -3021,10 +3021,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
}
protected function onDeathUpdate(int $tickDiff) : bool{
if(parent::onDeathUpdate($tickDiff)){
$this->despawnFromAll(); //non-player entities rely on close() to do this for them
}
parent::onDeathUpdate($tickDiff);
return false; //never flag players for despawn
}

View File

@ -670,7 +670,7 @@ abstract class Living extends Entity implements Damageable{
}
protected function endDeathAnimation() : void{
//TODO
$this->despawnFromAll();
}
public function entityBaseTick(int $tickDiff = 1) : bool{