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

Separate held item index change listener logic from PlayerInventory

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-01-12 16:44:25 +00:00
parent 01c867b608
commit c70c0b55df
5 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/inventory/PlayerInventory.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use Ds\Set;
use pocketmine\entity\Human;
use pocketmine\item\Item;
use pocketmine\player\Player;
@ -35,8 +36,15 @@ class PlayerInventory extends BaseInventory{
/** @var int */
protected $itemInHandIndex = 0;
/**
* @var \Closure[]|Set
* @phpstan-var Set<\Closure(int $oldIndex) : void>
*/
protected $heldItemIndexChangeListeners;
public function __construct(Human $player){
$this->holder = $player;
$this->heldItemIndexChangeListeners = new Set();
parent::__construct(36);
}
@ -73,25 +81,27 @@ class PlayerInventory extends BaseInventory{
/**
* Sets which hotbar slot the player is currently loading.
*
* @param int $hotbarSlot 0-8 index of the hotbar slot to hold
* @param bool $send Whether to send updates back to the inventory holder. This should usually be true for plugin calls.
* It should only be false to prevent feedback loops of equipment packets between client and server.
* @param int $hotbarSlot 0-8 index of the hotbar slot to hold
*
* @throws \InvalidArgumentException if the hotbar slot is out of range
*/
public function setHeldItemIndex(int $hotbarSlot, bool $send = true) : void{
public function setHeldItemIndex(int $hotbarSlot) : void{
$this->throwIfNotHotbarSlot($hotbarSlot);
$oldIndex = $this->itemInHandIndex;
$this->itemInHandIndex = $hotbarSlot;
if($this->holder instanceof Player and $send){
$this->holder->getNetworkSession()->getInvManager()->syncSelectedHotbarSlot();
}
foreach($this->holder->getViewers() as $viewer){
$viewer->getNetworkSession()->onMobEquipmentChange($this->holder);
foreach($this->heldItemIndexChangeListeners as $callback){
$callback($oldIndex);
}
}
/**
* @return \Closure[]|Set
* @phpstan-return Set<\Closure(int $oldIndex) : void>
*/
public function getHeldItemIndexChangeListeners() : Set{ return $this->heldItemIndexChangeListeners; }
/**
* Returns the currently-held item.
*/