mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 04:00:29 +00:00
Code Issues Projects Releases Wiki Activity

Inventory: reduce API duplication by using a Set for viewers

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-05-14 14:13:28 +01:00
parent 3dafee6aa6
commit 4437756987
8 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entity/Human.php
View File

@@ -221,8 +221,8 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
$inventoryTag = $nbt->getListTag("Inventory");
if($inventoryTag !== null){
$armorListeners = $this->armorInventory->getListeners();
$this->armorInventory->removeListeners(...$armorListeners);
$armorListeners = $this->armorInventory->getListeners()->toArray();
$this->armorInventory->getListeners()->clear();
/** @var CompoundTag $item */
foreach($inventoryTag as $i => $item){
@@ -236,7 +236,7 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
}
}
$this->armorInventory->addListeners(...$armorListeners);
$this->armorInventory->getListeners()->add(...$armorListeners);
}
$enderChestInventoryTag = $nbt->getListTag("EnderChestInventory");

2
src/entity/Living.php
View File

@@ -110,7 +110,7 @@ abstract class Living extends Entity{
$this->armorInventory = new ArmorInventory($this);
//TODO: load/save armor inventory contents
$this->armorInventory->addListeners(CallbackInventoryListener::onAnyChange(
$this->armorInventory->getListeners()->add(CallbackInventoryListener::onAnyChange(
function(Inventory $unused) : void{
foreach($this->getViewers() as $viewer){
$viewer->getNetworkSession()->onMobArmorChange($this);