From b01e4ab417670fb4d78cea6d71dad1dbef1233fa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:49:08 +0000 Subject: [PATCH 1/4] Bump phpstan/phpstan from 0.12.83 to 0.12.84 (#4189) --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index eb234ebd8..52a2c6a53 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "pocketmine/spl": "^0.4.0" }, "require-dev": { - "phpstan/phpstan": "0.12.83", + "phpstan/phpstan": "0.12.84", "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 7828a6cf8..6df2a2c04 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": "c07802390fc058bf06b3a1741ef7c08e", + "content-hash": "8c9701fdb696fe1cd1952aa273f1bfa6", "packages": [ { "name": "adhocore/json-comment", @@ -1009,16 +1009,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.83", + "version": "0.12.84", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f" + "reference": "9c43f15da8798c8f30a4b099e6a94530a558cfd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a967cec6efb46b500dd6d768657336a3ffe699f", - "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9c43f15da8798c8f30a4b099e6a94530a558cfd5", + "reference": "9c43f15da8798c8f30a4b099e6a94530a558cfd5", "shasum": "" }, "require": { @@ -1049,7 +1049,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.83" + "source": "https://github.com/phpstan/phpstan/tree/0.12.84" }, "funding": [ { @@ -1065,7 +1065,7 @@ "type": "tidelift" } ], - "time": "2021-04-03T15:35:45+00:00" + "time": "2021-04-19T17:10:54+00:00" }, { "name": "phpstan/phpstan-phpunit", From 361be8fe36601a857d32f0b9afe8f28889b3711c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Apr 2021 14:37:22 +0100 Subject: [PATCH 2/4] Normal: drop MOUNTAINS and SMALL_MOUNTAINS from biome selection this would cause disruption to generation on a patch release, which is unacceptable. This would be better for 3.20 or 4.0. --- src/pocketmine/level/generator/normal/Normal.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pocketmine/level/generator/normal/Normal.php b/src/pocketmine/level/generator/normal/Normal.php index d4902e236..2531fe256 100644 --- a/src/pocketmine/level/generator/normal/Normal.php +++ b/src/pocketmine/level/generator/normal/Normal.php @@ -144,13 +144,9 @@ class Normal extends Generator{ return Biome::BIRCH_FOREST; } }else{ - if($temperature < 0.20){ - return Biome::MOUNTAINS; - }elseif($temperature < 0.40){ - return Biome::SMALL_MOUNTAINS; - }else{ - return Biome::RIVER; - } + //Previously here, we had a (broken) condition to generate mountains, but fixing it would have + //caused generation changes on a patch release, so we can't keep it here for now. + return Biome::RIVER; } } }; From a7cd0810020af15fb3d79127c77cf576085cd4cc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Apr 2021 20:34:13 +0100 Subject: [PATCH 3/4] Release 3.19.1 --- changelogs/3.19.md | 6 ++++++ src/pocketmine/VersionInfo.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelogs/3.19.md b/changelogs/3.19.md index a59dc1b65..71eaaa8d7 100644 --- a/changelogs/3.19.md +++ b/changelogs/3.19.md @@ -15,3 +15,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.19.1 +- Fixed some particles not working since 1.16.220. +- Fixed issues with creative inventory items appearing in the wrong places since 1.16.220. +- `Item->removeEnchantment()` now removes the `ench` tag from item NBT when removing the only enchantment on an item. +- Fixed temporary memory leak of repeating tasks which cancelled themselves during their `onRun()` handler (they were pushed back onto the task queue even though cancelled, and only removed at their next attempted repeat). diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index 88758f859..44945eb04 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.19.1"; -const IS_DEVELOPMENT_BUILD = true; +const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; From 89260d788cd5962bd1a659795a04d717ae04315c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Apr 2021 20:34:13 +0100 Subject: [PATCH 4/4] 3.19.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 44945eb04..446fb23d4 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.19.1"; -const IS_DEVELOPMENT_BUILD = false; +const BASE_VERSION = "3.19.2"; +const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0;