From 561ffd3da38d4b5d342dbb9b26487092b013986f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 14:27:56 +0000 Subject: [PATCH 1/4] Bump pmmp/setup-php-action from 3.0.0 to 3.1.0 (#6267) Bumps [pmmp/setup-php-action](https://github.com/pmmp/setup-php-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/pmmp/setup-php-action/releases) - [Commits](https://github.com/pmmp/setup-php-action/compare/3.0.0...3.1.0) --- updated-dependencies: - dependency-name: pmmp/setup-php-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main-php-matrix.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-php-matrix.yml b/.github/workflows/main-php-matrix.yml index 846459748f4..b81ac8b460c 100644 --- a/.github/workflows/main-php-matrix.yml +++ b/.github/workflows/main-php-matrix.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: pmmp/setup-php-action@3.0.0 + uses: pmmp/setup-php-action@3.1.0 with: php-version: ${{ inputs.php }} install-path: "./bin" @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: pmmp/setup-php-action@3.0.0 + uses: pmmp/setup-php-action@3.1.0 with: php-version: ${{ inputs.php }} install-path: "./bin" @@ -96,7 +96,7 @@ jobs: submodules: true - name: Setup PHP - uses: pmmp/setup-php-action@3.0.0 + uses: pmmp/setup-php-action@3.1.0 with: php-version: ${{ inputs.php }} install-path: "./bin" @@ -128,7 +128,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: pmmp/setup-php-action@3.0.0 + uses: pmmp/setup-php-action@3.1.0 with: php-version: ${{ inputs.php }} install-path: "./bin" From 47f011966092f275cc1b11f8de635e89fd9651a7 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 26 Feb 2024 14:35:21 +0000 Subject: [PATCH 2/4] InGamePacketHandler: added an extra check --- src/network/mcpe/handler/InGamePacketHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php index 8c3449d415b..860f3c465f4 100644 --- a/src/network/mcpe/handler/InGamePacketHandler.php +++ b/src/network/mcpe/handler/InGamePacketHandler.php @@ -869,8 +869,12 @@ private function checkBookText(string $string, string $fieldName, int $softLimit } public function handleBookEdit(BookEditPacket $packet) : bool{ + $inventory = $this->player->getInventory(); + if(!$inventory->slotExists($packet->inventorySlot)){ + return false; + } //TODO: break this up into book API things - $oldBook = $this->player->getInventory()->getItem($packet->inventorySlot); + $oldBook = $inventory->getItem($packet->inventorySlot); if(!($oldBook instanceof WritableBook)){ return false; } From aee36564156b3dbb2791fb17ad1c01d16335b7b6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 26 Feb 2024 14:45:47 +0000 Subject: [PATCH 3/4] Release 5.11.2 --- changelogs/5.11.md | 6 ++++++ src/VersionInfo.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelogs/5.11.md b/changelogs/5.11.md index 96c05bf1b6c..e993dceec13 100644 --- a/changelogs/5.11.md +++ b/changelogs/5.11.md @@ -37,3 +37,9 @@ Released 23rd February 2024. ## Internals - Updated GitHub Actions versions to get rid of deprecation warnings. + +# 5.11.2 +Released 26th February 2024. + +## Fixes +- Added extra checks for `BookEditPacket` handling. diff --git a/src/VersionInfo.php b/src/VersionInfo.php index 52fecb633d6..104d5445697 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -32,7 +32,7 @@ final class VersionInfo{ public const NAME = "PocketMine-MP"; public const BASE_VERSION = "5.11.2"; - public const IS_DEVELOPMENT_BUILD = true; + public const IS_DEVELOPMENT_BUILD = false; public const BUILD_CHANNEL = "stable"; /** From 34a5f91aa9506a8369879e29f472c68a91c5b9e1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 26 Feb 2024 14:45:48 +0000 Subject: [PATCH 4/4] 5.11.3 is next --- src/VersionInfo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VersionInfo.php b/src/VersionInfo.php index 104d5445697..946e53a2328 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -31,8 +31,8 @@ final class VersionInfo{ public const NAME = "PocketMine-MP"; - public const BASE_VERSION = "5.11.2"; - public const IS_DEVELOPMENT_BUILD = false; + public const BASE_VERSION = "5.11.3"; + public const IS_DEVELOPMENT_BUILD = true; public const BUILD_CHANNEL = "stable"; /**