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

Fixed armor not dropping (#1962)

Browse Source
This commit is contained in:
Muqsit 2018-01-25 00:01:32 +04:00 committed by Dylan K. Taylor
parent 4a4900e5e7
commit 6c71b443e8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Player.php
View File

@ -3549,6 +3549,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->inventory->setHeldItemIndex(0, false); //This is already handled when sending contents, don't send it twice $this->inventory->setHeldItemIndex(0, false); //This is already handled when sending contents, don't send it twice
$this->inventory->clearAll(); $this->inventory->clearAll();
} }
if($this->armorInventory !== null){
$this->armorInventory->clearAll();
}
} }
if($ev->getDeathMessage() != ""){ if($ev->getDeathMessage() != ""){

5
src/pocketmine/entity/Human.php
View File

@ -613,7 +613,10 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
} }
public function getDrops() : array{ public function getDrops() : array{
return $this->inventory !== null ? array_values($this->inventory->getContents()) : []; return array_merge(
$this->inventory !== null ? array_values($this->inventory->getContents()) : [],
$this->armorInventory !== null ? array_values($this->armorInventory->getContents()) : []
);
} }
public function saveNBT(){ public function saveNBT(){