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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	build/php
#	composer.lock
#	resources/vanilla
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/level/format/io/region/McRegion.php
This commit is contained in:
Dylan K. Taylor 2020-12-07 18:57:58 +00:00
commit e810a68dd7
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/php

@ -1 +1 @@
Subproject commit eee477802a5e89bc9ec9adff42058aed36825475 Subproject commit 24388d20a548d92bb7747a195873f18eefca97a3

6
changelogs/3.16.md
View File

@ -16,3 +16,9 @@ Plugin developers should **only** update their required API to this version if y
- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon - Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
- New blocks, items & mobs aren't implemented - New blocks, items & mobs aren't implemented
- Nether doesn't exist - Nether doesn't exist
# 3.16.1
- Fixed incorrect encoding of skins in the protocol.
- `/version` no longer crashes when a plugin provides `string[]` for the `author` field in `plugin.yml`.
- `author` in `plugin.yml` now accepts arrays, just like `authors`.
- Fixed `HellBiome` never being registered.

2
composer.json
View File

@ -51,7 +51,7 @@
"composer-runtime-api": "^2.0" "composer-runtime-api": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.58", "phpstan/phpstan": "0.12.59",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2", "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

42
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "265c9d2e9b1ec4d52c934b4bec7a9188", "content-hash": "59cfedb6b07a8e13ae3a77a6ea8e18d8",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1126,16 +1126,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.10.2", "version": "v4.10.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "658f1be311a230e0907f5dfe0213742aff0596de" "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
"reference": "658f1be311a230e0907f5dfe0213742aff0596de", "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1176,9 +1176,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.2" "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.3"
}, },
"time": "2020-09-26T10:30:38+00:00" "time": "2020-12-03T17:45:45+00:00"
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",
@ -1518,16 +1518,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.58", "version": "0.12.59",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5" "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a4847df6047b30af28854ed9dc95304cdb56ae5", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cf4107257c8ca2ad967efdd6a00f12b21acbb779",
"reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5", "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1558,7 +1558,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.58" "source": "https://github.com/phpstan/phpstan/tree/0.12.59"
}, },
"funding": [ "funding": [
{ {
@ -1574,7 +1574,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-11-29T13:32:03+00:00" "time": "2020-12-07T14:46:03+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
@ -2011,16 +2011,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.4.4", "version": "9.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "6535e637961f0829832621dc1b7308c2d24a799e" "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6535e637961f0829832621dc1b7308c2d24a799e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
"reference": "6535e637961f0829832621dc1b7308c2d24a799e", "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2036,7 +2036,7 @@
"phar-io/version": "^3.0.2", "phar-io/version": "^3.0.2",
"php": ">=7.3", "php": ">=7.3",
"phpspec/prophecy": "^1.12.1", "phpspec/prophecy": "^1.12.1",
"phpunit/php-code-coverage": "^9.2", "phpunit/php-code-coverage": "^9.2.3",
"phpunit/php-file-iterator": "^3.0.5", "phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1", "phpunit/php-invoker": "^3.1.1",
"phpunit/php-text-template": "^2.0.3", "phpunit/php-text-template": "^2.0.3",
@ -2067,7 +2067,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "9.4-dev" "dev-master": "9.5-dev"
} }
}, },
"autoload": { "autoload": {
@ -2098,7 +2098,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.4" "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0"
}, },
"funding": [ "funding": [
{ {
@ -2110,7 +2110,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-12-01T04:58:47+00:00" "time": "2020-12-04T05:05:53+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

3
src/world/format/io/region/RegionWorldProvider.php
View File

@ -218,6 +218,9 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ); self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
assert(is_int($regionX) and is_int($regionZ)); assert(is_int($regionX) and is_int($regionZ));
if(!file_exists($this->pathToRegion($regionX, $regionZ))){
return null;
}
$this->loadRegion($regionX, $regionZ); $this->loadRegion($regionX, $regionZ);
$chunkData = $this->getRegion($regionX, $regionZ)->readChunk($chunkX & 0x1f, $chunkZ & 0x1f); $chunkData = $this->getRegion($regionX, $regionZ)->readChunk($chunkX & 0x1f, $chunkZ & 0x1f);