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

17
src/network/mcpe/protocol/ActorEventPacket.php
View File

@@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h>
use pocketmine\network\mcpe\handler\PacketHandler;
use pocketmine\network\mcpe\serializer\NetworkBinaryStream;
class ActorEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
public const NETWORK_ID = ProtocolInfo::ACTOR_EVENT_PACKET;
@@ -97,16 +98,16 @@ class ActorEventPacket extends DataPacket implements ClientboundPacket, Serverbo
return $result;
}
protected function decodePayload() : void{
$this->entityRuntimeId = $this->buf->getEntityRuntimeId();
$this->event = $this->buf->getByte();
$this->data = $this->buf->getVarInt();
protected function decodePayload(NetworkBinaryStream $in) : void{
$this->entityRuntimeId = $in->getEntityRuntimeId();
$this->event = $in->getByte();
$this->data = $in->getVarInt();
}
protected function encodePayload() : void{
$this->buf->putEntityRuntimeId($this->entityRuntimeId);
$this->buf->putByte($this->event);
$this->buf->putVarInt($this->data);
protected function encodePayload(NetworkBinaryStream $out) : void{
$out->putEntityRuntimeId($this->entityRuntimeId);
$out->putByte($this->event);
$out->putVarInt($this->data);
}
public function handle(PacketHandler $handler) : bool{