From 7886918140af7f2d15461f89c0c20f4b904e7ad0 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 5 Aug 2017 11:40:14 +0100 Subject: [PATCH] Cleaned up some bad code in DataPacket, added encode/decodeHeader and made encode/decodePayload protected --- .../mcpe/protocol/AddBehaviorTreePacket.php | 4 +-- .../network/mcpe/protocol/AddEntityPacket.php | 4 +-- .../mcpe/protocol/AddHangingEntityPacket.php | 4 +-- .../mcpe/protocol/AddItemEntityPacket.php | 4 +-- .../mcpe/protocol/AddPaintingPacket.php | 4 +-- .../network/mcpe/protocol/AddPlayerPacket.php | 4 +-- .../mcpe/protocol/AdventureSettingsPacket.php | 4 +-- .../network/mcpe/protocol/AnimatePacket.php | 4 +-- .../mcpe/protocol/AvailableCommandsPacket.php | 4 +-- .../network/mcpe/protocol/BatchPacket.php | 25 ++++++---------- .../mcpe/protocol/BlockEntityDataPacket.php | 4 +-- .../mcpe/protocol/BlockEventPacket.php | 4 +-- .../mcpe/protocol/BlockPickRequestPacket.php | 4 +-- .../network/mcpe/protocol/BookEditPacket.php | 4 +-- .../network/mcpe/protocol/BossEventPacket.php | 4 +-- .../network/mcpe/protocol/CameraPacket.php | 4 +-- .../mcpe/protocol/ChangeDimensionPacket.php | 4 +-- .../protocol/ChunkRadiusUpdatedPacket.php | 4 +-- .../ClientToServerHandshakePacket.php | 4 +-- .../protocol/ClientboundMapItemDataPacket.php | 4 +-- .../protocol/CommandBlockUpdatePacket.php | 4 +-- .../mcpe/protocol/CommandOutputPacket.php | 4 +-- .../mcpe/protocol/CommandRequestPacket.php | 4 +-- .../mcpe/protocol/ContainerClosePacket.php | 4 +-- .../mcpe/protocol/ContainerOpenPacket.php | 4 +-- .../mcpe/protocol/ContainerSetDataPacket.php | 4 +-- .../mcpe/protocol/ContainerSetSlotPacket.php | 4 +-- .../mcpe/protocol/CraftingDataPacket.php | 4 +-- .../mcpe/protocol/CraftingEventPacket.php | 4 +-- .../network/mcpe/protocol/DataPacket.php | 29 +++++++++++++++---- .../mcpe/protocol/DisconnectPacket.php | 4 +-- .../network/mcpe/protocol/DropItemPacket.php | 4 +-- .../mcpe/protocol/EntityEventPacket.php | 4 +-- .../mcpe/protocol/EntityFallPacket.php | 4 +-- .../mcpe/protocol/EntityPickRequestPacket.php | 4 +-- .../network/mcpe/protocol/EventPacket.php | 4 +-- .../network/mcpe/protocol/ExplodePacket.php | 4 +-- .../mcpe/protocol/FullChunkDataPacket.php | 4 +-- .../mcpe/protocol/GameRulesChangedPacket.php | 4 +-- .../mcpe/protocol/GuiDataPickItemPacket.php | 4 +-- .../network/mcpe/protocol/HurtArmorPacket.php | 4 +-- .../network/mcpe/protocol/InteractPacket.php | 4 +-- .../mcpe/protocol/InventoryContentPacket.php | 4 +-- .../mcpe/protocol/InventorySlotPacket.php | 4 +-- .../protocol/InventoryTransactionPacket.php | 4 +-- .../mcpe/protocol/ItemFrameDropItemPacket.php | 4 +-- .../mcpe/protocol/LevelEventPacket.php | 4 +-- .../mcpe/protocol/LevelSoundEventPacket.php | 4 +-- .../network/mcpe/protocol/LoginPacket.php | 4 +-- .../mcpe/protocol/MapInfoRequestPacket.php | 4 +-- .../mcpe/protocol/MobArmorEquipmentPacket.php | 4 +-- .../network/mcpe/protocol/MobEffectPacket.php | 4 +-- .../mcpe/protocol/MobEquipmentPacket.php | 4 +-- .../mcpe/protocol/ModalFormRequestPacket.php | 4 +-- .../mcpe/protocol/ModalFormResponsePacket.php | 4 +-- .../mcpe/protocol/MoveEntityPacket.php | 4 +-- .../mcpe/protocol/MovePlayerPacket.php | 4 +-- .../mcpe/protocol/NpcRequestPacket.php | 4 +-- .../mcpe/protocol/PhotoTransferPacket.php | 4 +-- .../network/mcpe/protocol/PlaySoundPacket.php | 4 +-- .../mcpe/protocol/PlayStatusPacket.php | 4 +-- .../mcpe/protocol/PlayerActionPacket.php | 4 +-- .../mcpe/protocol/PlayerHotbarPacket.php | 4 +-- .../mcpe/protocol/PlayerInputPacket.php | 4 +-- .../mcpe/protocol/PlayerListPacket.php | 4 +-- .../mcpe/protocol/PlayerSkinPacket.php | 4 +-- .../mcpe/protocol/PurchaseReceiptPacket.php | 4 +-- .../mcpe/protocol/RemoveBlockPacket.php | 4 +-- .../mcpe/protocol/RemoveEntityPacket.php | 4 +-- .../protocol/RequestChunkRadiusPacket.php | 4 +-- .../protocol/ResourcePackChunkDataPacket.php | 4 +-- .../ResourcePackChunkRequestPacket.php | 4 +-- .../ResourcePackClientResponsePacket.php | 4 +-- .../protocol/ResourcePackDataInfoPacket.php | 4 +-- .../mcpe/protocol/ResourcePackStackPacket.php | 4 +-- .../mcpe/protocol/ResourcePacksInfoPacket.php | 4 +-- .../network/mcpe/protocol/RespawnPacket.php | 4 +-- .../network/mcpe/protocol/RiderJumpPacket.php | 4 +-- .../protocol/ServerSettingsRequestPacket.php | 4 +-- .../protocol/ServerSettingsResponsePacket.php | 4 +-- .../ServerToClientHandshakePacket.php | 4 +-- .../protocol/SetCommandsEnabledPacket.php | 4 +-- .../mcpe/protocol/SetDifficultyPacket.php | 4 +-- .../mcpe/protocol/SetEntityDataPacket.php | 4 +-- .../mcpe/protocol/SetEntityLinkPacket.php | 4 +-- .../mcpe/protocol/SetEntityMotionPacket.php | 4 +-- .../network/mcpe/protocol/SetHealthPacket.php | 4 +-- .../mcpe/protocol/SetLastHurtByPacket.php | 4 +-- .../mcpe/protocol/SetPlayerGameTypePacket.php | 4 +-- .../mcpe/protocol/SetSpawnPositionPacket.php | 4 +-- .../network/mcpe/protocol/SetTimePacket.php | 4 +-- .../network/mcpe/protocol/SetTitlePacket.php | 4 +-- .../mcpe/protocol/ShowCreditsPacket.php | 4 +-- .../mcpe/protocol/ShowProfilePacket.php | 4 +-- .../mcpe/protocol/ShowStoreOfferPacket.php | 4 +-- .../mcpe/protocol/SimpleEventPacket.php | 4 +-- .../protocol/SpawnExperienceOrbPacket.php | 4 +-- .../network/mcpe/protocol/StartGamePacket.php | 4 +-- .../network/mcpe/protocol/StopSoundPacket.php | 4 +-- .../protocol/StructureBlockUpdatePacket.php | 4 +-- .../mcpe/protocol/SubClientLoginPacket.php | 4 +-- .../mcpe/protocol/TakeItemEntityPacket.php | 4 +-- .../network/mcpe/protocol/TextPacket.php | 4 +-- .../network/mcpe/protocol/TransferPacket.php | 4 +-- .../mcpe/protocol/UpdateAttributesPacket.php | 4 +-- .../mcpe/protocol/UpdateBlockPacket.php | 4 +-- .../mcpe/protocol/UpdateEquipPacket.php | 4 +-- .../mcpe/protocol/UpdateTradePacket.php | 4 +-- .../network/mcpe/protocol/UseItemPacket.php | 4 +-- .../network/mcpe/protocol/WSConnectPacket.php | 4 +-- 110 files changed, 249 insertions(+), 237 deletions(-) diff --git a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php index 56a5e0fc5..5a5151169 100644 --- a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php @@ -33,11 +33,11 @@ class AddBehaviorTreePacket extends DataPacket{ /** @var string */ public $unknownString1; - public function decodePayload(){ + protected function decodePayload(){ $this->unknownString1 = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->unknownString1); } diff --git a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php index d29ff2796..a310d6e33 100644 --- a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php @@ -49,7 +49,7 @@ class AddEntityPacket extends DataPacket{ public $metadata = []; public $links = []; - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->type = $this->getUnsignedVarInt(); @@ -83,7 +83,7 @@ class AddEntityPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId); $this->putEntityRuntimeId($this->entityRuntimeId); $this->putUnsignedVarInt($this->type); diff --git a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php index 3841fbfe0..a3f895977 100644 --- a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php @@ -37,14 +37,14 @@ class AddHangingEntityPacket extends DataPacket{ public $z; public $unknown; //TODO (rotation?) - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->getBlockPosition($this->x, $this->y, $this->z); $this->unknown = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId); $this->putEntityRuntimeId($this->entityRuntimeId); $this->putBlockPosition($this->x, $this->y, $this->z); diff --git a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php index 55f2a5ac5..e0f16bee4 100644 --- a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php @@ -44,7 +44,7 @@ class AddItemEntityPacket extends DataPacket{ public $speedZ = 0.0; public $metadata = []; - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->item = $this->getSlot(); @@ -53,7 +53,7 @@ class AddItemEntityPacket extends DataPacket{ $this->metadata = $this->getEntityMetadata(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId); $this->putEntityRuntimeId($this->entityRuntimeId); $this->putSlot($this->item); diff --git a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php index 602af28d9..30893d636 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php @@ -41,7 +41,7 @@ class AddPaintingPacket extends DataPacket{ public $direction; public $title; - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->getBlockPosition($this->x, $this->y, $this->z); @@ -49,7 +49,7 @@ class AddPaintingPacket extends DataPacket{ $this->title = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId); $this->putEntityRuntimeId($this->entityRuntimeId); $this->putBlockPosition($this->x, $this->y, $this->z); diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index 38c39d88e..8bbbba023 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -60,7 +60,7 @@ class AddPlayerPacket extends DataPacket{ public $uvarint4 = 0; public $long1 = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->uuid = $this->getUUID(); $this->username = $this->getString(); $this->entityUniqueId = $this->getEntityUniqueId(); @@ -80,7 +80,7 @@ class AddPlayerPacket extends DataPacket{ $this->long1 = $this->getLLong(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUUID($this->uuid); $this->putString($this->username); $this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId); diff --git a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php index 8e37f8fa7..1a6708de6 100644 --- a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php @@ -71,7 +71,7 @@ class AdventureSettingsPacket extends DataPacket{ public $playerPermission = PlayerPermissions::MEMBER; public $long1 = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->flags = $this->getUnsignedVarInt(); $this->commandPermission = $this->getUnsignedVarInt(); $this->flags2 = $this->getUnsignedVarInt(); @@ -79,7 +79,7 @@ class AdventureSettingsPacket extends DataPacket{ $this->long1 = $this->getLLong(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->flags); $this->putUnsignedVarInt($this->commandPermission); $this->putUnsignedVarInt($this->flags2); diff --git a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php index 0c1eecc07..8e489760c 100644 --- a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php @@ -40,7 +40,7 @@ class AnimatePacket extends DataPacket{ public $entityRuntimeId; public $float = 0.0; //TODO (Boat rowing time?) - public function decodePayload(){ + protected function decodePayload(){ $this->action = $this->getVarInt(); $this->entityRuntimeId = $this->getEntityRuntimeId(); if($this->action & 0x80){ @@ -48,7 +48,7 @@ class AnimatePacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->action); $this->putEntityRuntimeId($this->entityRuntimeId); if($this->action & 0x80){ diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index f532d6f54..3e4f1be84 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -33,12 +33,12 @@ class AvailableCommandsPacket extends DataPacket{ public $commands; //JSON-encoded command data public $unknown = ""; - public function decodePayload(){ + protected function decodePayload(){ $this->commands = $this->getString(); $this->unknown = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->commands); $this->putString($this->unknown); } diff --git a/src/pocketmine/network/mcpe/protocol/BatchPacket.php b/src/pocketmine/network/mcpe/protocol/BatchPacket.php index 8834ffac5..1a7b949ad 100644 --- a/src/pocketmine/network/mcpe/protocol/BatchPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BatchPacket.php @@ -48,23 +48,12 @@ class BatchPacket extends DataPacket{ return true; } - public function decode(){ - $this->offset = 1; - $this->decodePayload(); + protected function decodeHeader(){ + $pid = $this->getByte(); + assert($pid === static::NETWORK_ID); } - public function encode(){ - $this->reset(); - $this->encodePayload(); - $this->isEncoded = true; - } - - public function reset(){ - $this->buffer = "\xfe"; - $this->offset = 0; - } - - public function decodePayload(){ + protected function decodePayload(){ $data = $this->getRemaining(); try{ $this->payload = zlib_decode($data, 1024 * 1024 * 64); //Max 64MB @@ -73,7 +62,11 @@ class BatchPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodeHeader(){ + $this->putByte(static::NETWORK_ID); + } + + protected function encodePayload(){ $this->put(zlib_encode($this->payload, ZLIB_ENCODING_DEFLATE, $this->compressionLevel)); } diff --git a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php index 40cacd7dc..8c9354563 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php @@ -36,12 +36,12 @@ class BlockEntityDataPacket extends DataPacket{ public $z; public $namedtag; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); $this->namedtag = $this->getRemaining(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBlockPosition($this->x, $this->y, $this->z); $this->put($this->namedtag); } diff --git a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php index 6bc54cf08..836c73690 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php @@ -37,13 +37,13 @@ class BlockEventPacket extends DataPacket{ public $case1; public $case2; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); $this->case1 = $this->getVarInt(); $this->case2 = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBlockPosition($this->x, $this->y, $this->z); $this->putVarInt($this->case1); $this->putVarInt($this->case2); diff --git a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php index 0f67a9212..e4bd4db59 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php @@ -38,13 +38,13 @@ class BlockPickRequestPacket extends DataPacket{ public $addUserData = false; public $hotbarSlot; - public function decodePayload(){ + protected function decodePayload(){ $this->getSignedBlockPosition($this->tileX, $this->tileY, $this->tileZ); $this->addUserData = $this->getBool(); $this->hotbarSlot = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putSignedBlockPosition($this->tileX, $this->tileY, $this->tileZ); $this->putBool($this->addUserData); $this->putByte($this->hotbarSlot); diff --git a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php index cc03fb802..042035798 100644 --- a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php @@ -55,7 +55,7 @@ class BookEditPacket extends DataPacket{ /** @var string */ public $author; - public function decodePayload(){ + protected function decodePayload(){ $this->type = $this->getByte(); $this->inventorySlot = $this->getByte(); @@ -82,7 +82,7 @@ class BookEditPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->type); $this->putByte($this->inventorySlot); diff --git a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php index b3d7f71b3..d3be1551e 100644 --- a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php @@ -64,7 +64,7 @@ class BossEventPacket extends DataPacket{ /** @var int */ public $overlay; - public function decodePayload(){ + protected function decodePayload(){ $this->bossEid = $this->getEntityUniqueId(); $this->eventType = $this->getUnsignedVarInt(); switch($this->eventType){ @@ -94,7 +94,7 @@ class BossEventPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->bossEid); $this->putUnsignedVarInt($this->eventType); switch($this->eventType){ diff --git a/src/pocketmine/network/mcpe/protocol/CameraPacket.php b/src/pocketmine/network/mcpe/protocol/CameraPacket.php index ecc62f862..6ed239b9a 100644 --- a/src/pocketmine/network/mcpe/protocol/CameraPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CameraPacket.php @@ -35,12 +35,12 @@ class CameraPacket extends DataPacket{ /** @var int */ public $playerUniqueId; - public function decodePayload(){ + protected function decodePayload(){ $this->cameraUniqueId = $this->getEntityUniqueId(); $this->playerUniqueId = $this->getEntityUniqueId(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->cameraUniqueId); $this->putEntityUniqueId($this->playerUniqueId); } diff --git a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php index 41baac579..35bab51bb 100644 --- a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php @@ -42,13 +42,13 @@ class ChangeDimensionPacket extends DataPacket{ /** @var bool */ public $respawn = false; - public function decodePayload(){ + protected function decodePayload(){ $this->dimension = $this->getVarInt(); $this->getVector3f($this->x, $this->y, $this->z); $this->respawn = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->dimension); $this->putVector3f($this->x, $this->y, $this->z); $this->putBool($this->respawn); diff --git a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php index 4e6752989..2112e0718 100644 --- a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php @@ -33,11 +33,11 @@ class ChunkRadiusUpdatedPacket extends DataPacket{ public $radius; - public function decodePayload(){ + protected function decodePayload(){ $this->radius = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->radius); } diff --git a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php index 08d9f0b2a..4658e9e1c 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php @@ -35,11 +35,11 @@ class ClientToServerHandshakePacket extends DataPacket{ return true; } - public function decodePayload(){ + protected function decodePayload(){ //No payload } - public function encodePayload(){ + protected function encodePayload(){ //No payload } diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php index 474434aad..9d54eca25 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php @@ -50,7 +50,7 @@ class ClientboundMapItemDataPacket extends DataPacket{ /** @var Color[][] */ public $colors = []; - public function decodePayload(){ + protected function decodePayload(){ $this->mapId = $this->getEntityUniqueId(); $this->type = $this->getUnsignedVarInt(); @@ -93,7 +93,7 @@ class ClientboundMapItemDataPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->mapId); $type = 0; diff --git a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php index b8bfcfbb1..3d7bdcc35 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php @@ -49,7 +49,7 @@ class CommandBlockUpdatePacket extends DataPacket{ public $shouldTrackOutput; - public function decodePayload(){ + protected function decodePayload(){ $this->isBlock = $this->getBool(); if($this->isBlock){ @@ -69,7 +69,7 @@ class CommandBlockUpdatePacket extends DataPacket{ $this->shouldTrackOutput = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBool($this->isBlock); if($this->isBlock){ diff --git a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php index c84a14220..0cc331c10 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class CommandOutputPacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::COMMAND_OUTPUT_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php index 6ff311e74..d18d0f746 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php @@ -32,12 +32,12 @@ class CommandRequestPacket extends DataPacket{ public $command; - public function decodePayload(){ + protected function decodePayload(){ $this->command = $this->getString(); //TODO: everything else } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->command); //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php index 4d3aa7f40..ad95bdf9f 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php @@ -33,11 +33,11 @@ class ContainerClosePacket extends DataPacket{ public $windowid; - public function decodePayload(){ + protected function decodePayload(){ $this->windowid = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowid); } diff --git a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php index 28d989a10..b3ca9c792 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php @@ -38,14 +38,14 @@ class ContainerOpenPacket extends DataPacket{ public $z; public $entityUniqueId = -1; - public function decodePayload(){ + protected function decodePayload(){ $this->windowid = $this->getByte(); $this->type = $this->getByte(); $this->getBlockPosition($this->x, $this->y, $this->z); $this->entityUniqueId = $this->getEntityUniqueId(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowid); $this->putByte($this->type); $this->putBlockPosition($this->x, $this->y, $this->z); diff --git a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php index 656dcedfd..825a153d6 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php @@ -35,13 +35,13 @@ class ContainerSetDataPacket extends DataPacket{ public $property; public $value; - public function decodePayload(){ + protected function decodePayload(){ $this->windowid = $this->getByte(); $this->property = $this->getVarInt(); $this->value = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowid); $this->putVarInt($this->property); $this->putVarInt($this->value); diff --git a/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php index c94d4c7a9..879274b07 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php @@ -41,7 +41,7 @@ class ContainerSetSlotPacket extends DataPacket{ public $item; public $selectSlot = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->windowid = $this->getByte(); $this->slot = $this->getVarInt(); $this->hotbarSlot = $this->getVarInt(); @@ -49,7 +49,7 @@ class ContainerSetSlotPacket extends DataPacket{ $this->selectSlot = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowid); $this->putVarInt($this->slot); $this->putVarInt($this->hotbarSlot); diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index eb8a38d71..dc13a4847 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -52,7 +52,7 @@ class CraftingDataPacket extends DataPacket{ return parent::clean(); } - public function decodePayload(){ + protected function decodePayload(){ $entries = []; $recipeCount = $this->getUnsignedVarInt(); for($i = 0; $i < $recipeCount; ++$i){ @@ -182,7 +182,7 @@ class CraftingDataPacket extends DataPacket{ $this->entries[] = $recipe; } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt(count($this->entries)); $writer = new BinaryStream(); diff --git a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php index 6471d6957..ae6945cff 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php @@ -47,7 +47,7 @@ class CraftingEventPacket extends DataPacket{ return parent::clean(); } - public function decodePayload(){ + protected function decodePayload(){ $this->windowId = $this->getByte(); $this->type = $this->getVarInt(); $this->id = $this->getUUID(); @@ -63,7 +63,7 @@ class CraftingEventPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowId); $this->putVarInt($this->type); $this->putUUID($this->id); diff --git a/src/pocketmine/network/mcpe/protocol/DataPacket.php b/src/pocketmine/network/mcpe/protocol/DataPacket.php index b4dab501e..c6dec0c87 100644 --- a/src/pocketmine/network/mcpe/protocol/DataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DataPacket.php @@ -41,6 +41,9 @@ abstract class DataPacket extends BinaryStream{ public $isEncoded = false; + public $extraByte1 = 0; + public $extraByte2 = 0; + public function pid(){ return $this::NETWORK_ID; } @@ -58,28 +61,44 @@ abstract class DataPacket extends BinaryStream{ } public function decode(){ - $this->offset = 3; + $this->offset = 0; + $this->decodeHeader(); $this->decodePayload(); } + protected function decodeHeader(){ + $pid = $this->getUnsignedVarInt(); + assert($pid === static::NETWORK_ID); + + $this->extraByte1 = $this->getByte(); + $this->extraByte2 = $this->getByte(); + assert($this->extraByte1 === 0 and $this->extraByte2 === 0, "Got unexpected non-zero split-screen bytes (byte1: $this->extraByte1, byte2: $this->extraByte2"); + } + /** * Note for plugin developers: If you're adding your own packets, you should perform decoding in here. */ - public function decodePayload(){ + protected function decodePayload(){ } public function encode(){ $this->reset(); - $this->put("\x00\x00"); $this->encodePayload(); $this->isEncoded = true; } + protected function encodeHeader(){ + $this->putUnsignedVarInt(static::NETWORK_ID); + + $this->putByte($this->extraByte1); + $this->putByte($this->extraByte2); + } + /** * Note for plugin developers: If you're adding your own packets, you should perform encoding in here. */ - public function encodePayload(){ + protected function encodePayload(){ } @@ -96,7 +115,7 @@ abstract class DataPacket extends BinaryStream{ abstract public function handle(NetworkSession $session) : bool; public function reset(){ - $this->buffer = Binary::writeUnsignedVarInt(static::NETWORK_ID); + $this->encodeHeader(); $this->offset = 0; } diff --git a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php index 3915e4a42..a17b3b798 100644 --- a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php @@ -38,12 +38,12 @@ class DisconnectPacket extends DataPacket{ return true; } - public function decodePayload(){ + protected function decodePayload(){ $this->hideDisconnectionScreen = $this->getBool(); $this->message = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBool($this->hideDisconnectionScreen); if(!$this->hideDisconnectionScreen){ $this->putString($this->message); diff --git a/src/pocketmine/network/mcpe/protocol/DropItemPacket.php b/src/pocketmine/network/mcpe/protocol/DropItemPacket.php index 72b81e5a3..02be637e7 100644 --- a/src/pocketmine/network/mcpe/protocol/DropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DropItemPacket.php @@ -39,12 +39,12 @@ class DropItemPacket extends DataPacket{ /** @var Item */ public $item; - public function decodePayload(){ + protected function decodePayload(){ $this->type = $this->getByte(); $this->item = $this->getSlot(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->type); $this->putSlot($this->item); } diff --git a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php index cc031fef5..3bd00af81 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php @@ -54,13 +54,13 @@ class EntityEventPacket extends DataPacket{ public $event; public $data = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->event = $this->getByte(); $this->data = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putByte($this->event); $this->putVarInt($this->data); diff --git a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php index e51ddfcfe..fe2b2a6d7 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php @@ -35,13 +35,13 @@ class EntityFallPacket extends DataPacket{ public $fallDistance; public $bool1; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->fallDistance = $this->getLFloat(); $this->bool1 = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putLFloat($this->fallDistance); $this->putBool($this->bool1); diff --git a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php index f3a497018..6ac2c5a9f 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php @@ -33,12 +33,12 @@ class EntityPickRequestPacket extends DataPacket{ public $entityTypeId; public $hotbarSlot; - public function decodePayload(){ + protected function decodePayload(){ $this->entityTypeId = $this->getLLong(); $this->hotbarSlot = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putLLong($this->entityTypeId); $this->putByte($this->hotbarSlot); } diff --git a/src/pocketmine/network/mcpe/protocol/EventPacket.php b/src/pocketmine/network/mcpe/protocol/EventPacket.php index f76b89e9a..ff7ddfde3 100644 --- a/src/pocketmine/network/mcpe/protocol/EventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EventPacket.php @@ -45,7 +45,7 @@ class EventPacket extends DataPacket{ public $eventData; public $type; - public function decodePayload(){ + protected function decodePayload(){ $this->playerRuntimeId = $this->getEntityRuntimeId(); $this->eventData = $this->getVarInt(); $this->type = $this->getByte(); @@ -53,7 +53,7 @@ class EventPacket extends DataPacket{ //TODO: nice confusing mess } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->playerRuntimeId); $this->putVarInt($this->eventData); $this->putByte($this->type); diff --git a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php index df7d86cb2..9d7dd6c1b 100644 --- a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php @@ -45,7 +45,7 @@ class ExplodePacket extends DataPacket{ return parent::clean(); } - public function decodePayload(){ + protected function decodePayload(){ $this->getVector3f($this->x, $this->y, $this->z); $this->radius = (float) ($this->getVarInt() / 32); $count = $this->getUnsignedVarInt(); @@ -56,7 +56,7 @@ class ExplodePacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putVector3f($this->x, $this->y, $this->z); $this->putVarInt((int) ($this->radius * 32)); $this->putUnsignedVarInt(count($this->records)); diff --git a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php index 0d99749f6..18fe73198 100644 --- a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php @@ -35,13 +35,13 @@ class FullChunkDataPacket extends DataPacket{ public $chunkZ; public $data; - public function decodePayload(){ + protected function decodePayload(){ $this->chunkX = $this->getVarInt(); $this->chunkZ = $this->getVarInt(); $this->data = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->chunkX); $this->putVarInt($this->chunkZ); $this->putString($this->data); diff --git a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php index 6b127e2bf..d7fc26f70 100644 --- a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php @@ -32,11 +32,11 @@ class GameRulesChangedPacket extends DataPacket{ public $gameRules = []; - public function decodePayload(){ + protected function decodePayload(){ $this->gameRules = $this->getGameRules(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putGameRules($this->gameRules); } diff --git a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php index e8491b92d..72c930a62 100644 --- a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php @@ -33,11 +33,11 @@ class GuiDataPickItemPacket extends DataPacket{ /** @var int */ public $hotbarSlot; - public function decodePayload(){ + protected function decodePayload(){ $this->hotbarSlot = $this->getLInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putLInt($this->hotbarSlot); } diff --git a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php index c27609d64..0cee4e64a 100644 --- a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php +++ b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php @@ -33,11 +33,11 @@ class HurtArmorPacket extends DataPacket{ public $health; - public function decodePayload(){ + protected function decodePayload(){ $this->health = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->health); } diff --git a/src/pocketmine/network/mcpe/protocol/InteractPacket.php b/src/pocketmine/network/mcpe/protocol/InteractPacket.php index 5879972db..9be22b87a 100644 --- a/src/pocketmine/network/mcpe/protocol/InteractPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InteractPacket.php @@ -59,7 +59,7 @@ class InteractPacket extends DataPacket{ /** @var float */ public $z; - public function decodePayload(){ + protected function decodePayload(){ $this->action = $this->getByte(); $this->target = $this->getEntityRuntimeId(); @@ -70,7 +70,7 @@ class InteractPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->action); $this->putEntityRuntimeId($this->target); diff --git a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php index c29b14317..33e33c0f3 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php @@ -36,7 +36,7 @@ class InventoryContentPacket extends DataPacket{ /** @var Item[] */ public $items = []; - public function decodePayload(){ + protected function decodePayload(){ $this->windowId = $this->getUnsignedVarInt(); $count = $this->getUnsignedVarInt(); for($i = 0; $i < $count; ++$i){ @@ -44,7 +44,7 @@ class InventoryContentPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->windowId); $this->putUnsignedVarInt(count($this->items)); foreach($this->items as $item){ diff --git a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php index 01f6bafd1..95914bd44 100644 --- a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php @@ -38,13 +38,13 @@ class InventorySlotPacket extends DataPacket{ /** @var Item */ public $item; - public function decodePayload(){ + protected function decodePayload(){ $this->windowId = $this->getUnsignedVarInt(); $this->inventorySlot = $this->getUnsignedVarInt(); $this->item = $this->getSlot(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->windowId); $this->putUnsignedVarInt($this->inventorySlot); $this->putSlot($this->item); diff --git a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php index c683a1ef9..5cc46801a 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php @@ -85,7 +85,7 @@ class InventoryTransactionPacket extends DataPacket{ public $transactionData; - public function decodePayload(){ + protected function decodePayload(){ $type = $this->getUnsignedVarInt(); $actionCount = $this->getUnsignedVarInt(); @@ -133,7 +133,7 @@ class InventoryTransactionPacket extends DataPacket{ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php index 27fb6c806..b99fa7af4 100644 --- a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php @@ -35,11 +35,11 @@ class ItemFrameDropItemPacket extends DataPacket{ public $y; public $z; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBlockPosition($this->x, $this->y, $this->z); } diff --git a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php index 4ae6da57e..39063edcb 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php @@ -106,13 +106,13 @@ class LevelEventPacket extends DataPacket{ public $z = 0; public $data; - public function decodePayload(){ + protected function decodePayload(){ $this->evid = $this->getVarInt(); $this->getVector3f($this->x, $this->y, $this->z); $this->data = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->evid); $this->putVector3f($this->x, $this->y, $this->z); $this->putVarInt($this->data); diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php index 61b9606d1..ee3efdc85 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php @@ -201,7 +201,7 @@ class LevelSoundEventPacket extends DataPacket{ public $unknownBool = false; public $disableRelativeVolume = false; - public function decodePayload(){ + protected function decodePayload(){ $this->sound = $this->getByte(); $this->getVector3f($this->x, $this->y, $this->z); $this->extraData = $this->getVarInt(); @@ -210,7 +210,7 @@ class LevelSoundEventPacket extends DataPacket{ $this->disableRelativeVolume = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->sound); $this->putVector3f($this->x, $this->y, $this->z); $this->putVarInt($this->extraData); diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php index 8cb24a59c..c6d8bded3 100644 --- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php @@ -55,7 +55,7 @@ class LoginPacket extends DataPacket{ return true; } - public function decodePayload(){ + protected function decodePayload(){ $this->protocol = $this->getInt(); if($this->protocol !== ProtocolInfo::CURRENT_PROTOCOL){ @@ -93,7 +93,7 @@ class LoginPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php index 25e33f765..13835214c 100644 --- a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php @@ -34,11 +34,11 @@ class MapInfoRequestPacket extends DataPacket{ public $mapId; - public function decodePayload(){ + protected function decodePayload(){ $this->mapId = $this->getEntityUniqueId(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->mapId); } diff --git a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php index 22b5b32b4..b8ba8d59a 100644 --- a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php @@ -36,7 +36,7 @@ class MobArmorEquipmentPacket extends DataPacket{ /** @var Item[] */ public $slots = []; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->slots[0] = $this->getSlot(); $this->slots[1] = $this->getSlot(); @@ -44,7 +44,7 @@ class MobArmorEquipmentPacket extends DataPacket{ $this->slots[3] = $this->getSlot(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putSlot($this->slots[0]); $this->putSlot($this->slots[1]); diff --git a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php index eb7ba0637..c11c8fec4 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php @@ -42,7 +42,7 @@ class MobEffectPacket extends DataPacket{ public $particles = true; public $duration = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->eventId = $this->getByte(); $this->effectId = $this->getVarInt(); @@ -51,7 +51,7 @@ class MobEffectPacket extends DataPacket{ $this->duration = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putByte($this->eventId); $this->putVarInt($this->effectId); diff --git a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php index 8d79800ad..9ffe1164a 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php @@ -37,7 +37,7 @@ class MobEquipmentPacket extends DataPacket{ public $hotbarSlot; public $windowId = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->item = $this->getSlot(); $this->inventorySlot = $this->getByte(); @@ -45,7 +45,7 @@ class MobEquipmentPacket extends DataPacket{ $this->windowId = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putSlot($this->item); $this->putByte($this->inventorySlot); diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php index 8e32b6e53..03663f967 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php @@ -35,12 +35,12 @@ class ModalFormRequestPacket extends DataPacket{ /** @var string */ public $formData; //json - public function decodePayload(){ + protected function decodePayload(){ $this->formId = $this->getUnsignedVarInt(); $this->formData = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->formId); $this->putString($this->formData); } diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php index de32b9442..bbb7fbe49 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class ModalFormResponsePacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::MODAL_FORM_RESPONSE_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php index e3db528d5..92b301d0f 100644 --- a/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php @@ -41,7 +41,7 @@ class MoveEntityPacket extends DataPacket{ public $onGround = false; public $teleported = false; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->getVector3f($this->x, $this->y, $this->z); $this->pitch = $this->getByteRotation(); @@ -51,7 +51,7 @@ class MoveEntityPacket extends DataPacket{ $this->teleported = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putVector3f($this->x, $this->y, $this->z); $this->putByteRotation($this->pitch); diff --git a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php index 45bc917b5..48f66ddad 100644 --- a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php @@ -49,7 +49,7 @@ class MovePlayerPacket extends DataPacket{ public $int1 = 0; public $int2 = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->getVector3f($this->x, $this->y, $this->z); $this->pitch = $this->getLFloat(); @@ -64,7 +64,7 @@ class MovePlayerPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putVector3f($this->x, $this->y, $this->z); $this->putLFloat($this->pitch); diff --git a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php index 956c2db50..c37c7b794 100644 --- a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php @@ -39,14 +39,14 @@ class NpcRequestPacket extends DataPacket{ /** @var int */ public $actionType; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->requestType = $this->getByte(); $this->commandString = $this->getString(); $this->actionType = $this->getByte(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putByte($this->requestType); $this->putString($this->commandString); diff --git a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php index 5d2f975e3..3283ecd77 100644 --- a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php @@ -37,13 +37,13 @@ class PhotoTransferPacket extends DataPacket{ /** @var string */ public $string3; - public function decodePayload(){ + protected function decodePayload(){ $this->string1 = $this->getString(); $this->string2 = $this->getString(); $this->string3 = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->string1); $this->putString($this->string2); $this->putString($this->string3); diff --git a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php index cb6a5f61e..e44a1da94 100644 --- a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php @@ -39,14 +39,14 @@ class PlaySoundPacket extends DataPacket{ public $volume; public $pitch; - public function decodePayload(){ + protected function decodePayload(){ $this->soundName = $this->getString(); $this->getBlockPosition($this->x, $this->y, $this->z); $this->volume = $this->getLFloat(); $this->pitch = $this->getLFloat(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->soundName); $this->putBlockPosition($this->x, $this->y, $this->z); $this->putLFloat($this->volume); diff --git a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php index 29b5f624c..1f79a601e 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php @@ -41,7 +41,7 @@ class PlayStatusPacket extends DataPacket{ public $status; - public function decodePayload(){ + protected function decodePayload(){ $this->status = $this->getInt(); } @@ -49,7 +49,7 @@ class PlayStatusPacket extends DataPacket{ return true; } - public function encodePayload(){ + protected function encodePayload(){ $this->putInt($this->status); } diff --git a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php index b1996132b..61e2e80d1 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php @@ -61,14 +61,14 @@ class PlayerActionPacket extends DataPacket{ public $z; public $face; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->action = $this->getVarInt(); $this->getBlockPosition($this->x, $this->y, $this->z); $this->face = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putVarInt($this->action); $this->putBlockPosition($this->x, $this->y, $this->z); diff --git a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php index df9a86e74..5855c6129 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php @@ -38,7 +38,7 @@ class PlayerHotbarPacket extends DataPacket{ /** @var int[] */ public $slots = []; - public function decodePayload(){ + protected function decodePayload(){ $this->selectedSlot = $this->getUnsignedVarInt(); $this->windowId = $this->getByte(); $count = $this->getUnsignedVarInt(); @@ -47,7 +47,7 @@ class PlayerHotbarPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->selectedSlot); $this->putByte($this->windowId); $this->putUnsignedVarInt(count($this->slots)); diff --git a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php index ba7c280d0..5e41bc37e 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php @@ -36,14 +36,14 @@ class PlayerInputPacket extends DataPacket{ public $unknownBool1; public $unknownBool2; - public function decodePayload(){ + protected function decodePayload(){ $this->motionX = $this->getLFloat(); $this->motionY = $this->getLFloat(); $this->unknownBool1 = $this->getBool(); $this->unknownBool2 = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putLFloat($this->motionX); $this->putLFloat($this->motionY); $this->putBool($this->unknownBool1); diff --git a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php index 329f2a908..4a95aca9d 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php @@ -44,7 +44,7 @@ class PlayerListPacket extends DataPacket{ return parent::clean(); } - public function decodePayload(){ + protected function decodePayload(){ $this->type = $this->getByte(); $count = $this->getUnsignedVarInt(); for($i = 0; $i < $count; ++$i){ @@ -63,7 +63,7 @@ class PlayerListPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->type); $this->putUnsignedVarInt(count($this->entries)); foreach($this->entries as $d){ diff --git a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php index 2d57868f6..b5ce40670 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php @@ -49,7 +49,7 @@ class PlayerSkinPacket extends DataPacket{ public $geometryData; - public function decodePayload(){ + protected function decodePayload(){ $this->uuid = $this->getUUID(); $this->skinId = $this->getString(); $this->skinName = $this->getString(); @@ -60,7 +60,7 @@ class PlayerSkinPacket extends DataPacket{ $this->geometryData = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUUID($this->uuid); $this->putString($this->skinId); $this->putString($this->skinName); diff --git a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php index d1926475b..3b1c949bb 100644 --- a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php @@ -33,14 +33,14 @@ class PurchaseReceiptPacket extends DataPacket{ /** @var string[] */ public $entries = []; - public function decodePayload(){ + protected function decodePayload(){ $count = $this->getUnsignedVarInt(); for($i = 0; $i < $count; ++$i){ $this->entries[] = $this->getString(); } } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt(count($this->entries)); foreach($this->entries as $entry){ $this->putString($entry); diff --git a/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php index 363856d1d..89b21dcdb 100644 --- a/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveBlockPacket.php @@ -38,11 +38,11 @@ class RemoveBlockPacket extends DataPacket{ public $y; public $z; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBlockPosition($this->x, $this->y, $this->z); } diff --git a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php index d0093f9fa..cb79adc0f 100644 --- a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php @@ -33,11 +33,11 @@ class RemoveEntityPacket extends DataPacket{ public $entityUniqueId; - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId); } diff --git a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php index d50e4ba00..82a25cd41 100644 --- a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php @@ -33,11 +33,11 @@ class RequestChunkRadiusPacket extends DataPacket{ public $radius; - public function decodePayload(){ + protected function decodePayload(){ $this->radius = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->radius); } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php index 29c8d1b5e..3c61e79fd 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php @@ -37,14 +37,14 @@ class ResourcePackChunkDataPacket extends DataPacket{ public $progress; public $data; - public function decodePayload(){ + protected function decodePayload(){ $this->packId = $this->getString(); $this->chunkIndex = $this->getLInt(); $this->progress = $this->getLLong(); $this->data = $this->get($this->getLInt()); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->packId); $this->putLInt($this->chunkIndex); $this->putLLong($this->progress); diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php index 503e5ee55..40d5a06cc 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php @@ -35,12 +35,12 @@ class ResourcePackChunkRequestPacket extends DataPacket{ public $packId; public $chunkIndex; - public function decodePayload(){ + protected function decodePayload(){ $this->packId = $this->getString(); $this->chunkIndex = $this->getLInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->packId); $this->putLInt($this->chunkIndex); } diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php index 6e4489ce4..de814edad 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php @@ -39,7 +39,7 @@ class ResourcePackClientResponsePacket extends DataPacket{ public $status; public $packIds = []; - public function decodePayload(){ + protected function decodePayload(){ $this->status = $this->getByte(); $entryCount = $this->getLShort(); while($entryCount-- > 0){ @@ -47,7 +47,7 @@ class ResourcePackClientResponsePacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->status); $this->putLShort(count($this->packIds)); foreach($this->packIds as $id){ diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php index ab133b5e6..07838912a 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php @@ -38,7 +38,7 @@ class ResourcePackDataInfoPacket extends DataPacket{ public $compressedPackSize; public $sha256; - public function decodePayload(){ + protected function decodePayload(){ $this->packId = $this->getString(); $this->maxChunkSize = $this->getLInt(); $this->chunkCount = $this->getLInt(); @@ -46,7 +46,7 @@ class ResourcePackDataInfoPacket extends DataPacket{ $this->sha256 = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->packId); $this->putLInt($this->maxChunkSize); $this->putLInt($this->chunkCount); diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php index 4f1856fe0..547aa1d1b 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php @@ -41,7 +41,7 @@ class ResourcePackStackPacket extends DataPacket{ /** @var ResourcePack[] */ public $resourcePackStack = []; - public function decodePayload(){ + protected function decodePayload(){ /*$this->mustAccept = $this->getBool(); $behaviorPackCount = $this->getUnsignedVarInt(); while($behaviorPackCount-- > 0){ @@ -58,7 +58,7 @@ class ResourcePackStackPacket extends DataPacket{ }*/ } - public function encodePayload(){ + protected function encodePayload(){ $this->putBool($this->mustAccept); $this->putUnsignedVarInt(count($this->behaviorPackStack)); diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php index d4ee594c7..8a43521e6 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -39,7 +39,7 @@ class ResourcePacksInfoPacket extends DataPacket{ /** @var ResourcePack[] */ public $resourcePackEntries = []; - public function decodePayload(){ + protected function decodePayload(){ /*$this->mustAccept = $this->getBool(); $behaviorPackCount = $this->getLShort(); while($behaviorPackCount-- > 0){ @@ -60,7 +60,7 @@ class ResourcePacksInfoPacket extends DataPacket{ }*/ } - public function encodePayload(){ + protected function encodePayload(){ $this->putBool($this->mustAccept); $this->putLShort(count($this->behaviorPackEntries)); diff --git a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php index 9f623313d..5b479a260 100644 --- a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php @@ -35,11 +35,11 @@ class RespawnPacket extends DataPacket{ public $y; public $z; - public function decodePayload(){ + protected function decodePayload(){ $this->getVector3f($this->x, $this->y, $this->z); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVector3f($this->x, $this->y, $this->z); } diff --git a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php index 5f9f3e54a..98bb7571c 100644 --- a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php @@ -34,11 +34,11 @@ class RiderJumpPacket extends DataPacket{ public $unknown; - public function decodePayload(){ + protected function decodePayload(){ $this->unknown = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->unknown); } diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php index 138d93e36..a5e6d9521 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class ServerSettingsRequestPacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_REQUEST_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //No payload } - public function encodePayload(){ + protected function encodePayload(){ //No payload } diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php index 17208fff3..39a9d3aa3 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php @@ -35,12 +35,12 @@ class ServerSettingsResponsePacket extends DataPacket{ /** @var string */ public $formData; //json - public function decodePayload(){ + protected function decodePayload(){ $this->formId = $this->getUnsignedVarInt(); $this->formData = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->formId); $this->putString($this->formData); } diff --git a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php index fc9657d89..92b4d77ac 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php @@ -41,11 +41,11 @@ class ServerToClientHandshakePacket extends DataPacket{ return true; } - public function decodePayload(){ + protected function decodePayload(){ $this->jwt = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->jwt); } diff --git a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php index 3922bd503..75b1e6a52 100644 --- a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php @@ -33,11 +33,11 @@ class SetCommandsEnabledPacket extends DataPacket{ public $enabled; - public function decodePayload(){ + protected function decodePayload(){ $this->enabled = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putBool($this->enabled); } diff --git a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php index 3ce9485fe..9ea8baa3b 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php @@ -33,11 +33,11 @@ class SetDifficultyPacket extends DataPacket{ public $difficulty; - public function decodePayload(){ + protected function decodePayload(){ $this->difficulty = $this->getUnsignedVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->difficulty); } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php index 98aca9f51..ddefb2409 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php @@ -34,12 +34,12 @@ class SetEntityDataPacket extends DataPacket{ public $entityRuntimeId; public $metadata; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->metadata = $this->getEntityMetadata(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putEntityMetadata($this->metadata); } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php index f545ae3b9..c53453208 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php @@ -34,11 +34,11 @@ class SetEntityLinkPacket extends DataPacket{ /** @var array [from, to, type, unknown byte] */ public $link = []; - public function decodePayload(){ + protected function decodePayload(){ $this->link = $this->getEntityLink(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityLink($this->link); } diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php index e4858549c..9dcf2f1bc 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php @@ -36,12 +36,12 @@ class SetEntityMotionPacket extends DataPacket{ public $motionY; public $motionZ; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->getVector3f($this->motionX, $this->motionY, $this->motionZ); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putVector3f($this->motionX, $this->motionY, $this->motionZ); } diff --git a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php index 9c6776c8b..f989bf6c9 100644 --- a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php @@ -33,11 +33,11 @@ class SetHealthPacket extends DataPacket{ public $health; - public function decodePayload(){ + protected function decodePayload(){ $this->health = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->health); } diff --git a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php index 6304b9c5e..a27864b36 100644 --- a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php @@ -32,11 +32,11 @@ class SetLastHurtByPacket extends DataPacket{ public $entityTypeId; - public function decodePayload(){ + protected function decodePayload(){ $this->entityTypeId = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->entityTypeId); } diff --git a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php index deebe656d..4f5dc0e6e 100644 --- a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php @@ -33,11 +33,11 @@ class SetPlayerGameTypePacket extends DataPacket{ public $gamemode; - public function decodePayload(){ + protected function decodePayload(){ $this->gamemode = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->gamemode); } diff --git a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php index 35f46315c..c8d786261 100644 --- a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php @@ -40,13 +40,13 @@ class SetSpawnPositionPacket extends DataPacket{ public $z; public $spawnForced; - public function decodePayload(){ + protected function decodePayload(){ $this->spawnType = $this->getVarInt(); $this->getBlockPosition($this->x, $this->y, $this->z); $this->spawnForced = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->spawnType); $this->putBlockPosition($this->x, $this->y, $this->z); $this->putBool($this->spawnForced); diff --git a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php index 499eecc8e..09dedbd6e 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php @@ -32,11 +32,11 @@ class SetTimePacket extends DataPacket{ public $time; - public function decodePayload(){ + protected function decodePayload(){ $this->time = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->time); } diff --git a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php index c97717cd1..2531c2c32 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php @@ -45,7 +45,7 @@ class SetTitlePacket extends DataPacket{ public $stayTime = 0; public $fadeOutTime = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->type = $this->getVarInt(); $this->text = $this->getString(); $this->fadeInTime = $this->getVarInt(); @@ -53,7 +53,7 @@ class SetTitlePacket extends DataPacket{ $this->fadeOutTime = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVarInt($this->type); $this->putString($this->text); $this->putVarInt($this->fadeInTime); diff --git a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php index 5300fbdeb..feb65cff1 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php @@ -38,12 +38,12 @@ class ShowCreditsPacket extends DataPacket{ public $playerEid; public $status; - public function decodePayload(){ + protected function decodePayload(){ $this->playerEid = $this->getEntityRuntimeId(); $this->status = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->playerEid); $this->putVarInt($this->status); } diff --git a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php index 4b345f4de..15935a29c 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class ShowProfilePacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::SHOW_PROFILE_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php index ab079ce30..2d58efd3a 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php @@ -32,11 +32,11 @@ class ShowStoreOfferPacket extends DataPacket{ public $offerId; - public function decodePayload(){ + protected function decodePayload(){ $this->offerId = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->offerId); } diff --git a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php index 354008f2a..151c788a9 100644 --- a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php @@ -32,11 +32,11 @@ class SimpleEventPacket extends DataPacket{ public $unknownShort1; - public function decodePayload(){ + protected function decodePayload(){ $this->unknownShort1 = $this->getLShort(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putLShort($this->unknownShort1); } diff --git a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php index 7907df0da..ce7846461 100644 --- a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php @@ -36,12 +36,12 @@ class SpawnExperienceOrbPacket extends DataPacket{ public $z; public $amount; - public function decodePayload(){ + protected function decodePayload(){ $this->getVector3f($this->x, $this->y, $this->z); $this->amount = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putVector3f($this->x, $this->y, $this->z); $this->putVarInt($this->amount); } diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 2c48b144d..0d6d309a9 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -75,7 +75,7 @@ class StartGamePacket extends DataPacket{ public $unknownVarInt = 0; - public function decodePayload(){ + protected function decodePayload(){ $this->entityUniqueId = $this->getEntityUniqueId(); $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->playerGamemode = $this->getVarInt(); @@ -117,7 +117,7 @@ class StartGamePacket extends DataPacket{ $this->unknownVarInt = $this->getVarInt(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityUniqueId($this->entityUniqueId); $this->putEntityRuntimeId($this->entityRuntimeId); $this->putVarInt($this->playerGamemode); diff --git a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php index c43326aee..f69ef6817 100644 --- a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php @@ -35,12 +35,12 @@ class StopSoundPacket extends DataPacket{ public $soundName; public $stopAll; - public function decodePayload(){ + protected function decodePayload(){ $this->soundName = $this->getString(); $this->stopAll = $this->getBool(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->soundName); $this->putBool($this->stopAll); } diff --git a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php index f6971700e..5492cf092 100644 --- a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class StructureBlockUpdatePacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::STRUCTURE_BLOCK_UPDATE_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php index eaf1ceacc..f5461a08a 100644 --- a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php @@ -30,11 +30,11 @@ use pocketmine\network\mcpe\NetworkSession; class SubClientLoginPacket extends DataPacket{ const NETWORK_ID = ProtocolInfo::SUB_CLIENT_LOGIN_PACKET; - public function decodePayload(){ + protected function decodePayload(){ //TODO } - public function encodePayload(){ + protected function encodePayload(){ //TODO } diff --git a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php index 95990e371..31ab3220b 100644 --- a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php @@ -34,11 +34,11 @@ class TakeItemEntityPacket extends DataPacket{ public $target; public $eid; - public function decodePayload(){ + protected function decodePayload(){ } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->target); $this->putEntityRuntimeId($this->eid); } diff --git a/src/pocketmine/network/mcpe/protocol/TextPacket.php b/src/pocketmine/network/mcpe/protocol/TextPacket.php index 77bf36b36..ace6ea3e9 100644 --- a/src/pocketmine/network/mcpe/protocol/TextPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TextPacket.php @@ -46,7 +46,7 @@ class TextPacket extends DataPacket{ public $message; public $parameters = []; - public function decodePayload(){ + protected function decodePayload(){ $this->type = $this->getByte(); $this->unknownBool = $this->getBool(); switch($this->type){ @@ -71,7 +71,7 @@ class TextPacket extends DataPacket{ } } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->type); $this->putBool($this->unknownBool); switch($this->type){ diff --git a/src/pocketmine/network/mcpe/protocol/TransferPacket.php b/src/pocketmine/network/mcpe/protocol/TransferPacket.php index 41881c591..d6bb00d83 100644 --- a/src/pocketmine/network/mcpe/protocol/TransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TransferPacket.php @@ -33,12 +33,12 @@ class TransferPacket extends DataPacket{ public $address; public $port = 19132; - public function decodePayload(){ + protected function decodePayload(){ $this->address = $this->getString(); $this->port = $this->getLShort(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->address); $this->putLShort($this->port); } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php index 8d86708c6..e2e923325 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php @@ -36,12 +36,12 @@ class UpdateAttributesPacket extends DataPacket{ /** @var Attribute[] */ public $entries = []; - public function decodePayload(){ + protected function decodePayload(){ $this->entityRuntimeId = $this->getEntityRuntimeId(); $this->entries = $this->getAttributeList(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putEntityRuntimeId($this->entityRuntimeId); $this->putAttributeList(...$this->entries); } diff --git a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php index 229ca6c04..adcbe1d35 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php @@ -47,7 +47,7 @@ class UpdateBlockPacket extends DataPacket{ public $blockData; public $flags; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); $this->blockId = $this->getUnsignedVarInt(); $aux = $this->getUnsignedVarInt(); @@ -55,7 +55,7 @@ class UpdateBlockPacket extends DataPacket{ $this->flags = $aux >> 4; } - public function encodePayload(){ + protected function encodePayload(){ $this->putBlockPosition($this->x, $this->y, $this->z); $this->putUnsignedVarInt($this->blockId); $this->putUnsignedVarInt(($this->flags << 4) | $this->blockData); diff --git a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php index 7f3c9bbd7..08d4136d6 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php @@ -36,7 +36,7 @@ class UpdateEquipPacket extends DataPacket{ public $entityUniqueId; public $namedtag; - public function decodePayload(){ + protected function decodePayload(){ $this->windowId = $this->getByte(); $this->windowType = $this->getByte(); $this->unknownVarint = $this->getVarInt(); @@ -44,7 +44,7 @@ class UpdateEquipPacket extends DataPacket{ $this->namedtag = $this->get(true); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowId); $this->putByte($this->windowType); $this->putVarInt($this->unknownVarint); diff --git a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php index 9a7496f86..41b122aef 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php @@ -44,7 +44,7 @@ class UpdateTradePacket extends DataPacket{ public $displayName; public $offers; - public function decodePayload(){ + protected function decodePayload(){ $this->windowId = $this->getByte(); $this->windowType = $this->getByte(); $this->varint1 = $this->getVarInt(); @@ -56,7 +56,7 @@ class UpdateTradePacket extends DataPacket{ $this->offers = $this->getRemaining(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putByte($this->windowId); $this->putByte($this->windowType); $this->putVarInt($this->varint1); diff --git a/src/pocketmine/network/mcpe/protocol/UseItemPacket.php b/src/pocketmine/network/mcpe/protocol/UseItemPacket.php index 0fb674a27..25e28350d 100644 --- a/src/pocketmine/network/mcpe/protocol/UseItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UseItemPacket.php @@ -50,7 +50,7 @@ class UseItemPacket extends DataPacket{ /** @var Item */ public $item; - public function decodePayload(){ + protected function decodePayload(){ $this->getBlockPosition($this->x, $this->y, $this->z); $this->blockId = $this->getUnsignedVarInt(); $this->face = $this->getVarInt(); @@ -60,7 +60,7 @@ class UseItemPacket extends DataPacket{ $this->item = $this->getSlot(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putUnsignedVarInt($this->blockId); $this->putUnsignedVarInt($this->face); $this->putVector3f($this->fx, $this->fy, $this->fz); diff --git a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php index fe8f1c16c..94faea19f 100644 --- a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php @@ -33,11 +33,11 @@ class WSConnectPacket extends DataPacket{ /** @var string */ public $string1; - public function decodePayload(){ + protected function decodePayload(){ $this->string1 = $this->getString(); } - public function encodePayload(){ + protected function encodePayload(){ $this->putString($this->string1); }