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

Implement a Living::getDisplayName() (#5384)

Browse Source
This commit is contained in:
IvanCraft623 2022-11-27 14:48:55 -05:00 committed by GitHub
parent 80a432d9ff
commit d476a4c1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/entity/Living.php
View File

@ -184,6 +184,13 @@ abstract class Living extends Entity{
$this->attributeMap->add($this->absorptionAttr = AttributeFactory::getInstance()->mustGet(Attribute::ABSORPTION)); $this->attributeMap->add($this->absorptionAttr = AttributeFactory::getInstance()->mustGet(Attribute::ABSORPTION));
} }
/**
* Returns the name used to describe this entity in chat and command outputs.
*/
public function getDisplayName() : string{
return $this->nameTag !== "" ? $this->nameTag : $this->getName();
}
public function setHealth(float $amount) : void{ public function setHealth(float $amount) : void{
$wasAlive = $this->isAlive(); $wasAlive = $this->isAlive();
parent::setHealth($amount); parent::setHealth($amount);

10
src/event/player/PlayerDeathEvent.php
View File

@ -98,17 +98,15 @@ class PlayerDeathEvent extends EntityDeathEvent{
if($e instanceof Player){ if($e instanceof Player){
return KnownTranslationFactory::death_attack_player($name, $e->getDisplayName()); return KnownTranslationFactory::death_attack_player($name, $e->getDisplayName());
}elseif($e instanceof Living){ }elseif($e instanceof Living){
return KnownTranslationFactory::death_attack_mob($name, $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName()); return KnownTranslationFactory::death_attack_mob($name, $e->getDisplayName());
} }
} }
break; break;
case EntityDamageEvent::CAUSE_PROJECTILE: case EntityDamageEvent::CAUSE_PROJECTILE:
if($deathCause instanceof EntityDamageByEntityEvent){ if($deathCause instanceof EntityDamageByEntityEvent){
$e = $deathCause->getDamager(); $e = $deathCause->getDamager();
if($e instanceof Player){ if($e instanceof Living){
return KnownTranslationFactory::death_attack_arrow($name, $e->getDisplayName()); return KnownTranslationFactory::death_attack_arrow($name, $e->getDisplayName());
}elseif($e instanceof Living){
return KnownTranslationFactory::death_attack_arrow($name, $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName());
} }
} }
break; break;
@ -149,10 +147,8 @@ class PlayerDeathEvent extends EntityDeathEvent{
case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION: case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
if($deathCause instanceof EntityDamageByEntityEvent){ if($deathCause instanceof EntityDamageByEntityEvent){
$e = $deathCause->getDamager(); $e = $deathCause->getDamager();
if($e instanceof Player){ if($e instanceof Living){
return KnownTranslationFactory::death_attack_explosion_player($name, $e->getDisplayName()); return KnownTranslationFactory::death_attack_explosion_player($name, $e->getDisplayName());
}elseif($e instanceof Living){
return KnownTranslationFactory::death_attack_explosion_player($name, $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName());
} }
} }
return KnownTranslationFactory::death_attack_explosion($name); return KnownTranslationFactory::death_attack_explosion($name);