diff --git a/changelogs/4.17.md b/changelogs/4.17.md index 58669cc25..aa50ccd5a 100644 --- a/changelogs/4.17.md +++ b/changelogs/4.17.md @@ -31,3 +31,9 @@ Released 22nd March 2023. - Added version-specific channels to `update.pmmp.io`, such as `4`, `4.18-beta`, `4.17`, etc. - Replaced deprecated `::set-output` commands in GitHub Actions workflows. - `build/make-release.php` no longer automatically pushes changes, to avoid accidents when testing release workflows on forks. + +# 4.17.2 +Released 29th March 2023. + +## Fixes +- Fixed players being unable to join due to the appearance of a new `x5t` field in the JWT header of Xbox Live authentication tokens. diff --git a/changelogs/4.18.md b/changelogs/4.18.md index 4007b206c..435784fb0 100644 --- a/changelogs/4.18.md +++ b/changelogs/4.18.md @@ -89,4 +89,11 @@ Released 27th March 2023. ## Fixes - Fixed server crash when attempting to drop more of an item from a stack than available in the inventory. - Fixed packet processing errors when editing writable books. -- Fixed packet processing errors when shift-clicking on the recipe book to craft recipes which draw from a large number of inventory slots. \ No newline at end of file +- Fixed packet processing errors when shift-clicking on the recipe book to craft recipes which draw from a large number of inventory slots. + +# 4.18.2 +Released 29th March 2023. + +## Fixes +- Fixed players being unable to join due to the appearance of a new `x5t` field in the JWT header of Xbox Live authentication tokens. +- Fixed items' durability appearing to reset when moving them around in the inventory. diff --git a/composer.json b/composer.json index eab5c6ed8..1bc3c5370 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "pocketmine/bedrock-block-upgrade-schema": "~1.1.1+bedrock-1.19.70", "pocketmine/bedrock-data": "~2.1.1+bedrock-1.19.70", "pocketmine/bedrock-item-upgrade-schema": "~1.1.0+bedrock-1.19.70", - "pocketmine/bedrock-protocol": "~20.1.0+bedrock-1.19.70", + "pocketmine/bedrock-protocol": "~20.1.1+bedrock-1.19.70", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/classloader": "^0.2.0", diff --git a/composer.lock b/composer.lock index d57d22ae7..8d914bb31 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": "956553d402f9c522cfcfe19260af2d2b", + "content-hash": "7c779ace575b5ef662eb5a6b0f173418", "packages": [ { "name": "adhocore/json-comment", @@ -328,16 +328,16 @@ }, { "name": "pocketmine/bedrock-protocol", - "version": "20.1.0+bedrock-1.19.70", + "version": "20.1.1+bedrock-1.19.70", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "91d67c8b1bced3c82d0841b1041c0c1f4e93eb68" + "reference": "455dbad93d29b4489b60910a41e38b8007b26563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/91d67c8b1bced3c82d0841b1041c0c1f4e93eb68", - "reference": "91d67c8b1bced3c82d0841b1041c0c1f4e93eb68", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/455dbad93d29b4489b60910a41e38b8007b26563", + "reference": "455dbad93d29b4489b60910a41e38b8007b26563", "shasum": "" }, "require": { @@ -369,9 +369,9 @@ "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP", "support": { "issues": "https://github.com/pmmp/BedrockProtocol/issues", - "source": "https://github.com/pmmp/BedrockProtocol/tree/20.1.0+bedrock-1.19.70" + "source": "https://github.com/pmmp/BedrockProtocol/tree/20.1.1+bedrock-1.19.70" }, - "time": "2023-03-20T01:17:00+00:00" + "time": "2023-03-29T22:38:17+00:00" }, { "name": "pocketmine/binaryutils", diff --git a/src/VersionInfo.php b/src/VersionInfo.php index 14e4d3883..0ac681340 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -31,7 +31,7 @@ use function str_repeat; final class VersionInfo{ public const NAME = "PocketMine-MP"; - public const BASE_VERSION = "4.18.2"; + public const BASE_VERSION = "4.18.3"; public const IS_DEVELOPMENT_BUILD = true; public const BUILD_CHANNEL = "stable"; diff --git a/src/network/mcpe/handler/ItemStackResponseBuilder.php b/src/network/mcpe/handler/ItemStackResponseBuilder.php index 325a2b108..68a549f21 100644 --- a/src/network/mcpe/handler/ItemStackResponseBuilder.php +++ b/src/network/mcpe/handler/ItemStackResponseBuilder.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\handler; use pocketmine\inventory\Inventory; +use pocketmine\item\Durable; use pocketmine\network\mcpe\InventoryManager; use pocketmine\network\mcpe\protocol\types\inventory\ContainerUIIds; use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponse; @@ -91,7 +92,7 @@ final class ItemStackResponseBuilder{ $item->getCount(), $itemStackInfo->getStackId(), $item->getCustomName(), - 0 + $item instanceof Durable ? $item->getDamage() : 0, ); } }