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

Picked up items can now be added to offhand slots. (#4360)

Browse Source
This commit is contained in:
Rush2929 2021-08-23 04:36:12 +09:00 committed by GitHub
parent cd9af7f9f6
commit 1ce9474fce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/entity/object/ItemEntity.php
View File

@ -226,10 +226,11 @@ class ItemEntity extends Entity{
} }
$item = $this->getItem(); $item = $this->getItem();
$playerInventory = $player->getInventory(); $playerInventory = match(true){
if(!$playerInventory->canAddItem($item)){ $player->getOffHandInventory()->getItem(0)->canStackWith($item) => $player->getOffHandInventory(),
$playerInventory = null; $player->getInventory()->canAddItem($item) => $player->getInventory(),
} default => null
};
$ev = new EntityItemPickupEvent($player, $this, $item, $playerInventory); $ev = new EntityItemPickupEvent($player, $this, $item, $playerInventory);
if($player->hasFiniteResources() and $playerInventory === null){ if($player->hasFiniteResources() and $playerInventory === null){

9
src/entity/projectile/Arrow.php
View File

@ -174,10 +174,11 @@ class Arrow extends Projectile{
} }
$item = VanillaItems::ARROW(); $item = VanillaItems::ARROW();
$playerInventory = $player->getInventory(); $playerInventory = match(true){
if(!$playerInventory->canAddItem($item)){ $player->getOffHandInventory()->getItem(0)->canStackWith($item) => $player->getOffHandInventory(),
$playerInventory = null; $player->getInventory()->canAddItem($item) => $player->getInventory(),
} default => null
};
$ev = new EntityItemPickupEvent($player, $this, $item, $playerInventory); $ev = new EntityItemPickupEvent($player, $this, $item, $playerInventory);
if($player->hasFiniteResources() and $playerInventory === null){ if($player->hasFiniteResources() and $playerInventory === null){