1.21.50 changes

NetherGamesMC · Dec 3, 2024 · a863f27 · a863f27
1 parent 48d512e
commit a863f27
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/src/CameraAimAssistPacket.php b/src/CameraAimAssistPacket.php
@@ -52,15 +52,19 @@ public function getTargetMode() : CameraAimAssistTargetMode{ return $this->targe
 	public function getActionType() : CameraAimAssistActionType{ return $this->actionType; }
 
 	protected function decodePayload(PacketSerializer $in) : void{
-		$this->presetId = $in->getString();
+		if($in->getProtocolId() >= ProtocolInfo::PROTOCOL_1_21_50){
+			$this->presetId = $in->getString();
+		}
 		$this->viewAngle = $in->getVector2();
 		$this->distance = $in->getLFloat();
 		$this->targetMode = CameraAimAssistTargetMode::fromPacket($in->getByte());
 		$this->actionType = CameraAimAssistActionType::fromPacket($in->getByte());
 	}
 
 	protected function encodePayload(PacketSerializer $out) : void{
-		$out->putString($this->presetId);
+		if($out->getProtocolId() >= ProtocolInfo::PROTOCOL_1_21_50){
+			$out->putString($this->presetId);
+		}
 		$out->putVector2($this->viewAngle);
 		$out->putLFloat($this->distance);
 		$out->putByte($this->targetMode->value);

diff --git a/src/serializer/BitSet.php b/src/serializer/BitSet.php
@@ -113,9 +113,13 @@ public static function read(PacketSerializer $in, int $length) : self{
 		return new self($length, array_slice($result, 0, self::getExpectedPartsCount($length)));
 	}
 
-	public function write(PacketSerializer $out) : void{
+	public function write(PacketSerializer $out, int $length = null) : void{
 		$parts = $this->parts;
-		$length = $this->length;
+		$length ??= $this->length;
+
+		if($length > $this->length){
+			throw new \InvalidArgumentException("Cannot write more bits than the BitSet contains");
+		}
 
 		$currentIndex = 0;
 		$currentShift = 0;

diff --git a/src/types/inventory/stackresponse/ItemStackResponseSlotInfo.php b/src/types/inventory/stackresponse/ItemStackResponseSlotInfo.php
@@ -14,6 +14,7 @@
 
 namespace pocketmine\network\mcpe\protocol\types\inventory\stackresponse;
 
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 
 final class ItemStackResponseSlotInfo{
@@ -47,9 +48,11 @@ public static function read(PacketSerializer $in) : self{
 		$count = $in->getByte();
 		$itemStackId = $in->readServerItemStackId();
 		$customName = $in->getString();
-		$filteredCustomName = $in->getString();
+		if($in->getProtocolId() >= ProtocolInfo::PROTOCOL_1_21_50){
+			$filteredCustomName = $in->getString();
+		}
 		$durabilityCorrection = $in->getVarInt();
-		return new self($slot, $hotbarSlot, $count, $itemStackId, $customName, $filteredCustomName, $durabilityCorrection);
+		return new self($slot, $hotbarSlot, $count, $itemStackId, $customName, $filteredCustomName ?? $customName, $durabilityCorrection);
 	}
 
 	public function write(PacketSerializer $out) : void{
@@ -58,7 +61,9 @@ public function write(PacketSerializer $out) : void{
 		$out->putByte($this->count);
 		$out->writeServerItemStackId($this->itemStackId);
 		$out->putString($this->customName);
-		$out->putString($this->filteredCustomName);
+		if($out->getProtocolId() >= ProtocolInfo::PROTOCOL_1_21_50){
+			$out->putString($this->filteredCustomName);
+		}
 		$out->putVarInt($this->durabilityCorrection);
 	}
 }
diff --git a/tests/phpunit/BitSetTest.php b/tests/phpunit/BitSetTest.php
@@ -28,10 +28,10 @@ public function testBitSet() : void{
 		$writeTest->set(0, true);
 		$writeTest->set(64, true);
 
-		$packetSerializer = PacketSerializer::encoder();
+		$packetSerializer = PacketSerializer::encoder(ProtocolInfo::CURRENT_PROTOCOL);
 		$writeTest->write($packetSerializer);
 
-		$packetSerializer = PacketSerializer::decoder($packetSerializer->getBuffer(), 0);
+		$packetSerializer = PacketSerializer::decoder(ProtocolInfo::CURRENT_PROTOCOL, $packetSerializer->getBuffer(), 0);
 		$readTest = BitSet::read($packetSerializer, 65);
 
 		assertTrue($this->setsEqual($writeTest, $readTest));
@@ -43,10 +43,10 @@ public function testBitSetConstructor() : void{
 
 		$test2->set(64, true);
 
-		$packetSerializer = PacketSerializer::encoder();
+		$packetSerializer = PacketSerializer::encoder(ProtocolInfo::CURRENT_PROTOCOL);
 		$test->write($packetSerializer);
 
-		$packetSerializer2 = PacketSerializer::encoder();
+		$packetSerializer2 = PacketSerializer::encoder(ProtocolInfo::CURRENT_PROTOCOL);
 		$test2->write($packetSerializer2);
 
 		self::assertEquals($packetSerializer->getBuffer(), $packetSerializer2->getBuffer());
@@ -56,20 +56,20 @@ public function testBitSetParts() : void{
 		$writeTest = new BitSet(128);
 		$writeTest->set(127, true);
 
-		$packetSerializer = PacketSerializer::encoder();
+		$packetSerializer = PacketSerializer::encoder(ProtocolInfo::CURRENT_PROTOCOL);
 		$writeTest->write($packetSerializer);
 
-		$packetSerializer = PacketSerializer::decoder($packetSerializer->getBuffer(), 0);
+		$packetSerializer = PacketSerializer::decoder(ProtocolInfo::CURRENT_PROTOCOL, $packetSerializer->getBuffer(), 0);
 		$readTest = BitSet::read($packetSerializer, 128);
 
 		assertTrue($this->setsEqual($writeTest, $readTest));
 	}
 
 	public function testVarUnsignedLongCompatibility() : void{
-		$packetSerializer = PacketSerializer::encoder();
+		$packetSerializer = PacketSerializer::encoder(ProtocolInfo::CURRENT_PROTOCOL);
 		$packetSerializer->putUnsignedVarLong(0 | 1 << 63);
 
-		$packetSerializer = PacketSerializer::decoder($packetSerializer->getBuffer(), 0);
+		$packetSerializer = PacketSerializer::decoder(ProtocolInfo::CURRENT_PROTOCOL, $packetSerializer->getBuffer(), 0);
 		$readTest = BitSet::read($packetSerializer, 64);
 
 		$expectedResult = new BitSet(64);