From f4480c07eeba06b74922bddff1b73ad71a46b22a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 29 Mar 2019 19:47:15 +0000 Subject: [PATCH 1/2] Updated NBT dependency --- composer.lock | 12 ++++++------ src/pocketmine/Player.php | 3 ++- src/pocketmine/network/mcpe/NetworkBinaryStream.php | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 32846cebf1..73f2f0e929 100644 --- a/composer.lock +++ b/composer.lock @@ -160,16 +160,16 @@ }, { "name": "pocketmine/nbt", - "version": "0.2.6", + "version": "0.2.7", "source": { "type": "git", "url": "https://github.com/pmmp/NBT.git", - "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4" + "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/NBT/zipball/92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", - "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", + "url": "https://api.github.com/repos/pmmp/NBT/zipball/2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a", + "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a", "shasum": "" }, "require": { @@ -194,10 +194,10 @@ ], "description": "PHP library for working with Named Binary Tags", "support": { - "source": "https://github.com/pmmp/NBT/tree/0.2.6", + "source": "https://github.com/pmmp/NBT/tree/0.2.7", "issues": "https://github.com/pmmp/NBT/issues" }, - "time": "2019-02-07T16:28:11+00:00" + "time": "2019-03-29T19:39:42+00:00" }, { "name": "pocketmine/raklib", diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 0473571480..a9969cbd96 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2983,7 +2983,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ $t = $this->level->getTile($pos); if($t instanceof Spawnable){ $nbt = new NetworkLittleEndianNBTStream(); - $compound = $nbt->read($packet->namedtag); + $_ = 0; + $compound = $nbt->read($packet->namedtag, false, $_, 512); if(!($compound instanceof CompoundTag)){ throw new \InvalidArgumentException("Expected " . CompoundTag::class . " in block entity NBT, got " . (is_object($compound) ? get_class($compound) : gettype($compound))); diff --git a/src/pocketmine/network/mcpe/NetworkBinaryStream.php b/src/pocketmine/network/mcpe/NetworkBinaryStream.php index f8525a0648..5c4825ef33 100644 --- a/src/pocketmine/network/mcpe/NetworkBinaryStream.php +++ b/src/pocketmine/network/mcpe/NetworkBinaryStream.php @@ -89,7 +89,7 @@ class NetworkBinaryStream extends BinaryStream{ if($c !== 1){ throw new \UnexpectedValueException("Unexpected NBT count $c"); } - $nbt = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset); + $nbt = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset, 512); }elseif($nbtLen !== 0){ throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen"); } From bd2e7db3b9a312d0d2a94c38ed982e73fb190cea Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 29 Mar 2019 19:49:30 +0000 Subject: [PATCH 2/2] Release 3.6.6 --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index eed8697558..8109a4ddf7 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -38,7 +38,7 @@ namespace pocketmine { const NAME = "PocketMine-MP"; const BASE_VERSION = "3.6.6"; - const IS_DEVELOPMENT_BUILD = true; + const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; const MIN_PHP_VERSION = "7.2.0";