Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AkmalFairuz committed Sep 20, 2024
1 parent 6128c9d commit 57d25ab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/InventoryContentPacket.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ protected function decodePayload(PacketSerializer $in) : void{
$this->containerName = FullContainerName::read($in);
$this->dynamicContainerSize = $in->getUnsignedVarInt();
}else {
$dynamicContainerId = $in->getUnsignedVarInt();
$this->containerName = new FullContainerName(0, $dynamicContainerId);
$in->getUnsignedVarInt(); // ignore
$this->containerName = new FullContainerName(0);
}
}
}
Expand All @@ -69,7 +69,7 @@ protected function encodePayload(PacketSerializer $out) : void{
$this->containerName->write($out);
$out->putUnsignedVarInt($this->dynamicContainerSize);
}else{
$out->putUnsignedVarInt($this->containerName->getDynamicId());
$out->putUnsignedVarInt(0);
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/InventorySlotPacket.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ protected function decodePayload(PacketSerializer $in) : void{
$this->containerName = FullContainerName::read($in);
$this->dynamicContainerSize = $in->getUnsignedVarInt();
}else{
$this->containerName = new FullContainerName(0, $in->getUnsignedVarInt());
$in->getUnsignedVarInt(); // ignore
$this->containerName = new FullContainerName(0);
}
}
$this->item = ItemStackWrapper::read($in);
Expand All @@ -62,7 +63,7 @@ protected function encodePayload(PacketSerializer $out) : void{
$this->containerName->write($out);
$out->putUnsignedVarInt($this->dynamicContainerSize);
}else{
$out->putUnsignedVarInt($this->containerName->getDynamicId());
$out->putUnsignedVarInt(0);
}
}
$this->item->write($out);
Expand Down
10 changes: 8 additions & 2 deletions src/types/inventory/FullContainerName.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

namespace pocketmine\network\mcpe\protocol\types\inventory;

use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;

final class FullContainerName{
Expand All @@ -28,12 +29,17 @@ public function getDynamicId() : ?int{ return $this->dynamicId; }

public static function read(PacketSerializer $in) : self{
$containerId = $in->getByte();
$dynamicId = $in->readOptional($in->getLInt(...));
$dynamicId = $in->getProtocol() >= ProtocolInfo::PROTOCOL_729 ?
$in->readOptional($in->getLInt(...)) : $in->getLInt();
return new self($containerId, $dynamicId);
}

public function write(PacketSerializer $out) : void{
$out->putByte($this->containerId);
$out->writeOptional($this->dynamicId, $out->putLInt(...));
if($out->getProtocol() >= ProtocolInfo::PROTOCOL_729) {
$out->writeOptional($this->dynamicId, $out->putLInt(...));
}else{
$out->putLInt($this->dynamicId);
}
}
}

0 comments on commit 57d25ab

Please sign in to comment.