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

Clean up handling of armour sync

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-05-19 16:56:10 +01:00
parent cd103cefcc
commit bca0833035
3 changed files with 17 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/pocketmine/inventory/ArmorInventory.php
View File

@ -25,10 +25,6 @@ namespace pocketmine\inventory;
use pocketmine\entity\Living;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\Player;
use function array_merge;
use function array_search;
class ArmorInventory extends BaseInventory{
public const SLOT_HEAD = 0;
@ -79,51 +75,4 @@ class ArmorInventory extends BaseInventory{
public function setBoots(Item $boots) : bool{
return $this->setItem(self::SLOT_FEET, $boots);
}
public function sendSlot(int $index, $target) : void{
if($target instanceof Player){
$target = [$target];
}
/** @var Player[] $target */
if(($k = array_search($this->holder, $target, true)) !== false){
$target[$k]->getNetworkSession()->syncInventorySlot($this, $index);
unset($target[$k]);
}
if(!empty($target)){
//TODO: this should be handled by change listeners
$pk = new MobArmorEquipmentPacket();
$pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $this->getContents(true);
$this->holder->getWorld()->getServer()->broadcastPacket($target, $pk);
}
}
public function sendContents($target) : void{
if($target instanceof Player){
$target = [$target];
}
$armor = $this->getContents(true);
if(($k = array_search($this->holder, $target, true)) !== false){
$target[$k]->getNetworkSession()->syncInventoryContents($this);
unset($target[$k]);
}
if(!empty($target)){
//TODO: this should be handled by change listeners
$pk = new MobArmorEquipmentPacket();
$pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $armor;
$this->holder->getWorld()->getServer()->broadcastPacket($target, $pk);
}
}
/**
* @return Player[]
*/
public function getViewers() : array{
return array_merge(parent::getViewers(), $this->holder->getViewers());
}
}