mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 02:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.1'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-02 16:58:22 +01:00
commit 399870bf31
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -537,7 +537,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
public function canBeCollidedWith() : bool{ public function canBeCollidedWith() : bool{
return !$this->isSpectator(); return !$this->isSpectator() and parent::canBeCollidedWith();
} }
public function resetFallDistance() : void{ public function resetFallDistance() : void{

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

@ -1101,7 +1101,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
} }
public function canBeCollidedWith() : bool{ public function canBeCollidedWith() : bool{
return true; return $this->isAlive();
} }
protected function updateMovement(bool $teleport = false) : void{ protected function updateMovement(bool $teleport = false) : void{

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

@ -582,8 +582,6 @@ abstract class Living extends Entity implements Damageable{
if($this->isAlive()){ if($this->isAlive()){
$this->applyPostDamageEffects($source); $this->applyPostDamageEffects($source);
$this->doHitAnimation(); $this->doHitAnimation();
}else{
$this->startDeathAnimation();
} }
} }
@ -622,6 +620,7 @@ abstract class Living extends Entity implements Damageable{
public function kill() : void{ public function kill() : void{
parent::kill(); parent::kill();
$this->onDeath(); $this->onDeath();
$this->startDeathAnimation();
} }
protected function onDeath() : void{ protected function onDeath() : void{