mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6' into 3.7

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-29 19:55:36 +00:00
commit 8fcb44de7d
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -160,16 +160,16 @@
}, },
{ {
"name": "pocketmine/nbt", "name": "pocketmine/nbt",
"version": "0.2.6", "version": "0.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/NBT.git", "url": "https://github.com/pmmp/NBT.git",
"reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4" "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", "url": "https://api.github.com/repos/pmmp/NBT/zipball/2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a",
"reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4", "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -194,10 +194,10 @@
], ],
"description": "PHP library for working with Named Binary Tags", "description": "PHP library for working with Named Binary Tags",
"support": { "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" "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", "name": "pocketmine/raklib",

3
src/pocketmine/Player.php
View File

@ -2985,7 +2985,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$t = $this->level->getTile($pos); $t = $this->level->getTile($pos);
if($t instanceof Spawnable){ if($t instanceof Spawnable){
$nbt = new NetworkLittleEndianNBTStream(); $nbt = new NetworkLittleEndianNBTStream();
$compound = $nbt->read($packet->namedtag); $_ = 0;
$compound = $nbt->read($packet->namedtag, false, $_, 512);
if(!($compound instanceof CompoundTag)){ if(!($compound instanceof CompoundTag)){
throw new \InvalidArgumentException("Expected " . CompoundTag::class . " in block entity NBT, got " . (is_object($compound) ? get_class($compound) : gettype($compound))); throw new \InvalidArgumentException("Expected " . CompoundTag::class . " in block entity NBT, got " . (is_object($compound) ? get_class($compound) : gettype($compound)));

2
src/pocketmine/network/mcpe/NetworkBinaryStream.php
View File

@ -90,7 +90,7 @@ class NetworkBinaryStream extends BinaryStream{
if($c !== 1){ if($c !== 1){
throw new \UnexpectedValueException("Unexpected NBT count $c"); 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){ }elseif($nbtLen !== 0){
throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen"); throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen");
} }