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

Extract a DelegateInventory from EnderChestInventory

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-06-26 20:56:04 +01:00
parent 8cd7cc7c00
commit 9b30c2feda
2 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/block/inventory/EnderChestInventory.php
View File

@ -24,12 +24,9 @@ declare(strict_types=1);
namespace pocketmine\block\inventory;
use pocketmine\block\tile\EnderChest;
use pocketmine\inventory\BaseInventory;
use pocketmine\inventory\CallbackInventoryListener;
use pocketmine\inventory\DelegateInventory;
use pocketmine\inventory\Inventory;
use pocketmine\inventory\InventoryListener;
use pocketmine\inventory\PlayerEnderInventory;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\player\Player;
use pocketmine\world\Position;
@ -40,52 +37,23 @@ use pocketmine\world\sound\Sound;
/**
* EnderChestInventory is not a real inventory; it's just a gateway to the player's ender inventory.
*/
class EnderChestInventory extends BaseInventory implements BlockInventory{
class EnderChestInventory extends DelegateInventory implements BlockInventory{
use AnimatedBlockInventoryTrait {
onClose as animatedBlockInventoryTrait_onClose;
}
private PlayerEnderInventory $inventory;
private InventoryListener $inventoryListener;
public function __construct(Position $holder, PlayerEnderInventory $inventory){
parent::__construct();
parent::__construct($inventory);
$this->holder = $holder;
$this->inventory = $inventory;
$this->inventory->getListeners()->add($this->inventoryListener = new CallbackInventoryListener(
function(Inventory $unused, int $slot, Item $oldItem) : void{
$this->onSlotChange($slot, $oldItem);
},
function(Inventory $unused, array $oldContents) : void{
$this->onContentChange($oldContents);
}
));
}
public function getEnderInventory() : PlayerEnderInventory{
return $this->inventory;
}
public function getSize() : int{
return $this->inventory->getSize();
}
public function getItem(int $index) : Item{
return $this->inventory->getItem($index);
}
protected function internalSetItem(int $index, Item $item) : void{
$this->inventory->setItem($index, $item);
}
public function getContents(bool $includeEmpty = false) : array{
return $this->inventory->getContents($includeEmpty);
}
protected function internalSetContents(array $items) : void{
$this->inventory->setContents($items);
}
public function getViewerCount() : int{
$enderChest = $this->getHolder()->getWorld()->getTile($this->getHolder());
if(!$enderChest instanceof EnderChest){
@ -115,9 +83,5 @@ class EnderChestInventory extends BaseInventory implements BlockInventory{
if($enderChest instanceof EnderChest){
$enderChest->setViewerCount($enderChest->getViewerCount() - 1);
}
if($who === $this->inventory->getHolder()){
$this->inventory->getListeners()->remove($this->inventoryListener);
$this->inventoryListener = CallbackInventoryListener::onAnyChange(static function() : void{}); //break cyclic reference
}
}
}