From 07cae8a12948a63a0734cfdabfe86b29ce63d920 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 5 Dec 2020 19:40:30 +0000 Subject: [PATCH 1/7] Updated composer dependencies --- composer.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 6917c1f84..45e18b91a 100644 --- a/composer.lock +++ b/composer.lock @@ -604,16 +604,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.2", + "version": "v4.10.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de" + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", "shasum": "" }, "require": { @@ -654,9 +654,9 @@ ], "support": { "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", @@ -1489,16 +1489,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.4.4", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e" + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6535e637961f0829832621dc1b7308c2d24a799e", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", "shasum": "" }, "require": { @@ -1514,7 +1514,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "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-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -1545,7 +1545,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.4-dev" + "dev-master": "9.5-dev" } }, "autoload": { @@ -1576,7 +1576,7 @@ ], "support": { "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": [ { @@ -1588,7 +1588,7 @@ "type": "github" } ], - "time": "2020-12-01T04:58:47+00:00" + "time": "2020-12-04T05:05:53+00:00" }, { "name": "sebastian/cli-parser", From d0d701f232951fb43decff547256879d1afe5b98 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 5 Dec 2020 19:42:41 +0000 Subject: [PATCH 2/7] Updated build/php submodule to pmmp/php-build-scripts@a42c7df20a1dc8d6a520133d221916a922f45af1 --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index e45cfc1ec..a42c7df20 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit e45cfc1ece707a2ba9e68275249f0670077430b0 +Subproject commit a42c7df20a1dc8d6a520133d221916a922f45af1 From 9c07c206f653eaa3114ab3a9094165de995244c9 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 5 Dec 2020 20:02:14 +0000 Subject: [PATCH 3/7] Updated DevTools submodule to pmmp/DevTools@1606a4307bae044c0c4a5e287a4fd958bfa05918 --- tests/plugins/DevTools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/DevTools b/tests/plugins/DevTools index 9a43721a2..1606a4307 160000 --- a/tests/plugins/DevTools +++ b/tests/plugins/DevTools @@ -1 +1 @@ -Subproject commit 9a43721a2f4c08c235599bd97704f2e4d5d542c1 +Subproject commit 1606a4307bae044c0c4a5e287a4fd958bfa05918 From f28405fcfb428c3b9a649cdac427bf33f2bbf80f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 7 Dec 2020 17:12:55 +0000 Subject: [PATCH 4/7] phpstan 0.12.59 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 362eaffc8..df24c2f07 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "composer-runtime-api": "^2.0" }, "require-dev": { - "phpstan/phpstan": "0.12.58", + "phpstan/phpstan": "0.12.59", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 45e18b91a..5d7fa9386 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6e254dbfde069aa358d41f88a9ea7f1e", + "content-hash": "2c44138f2052c259a201871d4d423947", "packages": [ { "name": "adhocore/json-comment", @@ -996,16 +996,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.58", + "version": "0.12.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5" + "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a4847df6047b30af28854ed9dc95304cdb56ae5", - "reference": "2a4847df6047b30af28854ed9dc95304cdb56ae5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cf4107257c8ca2ad967efdd6a00f12b21acbb779", + "reference": "cf4107257c8ca2ad967efdd6a00f12b21acbb779", "shasum": "" }, "require": { @@ -1036,7 +1036,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "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": [ { @@ -1052,7 +1052,7 @@ "type": "tidelift" } ], - "time": "2020-11-29T13:32:03+00:00" + "time": "2020-12-07T14:46:03+00:00" }, { "name": "phpstan/phpstan-phpunit", From 9b01fb3d89fd934e4e5eefc39d6f60f228c968f4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 7 Dec 2020 17:16:10 +0000 Subject: [PATCH 5/7] Release 3.16.1 --- changelogs/3.16.md | 6 ++++++ src/pocketmine/VersionInfo.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelogs/3.16.md b/changelogs/3.16.md index 717f07acb..60d4749e4 100644 --- a/changelogs/3.16.md +++ b/changelogs/3.16.md @@ -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 - New blocks, items & mobs aren't implemented - 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. diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index c8a2da70f..743270fd2 100644 --- a/src/pocketmine/VersionInfo.php +++ b/src/pocketmine/VersionInfo.php @@ -34,5 +34,5 @@ const _VERSION_INFO_INCLUDED = true; const NAME = "PocketMine-MP"; const BASE_VERSION = "3.16.1"; -const IS_DEVELOPMENT_BUILD = true; +const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; From 5f0310a8b66a7c76ec2025dfeec0af42d5a64a08 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 7 Dec 2020 17:16:11 +0000 Subject: [PATCH 6/7] 3.16.2 is next --- src/pocketmine/VersionInfo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index 743270fd2..a1eb5903c 100644 --- a/src/pocketmine/VersionInfo.php +++ b/src/pocketmine/VersionInfo.php @@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){ const _VERSION_INFO_INCLUDED = true; const NAME = "PocketMine-MP"; -const BASE_VERSION = "3.16.1"; -const IS_DEVELOPMENT_BUILD = false; +const BASE_VERSION = "3.16.2"; +const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0; From 4d1be4d41d615f8bb47c1964b79520f309c16ef5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 7 Dec 2020 18:44:49 +0000 Subject: [PATCH 7/7] McRegion: do not create a region file when trying to read a chunk that doesn't exist fixes #3953 --- src/pocketmine/level/format/io/region/McRegion.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pocketmine/level/format/io/region/McRegion.php b/src/pocketmine/level/format/io/region/McRegion.php index 4155810f7..f999b01ed 100644 --- a/src/pocketmine/level/format/io/region/McRegion.php +++ b/src/pocketmine/level/format/io/region/McRegion.php @@ -391,6 +391,9 @@ class McRegion extends BaseLevelProvider{ self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ); assert(is_int($regionX) and is_int($regionZ)); + if(!file_exists($this->pathToRegion($regionX, $regionZ))){ + return null; + } $this->loadRegion($regionX, $regionZ); $chunkData = $this->getRegion($regionX, $regionZ)->readChunk($chunkX & 0x1f, $chunkZ & 0x1f);