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

Merge pull request #3072 from alejandroliu/Kill-entity-bug

Browse Source 
Fixes bug #3071
This commit is contained in:
Shoghi Cervantes 2015-05-28 17:34:38 +02:00
commit ce59703dd0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,7 +617,6 @@ abstract class Entity extends Location implements Metadatable{
if($amount <= 0){ if($amount <= 0){
if($this->isAlive()){ if($this->isAlive()){
$this->health = 0;
$this->kill(); $this->kill();
} }
}elseif($amount <= $this->getMaxHealth() or $amount < $this->health){ }elseif($amount <= $this->getMaxHealth() or $amount < $this->health){
@ -1424,7 +1423,7 @@ abstract class Entity extends Location implements Metadatable{
} }
public function kill(){ public function kill(){
$this->setHealth(0); $this->health = 0;
$this->scheduleUpdate(); $this->scheduleUpdate();
} }