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

Rename Packet->getBinaryStream() -> Packet->getSerializer()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-17 11:33:59 +01:00
parent 6c096c44aa
commit 9c46a1f141
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/mcpe/NetworkSession.php
View File

@ -342,7 +342,7 @@ class NetworkSession{
try{ try{
$this->handleDataPacket($pk); $this->handleDataPacket($pk);
}catch(BadPacketException $e){ }catch(BadPacketException $e){
$this->logger->debug($pk->getName() . ": " . base64_encode($pk->getBinaryStream()->getBuffer())); $this->logger->debug($pk->getName() . ": " . base64_encode($pk->getSerializer()->getBuffer()));
throw BadPacketException::wrap($e, "Error processing " . $pk->getName()); throw BadPacketException::wrap($e, "Error processing " . $pk->getName());
} }
} }
@ -354,7 +354,7 @@ class NetworkSession{
public function handleDataPacket(Packet $packet) : void{ public function handleDataPacket(Packet $packet) : void{
if(!($packet instanceof ServerboundPacket)){ if(!($packet instanceof ServerboundPacket)){
if($packet instanceof GarbageServerboundPacket){ if($packet instanceof GarbageServerboundPacket){
$this->logger->debug("Garbage serverbound " . $packet->getName() . ": " . base64_encode($packet->getBinaryStream()->getBuffer())); $this->logger->debug("Garbage serverbound " . $packet->getName() . ": " . base64_encode($packet->getSerializer()->getBuffer()));
return; return;
} }
throw new BadPacketException("Unexpected non-serverbound packet"); throw new BadPacketException("Unexpected non-serverbound packet");
@ -369,7 +369,7 @@ class NetworkSession{
}catch(PacketDecodeException $e){ }catch(PacketDecodeException $e){
throw BadPacketException::wrap($e); throw BadPacketException::wrap($e);
} }
$stream = $packet->getBinaryStream(); $stream = $packet->getSerializer();
if(!$stream->feof()){ if(!$stream->feof()){
$remains = substr($stream->getBuffer(), $stream->getOffset()); $remains = substr($stream->getBuffer(), $stream->getOffset());
$this->logger->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": " . bin2hex($remains)); $this->logger->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": " . bin2hex($remains));

2
src/network/mcpe/protocol/DataPacket.php
View File

@ -51,7 +51,7 @@ abstract class DataPacket implements Packet{
$this->buf = new PacketSerializer(); $this->buf = new PacketSerializer();
} }
public function getBinaryStream() : PacketSerializer{ public function getSerializer() : PacketSerializer{
return $this->buf; return $this->buf;
} }

2
src/network/mcpe/protocol/Packet.php
View File

@ -27,7 +27,7 @@ use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
interface Packet{ interface Packet{
public function getBinaryStream() : PacketSerializer; public function getSerializer() : PacketSerializer;
public function pid() : int; public function pid() : int;

2
src/network/mcpe/protocol/PacketPool.php
View File

@ -201,7 +201,7 @@ class PacketPool{
public function getPacket(string $buffer) : Packet{ public function getPacket(string $buffer) : Packet{
$offset = 0; $offset = 0;
$pk = $this->getPacketById(Binary::readUnsignedVarInt($buffer, $offset) & DataPacket::PID_MASK); $pk = $this->getPacketById(Binary::readUnsignedVarInt($buffer, $offset) & DataPacket::PID_MASK);
$pk->getBinaryStream()->setBuffer($buffer, $offset); $pk->getSerializer()->setBuffer($buffer, $offset);
return $pk; return $pk;
} }

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

@ -30,22 +30,22 @@ use pocketmine\utils\BinaryDataException;
class PacketBatch{ class PacketBatch{
/** @var PacketSerializer */ /** @var PacketSerializer */
private $binaryStream; private $serializer;
public function __construct(?string $buffer = null){ public function __construct(?string $buffer = null){
$this->binaryStream = new PacketSerializer($buffer ?? ""); $this->serializer = new PacketSerializer($buffer ?? "");
} }
public function putPacket(Packet $packet) : void{ public function putPacket(Packet $packet) : void{
$packet->encode(); $packet->encode();
$this->binaryStream->putString($packet->getBinaryStream()->getBuffer()); $this->serializer->putString($packet->getSerializer()->getBuffer());
} }
/** /**
* @throws BinaryDataException * @throws BinaryDataException
*/ */
public function getPacket(PacketPool $packetPool) : Packet{ public function getPacket(PacketPool $packetPool) : Packet{
return $packetPool->getPacket($this->binaryStream->getString()); return $packetPool->getPacket($this->serializer->getString());
} }
/** /**
@ -64,10 +64,10 @@ class PacketBatch{
} }
public function getBuffer() : string{ public function getBuffer() : string{
return $this->binaryStream->getBuffer(); return $this->serializer->getBuffer();
} }
public function feof() : bool{ public function feof() : bool{
return $this->binaryStream->feof(); return $this->serializer->feof();
} }
} }

2
tests/phpunit/network/mcpe/protocol/DataPacketTest.php
View File

@ -34,7 +34,7 @@ class DataPacketTest extends TestCase{
$pk->encode(); $pk->encode();
$pk2 = new TestPacket(); $pk2 = new TestPacket();
$pk2->getBinaryStream()->setBuffer($pk->getBinaryStream()->getBuffer()); $pk2->getSerializer()->setBuffer($pk->getSerializer()->getBuffer());
$pk2->decode(); $pk2->decode();
self::assertSame($pk2->senderSubId, 3); self::assertSame($pk2->senderSubId, 3);
self::assertSame($pk2->recipientSubId, 2); self::assertSame($pk2->recipientSubId, 2);