mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 23:59:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/Player.php
View File

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

2
src/pocketmine/entity/Living.php
View File

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