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

Player: avoid doing some post-melee attack actions if attacking killed the attacker

Browse Source 
This can happen when an attacker attacks a victim wearing thorns armour while having low health, which prior to this commit would cause the tool to be duplicated.
This commit is contained in:
Dylan K. Taylor 2018-06-22 17:17:40 +01:00
parent a5a236084f
commit 6c6630d845
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/Player.php
View File

@ -2529,11 +2529,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
} }
if($heldItem->onAttackEntity($target) and $this->isSurvival()){ //always fire the hook, even if we are survival if($this->isAlive()){
$this->inventory->setItemInHand($heldItem); //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()){ //always fire the hook, even if we are survival
$this->inventory->setItemInHand($heldItem);
}
$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK); $this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
}
return true; return true;
default: default: