mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

DataPacket: inject buffer via parameter instead of class field (packet & stream separation, step 2)

Browse Source 
this is not complete yet, but the final change (having the binarystream actually come from outside) is a little more disruptive, and some extra changes need to be made. This will grant some sanity in the meantime without breaking too much stuff.
This commit is contained in:
Dylan K. Taylor
2020-02-25 16:19:11 +00:00
parent a633e415ef
commit 5c2ae0257c
145 changed files with 1704 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/network/mcpe/protocol/AdventureSettingsPacket.php
View File

@@ -27,6 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\network\mcpe\handler\PacketHandler;
use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
use pocketmine\network\mcpe\serializer\NetworkBinaryStream;
class AdventureSettingsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
public const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET;
@@ -75,22 +76,22 @@ class AdventureSettingsPacket extends DataPacket implements ClientboundPacket, S
/** @var int */
public $entityUniqueId; //This is a little-endian long, NOT a var-long. (WTF Mojang)
protected function decodePayload() : void{
$this->flags = $this->buf->getUnsignedVarInt();
$this->commandPermission = $this->buf->getUnsignedVarInt();
$this->flags2 = $this->buf->getUnsignedVarInt();
$this->playerPermission = $this->buf->getUnsignedVarInt();
$this->customFlags = $this->buf->getUnsignedVarInt();
$this->entityUniqueId = $this->buf->getLLong();
protected function decodePayload(NetworkBinaryStream $in) : void{
$this->flags = $in->getUnsignedVarInt();
$this->commandPermission = $in->getUnsignedVarInt();
$this->flags2 = $in->getUnsignedVarInt();
$this->playerPermission = $in->getUnsignedVarInt();
$this->customFlags = $in->getUnsignedVarInt();
$this->entityUniqueId = $in->getLLong();
}
protected function encodePayload() : void{
$this->buf->putUnsignedVarInt($this->flags);
$this->buf->putUnsignedVarInt($this->commandPermission);
$this->buf->putUnsignedVarInt($this->flags2);
$this->buf->putUnsignedVarInt($this->playerPermission);
$this->buf->putUnsignedVarInt($this->customFlags);
$this->buf->putLLong($this->entityUniqueId);
protected function encodePayload(NetworkBinaryStream $out) : void{
$out->putUnsignedVarInt($this->flags);
$out->putUnsignedVarInt($this->commandPermission);
$out->putUnsignedVarInt($this->flags2);
$out->putUnsignedVarInt($this->playerPermission);
$out->putUnsignedVarInt($this->customFlags);
$out->putLLong($this->entityUniqueId);
}
public function getFlag(int $flag) : bool{