mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-23 03:16:35 +00:00
Picked up items can now be added to offhand slots. (#4360)
This commit is contained in:
parent
cd9af7f9f6
commit
1ce9474fce
@ -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){
|
||||||
|
@ -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){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user