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

Fixed implicit dependency on MobArmorEquipmentPacket field ordering

Browse Source 
the order of the slots is entirely dependent on Mojang whims, so we shouldn't let our internals rely on it.
This commit is contained in:
Dylan K. Taylor
2019-06-04 18:16:56 +01:00
parent 341c480e13
commit 80f8a27094
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,11 +94,12 @@ class ArmorInventory extends BaseInventory{
$target = [$target];
}
$armor = $this->getContents(true);
$pk = new MobArmorEquipmentPacket();
$pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $armor;
$pk->head = $this->getHelmet();
$pk->chest = $this->getChestplate();
$pk->legs = $this->getLeggings();
$pk->feet = $this->getBoots();
$pk->encode();
foreach($target as $player){
@ -121,18 +122,19 @@ class ArmorInventory extends BaseInventory{
$target = [$target];
}
$armor = $this->getContents(true);
$pk = new MobArmorEquipmentPacket();
$pk->entityRuntimeId = $this->getHolder()->getId();
$pk->slots = $armor;
$pk->head = $this->getHelmet();
$pk->chest = $this->getChestplate();
$pk->legs = $this->getLeggings();
$pk->feet = $this->getBoots();
$pk->encode();
foreach($target as $player){
if($player === $this->getHolder()){
$pk2 = new InventoryContentPacket();
$pk2->windowId = $player->getWindowId($this);
$pk2->items = $armor;
$pk2->items = $this->getContents(true);
$player->dataPacket($pk2);
}else{
$player->dataPacket($pk);

27
src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php
View File

@ -34,21 +34,32 @@ class MobArmorEquipmentPacket extends DataPacket{
/** @var int */
public $entityRuntimeId;
/** @var Item[] */
public $slots = [];
//this intentionally doesn't use an array because we don't want any implicit dependencies on internal order
/** @var Item */
public $head;
/** @var Item */
public $chest;
/** @var Item */
public $legs;
/** @var Item */
public $feet;
protected function decodePayload(){
$this->entityRuntimeId = $this->getEntityRuntimeId();
for($i = 0; $i < 4; ++$i){
$this->slots[$i] = $this->getSlot();
}
$this->head = $this->getSlot();
$this->chest = $this->getSlot();
$this->legs = $this->getSlot();
$this->feet = $this->getSlot();
}
protected function encodePayload(){
$this->putEntityRuntimeId($this->entityRuntimeId);
for($i = 0; $i < 4; ++$i){
$this->putSlot($this->slots[$i]);
}
$this->putSlot($this->head);
$this->putSlot($this->chest);
$this->putSlot($this->legs);
$this->putSlot($this->feet);
}
public function handle(NetworkSession $session) : bool{