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

Fixed armour equipment logic, close #3896

Browse Source 
this isn't perfect because the client expects to be the boss here and is also inconsistent.
This commit is contained in:
Dylan K. Taylor 2020-11-09 13:32:12 +00:00
parent 4e91009492
commit 3c6a64f91b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/item/Armor.php
View File

@ -123,10 +123,13 @@ class Armor extends Durable{
public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{ public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
$existing = $player->getArmorInventory()->getItem($this->getArmorSlot()); $existing = $player->getArmorInventory()->getItem($this->getArmorSlot());
if(!$existing->isNull()){
return ItemUseResult::FAIL();
}
$player->getArmorInventory()->setItem($this->getArmorSlot(), $this->pop()); $player->getArmorInventory()->setItem($this->getArmorSlot(), $this->pop());
if($this->getCount() === 0){
$player->getInventory()->setItemInHand($existing);
}else{ //if the stack size was bigger than 1 (usually won't happen, but might be caused by plugins
$player->getInventory()->setItemInHand($this);
$player->getInventory()->addItem($existing);
}
return ItemUseResult::SUCCESS(); return ItemUseResult::SUCCESS();
} }