Merge branch 'release/3.0' into release/3.1

This commit is contained in:
Dylan K. Taylor
2018-07-02 16:58:15 +01:00
3 changed files with 3 additions and 4 deletions

View File

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