mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 05:40:01 +00:00
Code Issues Projects Releases Wiki Activity

PacketBatch is now immutable

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-07-22 15:37:06 +01:00
parent 798efc370c
commit 8402465fd2
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/network/mcpe/protocol/serializer/PacketBatch.php
View File

@ -30,18 +30,11 @@ use pocketmine\utils\BinaryDataException;
class PacketBatch{
/** @var PacketSerializer */
private $serializer;
/** @var string */
private $buffer;
public function __construct(?string $buffer = null){
$this->serializer = new PacketSerializer($buffer ?? "");
}
/**
* @throws BinaryDataException
*/
public function getPacket(PacketPool $packetPool) : Packet{
return $packetPool->getPacket($this->serializer->getString());
public function __construct(string $buffer){
$this->buffer = $buffer;
}
/**
@ -49,10 +42,11 @@ class PacketBatch{
* @phpstan-return \Generator<int, Packet, void, void>
*/
public function getPackets(PacketPool $packetPool, int $max) : \Generator{
for($c = 0; $c < $max and !$this->serializer->feof(); ++$c){
yield $c => $packetPool->getPacket($this->serializer->getString());
$serializer = new PacketSerializer($this->buffer);
for($c = 0; $c < $max and !$serializer->feof(); ++$c){
yield $c => $packetPool->getPacket($serializer->getString());
}
if(!$this->serializer->feof()){
if(!$serializer->feof()){
throw new PacketDecodeException("Reached limit of $max packets in a single batch");
}
}
@ -65,19 +59,15 @@ class PacketBatch{
* @return PacketBatch
*/
public static function fromPackets(Packet ...$packets) : self{
$result = new self();
$serializer = new PacketSerializer();
foreach($packets as $packet){
$packet->encode();
$result->serializer->putString($packet->getSerializer()->getBuffer());
$serializer->putString($packet->getSerializer()->getBuffer());
}
return $result;
return new self($serializer->getBuffer());
}
public function getBuffer() : string{
return $this->serializer->getBuffer();
}
public function feof() : bool{
return $this->serializer->feof();
return $this->buffer;
}
}