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

Added arrow and suicide death messages

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-30 18:30:39 +02:00
parent 23793e0fc4
commit 36ee6d9966
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/Player.php
View File

@ -2251,8 +2251,18 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
$message = $this->getName() . " was killed"; $message = $this->getName() . " was killed";
break; break;
case EntityDamageEvent::CAUSE_PROJECTILE:
if($ev instanceof EntityDamageByEntityEvent){
$e = $ev->getDamager();
if($e instanceof Living){
$message = $this->getName() . " was shot by " . $e->getName();
break;
}
}
$message = $this->getName() . " was shot by arrow";
break;
case EntityDamageEvent::CAUSE_SUICIDE: case EntityDamageEvent::CAUSE_SUICIDE:
$message = $this->getName() . " died";
break; break;
case EntityDamageEvent::CAUSE_VOID: case EntityDamageEvent::CAUSE_VOID:
$message = $this->getName() . " fell out of the world"; $message = $this->getName() . " fell out of the world";
@ -2268,7 +2278,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
break; break;
case EntityDamageEvent::CAUSE_CONTACT: case EntityDamageEvent::CAUSE_CONTACT:
case EntityDamageEvent::CAUSE_PROJECTILE:
case EntityDamageEvent::CAUSE_SUFFOCATION: case EntityDamageEvent::CAUSE_SUFFOCATION:
case EntityDamageEvent::CAUSE_FIRE: case EntityDamageEvent::CAUSE_FIRE:
case EntityDamageEvent::CAUSE_FIRE_TICK: case EntityDamageEvent::CAUSE_FIRE_TICK:
@ -2285,7 +2294,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->server->getPluginManager()->callEvent($ev = new PlayerDeathEvent($this, $this->getDrops(), $message)); $this->server->getPluginManager()->callEvent($ev = new PlayerDeathEvent($this, $this->getDrops(), $message));
if($ev->getDeathMessage() != ""){
$this->server->broadcast($ev->getDeathMessage(), Server::BROADCAST_CHANNEL_USERS); $this->server->broadcast($ev->getDeathMessage(), Server::BROADCAST_CHANNEL_USERS);
}
} }