Prepare 5.33.2 release (#6804 )

Update composer dev dependencies
InGamePacketHandler: don't resync blocks if the client predicted an interact fail
2025-09-16 14:25:05 +00:00 · 2025-09-15 23:53:05 +01:00 · 2025-09-15 22:41:02 +01:00 · 2025-09-15 19:36:29 +01:00 · 2025-09-15 18:02:10 +01:00 · 2025-09-15 17:34:35 +01:00
25 changed files with 244 additions and 88 deletions
--- a/.github/workflows/discord-release-notify.yml
+++ b/.github/workflows/discord-release-notify.yml
@ -18,7 +18,7 @@ jobs:
      - uses: actions/checkout@v5

      - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.35.3
+        uses: shivammathur/setup-php@2.35.4
        with:
          php-version: 8.2

--- a/.github/workflows/draft-release-pr-check.yml
+++ b/.github/workflows/draft-release-pr-check.yml
@ -49,7 +49,7 @@ jobs:
      - uses: actions/checkout@v5

      - name: Setup PHP
-        uses: shivammathur/setup-php@2.35.3
+        uses: shivammathur/setup-php@2.35.4
        with:
          php-version: 8.2

--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@ -87,7 +87,7 @@ jobs:
          submodules: true

      - name: Setup PHP
-        uses: shivammathur/setup-php@2.35.3
+        uses: shivammathur/setup-php@2.35.4
        with:
          php-version: ${{ env.PHP_VERSION }}

--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -11,7 +11,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php: ["8.1", "8.2", "8.3"]
+        php: ["8.1", "8.2", "8.3", "8.4"]

    uses: ./.github/workflows/main-php-matrix.yml
    with:
@ -28,7 +28,7 @@ jobs:
      - uses: actions/checkout@v5

      - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.35.3
+        uses: shivammathur/setup-php@2.35.4
        with:
          php-version: 8.3
          tools: php-cs-fixer:3.75
--- a/README.md
+++ b/README.md
@ -73,7 +73,7 @@ PocketMine-MP is free, but it requires a lot of time and effort from unpaid volu
 You can support development using the following methods:

 - [Patreon](https://www.patreon.com/pocketminemp)
- Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
+- Bitcoin (BTC): `bc1q2v5ngyf8ugyd55kqa9ep35g2rv342ueqm6ks33`
 - Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`

 Thanks for your support!
--- a/build/generate-block-serializer-consts.php
+++ b/build/generate-block-serializer-consts.php
@ -29,6 +29,9 @@ use pocketmine\data\bedrock\block\BlockStateStringValues;
 use pocketmine\data\bedrock\block\BlockTypeNames;
 use pocketmine\errorhandler\ErrorToExceptionHandler;
 use pocketmine\nbt\NbtException;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\convert\BlockStateDictionary;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
@ -78,6 +81,9 @@ function generateBlockPaletteReport(array $states) : BlockPaletteReport{
 		$name = $stateData->getName();
 		$result->seenTypes[$name] = $name;
 		foreach(Utils::stringifyKeys($stateData->getStates()) as $k => $v){
+			if(!$v instanceof ByteTag && !$v instanceof IntTag && !$v instanceof StringTag){
+				throw new AssumptionFailedError("Assumed all state tags should be TAG_Byte, TAG_Int or TAG_String, but found $k ($v) on block $name");
+			}
 			$result->seenStateValues[$k][$v->getValue()] = $v->getValue();
 			asort($result->seenStateValues[$k]);
 		}
--- a/build/php
+++ b/build/php
--- a/changelogs/5.33.md
+++ b/changelogs/5.33.md
@ -127,3 +127,21 @@ Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if
 ## Internals
 - `BlockStateUpgrader` is now almost entirely independent from `BlockStateData`. It's anticipated that the upgrader library will be separable from the core in the future.
 - `Block->readStateFromWorld()` is now triggered on chunk load for any position containing a tile. This should allow more effective updating of blocks with properties in their tiles.
+
+# 5.33.1
+Released 31st August 2025.
+
+## Fixes
+- Fixed banners placed in prior versions getting their tiles deleted (due to missing `Type` tags).
+
+# 5.33.2
+Released 16th September 2025.
+
+## General
+- PHP 8.4 has now been added to the test matrix.
+
+## Fixes
+- Fixed PHP 8.4 deprecation notice in `AsyncGeneratorExecutor`.
+- Fixed inventory windows breaking if a window is sent while the player has the chat window open (e.g. quickly pressing E followed by / could trigger this).
+- Fixed `BlockBreakEvent` being called twice in creative if cancelled.
+- Reduced block lag when towering and other situations where the placed block might intersect with the player's AABB. Block lag may still appear on higher latency clients - this is still being worked on.
--- a/composer.json
+++ b/composer.json
@ -52,7 +52,7 @@
      "symfony/filesystem": "~6.4.0"
   },
   "require-dev": {
-      "phpstan/phpstan": "2.1.17",
+      "phpstan/phpstan": "2.1.25",
      "phpstan/phpstan-phpunit": "^2.0.0",
      "phpstan/phpstan-strict-rules": "^2.0.0",
      "phpunit/phpunit": "^10.5.24"
--- 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": "27fee330bdcb6ea2373c57cdfb3bc22f",
+    "content-hash": "008c888b5812dda09a0ec6e425453153",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -818,20 +818,20 @@
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.9.0",
+            "version": "4.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0"
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4e0e23cc785f0724a0e838279a9eb03f28b092a0",
-                "reference": "4e0e23cc785f0724a0e838279a9eb03f28b092a0",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
                "php": "^8.0",
                "ramsey/collection": "^1.2 || ^2.0"
            },
@ -890,9 +890,9 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.0"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
            },
-            "time": "2025-06-25T14:20:11+00:00"
+            "time": "2025-09-04T20:59:21+00:00"
        },
        {
            "name": "symfony/filesystem",
@ -1204,16 +1204,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.17",
+            "version": "2.1.25",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
+                "reference": "4087d28bd252895874e174d65e26b2c202ed893a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4087d28bd252895874e174d65e26b2c202ed893a",
+                "reference": "4087d28bd252895874e174d65e26b2c202ed893a",
                "shasum": ""
            },
            "require": {
@ -1258,25 +1258,25 @@
                    "type": "github"
                }
            ],
-            "time": "2025-05-21T20:55:28+00:00"
+            "time": "2025-09-12T14:26:42+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
-            "version": "2.0.6",
+            "version": "2.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-phpunit.git",
-                "reference": "6b92469f8a7995e626da3aa487099617b8dfa260"
+                "reference": "9a9b161baee88a5f5c58d816943cff354ff233dc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/6b92469f8a7995e626da3aa487099617b8dfa260",
-                "reference": "6b92469f8a7995e626da3aa487099617b8dfa260",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9a9b161baee88a5f5c58d816943cff354ff233dc",
+                "reference": "9a9b161baee88a5f5c58d816943cff354ff233dc",
                "shasum": ""
            },
            "require": {
                "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.0.4"
+                "phpstan/phpstan": "^2.1.18"
            },
            "conflict": {
                "phpunit/phpunit": "<7.0"
@ -1309,9 +1309,9 @@
            "description": "PHPUnit extensions and rules for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
-                "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.6"
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.7"
            },
-            "time": "2025-03-26T12:47:06+00:00"
+            "time": "2025-07-13T11:31:46+00:00"
        },
        {
            "name": "phpstan/phpstan-strict-rules",
@ -1684,16 +1684,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.53",
+            "version": "10.5.55",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "32768472ebfb6969e6c7399f1c7b09009723f653"
+                "reference": "4b2d546b336876bd9562f24641b08a25335b06b6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32768472ebfb6969e6c7399f1c7b09009723f653",
-                "reference": "32768472ebfb6969e6c7399f1c7b09009723f653",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b2d546b336876bd9562f24641b08a25335b06b6",
+                "reference": "4b2d546b336876bd9562f24641b08a25335b06b6",
                "shasum": ""
            },
            "require": {
@ -1714,7 +1714,7 @@
                "phpunit/php-timer": "^6.0.0",
                "sebastian/cli-parser": "^2.0.1",
                "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.3",
+                "sebastian/comparator": "^5.0.4",
                "sebastian/diff": "^5.1.1",
                "sebastian/environment": "^6.1.0",
                "sebastian/exporter": "^5.1.2",
@ -1765,7 +1765,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.53"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.55"
            },
            "funding": [
                {
@ -1789,7 +1789,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-08-20T14:40:06+00:00"
+            "time": "2025-09-14T06:19:20+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@ -1961,16 +1961,16 @@
        },
        {
            "name": "sebastian/comparator",
-            "version": "5.0.3",
+            "version": "5.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
+                "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
-                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e8e53097718d2b53cfb2aa859b06a41abf58c62e",
+                "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e",
                "shasum": ""
            },
            "require": {
@ -2026,15 +2026,27 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/comparator/issues",
                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.4"
            },
            "funding": [
                {
                    "url": "https://github.com/sebastianbergmann",
                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
                }
            ],
-            "time": "2024-10-18T14:56:07+00:00"
+            "time": "2025-09-07T05:25:07+00:00"
        },
        {
            "name": "sebastian/complexity",
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -4,6 +4,8 @@ includes:
 	- tests/phpstan/configs/impossible-generics.neon
 	- tests/phpstan/configs/php-bugs.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
+	- tests/phpstan/configs/property-hook-sadness.neon
+	- tests/phpstan/configs/reflection-class-sadness.neon
 	- tests/phpstan/configs/spl-fixed-array-sucks.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
--- 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 = "5.33.0";
+	public const BASE_VERSION = "5.33.2";
 	public const IS_DEVELOPMENT_BUILD = false;
 	public const BUILD_CHANNEL = "stable";

--- a/src/block/tile/Banner.php
+++ b/src/block/tile/Banner.php
@ -82,7 +82,7 @@ class Banner extends Spawnable{
 			}
 		}

-		$this->type = $nbt->getInt(self::TAG_TYPE);
+		$this->type = $nbt->getInt(self::TAG_TYPE, self::TYPE_NORMAL);
 	}

 	protected function writeSaveData(CompoundTag $nbt) : void{
--- a/src/data/bedrock/block/upgrade/BlockStateUpgrader.php
+++ b/src/data/bedrock/block/upgrade/BlockStateUpgrader.php
@ -278,6 +278,10 @@ final class BlockStateUpgrader{
 	private function applyPropertyFlattened(BlockStateUpgradeSchemaFlattenInfo $flattenInfo, string $oldName, array $states) : array{
 		$flattenedValue = $states[$flattenInfo->flattenedProperty] ?? null;
 		$expectedType = $flattenInfo->flattenedPropertyType;
+		if($expectedType === null){
+			//TODO: we can't make this non-nullable in a patch release
+			throw new AssumptionFailedError("We never give this null");
+		}
 		if(!$flattenedValue instanceof $expectedType){
 			//flattened property is not of the expected type, so this transformation is not applicable
 			return [$oldName, $states];
--- a/src/network/mcpe/InventoryManager.php
+++ b/src/network/mcpe/InventoryManager.php
@ -64,6 +64,7 @@ use pocketmine\network\mcpe\protocol\types\inventory\WindowTypes;
 use pocketmine\network\PacketHandlingException;
 use pocketmine\player\Player;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Binary;
 use pocketmine\utils\ObjectSet;
 use function array_fill_keys;
 use function array_keys;
@ -419,6 +420,15 @@ class InventoryManager{
 	}

 	public function onClientRemoveWindow(int $id) : void{
+		if(Binary::signByte($id) === ContainerIds::NONE){ //TODO: REMOVE signByte() once BedrockProtocol + ext-encoding are implemented
+			//TODO: HACK! Since 1.21.100 (and probably earlier), the client will send -1 to close windows that it can't
+			//view for some reason, e.g. if the chat window was already open. This is pretty awkward, since it means
+			//that we can only assume it refers to the most recently sent window, and if we don't handle it,
+			//InventoryManager will never get the green light to send subsequent windows, which breaks inventory UIs.
+			//Fortunately, we already wait for close acks anyway, so the window ID is technically useless...?
+			$this->session->getLogger()->debug("Client rejected opening of a window, assuming it was $this->lastInventoryNetworkId");
+			$id = $this->lastInventoryNetworkId;
+		}
 		if($id === $this->lastInventoryNetworkId){
 			if(isset($this->networkIdToInventoryMap[$id]) && $id !== $this->pendingCloseWindowId){
 				$this->remove($id);
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@ -89,6 +89,7 @@ use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\inventory\MismatchTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
 use pocketmine\network\mcpe\protocol\types\inventory\NormalTransactionData;
+use pocketmine\network\mcpe\protocol\types\inventory\PredictedResult;
 use pocketmine\network\mcpe\protocol\types\inventory\ReleaseItemTransactionData;
 use pocketmine\network\mcpe\protocol\types\inventory\stackrequest\ItemStackRequest;
 use pocketmine\network\mcpe\protocol\types\inventory\stackresponse\ItemStackResponse;
@ -498,11 +499,13 @@ class InGamePacketHandler extends PacketHandler{
 				$blockPos = $data->getBlockPosition();
 				$vBlockPos = new Vector3($blockPos->getX(), $blockPos->getY(), $blockPos->getZ());
 				$this->player->interactBlock($vBlockPos, $data->getFace(), $clickPos);
-				//always sync this in case plugins caused a different result than the client expected
-				//we *could* try to enhance detection of plugin-altered behaviour, but this would require propagating
-				//more information up the stack. For now I think this is good enough.
-				//if only the client would tell us what blocks it thinks changed...
-				$this->syncBlocksNearby($vBlockPos, $data->getFace());
+				if($data->getClientInteractPrediction() === PredictedResult::SUCCESS){
+					//always sync this in case plugins caused a different result than the client expected
+					//we *could* try to enhance detection of plugin-altered behaviour, but this would require propagating
+					//more information up the stack. For now I think this is good enough.
+					//if only the client would tell us what blocks it thinks changed...
+					$this->syncBlocksNearby($vBlockPos, $data->getFace());
+				}
 				return true;
 			case UseItemTransactionData::ACTION_CLICK_AIR:
 				if($this->player->isUsingItem()){
@ -717,7 +720,8 @@ class InGamePacketHandler extends PacketHandler{
 			case PlayerAction::INTERACT_BLOCK: //TODO: ignored (for now)
 				break;
 			case PlayerAction::CREATIVE_PLAYER_DESTROY_BLOCK:
-				//TODO: do we need to handle this?
+				//in server auth block breaking, we get PREDICT_DESTROY_BLOCK anyway, so this action is redundant
+				break;
 			case PlayerAction::PREDICT_DESTROY_BLOCK:
 				self::validateFacing($face);
 				if(!$this->player->breakBlock($pos)){
--- a/src/world/generator/executor/AsyncGeneratorExecutor.php
+++ b/src/world/generator/executor/AsyncGeneratorExecutor.php
@ -48,7 +48,7 @@ final class AsyncGeneratorExecutor implements GeneratorExecutor{
 		\Logger $logger,
 		private readonly AsyncPool $workerPool,
 		private readonly GeneratorExecutorSetupParameters $setupParameters,
-		int $asyncContextId = null
+		?int $asyncContextId = null
 	){
 		$this->logger = new \PrefixedLogger($logger, "AsyncGeneratorExecutor");

--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@ -948,6 +948,12 @@ parameters:
 			count: 1
 			path: ../../../src/plugin/PluginDescription.php

+		-
+			message: '#^Property pocketmine\\plugin\\PluginDescription\:\:\$srcNamespacePrefix \(string\) does not accept mixed\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: ../../../src/plugin/PluginDescription.php
+
 		-
 			message: '#^Cannot call method addChild\(\) on pocketmine\\permission\\Permission\|null\.$#'
 			identifier: method.nonObject
@ -990,6 +996,12 @@ parameters:
 			count: 1
 			path: ../../../src/scheduler/TaskScheduler.php

+		-
+			message: '#^Possibly invalid array key type mixed\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: ../../../src/thread/ThreadManager.php
+
 		-
 			message: '#^Cannot access offset string on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible
@ -1158,12 +1170,6 @@ parameters:
 			count: 2
 			path: ../../../src/world/World.php

-		-
-			message: '#^Parameter \#2 \$x of method pocketmine\\block\\Block\:\:position\(\) expects int, float\|int given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../src/world/World.php
-
 		-
 			message: '#^Parameter \#2 \$y of method pocketmine\\world\\World\:\:getBlockAt\(\) expects int, float\|int given\.$#'
 			identifier: argument.type
@ -1188,12 +1194,6 @@ parameters:
 			count: 2
 			path: ../../../src/world/World.php

-		-
-			message: '#^Parameter \#3 \$y of method pocketmine\\block\\Block\:\:position\(\) expects int, float\|int given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../src/world/World.php
-
 		-
 			message: '#^Parameter \#3 \$z of method pocketmine\\world\\World\:\:getBlockAt\(\) expects int, float\|int given\.$#'
 			identifier: argument.type
@ -1218,12 +1218,6 @@ parameters:
 			count: 2
 			path: ../../../src/world/World.php

-		-
-			message: '#^Parameter \#4 \$z of method pocketmine\\block\\Block\:\:position\(\) expects int, float\|int given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../src/world/World.php
-
 		-
 			message: '#^Method pocketmine\\world\\biome\\BiomeRegistry\:\:getBiome\(\) should return pocketmine\\world\\biome\\Biome but returns pocketmine\\world\\biome\\Biome\|null\.$#'
 			identifier: return.type
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@ -192,18 +192,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/cache/CraftingDataCache.php

-		-
-			message: '#^Method pocketmine\\network\\mcpe\\compression\\ZlibCompressor\:\:getNetworkId\(\) never returns 1 so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: ../../../src/network/mcpe/compression/ZlibCompressor.php
-
-		-
-			message: '#^Method pocketmine\\network\\mcpe\\compression\\ZlibCompressor\:\:getNetworkId\(\) never returns 255 so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: ../../../src/network/mcpe/compression/ZlibCompressor.php
-
 		-
 			message: '#^Parameter \#1 \$states of class pocketmine\\network\\mcpe\\convert\\BlockStateDictionary constructor expects list\<pocketmine\\network\\mcpe\\convert\\BlockStateDictionaryEntry\>, array\<int\<0, max\>, pocketmine\\network\\mcpe\\convert\\BlockStateDictionaryEntry\> given\.$#'
 			identifier: argument.type
--- a/tests/phpstan/configs/property-hook-sadness.neon
+++ b/tests/phpstan/configs/property-hook-sadness.neon
@ -0,0 +1,61 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Human\:\:\$enderInventory because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Human.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Human\:\:\$hungerManager because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Human.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Human\:\:\$inventory because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Human.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Human\:\:\$offHandInventory because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Human.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Human\:\:\$xpManager because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Human.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Living\:\:\$armorInventory because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Living.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\entity\\Living\:\:\$effectManager because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/entity/Living.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\player\\Player\:\:\$craftingGrid because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/player/Player.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\player\\Player\:\:\$cursorInventory because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/player/Player.php
+
+		-
+			message: '#^Cannot unset property pocketmine\\world\\format\\io\\leveldb\\LevelDB\:\:\$db because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: ../../../src/world/format/io/leveldb/LevelDB.php
--- a/tests/phpstan/configs/reflection-class-sadness.neon
+++ b/tests/phpstan/configs/reflection-class-sadness.neon
@ -0,0 +1,31 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Call\-site variance of covariant pocketmine\\event\\Event in generic type ReflectionClass\<covariant pocketmine\\event\\Event\> in PHPDoc tag @param for parameter \$class is redundant, template type T of object of class ReflectionClass has the same variance\.$#'
+			identifier: generics.callSiteVarianceRedundant
+			count: 2
+			path: ../../phpunit/event/HandlerListManagerTest.php
+
+		-
+			message: '#^Call\-site variance of covariant pocketmine\\event\\Event in generic type ReflectionClass\<covariant pocketmine\\event\\Event\> in PHPDoc tag @param for parameter \$expect is redundant, template type T of object of class ReflectionClass has the same variance\.$#'
+			identifier: generics.callSiteVarianceRedundant
+			count: 1
+			path: ../../phpunit/event/HandlerListManagerTest.php
+
+		-
+			message: '#^Call\-site variance of covariant pocketmine\\event\\Event in generic type ReflectionClass\<covariant pocketmine\\event\\Event\> in PHPDoc tag @return is redundant, template type T of object of class ReflectionClass has the same variance\.$#'
+			identifier: generics.callSiteVarianceRedundant
+			count: 3
+			path: ../../phpunit/event/HandlerListManagerTest.php
+
+		-
+			message: '#^Call\-site variance of covariant pocketmine\\event\\Event in generic type ReflectionClass\<covariant pocketmine\\event\\Event\> in PHPDoc tag @var for property pocketmine\\event\\HandlerListManagerTest\:\:\$isValidFunc is redundant, template type T of object of class ReflectionClass has the same variance\.$#'
+			identifier: generics.callSiteVarianceRedundant
+			count: 1
+			path: ../../phpunit/event/HandlerListManagerTest.php
+
+		-
+			message: '#^Call\-site variance of covariant pocketmine\\event\\Event in generic type ReflectionClass\<covariant pocketmine\\event\\Event\> in PHPDoc tag @var for property pocketmine\\event\\HandlerListManagerTest\:\:\$resolveParentFunc is redundant, template type T of object of class ReflectionClass has the same variance\.$#'
+			identifier: generics.callSiteVarianceRedundant
+			count: 2
+			path: ../../phpunit/event/HandlerListManagerTest.php
--- a/tests/phpstan/configs/spl-fixed-array-sucks.neon
+++ b/tests/phpstan/configs/spl-fixed-array-sucks.neon
@ -30,3 +30,26 @@ parameters:
 			count: 4
 			path: ../../../src/world/generator/noise/Noise.php

+		-
+			message: '#^Parameter \$q00 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q01 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q10 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q11 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
--- a/tests/phpunit/event/HandlerListManagerTest.php
+++ b/tests/phpunit/event/HandlerListManagerTest.php
@ -35,12 +35,12 @@ class HandlerListManagerTest extends TestCase{

 	/**
 	 * @var \Closure
-	 * @phpstan-var \Closure(\ReflectionClass<Event>) : bool
+	 * @phpstan-var \Closure(\ReflectionClass<covariant Event>) : bool
 	 */
 	private $isValidFunc;
 	/**
 	 * @var \Closure
-	 * @phpstan-var \Closure(\ReflectionClass<Event>) : ?\ReflectionClass<Event>
+	 * @phpstan-var \Closure(\ReflectionClass<covariant Event>) : ?\ReflectionClass<covariant Event>
 	 */
 	private $resolveParentFunc;

@ -53,7 +53,7 @@ class HandlerListManagerTest extends TestCase{

 	/**
 	 * @return \Generator|mixed[][]
-	 * @phpstan-return \Generator<int, array{\ReflectionClass<Event>, bool, string}, void, void>
+	 * @phpstan-return \Generator<int, array{\ReflectionClass<covariant Event>, bool, string}, void, void>
 	 */
 	public static function isValidClassProvider() : \Generator{
 		yield [new \ReflectionClass(Event::class), false, "event base should not be handleable"];
@ -65,7 +65,7 @@ class HandlerListManagerTest extends TestCase{
 	/**
 	 * @dataProvider isValidClassProvider
 	 *
-	 * @phpstan-param \ReflectionClass<Event> $class
+	 * @phpstan-param \ReflectionClass<covariant Event> $class
 	 */
 	public function testIsValidClass(\ReflectionClass $class, bool $isValid, string $reason) : void{
 		self::assertSame($isValid, ($this->isValidFunc)($class), $reason);
@ -73,7 +73,7 @@ class HandlerListManagerTest extends TestCase{

 	/**
 	 * @return \Generator|\ReflectionClass[][]
-	 * @phpstan-return \Generator<int, array{\ReflectionClass<Event>, \ReflectionClass<Event>|null}, void, void>
+	 * @phpstan-return \Generator<int, array{\ReflectionClass<covariant Event>, \ReflectionClass<covariant Event>|null}, void, void>
 	 */
 	public static function resolveParentClassProvider() : \Generator{
 		yield [new \ReflectionClass(TestConcreteExtendsAllowHandleEvent::class), new \ReflectionClass(TestAbstractAllowHandleEvent::class)];
@ -85,8 +85,8 @@ class HandlerListManagerTest extends TestCase{
 	/**
 	 * @dataProvider resolveParentClassProvider
 	 *
-	 * @phpstan-param \ReflectionClass<Event>      $class
-	 * @phpstan-param \ReflectionClass<Event>|null $expect
+	 * @phpstan-param \ReflectionClass<covariant Event>      $class
+	 * @phpstan-param \ReflectionClass<covariant Event>|null $expect
 	 */
 	public function testResolveParentClass(\ReflectionClass $class, ?\ReflectionClass $expect) : void{
 		if($expect === null){
--- a/tests/phpunit/utils/CloningRegistryTraitTest.php
+++ b/tests/phpunit/utils/CloningRegistryTraitTest.php
@ -47,7 +47,7 @@ final class CloningRegistryTraitTest extends TestCase{
 	public function testGetAllClone() : void{
 		$list1 = TestCloningRegistry::getAll();
 		$list2 = TestCloningRegistry::getAll();
-		foreach(Utils::promoteKeys($list1) as $k => $member){
+		foreach(Utils::stringifyKeys($list1) as $k => $member){
 			self::assertNotSame($member, $list2[$k], "VanillaBlocks ought to clone its members");
 		}
 	}
--- a/tools/blockstate-upgrade-schema-utils.php
+++ b/tools/blockstate-upgrade-schema-utils.php
@ -354,6 +354,9 @@ function processStateGroup(string $oldName, array $upgradeTable, BlockStateUpgra
 * @param string[] $strings
 */
 function findCommonPrefix(array $strings) : string{
+	if(count($strings) === 0){
+		return "";
+	}
 	sort($strings, SORT_STRING);

 	$first = $strings[array_key_first($strings)];
Author	SHA1	Message	Date
Dylan T.	1e797b9897	Prepare 5.33.2 release (#6804 )	2025-09-15 23:53:05 +01:00
Dylan K. Taylor	a056af1617	Update composer dev dependencies	2025-09-15 22:41:02 +01:00
Dylan K. Taylor	b237cacfc9	InGamePacketHandler: don't resync blocks if the client predicted an interact fail if the prediction was a fail, we can assume that the client didn't do anything visual on its end, which avoids the need to resend blocks. This fixes block lag when towering as discussed in #6803. The more general issue in #6803 remains unresolved (that the server's block resyncing may overwrite additional client side predictions if it places a block before the server's resync for the initial placement arrives), but that's more complicated to fix and I'm not convinced on the correct method to resolve it yet. In any case, this change nets a decent improvement for everyone, regardless.	2025-09-15 19:36:29 +01:00
Dylan K. Taylor	e7ad3c25fa	InGamePacketHandler: ignore CREATIVE_PLAYER_DESTROY_BLOCK fixes #6757 we get PREDICT_DESTROY_BLOCK anyway, so it's not needed	2025-09-15 18:02:10 +01:00
Dylan K. Taylor	c6a28d8df0	InventoryManager: fixed window sending getting stuck on client rejecting window opening closes #6778 honestly, we could just stop checking the window ID entirely, considering the need for delaying and waiting for window close acks, it seems useless at this point...	2025-09-15 17:34:35 +01:00
Dylan K. Taylor	636b96a9a5	Updated composer dependencies	2025-09-12 01:13:55 +01:00
Dylan K. Taylor	4b4fc52cd7	Updated Bitcoin donation address	2025-09-10 19:10:56 +01:00
dependabot[bot]	ce90835c7b	Bump build/php from `b839e52` to `1d9cda6` (#6796 )	2025-09-08 10:21:54 +00:00
Dylan K. Taylor	dc04992ba9	Merge branch 'stable' of github.com:pmmp/PocketMine-MP into stable	2025-09-05 19:25:31 +01:00
dependabot[bot]	bddab47ee8	Bump build/php from `ce1b095` to `b839e52` (#6795 )	2025-09-05 10:32:17 +00:00
Dylan K. Taylor	3411103e11	Remove dead PHPStan ignores	2025-09-04 23:29:55 +01:00
Dylan K. Taylor	1868536916	Add PHP 8.4 to test matrix	2025-09-04 21:58:12 +01:00
dependabot[bot]	9a0a8a55b1	Bump shivammathur/setup-php in the github-actions group (#6787 )	2025-09-02 13:17:41 +00:00
pmmp-admin-bot[bot]	09cc76ae2b	5.33.2 is next Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/17351431906	2025-08-31 02:28:17 +00:00
Dylan T.	a540de1e3c	Prepare 5.33.1 patch release (#6784 )	2025-08-31 03:27:21 +01:00
Dylan K. Taylor	9eee1a9a6e	Banner: don't bail on missing type tags we didn't set these prior to 5.33.0, so these won't be present on older worlds.	2025-08-31 03:22:58 +01:00
pmmp-admin-bot[bot]	f673159471	5.33.1 is next Commit created by: https://github.com/pmmp/RestrictedActions/actions/runs/17346780638	2025-08-30 17:46:07 +00:00