From ca22223b62ffa4cdc5a303ca5a0c4fbece471460 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 25 Mar 2019 14:55:25 +0000 Subject: [PATCH] PlayerDeathEvent: fixed constructor signature, closes #2835 can we ban multi-type parameters already? this is tiresome... --- src/pocketmine/Player.php | 2 +- src/pocketmine/event/player/PlayerDeathEvent.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 819274722..0146f5260 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2808,7 +2808,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener, //main inventory and drops the rest on the ground. $this->doCloseInventory(); - $ev = new PlayerDeathEvent($this, $this->getDrops(), $this->getXpDropAmount()); + $ev = new PlayerDeathEvent($this, $this->getDrops(), $this->getXpDropAmount(), null); $ev->call(); if(!$ev->getKeepInventory()){ diff --git a/src/pocketmine/event/player/PlayerDeathEvent.php b/src/pocketmine/event/player/PlayerDeathEvent.php index af2d22990..74f41cf37 100644 --- a/src/pocketmine/event/player/PlayerDeathEvent.php +++ b/src/pocketmine/event/player/PlayerDeathEvent.php @@ -45,10 +45,11 @@ class PlayerDeathEvent extends EntityDeathEvent{ /** * @param Player $entity * @param Item[] $drops + * @param int $xp * @param string|TextContainer|null $deathMessage Null will cause the default vanilla message to be used */ - public function __construct(Player $entity, array $drops, $deathMessage = null){ - parent::__construct($entity, $drops); + public function __construct(Player $entity, array $drops, int $xp, $deathMessage){ + parent::__construct($entity, $drops, $xp); $this->deathMessage = $deathMessage ?? self::deriveMessage($entity->getDisplayName(), $entity->getLastDamageCause()); }