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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-11 16:36:39 +01:00
commit 74d103a56f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
"version": "1.1.0", "version": "1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/adhocore/php-json-comment.git", "url": "https://github.com/adhocore/php-json-comment.git",
"reference": "cf7998124d1050b83d7d985447fefd630e09c1a2" "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/cf7998124d1050b83d7d985447fefd630e09c1a2", "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7",
"reference": "cf7998124d1050b83d7d985447fefd630e09c1a2", "reference": "fc2f76979f0a44a5f5bc2a2b600d0762fe0e78e7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -51,7 +51,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/adhocore/php-json-comment/issues", "issues": "https://github.com/adhocore/php-json-comment/issues",
"source": "https://github.com/adhocore/php-json-comment/tree/1.1.0" "source": "https://github.com/adhocore/php-json-comment/tree/1.1.2"
}, },
"funding": [ "funding": [
{ {
@ -59,7 +59,7 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2021-04-05T13:11:13+00:00" "time": "2021-04-09T03:06:06+00:00"
}, },
{ {
"name": "brick/math", "name": "brick/math",

4
src/network/mcpe/protocol/serializer/PacketSerializer.php
View File

@ -286,6 +286,10 @@ class PacketSerializer extends BinaryStream{
$shieldBlockingTick = $extraData->getLLong(); $shieldBlockingTick = $extraData->getLLong();
} }
if(!$extraData->feof()){
throw new PacketDecodeException("Unexpected trailing extradata for network item $netId");
}
return new ItemStack($id, $meta, $count, $blockRuntimeId, $compound, $canPlaceOn, $canDestroy, $shieldBlockingTick); return new ItemStack($id, $meta, $count, $blockRuntimeId, $compound, $canPlaceOn, $canDestroy, $shieldBlockingTick);
})(); })();
} }