From 7a5e5773b7943a06d1151d82ecd4f17a7561063c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 16 Jan 2018 20:01:41 +0000 Subject: [PATCH] Updated RakLib dependency --- composer.json | 2 +- composer.lock | 16 +++++++++------- .../network/mcpe/CachedEncapsulatedPacket.php | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 5277a708d..a89f915b2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-yaml": ">=2.0.0", "ext-zip": "*", "ext-zlib": ">=1.2.11", - "pocketmine/raklib": "^0.10.0", + "pocketmine/raklib": "dev-master#998af685be51d6ee8a1e206066ccd96c21450bfd", "pocketmine/pocketmine-spl": "^0.2.0", "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887", "pocketmine/pocketmine-nbt": "dev-master#f8934c0aed90d1f55452588f7ebef7c4519518a5" diff --git a/composer.lock b/composer.lock index eb5f85fbd..1896d5527 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "1c1cb8b3b3cd2e20af5acb65235bb586", + "content-hash": "f13679b4c6a569a758646a63936dbd18", "packages": [ { "name": "pocketmine/pocketmine-binaryutils", @@ -107,16 +107,16 @@ }, { "name": "pocketmine/raklib", - "version": "0.10.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "112e11fb68efcd97dab8b1ace16e818b3163cba0" + "reference": "998af685be51d6ee8a1e206066ccd96c21450bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/112e11fb68efcd97dab8b1ace16e818b3163cba0", - "reference": "112e11fb68efcd97dab8b1ace16e818b3163cba0", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/998af685be51d6ee8a1e206066ccd96c21450bfd", + "reference": "998af685be51d6ee8a1e206066ccd96c21450bfd", "shasum": "" }, "require": { @@ -124,6 +124,7 @@ "ext-pthreads": ">=3.1.7dev", "ext-sockets": "*", "php": ">=7.2.0RC3", + "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887", "pocketmine/pocketmine-spl": "^0.2.0" }, "type": "library", @@ -137,10 +138,10 @@ ], "description": "A RakNet server implementation written in PHP", "support": { - "source": "https://github.com/pmmp/RakLib/tree/0.10.0", + "source": "https://github.com/pmmp/RakLib/tree/master", "issues": "https://github.com/pmmp/RakLib/issues" }, - "time": "2018-01-11T13:13:42+00:00" + "time": "2018-01-16T19:33:21+00:00" } ], "packages-dev": [], @@ -149,6 +150,7 @@ "stability-flags": { "php": 5, "ext-pthreads": 20, + "pocketmine/raklib": 20, "pocketmine/pocketmine-binaryutils": 20, "pocketmine/pocketmine-nbt": 20 }, diff --git a/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php b/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php index 48a1c0eb0..74bf3d464 100644 --- a/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php +++ b/src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php @@ -26,10 +26,10 @@ namespace pocketmine\network\mcpe; use raklib\protocol\EncapsulatedPacket; class CachedEncapsulatedPacket extends EncapsulatedPacket{ - + /** @var string|null */ private $internalData = null; - public function toBinary($internal = false){ - return $this->internalData ?? ($this->internalData = parent::toBinary($internal)); + public function toInternalBinary() : string{ + return $this->internalData ?? ($this->internalData = parent::toInternalBinary()); } }