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

Added display of names on death

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-08-08 13:35:57 +02:00
parent fdf10b60dc
commit fe196c6404
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pocketmine/Player.php
View File

@ -3140,7 +3140,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$message = "death.attack.generic"; $message = "death.attack.generic";
$params = [ $params = [
$this->getName() $this->getDisplayName()
]; ];
$cause = $this->getLastDamageCause(); $cause = $this->getLastDamageCause();
@ -3151,11 +3151,11 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$e = $cause->getDamager(); $e = $cause->getDamager();
if($e instanceof Player){ if($e instanceof Player){
$message = "death.attack.player"; $message = "death.attack.player";
$params[] = $e->getName(); $params[] = $e->getDisplayName();
break; break;
}elseif($e instanceof Living){ }elseif($e instanceof Living){
$message = "death.attack.mob"; $message = "death.attack.mob";
$params[] = $e->getName(); $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break; break;
}else{ }else{
$params[] = "Unknown"; $params[] = "Unknown";
@ -3165,9 +3165,12 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
case EntityDamageEvent::CAUSE_PROJECTILE: case EntityDamageEvent::CAUSE_PROJECTILE:
if($cause instanceof EntityDamageByEntityEvent){ if($cause instanceof EntityDamageByEntityEvent){
$e = $cause->getDamager(); $e = $cause->getDamager();
if($e instanceof Living){ if($e instanceof Player){
$message = "death.attack.arrow"; $message = "death.attack.arrow";
$params[] = $e->getName(); $params[] = $e->getDisplayName();
}elseif($e instanceof Living){
$message = "death.attack.arrow";
$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break; break;
}else{ }else{
$params[] = "Unknown"; $params[] = "Unknown";
@ -3222,9 +3225,13 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION: case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
if($cause instanceof EntityDamageByEntityEvent){ if($cause instanceof EntityDamageByEntityEvent){
$e = $cause->getDamager(); $e = $cause->getDamager();
if($e instanceof Living){ if($e instanceof Player){
$message = "death.attack.explosion.player"; $message = "death.attack.explosion.player";
$params[] = $e->getName(); $params[] = $e->getDisplayName();
}elseif($e instanceof Living){
$message = "death.attack.explosion.player";
$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break;
} }
}else{ }else{
$message = "death.attack.explosion"; $message = "death.attack.explosion";