From f1d378468ecccb7bb03ed5d4e5729558c2beda3c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 18 May 2020 09:44:43 +0100 Subject: [PATCH 1/4] updated build/php submodule to pmmp/php-build-scripts@a6ab41089e4c2d19b309fe29763f332564b4b662 --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index e14551586..a6ab41089 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit e145515864a6b1a5bad4e755b68e93b7dfbf9697 +Subproject commit a6ab41089e4c2d19b309fe29763f332564b4b662 From 1fb0ba6fc051a3052bf6ef8a84db31f85cfd4313 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 18 May 2020 09:47:56 +0100 Subject: [PATCH 2/4] travis: update PHP extension versions --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fc68b387..91c927db6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,10 @@ php: before_script: - phpenv config-rm xdebug.ini -# - pecl install channel://pecl.php.net/pthreads-3.1.6 - - echo | pecl install channel://pecl.php.net/yaml-2.0.4 + - echo | pecl install channel://pecl.php.net/yaml-2.1.0 - git clone https://github.com/pmmp/pthreads.git - cd pthreads - - git checkout 1b7da492b944146fa9680f6399bd9c6c6c6095e0 + - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d - phpize - ./configure - make From 9b6b3f50a14a37a66d98351a0bdf03ba383be636 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 18 May 2020 10:17:02 +0100 Subject: [PATCH 3/4] Release 3.12.2 --- changelogs/3.12.md | 9 +++++++++ src/pocketmine/VersionInfo.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changelogs/3.12.md b/changelogs/3.12.md index 2c03b4f1a..5e068a319 100644 --- a/changelogs/3.12.md +++ b/changelogs/3.12.md @@ -16,3 +16,12 @@ Plugin developers should **only** update their required API to this version if y - Fixed some bugs in login verification that could cause undefined behaviour. - Fixed item-use behaviour when sneaking - sneaking and clicking a block with an empty hand, and sneaking and using an item, both now follow vanilla behaviour. - `start.sh` will now work on platforms where `/bin/bash` is not available, as long as `/usr/bin/env` knows where bash is. + +# 3.12.2 +- Fixed permission default timings not being reported in timings reports (they were never stopped, only started). +- Resource packs with a directory tree like `pack.zip/MyPack/manifest.json` are now supported. Note that the manifest closest to the root will be used. +- Fixed `SkinImage` height and width being inverted at the protocol layer. +- Fixed blocks being able to be placed inside the spawn protectionb radius by clicking the side of a block outside the radius. +- Fixed server crash when `network.compression-level` is overridden by a CLI parameter. +- Fixed moving entities spawning themselves to players registered on chunks when the players haven't received the chunk yet. +- Cocoa pods now drop cocoa beans when broken instead of the block itself. diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index 247de6176..6efcbde79 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.12.2"; -const IS_DEVELOPMENT_BUILD = true; +const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; From 27f55e4c9650c54246daaa40a7953fabd3ad29c6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 18 May 2020 10:17:08 +0100 Subject: [PATCH 4/4] 3.12.3 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 6efcbde79..e05a4885a 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.12.2"; -const IS_DEVELOPMENT_BUILD = false; +const BASE_VERSION = "3.12.3"; +const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0;