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

Human: make held item sync on inventory content change more consistent

Browse Source 
before this change, setContents() wouldn't trigger a held item sync, nor would setItem(heldItemIndex, someItem).
This commit is contained in:
Dylan K. Taylor
2021-01-10 20:30:39 +00:00
parent c4845ab6b1
commit 01c867b608
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/entity/Human.php
View File

@ -30,6 +30,8 @@ use pocketmine\entity\effect\VanillaEffects;
use pocketmine\entity\projectile\ProjectileSource; use pocketmine\entity\projectile\ProjectileSource;
use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\player\PlayerExhaustEvent; use pocketmine\event\player\PlayerExhaustEvent;
use pocketmine\inventory\CallbackInventoryListener;
use pocketmine\inventory\Inventory;
use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\InventoryHolder;
use pocketmine\inventory\PlayerInventory; use pocketmine\inventory\PlayerInventory;
use pocketmine\item\enchantment\VanillaEnchantments; use pocketmine\item\enchantment\VanillaEnchantments;
@ -56,6 +58,7 @@ use pocketmine\utils\Limits;
use pocketmine\uuid\UUID; use pocketmine\uuid\UUID;
use pocketmine\world\sound\TotemUseSound; use pocketmine\world\sound\TotemUseSound;
use function array_filter; use function array_filter;
use function array_key_exists;
use function array_merge; use function array_merge;
use function array_values; use function array_values;
use function min; use function min;
@ -210,6 +213,23 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
$this->xpManager = new ExperienceManager($this); $this->xpManager = new ExperienceManager($this);
$this->inventory = new PlayerInventory($this); $this->inventory = new PlayerInventory($this);
$syncHeldItem = function() : void{
foreach($this->getViewers() as $viewer){
$viewer->getNetworkSession()->onMobEquipmentChange($this);
}
};
$this->inventory->getListeners()->add(new CallbackInventoryListener(
function(Inventory $unused, int $slot, Item $unused2) use ($syncHeldItem) : void{
if($slot === $this->inventory->getHeldItemIndex()){
$syncHeldItem();
}
},
function(Inventory $unused, array $oldItems) use ($syncHeldItem) : void{
if(array_key_exists($this->inventory->getHeldItemIndex(), $oldItems)){
$syncHeldItem();
}
}
));
$this->enderChestInventory = new EnderChestInventory(); $this->enderChestInventory = new EnderChestInventory();
$this->initHumanData($nbt); $this->initHumanData($nbt);
@ -217,6 +237,8 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
if($inventoryTag !== null){ if($inventoryTag !== null){
$armorListeners = $this->armorInventory->getListeners()->toArray(); $armorListeners = $this->armorInventory->getListeners()->toArray();
$this->armorInventory->getListeners()->clear(); $this->armorInventory->getListeners()->clear();
$inventoryListeners = $this->inventory->getListeners()->toArray();
$this->inventory->getListeners()->clear();
/** @var CompoundTag $item */ /** @var CompoundTag $item */
foreach($inventoryTag as $i => $item){ foreach($inventoryTag as $i => $item){
@ -231,6 +253,7 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
} }
$this->armorInventory->getListeners()->add(...$armorListeners); $this->armorInventory->getListeners()->add(...$armorListeners);
$this->inventory->getListeners()->add(...$inventoryListeners);
} }
$enderChestInventoryTag = $nbt->getListTag("EnderChestInventory"); $enderChestInventoryTag = $nbt->getListTag("EnderChestInventory");

3
src/inventory/PlayerInventory.php
View File

@ -104,9 +104,6 @@ class PlayerInventory extends BaseInventory{
*/ */
public function setItemInHand(Item $item) : void{ public function setItemInHand(Item $item) : void{
$this->setItem($this->getHeldItemIndex(), $item); $this->setItem($this->getHeldItemIndex(), $item);
foreach($this->holder->getViewers() as $viewer){
$viewer->getNetworkSession()->onMobEquipmentChange($this->holder);
}
} }
/** /**