mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-15 07:55:31 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #1584 duplicated death messages

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-09 20:25:40 +02:00
parent 1f882f42d3
commit 9604907566
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Player.php
View File

@ -2119,6 +2119,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
public function kill(){ public function kill(){
if($this->dead or $this->spawned === false){
return;
}
parent::kill(); parent::kill();
$message = $this->getName() ." died"; $message = $this->getName() ." died";
$cause = $this->getLastDamageCause(); $cause = $this->getLastDamageCause();

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

@ -957,6 +957,9 @@ abstract class Entity extends Position implements Metadatable{
} }
public function kill(){ public function kill(){
if($this->dead){
return;
}
$this->setHealth(0); $this->setHealth(0);
$this->dead = true; $this->dead = true;
$this->scheduleUpdate(); $this->scheduleUpdate();

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

@ -84,6 +84,9 @@ abstract class Living extends Entity implements Damageable{
} }
public function kill(){ public function kill(){
if($this->dead){
return;
}
parent::kill(); parent::kill();
$this->server->getPluginManager()->callEvent($ev = new EntityDeathEvent($this, $this->getDrops())); $this->server->getPluginManager()->callEvent($ev = new EntityDeathEvent($this, $this->getDrops()));
foreach($ev->getDrops() as $item){ foreach($ev->getDrops() as $item){