From 517f9a3c3acfa20b5a68dc7e67edb02d80f6e74f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 18 Mar 2020 12:51:05 +0000 Subject: [PATCH] Player: fix weapons not taking damage from attacks (bug introduced by #3348) --- src/pocketmine/Player.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 1dca005b5..2b5043100 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2535,6 +2535,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $cancelled = false; $heldItem = $this->inventory->getItemInHand(); + $oldItem = clone $heldItem; if(!$this->canInteract($target, 8)){ $cancelled = true; @@ -2594,7 +2595,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ if($this->isAlive()){ //reactive damage like thorns might cause us to be killed by attacking another mob, which //would mean we'd already have dropped the inventory by the time we reached here - if($heldItem->onAttackEntity($target) and $this->isSurvival() and $heldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival + if($heldItem->onAttackEntity($target) and $this->isSurvival() and $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival $this->inventory->setItemInHand($heldItem); }