Backward compatible

VenityNetwork · Aug 15, 2024 · ea8a2ec · ea8a2ec
1 parent 9687bbb
commit ea8a2ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/InventoryContentPacket.php b/src/InventoryContentPacket.php
@@ -30,7 +30,7 @@ class InventoryContentPacket extends DataPacket implements ClientboundPacket{
 	 * @generate-create-func
 	 * @param ItemStackWrapper[] $items
 	 */
-	public static function create(int $windowId, array $items, int $dynamicContainerId) : self{
+	public static function create(int $windowId, array $items, int $dynamicContainerId = 0) : self{
 		$result = new self;
 		$result->windowId = $windowId;
 		$result->items = $items;

diff --git a/src/MobArmorEquipmentPacket.php b/src/MobArmorEquipmentPacket.php
@@ -15,6 +15,7 @@
 namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 
 class MobArmorEquipmentPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
@@ -27,12 +28,12 @@ class MobArmorEquipmentPacket extends DataPacket implements ClientboundPacket, S
 	public ItemStackWrapper $chest;
 	public ItemStackWrapper $legs;
 	public ItemStackWrapper $feet;
-	public ItemStackWrapper $body;
+	public ?ItemStackWrapper $body;
 
 	/**
 	 * @generate-create-func
 	 */
-	public static function create(int $actorRuntimeId, ItemStackWrapper $head, ItemStackWrapper $chest, ItemStackWrapper $legs, ItemStackWrapper $feet, ItemStackWrapper $body) : self{
+	public static function create(int $actorRuntimeId, ItemStackWrapper $head, ItemStackWrapper $chest, ItemStackWrapper $legs, ItemStackWrapper $feet, ?ItemStackWrapper $body = null) : self{
 		$result = new self;
 		$result->actorRuntimeId = $actorRuntimeId;
 		$result->head = $head;
@@ -61,7 +62,11 @@ protected function encodePayload(PacketSerializer $out) : void{
 		$this->legs->write($out);
 		$this->feet->write($out);
 		if($out->getProtocol() >= ProtocolInfo::PROTOCOL_712){
-			$this->body->write($out);
+			if($this->body === null){
+				(new ItemStackWrapper(0, ItemStack::null()))->write($out);
+			}else{
+				$this->body->write($out);
+			}
 		}
 	}
 

diff --git a/src/types/inventory/ContainerUIIds.php b/src/types/inventory/ContainerUIIds.php
@@ -104,7 +104,7 @@ public static function write(PacketSerializer $out, int $containerId, bool $lega
 		$out->putByte($containerId);
 	}
 
-	public static function read(PacketSerializer $in, bool $legacy = false) : ?int{
+	public static function read(PacketSerializer $in, bool $legacy = false) : int{
 		if($in->getProtocol() >= ProtocolInfo::PROTOCOL_712 && !$legacy){
 			return FullContainerName::read($in)->getContainerId();
 		}