Merge branch 'minor-next' into major-next

This commit is contained in:
Dylan K. Taylor
2023-05-30 16:15:56 +01:00
13 changed files with 391 additions and 483 deletions

View File

@ -39,6 +39,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
protected Player $player;
private Translatable|string $deathMessage;
private Translatable|string $deathScreenMessage;
private bool $keepInventory = false;
private bool $keepXp = false;
@ -50,6 +51,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
parent::__construct($entity, $drops, $xp);
$this->player = $entity;
$this->deathMessage = $deathMessage ?? self::deriveMessage($entity->getDisplayName(), $entity->getLastDamageCause());
$this->deathScreenMessage = $this->deathMessage;
}
/**
@ -71,6 +73,14 @@ class PlayerDeathEvent extends EntityDeathEvent{
$this->deathMessage = $deathMessage;
}
public function getDeathScreenMessage() : Translatable|string{
return $this->deathScreenMessage;
}
public function setDeathScreenMessage(Translatable|string $deathScreenMessage) : void{
$this->deathScreenMessage = $deathScreenMessage;
}
public function getKeepInventory() : bool{
return $this->keepInventory;
}