Release 4.0.0-BETA15

This reverts commit cbe0f44c4f.

This achieves the same result as the reverted commit wrt. process in the
same manner (writing a keepalive into the socket and checking if it
failed to send). However, it does _not_ allow the process to die on
reaching pipe EOF, since this can cause many spams of subprocesses when
stdin is actually not a tty (e.g. in a Docker container).

.gitattributes

@@ -4,6 +4,7 @@
 *.sh text eol=lf
 *.txt text eol=lf
 *.properties text eol=lf
+*.neon text eol=lf
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.ps1 text eol=crlf

.github/workflows/draft-release.yml

@@ -35,17 +35,18 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-dev --prefer-dist --no-interaction --ignore-platform-reqs
 
-      - name: Patch VersionInfo
+      - name: Calculate build number
+        id: build-number
         run: |
-          BUILD_NUMBER=2000+$GITHUB_RUN_NUMBER #to stay above jenkins
+          BUILD_NUMBER=$((2000+$GITHUB_RUN_NUMBER)) #to stay above jenkins
           echo "Build number: $BUILD_NUMBER"
-          sed -i "s/const BUILD_NUMBER = 0/const BUILD_NUMBER = ${BUILD_NUMBER}/" src/VersionInfo.php
+          echo ::set-output name=BUILD_NUMBER::$BUILD_NUMBER
 
       - name: Minify BedrockData JSON files
         run: php vendor/pocketmine/bedrock-data/.minify_json.php
 
       - name: Build PocketMine-MP.phar
-        run: php -dphar.readonly=0 build/server-phar.php --git ${{ github.sha }}
+        run: php -dphar.readonly=0 build/server-phar.php --git ${{ github.sha }} --build ${{ steps.build-number.outputs.BUILD_NUMBER }}
 
       - name: Get PocketMine-MP release version
         id: get-pm-version
@@ -56,7 +57,7 @@ jobs:
           echo ::set-output name=PM_VERSION_MD::$(php -r 'require "vendor/autoload.php"; echo str_replace(".", "", \pocketmine\VersionInfo::BASE_VERSION);')
 
       - name: Generate build info
-        run: php build/generate-build-info-json.php ${{ github.sha }} ${{ steps.get-pm-version.outputs.PM_VERSION }} ${{ github.repository }} > build_info.json
+        run: php build/generate-build-info-json.php ${{ github.sha }} ${{ steps.get-pm-version.outputs.PM_VERSION }} ${{ github.repository }} ${{ steps.build-number.outputs.BUILD_NUMBER }} > build_info.json
 
       - name: Upload release artifacts
         uses: actions/upload-artifact@v2

BUILDING.md

@@ -14,13 +14,12 @@ Because PocketMine-MP requires several non-standard PHP extensions and configura
 If you use a custom binary, you'll need to replace `composer` usages in this guide with `path/to/your/php path/to/your/composer.phar`.
 
 ## Setting up environment
-1. `git clone --recursive https://github.com/pmmp/PocketMine-MP.git`
+1. `git clone https://github.com/pmmp/PocketMine-MP.git`
 2. `composer install`
 
 ## Checking out a different branch to build
 1. `git checkout <branch to checkout>`
-2. `git submodule update --init`
-3. Re-run `composer install` to synchronize dependencies.
+2. Re-run `composer install` to synchronize dependencies.
 
 ## Optimizing for release builds
 1. Add the flags `--no-dev --classmap-authoritative` to your `composer install` command. This will reduce build size and improve autoloading speed.

README.md

@@ -5,7 +5,7 @@
 
 <p align="center">
 	<img src="https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg" alt="CI" />
-	<a href="https://github.com/pmmp/PocketMine-MP/releases"><img src="https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github" alt="GitHub tag (latest semver)" /></a>
+	<img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/pmmp/PocketMine-MP?label=release&sort=semver">
 	<a href="https://hub.docker.com/r/pmmp/pocketmine-mp"><img src="https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image" alt="Docker image version (latest semver)" /></a>
 	<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
 </p>

build/generate-build-info-json.php

@@ -23,15 +23,15 @@ declare(strict_types=1);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-if(count($argv) !== 4){
-	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)>");
+if(count($argv) !== 5){
+	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)> <build number>");
 	exit(1);
 }
 
 echo json_encode([
 	"php_version" => sprintf("%d.%d", PHP_MAJOR_VERSION, PHP_MINOR_VERSION),
 	"base_version" => \pocketmine\VersionInfo::BASE_VERSION,
-	"build" => \pocketmine\VersionInfo::BUILD_NUMBER,
+	"build" => (int) $argv[4],
 	"is_dev" => \pocketmine\VersionInfo::IS_DEVELOPMENT_BUILD,
 	"channel" => \pocketmine\VersionInfo::BUILD_CHANNEL,
 	"git_commit" => $argv[1],

build/generate-known-translation-apis.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\build\generate_known_translation_apis;
 
 use pocketmine\lang\Translatable;
+use pocketmine\utils\Utils;
 use Webmozart\PathUtil\Path;
 use function array_map;
 use function count;
@@ -100,7 +101,7 @@ final class KnownTranslationKeys{
 HEADER;
 
 	ksort($languageDefinitions, SORT_STRING);
-	foreach($languageDefinitions as $k => $_){
+	foreach(Utils::stringifyKeys($languageDefinitions) as $k => $_){
 		echo "\tpublic const ";
 		echo constantify($k);
 		echo " = \"" . $k . "\";\n";
@@ -135,7 +136,7 @@ HEADER;
 	$parameterRegex = '/{%(.+?)}/';
 
 	$translationContainerClass = (new \ReflectionClass(Translatable::class))->getShortName();
-	foreach($languageDefinitions as $key => $value){
+	foreach(Utils::stringifyKeys($languageDefinitions) as $key => $value){
 		$parameters = [];
 		if(preg_match_all($parameterRegex, $value, $matches) > 0){
 			foreach($matches[1] as $parameterName){

build/generate-registry-annotations.php

@@ -91,7 +91,7 @@ foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($argv[1],
 		throw new \RuntimeException("Failed to get contents of $file");
 	}
 
-	if(preg_match("/^namespace (.+);$/m", $contents, $matches) !== 1 || preg_match('/^((final|abstract)\s+)?class /m', $contents) !== 1){
+	if(preg_match("/(*ANYCRLF)^namespace (.+);$/m", $contents, $matches) !== 1 || preg_match('/(*ANYCRLF)^((final|abstract)\s+)?class /m', $contents) !== 1){
 		continue;
 	}
 	$shortClassName = basename($file, ".php");
@@ -101,7 +101,7 @@ foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($argv[1],
 	}
 	$reflect = new \ReflectionClass($className);
 	$docComment = $reflect->getDocComment();
-	if($docComment === false || preg_match("/^\s*\*\s*@generate-registry-docblock$/m", $docComment) !== 1){
+	if($docComment === false || preg_match("/(*ANYCRLF)^\s*\*\s*@generate-registry-docblock$/m", $docComment) !== 1){
 		continue;
 	}
 	echo "Found registry in $file\n";

build/make-release.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\build\make_release;
 
+use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
 use pocketmine\VersionInfo;
 use function array_keys;
@@ -76,7 +77,7 @@ const ACCEPTED_OPTS = [
 
 function main() : void{
 	$filteredOpts = [];
-	foreach(getopt("", ["current:", "next:", "channel:", "help"]) as $optName => $optValue){
+	foreach(Utils::stringifyKeys(getopt("", ["current:", "next:", "channel:", "help"])) as $optName => $optValue){
 		if($optName === "help"){
 			fwrite(STDOUT, "Options:\n");
 

build/server-phar.php

@@ -134,13 +134,18 @@ function main() : void{
 		exit(1);
 	}
 
-	$opts = getopt("", ["out:", "git:"]);
+	$opts = getopt("", ["out:", "git:", "build:"]);
 	if(isset($opts["git"])){
 		$gitHash = $opts["git"];
 	}else{
 		$gitHash = Git::getRepositoryStatePretty(dirname(__DIR__));
 		echo "Git hash detected as $gitHash" . PHP_EOL;
 	}
+	if(isset($opts["build"])){
+		$build = (int) $opts["build"];
+	}else{
+		$build = 0;
+	}
 	foreach(buildPhar(
 		$opts["out"] ?? getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar",
 		dirname(__DIR__) . DIRECTORY_SEPARATOR,
@@ -150,7 +155,8 @@ function main() : void{
 			'vendor'
 		],
 		[
-			'git' => $gitHash
+			'git' => $gitHash,
+			'build' => $build
 		],
 		<<<'STUB'
 <?php

changelogs/3.25.md

@@ -21,3 +21,18 @@ Plugin developers should **only** update their required API to this version if y
 - Fixed crash in `Player->showPlayer()` when the target is not in the same world.
 - `Human->setLifetimeTotalXp()` now limits the maximum value to 2^31.
 - Fixed players, who died in hardcore mode and were unbanned, getting re-banned on next server join.
+
+# 3.25.3
+- Fixed crash when players try to pickup XP while already having max XP.
+- Added a sanity check to `Human->setCurrentTotalXp()` to try and catch an elusive bug that's been appearing in the wild - please get in touch if you know how to reproduce it!
+
+# 3.25.4
+- Fixed a long-standing issue with `Player->removeWindow()` breaking inventory UIs on the client.
+
+# 3.25.5
+- Protocol: Fixed incorrect encoding in `StructureSettings`
+- Fixed reading tags from non-docblock comments in script plugins.
+- Build number is now defined in phar metadata instead of being patched into the source code directly.
+
+# 3.25.6
+- Fixed borked build number in release build of 3.25.5.

changelogs/3.26.md

@@ -0,0 +1,11 @@
+**For Minecraft: Bedrock Edition 1.18.0**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.26.0
+- Added support for Minecraft: Bedrock Edition 1.18.0.
+- Removed compatibility with earlier versions.

changelogs/4.0.md

@@ -313,6 +313,10 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
 ### Entity
 #### General
 - `Entity` no longer extends from `Location`. `Entity->getLocation()` and `Entity->getPosition()` should be used instead.
+- Ender inventory has been refactored. It's now split into two parts:
+  - `EnderChestInventory` is a temporary gateway "inventory" that acts as a proxy to the player's ender inventory. It has a `Position` for holder. This is discarded when the player closes the inventory window.
+  - `PlayerEnderInventory` is the storage part. This is stored in `Human` and does not contain any block info.
+  - To open the player's ender inventory, use `Player->setCurrentWindow(new EnderChestInventory($blockPos, $player->getEnderInventory()))`.
 - The following public fields have been removed:
   - `Entity->chunk`: Entities no longer know which chunk they are in (the `World` now manages this instead).
   - `Entity->height`: moved to `EntitySizeInfo`; use `Entity->size` instead
@@ -351,6 +355,7 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
   - `Human->getMaxFood()` -> `HungerManager->getMaxFood()`
   - `Human->addFood()` -> `HungerManager->addFood()`
   - `Human->isHungry()` -> `HungerManager->isHungry()`
+  - `Human->getEnderChestInventory()` -> `Human->getEnderInventory()`
   - `Human->getSaturation()` -> `HungerManager->getSaturation()`
   - `Human->setSaturation()` -> `HungerManager->setSaturation()`
   - `Human->addSaturation()` -> `HungerManager->addSaturation()`
@@ -564,6 +569,7 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
   - `CallbackInventoryChangeListener`
   - `CreativeInventory`: contains the creative functionality previously embedded in `pocketmine\item\Item`, see Item changes for details
   - `InventoryChangeListener`: allows listening (but not interfering with) events in an inventory.
+  - `PlayerEnderInventory`: represents the pure storage part of the player's ender inventory, without any block information
   - `transaction\CreateItemAction`
   - `transaction\DestroyItemAction`
 - The following classes have been renamed / moved:
@@ -588,6 +594,7 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
 - The following API methods have been removed:
   - `BaseInventory->getDefaultSize()`
   - `BaseInventory->setSize()`
+  - `EnderChestInventory->setHolderPosition()`
   - `Inventory->close()`
   - `Inventory->dropContents()`
   - `Inventory->getName()`
@@ -1276,6 +1283,7 @@ However, if we add `src-namespace-prefix: pmmp\TesterPlugin` to the `plugin.yml`
 - Implemented offhand inventory.
 - Block-picking is now supported in survival mode.
 - Block picking behaviour now matches vanilla (no longer overwrites held item, jumps to existing item where possible).
+- Armor can now be equipped by right-clicking while holding it.
 
 # 4.0.0-BETA2
 Released 10th September 2021.
@@ -1702,4 +1710,58 @@ Released 9th November 2021.
 ### Server
 - Added the following API methods:
   - `Server->getIpV6()`
-  - `Server->getPortV6()`
+  - `Server->getPortV6()`
+
+# 4.0.0-BETA13
+Released 25th November 2021.
+
+## General
+- Improved error messages when a plugin command name or alias contains an illegal character.
+- Fixed script plugins reading tags from non-docblocks before the actual docblock.
+- Added a sanity check to `Human->setCurrentTotalXp()` to try and catch an elusive bug that's been appearing in the wild - please get in touch if you know how to reproduce it!
+- Updated `BUILDING.md` to reflect the fact that submodules are no longer required to build or run the server.
+
+## Internals
+- Crashdump rendering has been separated from crashdump data generation. This allows rendering crashdumps from existing JSON data.
+- Direct iteration of arrays with string keys is now disallowed by a custom PHPStan rule. This is because numeric strings are casted to integers when used as array keys, which produces a variety of unexpected behaviour particularly for iteration.
+  - To iterate on arrays with string keys, `Utils::stringifyKeys()` must now be used.
+
+## Fixes
+- Fixed various crashes involving bad entity data saved on disk (e.g. an item entity with invalid item would crash the server).
+- Fixed various crashes involving arrays with numeric string keys.
+- Fixed crash when players try to pickup XP while already having max XP.
+- Fixed ungenerated chunks saved on disk by old versions of PocketMine-MP (before 3.0.0) being treated as corrupted during world conversion (they are now ignored instead).
+- Fixed misleading corruption error message when saved chunks have missing NBT tags.
+
+## Gameplay
+- Fixed `/setworldspawn` setting incorrect positions based on player position when in negative coordinates.
+- `/setworldspawn` now accepts relative coordinates when used as a player.
+- Added some extra aliases for `/give` and `/clear`: `chipped_anvil`, `coarse_dirt`, `damaged_anvil`, `dark_oak_standing_sign`, `jungle_wood_stairs`, `jungle_wooden_stairs` and `oak_standing_sign`.
+  - Some of these were added for quality-of-life, others were added just to be consistent.
+- Fixed explosions dropping incorrect items when destroying blocks with tile data (e.g. banners, beds).
+- Fixed the bounding box of skulls when mounted on a wall.
+- Fixed podzol dropping itself when mined (instead of dirt).
+
+## API
+### Entity
+- `Projectile->move()` is now protected, like its parent.
+
+### Utils
+- `Utils::parseDocComment()` now allows `-` in tag names.
+
+# 4.0.0-BETA14
+Released 30th November 2021.
+
+## General
+- The server will now log an EMERGENCY-level message when `forceShutdown()` is used for any other reason than a graceful shutdown.
+- The server will now attempt to translate invalid blocks to valid equivalents when loading chunks. This fixes many issues with `update!` blocks appearing in worlds, particularly ghost structures (these would appear when world editors previously erased some blocks by setting their IDs but not metadata).
+
+## Fixes
+- Fixed `ConsoleReaderThread` spawning many zombie processes when running a server inside a Docker container.
+
+# 4.0.0-BETA15
+Released 30th November 2021.
+
+## General
+- Added support for Minecraft: Bedrock 1.18.0
+- Removed support for earlier versions.

composer.json

@@ -7,7 +7,7 @@
    "require": {
       "php": "^8.0",
       "php-64bit": "*",
-      "ext-chunkutils2": "^0.3.0",
+      "ext-chunkutils2": "^0.3.1",
       "ext-crypto": "^0.3.1",
       "ext-ctype": "*",
       "ext-curl": "*",
@@ -34,14 +34,14 @@
       "adhocore/json-comment": "^1.1",
       "fgrosse/phpasn1": "^2.3",
       "netresearch/jsonmapper": "^4.0",
-      "pocketmine/bedrock-data": "^1.4.0+bedrock-1.17.40",
-      "pocketmine/bedrock-protocol": "^5.0.0+bedrock-1.17.40",
+      "pocketmine/bedrock-data": "^1.5.0+bedrock-1.18.0",
+      "pocketmine/bedrock-protocol": "^7.0.0+bedrock-1.18.0",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/classloader": "^0.2.0",
       "pocketmine/color": "^0.2.0",
       "pocketmine/errorhandler": "^0.3.0",
-      "pocketmine/locale-data": "^1.1.4",
+      "pocketmine/locale-data": "^2.0.16",
       "pocketmine/log": "^0.4.0",
       "pocketmine/log-pthreads": "^0.4.0",
       "pocketmine/math": "^0.4.0",
@@ -53,7 +53,7 @@
       "webmozart/path-util": "^2.3"
    },
    "require-dev": {
-      "phpstan/phpstan": "1.1.1",
+      "phpstan/phpstan": "1.2.0",
       "phpstan/phpstan-phpunit": "^1.0.0",
       "phpstan/phpstan-strict-rules": "^1.0.0",
       "phpunit/phpunit": "^9.2"
@@ -79,7 +79,7 @@
       "sort-packages": true
    },
    "scripts": {
-      "make-devtools": "@php -dphar.readonly=0 tests/plugins/DevTools/src/DevTools/ConsoleScript.php --make tests/plugins/DevTools --out plugins/DevTools.phar",
+      "make-devtools": "@php -dphar.readonly=0 tests/plugins/DevTools/src/ConsoleScript.php --make tests/plugins/DevTools --out plugins/DevTools.phar",
       "make-server": [
          "@composer install --no-dev --classmap-authoritative --ignore-platform-reqs",
          "@php -dphar.readonly=0 build/server-phar.php"

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": "4f8e023ae390414fb40b77857c16ebee",
+    "content-hash": "b515e7eebbf12a6251d2df817ce56dbc",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -249,16 +249,16 @@
         },
         {
             "name": "pocketmine/bedrock-data",
-            "version": "1.4.0+bedrock-1.17.40",
+            "version": "1.5.0+bedrock-1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockData.git",
-                "reference": "f29b7be8fa3046d2ee4c6421485b97b3f5b07774"
+                "reference": "482c679aa5ed0b81c088c2b1ff0b8110a94c8a6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/f29b7be8fa3046d2ee4c6421485b97b3f5b07774",
-                "reference": "f29b7be8fa3046d2ee4c6421485b97b3f5b07774",
+                "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/482c679aa5ed0b81c088c2b1ff0b8110a94c8a6c",
+                "reference": "482c679aa5ed0b81c088c2b1ff0b8110a94c8a6c",
                 "shasum": ""
             },
             "type": "library",
@@ -269,22 +269,22 @@
             "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/BedrockData/issues",
-                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.17.40"
+                "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.18.0"
             },
-            "time": "2021-10-19T16:55:41+00:00"
+            "time": "2021-11-30T18:30:46+00:00"
         },
         {
             "name": "pocketmine/bedrock-protocol",
-            "version": "5.1.0+bedrock-1.17.40",
+            "version": "7.0.0+bedrock-1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "5abbe5bc21d8a9152d46c26578bf5257526612f9"
+                "reference": "040a883a4abb8c9b93114d5278cb5fecc635da82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/5abbe5bc21d8a9152d46c26578bf5257526612f9",
-                "reference": "5abbe5bc21d8a9152d46c26578bf5257526612f9",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/040a883a4abb8c9b93114d5278cb5fecc635da82",
+                "reference": "040a883a4abb8c9b93114d5278cb5fecc635da82",
                 "shasum": ""
             },
             "require": {
@@ -298,7 +298,7 @@
                 "ramsey/uuid": "^4.1"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.1.1",
+                "phpstan/phpstan": "1.2.0",
                 "phpstan/phpstan-phpunit": "^1.0.0",
                 "phpstan/phpstan-strict-rules": "^1.0.0",
                 "phpunit/phpunit": "^9.5"
@@ -316,9 +316,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/5.1.0+bedrock-1.17.40"
+                "source": "https://github.com/pmmp/BedrockProtocol/tree/7.0.0+bedrock-1.18.0"
             },
-            "time": "2021-11-08T16:26:25+00:00"
+            "time": "2021-11-30T19:02:41+00:00"
         },
         {
             "name": "pocketmine/binaryutils",
@@ -533,16 +533,16 @@
         },
         {
             "name": "pocketmine/locale-data",
-            "version": "1.1.6",
+            "version": "2.0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Language.git",
-                "reference": "216b49b87e20332f0b39d1717e1e2012a40074cc"
+                "reference": "a6e4eb22587e0014f6d658732cf633262723f8d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/216b49b87e20332f0b39d1717e1e2012a40074cc",
-                "reference": "216b49b87e20332f0b39d1717e1e2012a40074cc",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/a6e4eb22587e0014f6d658732cf633262723f8d3",
+                "reference": "a6e4eb22587e0014f6d658732cf633262723f8d3",
                 "shasum": ""
             },
             "type": "library",
@@ -550,9 +550,9 @@
             "description": "Language resources used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/Language/issues",
-                "source": "https://github.com/pmmp/Language/tree/1.1.6"
+                "source": "https://github.com/pmmp/Language/tree/2.0.20"
             },
-            "time": "2021-11-07T14:30:46+00:00"
+            "time": "2021-11-25T20:56:12+00:00"
         },
         {
             "name": "pocketmine/log",
@@ -1898,16 +1898,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c"
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cb317029197236c571c1b9305b8dd12850d8d85c",
-                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
                 "shasum": ""
             },
             "require": {
@@ -1923,7 +1923,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1938,7 +1938,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.1.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.2.0"
             },
             "funding": [
                 {
@@ -1958,7 +1958,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-06T22:46:47+00:00"
+            "time": "2021-11-18T14:09:01+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
@@ -2017,21 +2017,21 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "7f50eb112f37fda2ef956813d3f1e9b1e69d7940"
+                "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7f50eb112f37fda2ef956813d3f1e9b1e69d7940",
-                "reference": "7f50eb112f37fda2ef956813d3f1e9b1e69d7940",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/e12d55f74a8cca18c6e684c6450767e055ba7717",
+                "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0",
-                "phpstan/phpstan": "^1.0"
+                "phpstan/phpstan": "^1.2.0"
             },
             "require-dev": {
                 "nikic/php-parser": "^4.13.0",
@@ -2062,22 +2062,22 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.0.0"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.1.0"
             },
-            "time": "2021-10-11T06:57:58+00:00"
+            "time": "2021-11-18T09:30:29+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.8",
+            "version": "9.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e"
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
                 "shasum": ""
             },
             "require": {
@@ -2133,7 +2133,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
             },
             "funding": [
                 {
@@ -2141,7 +2141,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-30T08:01:38+00:00"
+            "time": "2021-11-19T15:21:02+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2916,16 +2916,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -2974,14 +2974,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -2989,7 +2989,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -3510,7 +3510,7 @@
     "platform": {
         "php": "^8.0",
         "php-64bit": "*",
-        "ext-chunkutils2": "^0.3.0",
+        "ext-chunkutils2": "^0.3.1",
         "ext-crypto": "^0.3.1",
         "ext-ctype": "*",
         "ext-curl": "*",

phpstan.neon.dist

@@ -4,7 +4,6 @@ includes:
 	- tests/phpstan/configs/impossible-generics.neon
 	- tests/phpstan/configs/php-bugs.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
-	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon
 	- tests/phpstan/configs/spl-fixed-array-sucks.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
@@ -13,6 +12,7 @@ includes:
 
 rules:
 	- pocketmine\phpstan\rules\DisallowEnumComparisonRule
+	- pocketmine\phpstan\rules\UnsafeForeachArrayOfStringRule
 #	- pocketmine\phpstan\rules\ThreadedSupportedTypesRule
 
 parameters:

src/MemoryManager.php

@@ -352,35 +352,33 @@ class MemoryManager{
 		file_put_contents(Path::join($outputFolder, "staticProperties.js"), json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 		$logger->info("Wrote $staticCount static properties");
 
-		if(isset($GLOBALS)){ //This might be null if we're on a different thread
-			$globalVariables = [];
-			$globalCount = 0;
+		$globalVariables = [];
+		$globalCount = 0;
 
-			$ignoredGlobals = [
-				'GLOBALS' => true,
-				'_SERVER' => true,
-				'_REQUEST' => true,
-				'_POST' => true,
-				'_GET' => true,
-				'_FILES' => true,
-				'_ENV' => true,
-				'_COOKIE' => true,
-				'_SESSION' => true
-			];
+		$ignoredGlobals = [
+			'GLOBALS' => true,
+			'_SERVER' => true,
+			'_REQUEST' => true,
+			'_POST' => true,
+			'_GET' => true,
+			'_FILES' => true,
+			'_ENV' => true,
+			'_COOKIE' => true,
+			'_SESSION' => true
+		];
 
-			foreach($GLOBALS as $varName => $value){
-				if(isset($ignoredGlobals[$varName])){
-					continue;
-				}
-
-				$globalCount++;
-				$globalVariables[$varName] = self::continueDump($value, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+		foreach(Utils::stringifyKeys($GLOBALS) as $varName => $value){
+			if(isset($ignoredGlobals[$varName])){
+				continue;
 			}
 
-			file_put_contents(Path::join($outputFolder, "globalVariables.js"), json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-			$logger->info("Wrote $globalCount global variables");
+			$globalCount++;
+			$globalVariables[$varName] = self::continueDump($value, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 		}
 
+		file_put_contents(Path::join($outputFolder, "globalVariables.js"), json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		$logger->info("Wrote $globalCount global variables");
+
 		foreach(get_defined_functions()["user"] as $function){
 			$reflect = new \ReflectionFunction($function);
 

src/Server.php

@@ -35,6 +35,7 @@ use pocketmine\console\ConsoleReaderThread;
 use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\CraftingManagerFromDataHelper;
 use pocketmine\crash\CrashDump;
+use pocketmine\crash\CrashDumpRenderer;
 use pocketmine\data\java\GameModeIdMap;
 use pocketmine\entity\EntityDataHelper;
 use pocketmine\entity\Location;
@@ -121,13 +122,18 @@ use function base64_encode;
 use function cli_set_process_title;
 use function copy;
 use function count;
+use function date;
+use function fclose;
 use function file_exists;
 use function file_get_contents;
 use function file_put_contents;
 use function filemtime;
+use function fopen;
 use function get_class;
 use function ini_set;
 use function is_array;
+use function is_dir;
+use function is_resource;
 use function is_string;
 use function json_decode;
 use function max;
@@ -1201,7 +1207,7 @@ class Server{
 	 * Unsubscribes from all broadcast channels.
 	 */
 	public function unsubscribeFromAllBroadcastChannels(CommandSender $subscriber) : void{
-		foreach($this->broadcastSubscribers as $channelId => $recipients){
+		foreach(Utils::stringifyKeys($this->broadcastSubscribers) as $channelId => $recipients){
 			$this->unsubscribeFromBroadcastChannel($channelId, $subscriber);
 		}
 	}
@@ -1407,6 +1413,9 @@ class Server{
 			echo "\x1b]0;\x07";
 		}
 
+		if($this->isRunning){
+			$this->logger->emergency("Forcing server shutdown");
+		}
 		try{
 			if(!$this->isRunning()){
 				$this->sendUsage(SendUsageTask::TYPE_CLOSE);
@@ -1505,6 +1514,25 @@ class Server{
 		$this->crashDump();
 	}
 
+	private function writeCrashDumpFile(CrashDump $dump) : string{
+		$crashFolder = Path::join($this->getDataPath(), "crashdumps");
+		if(!is_dir($crashFolder)){
+			mkdir($crashFolder);
+		}
+		$crashDumpPath = Path::join($crashFolder, date("D_M_j-H.i.s-T_Y", (int) $dump->getData()->time) . ".log");
+
+		$fp = @fopen($crashDumpPath, "wb");
+		if(!is_resource($fp)){
+			throw new \RuntimeException("Unable to open new file to generate crashdump");
+		}
+		$writer = new CrashDumpRenderer($fp, $dump->getData());
+		$writer->renderHumanReadable();
+		$dump->encodeData($writer);
+
+		fclose($fp);
+		return $crashDumpPath;
+	}
+
 	public function crashDump() : void{
 		while(@ob_end_flush()){}
 		if(!$this->isRunning){
@@ -1521,7 +1549,9 @@ class Server{
 			$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_create()));
 			$dump = new CrashDump($this, $this->pluginManager ?? null);
 
-			$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_submit($dump->getPath())));
+			$crashDumpPath = $this->writeCrashDumpFile($dump);
+
+			$this->logger->emergency($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_crash_submit($crashDumpPath)));
 
 			if($this->configGroup->getPropertyBool("auto-report.enabled", true)){
 				$report = true;

src/VersionInfo.php

@@ -25,13 +25,14 @@ namespace pocketmine;
 
 use pocketmine\utils\Git;
 use pocketmine\utils\VersionString;
+use function is_array;
+use function is_int;
 use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "4.0.0-BETA12";
+	public const BASE_VERSION = "4.0.0-BETA15";
 	public const IS_DEVELOPMENT_BUILD = false;
-	public const BUILD_NUMBER = 0;
 	public const BUILD_CHANNEL = "beta";
 
 	private function __construct(){
@@ -61,12 +62,29 @@ final class VersionInfo{
 		return self::$gitHash;
 	}
 
+	private static ?int $buildNumber = null;
+
+	public static function BUILD_NUMBER() : int{
+		if(self::$buildNumber === null){
+			self::$buildNumber = 0;
+			if(\Phar::running(true) !== ""){
+				$phar = new \Phar(\Phar::running(false));
+				$meta = $phar->getMetadata();
+				if(is_array($meta) && isset($meta["build"]) && is_int($meta["build"])){
+					self::$buildNumber = $meta["build"];
+				}
+			}
+		}
+
+		return self::$buildNumber;
+	}
+
 	/** @var VersionString|null */
 	private static $fullVersion = null;
 
 	public static function VERSION() : VersionString{
 		if(self::$fullVersion === null){
-			self::$fullVersion = new VersionString(self::BASE_VERSION, self::IS_DEVELOPMENT_BUILD, self::BUILD_NUMBER);
+			self::$fullVersion = new VersionString(self::BASE_VERSION, self::IS_DEVELOPMENT_BUILD, self::BUILD_NUMBER());
 		}
 		return self::$fullVersion;
 	}

src/block/Podzol.php

@@ -23,6 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+
 class Podzol extends Opaque{
 
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [
+			VanillaBlocks::DIRT()->asItem()
+		];
+	}
 }

src/block/Skull.php

@@ -124,8 +124,14 @@ class Skull extends Flowable{
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		//TODO: different bounds depending on attached face
-		return [AxisAlignedBB::one()->contract(0.25, 0, 0.25)->trim(Facing::UP, 0.5)];
+		$collisionBox = AxisAlignedBB::one()->contract(0.25, 0, 0.25)->trim(Facing::UP, 0.5);
+		return match($this->facing){
+			Facing::NORTH => [$collisionBox->offset(0, 0.25, 0.25)],
+			Facing::SOUTH => [$collisionBox->offset(0, 0.25, -0.25)],
+			Facing::WEST => [$collisionBox->offset(0.25, 0.25, 0)],
+			Facing::EAST => [$collisionBox->offset(-0.25, 0.25, 0)],
+			default => [$collisionBox]
+		};
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{

src/block/tile/TileFactory.php

@@ -23,8 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block\tile;
 
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\NbtDataException;
+use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\utils\SingletonTrait;
 use pocketmine\utils\Utils;
@@ -112,21 +113,25 @@ final class TileFactory{
 
 	/**
 	 * @internal
-	 * @throws NbtDataException
+	 * @throws SavedDataLoadingException
 	 */
 	public function createFromData(World $world, CompoundTag $nbt) : ?Tile{
-		$type = $nbt->getString(Tile::TAG_ID, "");
-		if(!isset($this->knownTiles[$type])){
-			return null;
+		try{
+			$type = $nbt->getString(Tile::TAG_ID, "");
+			if(!isset($this->knownTiles[$type])){
+				return null;
+			}
+			$class = $this->knownTiles[$type];
+			assert(is_a($class, Tile::class, true));
+			/**
+			 * @var Tile $tile
+			 * @see Tile::__construct()
+			 */
+			$tile = new $class($world, new Vector3($nbt->getInt(Tile::TAG_X), $nbt->getInt(Tile::TAG_Y), $nbt->getInt(Tile::TAG_Z)));
+			$tile->readSaveData($nbt);
+		}catch(NbtException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
 		}
-		$class = $this->knownTiles[$type];
-		assert(is_a($class, Tile::class, true));
-		/**
-		 * @var Tile $tile
-		 * @see Tile::__construct()
-		 */
-		$tile = new $class($world, new Vector3($nbt->getInt(Tile::TAG_X), $nbt->getInt(Tile::TAG_Y), $nbt->getInt(Tile::TAG_Z)));
-		$tile->readSaveData($nbt);
 
 		return $tile;
 	}

src/command/defaults/SetWorldSpawnCommand.php

@@ -31,8 +31,8 @@ use pocketmine\math\Vector3;
 use pocketmine\permission\DefaultPermissionNames;
 use pocketmine\player\Player;
 use pocketmine\utils\TextFormat;
+use pocketmine\world\World;
 use function count;
-use function round;
 
 class SetWorldSpawnCommand extends VanillaCommand{
 
@@ -54,22 +54,32 @@ class SetWorldSpawnCommand extends VanillaCommand{
 			if($sender instanceof Player){
 				$location = $sender->getPosition();
 				$world = $location->getWorld();
-				$pos = $location->asVector3()->round();
+				$pos = $location->asVector3()->floor();
 			}else{
 				$sender->sendMessage(TextFormat::RED . "You can only perform this command as a player");
 
 				return true;
 			}
 		}elseif(count($args) === 3){
-			$world = $sender->getServer()->getWorldManager()->getDefaultWorld();
-			$pos = new Vector3($this->getInteger($sender, $args[0]), $this->getInteger($sender, $args[1]), $this->getInteger($sender, $args[2]));
+			if($sender instanceof Player){
+				$base = $sender->getPosition();
+				$world = $base->getWorld();
+			}else{
+				$base = new Vector3(0.0, 0.0, 0.0);
+				$world = $sender->getServer()->getWorldManager()->getDefaultWorld();
+			}
+			$pos = (new Vector3(
+				$this->getRelativeDouble($base->x, $sender, $args[0]),
+				$this->getRelativeDouble($base->y, $sender, $args[1], World::Y_MIN, World::Y_MAX),
+				$this->getRelativeDouble($base->z, $sender, $args[2]),
+			))->floor();
 		}else{
 			throw new InvalidCommandSyntaxException();
 		}
 
 		$world->setSpawnLocation($pos);
 
-		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_setworldspawn_success((string) round($pos->x, 2), (string) round($pos->y, 2), (string) round($pos->z, 2)));
+		Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_setworldspawn_success((string) $pos->x, (string) $pos->y, (string) $pos->z));
 
 		return true;
 	}

src/console/ConsoleReader.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\console;
 
+use pocketmine\utils\AssumptionFailedError;
 use function fclose;
 use function fgets;
 use function fopen;
@@ -44,7 +45,9 @@ final class ConsoleReader{
 			fclose($this->stdin);
 		}
 
-		$this->stdin = fopen("php://stdin", "r");
+		$stdin = fopen("php://stdin", "r");
+		if($stdin === false) throw new AssumptionFailedError("Opening stdin should never fail");
+		$this->stdin = $stdin;
 	}
 
 	/**
@@ -60,11 +63,10 @@ final class ConsoleReader{
 		if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
 			return null;
 		}elseif($count === false){ //stream error
-			$this->initStdin();
+			return null;
 		}
 
 		if(($raw = fgets($this->stdin)) === false){ //broken pipe or EOF
-			$this->initStdin();
 			usleep(200000); //prevent CPU waste if it's end of pipe
 			return null; //loop back round
 		}

src/console/ConsoleReaderChildProcess.php

@@ -46,7 +46,10 @@ if($socket === false){
 $consoleReader = new ConsoleReader();
 while(!feof($socket)){
 	$line = $consoleReader->readLine();
-	if($line !== null){
-		fwrite($socket, $line . "\n");
+	if(@fwrite($socket, ($line ?? "") . "\n") === false){
+		//Always send even if there's no line, to check if the parent is alive
+		//If the parent process was terminated forcibly, it won't close the connection properly, so feof() will return
+		//false even though the connection is actually broken. However, fwrite() will fail.
+		break;
 	}
 }

src/console/ConsoleReaderThread.php

@@ -31,6 +31,7 @@ use function base64_encode;
 use function fgets;
 use function fopen;
 use function preg_replace;
+use function proc_close;
 use function proc_open;
 use function proc_terminate;
 use function sprintf;
@@ -116,6 +117,9 @@ final class ConsoleReaderThread extends Thread{
 
 				$command = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", trim($command)) ?? throw new AssumptionFailedError("This regex is assumed to be valid");
 				$command = preg_replace('/[[:cntrl:]]/', '', $command) ?? throw new AssumptionFailedError("This regex is assumed to be valid");
+				if($command === ""){
+					continue;
+				}
 				$buffer[] = $command;
 				if($notifier !== null){
 					$notifier->wakeupSleeper();
@@ -127,6 +131,7 @@ final class ConsoleReaderThread extends Thread{
 		//gets stuck in a blocking fgets() read because stream_select() is a hunk of junk (hence the separate process in
 		//the first place).
 		proc_terminate($sub);
+		proc_close($sub);
 		stream_socket_shutdown($client, STREAM_SHUT_RDWR);
 	}
 

src/crash/CrashDump.php

@@ -35,25 +35,17 @@ use pocketmine\utils\Utils;
 use pocketmine\VersionInfo;
 use Webmozart\PathUtil\Path;
 use function base64_encode;
-use function date;
 use function error_get_last;
-use function fclose;
 use function file;
 use function file_exists;
 use function file_get_contents;
-use function fopen;
-use function fwrite;
 use function get_loaded_extensions;
-use function implode;
-use function is_dir;
-use function is_resource;
 use function json_encode;
 use function json_last_error_msg;
 use function ksort;
 use function max;
 use function mb_strtoupper;
 use function microtime;
-use function mkdir;
 use function ob_end_clean;
 use function ob_get_contents;
 use function ob_start;
@@ -69,10 +61,10 @@ use function zend_version;
 use function zlib_encode;
 use const FILE_IGNORE_NEW_LINES;
 use const JSON_UNESCAPED_SLASHES;
-use const PHP_EOL;
 use const PHP_OS;
 use const PHP_VERSION;
 use const SORT_STRING;
+use const ZLIB_ENCODING_DEFLATE;
 
 class CrashDump{
 
@@ -84,58 +76,41 @@ class CrashDump{
 	 */
 	private const FORMAT_VERSION = 4;
 
-	private const PLUGIN_INVOLVEMENT_NONE = "none";
-	private const PLUGIN_INVOLVEMENT_DIRECT = "direct";
-	private const PLUGIN_INVOLVEMENT_INDIRECT = "indirect";
+	public const PLUGIN_INVOLVEMENT_NONE = "none";
+	public const PLUGIN_INVOLVEMENT_DIRECT = "direct";
+	public const PLUGIN_INVOLVEMENT_INDIRECT = "indirect";
 
 	/** @var Server */
 	private $server;
-	/** @var resource */
-	private $fp;
-	/** @var float */
-	private $time;
 	private CrashDumpData $data;
 	/** @var string */
 	private $encodedData;
-	/** @var string */
-	private $path;
 
 	private ?PluginManager $pluginManager;
 
 	public function __construct(Server $server, ?PluginManager $pluginManager){
-		$this->time = microtime(true);
+		$now = microtime(true);
 		$this->server = $server;
 		$this->pluginManager = $pluginManager;
 
-		$crashPath = Path::join($this->server->getDataPath(), "crashdumps");
-		if(!is_dir($crashPath)){
-			mkdir($crashPath);
-		}
-		$this->path = Path::join($crashPath, date("D_M_j-H.i.s-T_Y", (int) $this->time) . ".log");
-		$fp = @fopen($this->path, "wb");
-		if(!is_resource($fp)){
-			throw new \RuntimeException("Could not create Crash Dump");
-		}
-		$this->fp = $fp;
 		$this->data = new CrashDumpData();
 		$this->data->format_version = self::FORMAT_VERSION;
-		$this->data->time = $this->time;
-		$this->data->uptime = $this->time - $this->server->getStartTime();
-		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", (int) $this->time));
-		$this->addLine();
+		$this->data->time = $now;
+		$this->data->uptime = $now - $this->server->getStartTime();
+
 		$this->baseCrash();
 		$this->generalData();
 		$this->pluginsData();
 
 		$this->extraData();
 
-		$this->encodeData();
-
-		fclose($this->fp);
-	}
-
-	public function getPath() : string{
-		return $this->path;
+		$json = json_encode($this->data, JSON_UNESCAPED_SLASHES);
+		if($json === false){
+			throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
+		}
+		$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
+		if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
+		$this->encodedData = $zlibEncoded;
 	}
 
 	public function getEncodedData() : string{
@@ -146,29 +121,20 @@ class CrashDump{
 		return $this->data;
 	}
 
-	private function encodeData() : void{
-		$this->addLine();
-		$this->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
-		$this->addLine();
-		$this->addLine("===BEGIN CRASH DUMP===");
-		$json = json_encode($this->data, JSON_UNESCAPED_SLASHES);
-		if($json === false){
-			throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
-		}
-		$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
-		if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
-		$this->encodedData = $zlibEncoded;
+	public function encodeData(CrashDumpRenderer $renderer) : void{
+		$renderer->addLine();
+		$renderer->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
+		$renderer->addLine();
+		$renderer->addLine("===BEGIN CRASH DUMP===");
 		foreach(str_split(base64_encode($this->encodedData), 76) as $line){
-			$this->addLine($line);
+			$renderer->addLine($line);
 		}
-		$this->addLine("===END CRASH DUMP===");
+		$renderer->addLine("===END CRASH DUMP===");
 	}
 
 	private function pluginsData() : void{
 		if($this->pluginManager !== null){
 			$plugins = $this->pluginManager->getPlugins();
-			$this->addLine();
-			$this->addLine("Loaded plugins:");
 			ksort($plugins, SORT_STRING);
 			foreach($plugins as $p){
 				$d = $p->getDescription();
@@ -184,7 +150,6 @@ class CrashDump{
 					load: mb_strtoupper($d->getOrder()->name()),
 					website: $d->getWebsite()
 				);
-				$this->addLine($d->getName() . " " . $d->getVersion() . " by " . implode(", ", $d->getAuthors()) . " for API(s) " . implode(", ", $d->getCompatibleApis()));
 			}
 		}
 	}
@@ -250,10 +215,6 @@ class CrashDump{
 		$this->data->error = $error;
 		unset($this->data->error["fullFile"]);
 		unset($this->data->error["trace"]);
-		$this->addLine("Error: " . $error["message"]);
-		$this->addLine("File: " . $error["file"]);
-		$this->addLine("Line: " . $error["line"]);
-		$this->addLine("Type: " . $error["type"]);
 
 		$this->data->plugin_involvement = self::PLUGIN_INVOLVEMENT_NONE;
 		if(!$this->determinePluginFromFile($error["fullFile"], true)){ //fatal errors won't leave any stack trace
@@ -267,36 +228,24 @@ class CrashDump{
 			}
 		}
 
-		$this->addLine();
-		$this->addLine("Code:");
-
 		if($this->server->getConfigGroup()->getPropertyBool("auto-report.send-code", true) and file_exists($error["fullFile"])){
 			$file = @file($error["fullFile"], FILE_IGNORE_NEW_LINES);
 			if($file !== false){
 				for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10 and isset($file[$l]); ++$l){
-					$this->addLine("[" . ($l + 1) . "] " . $file[$l]);
 					$this->data->code[$l + 1] = $file[$l];
 				}
 			}
 		}
 
-		$this->addLine();
-		$this->addLine("Backtrace:");
-		foreach(($this->data->trace = Utils::printableTrace($error["trace"])) as $line){
-			$this->addLine($line);
-		}
-		$this->addLine();
+		$this->data->trace = Utils::printableTrace($error["trace"]);
 	}
 
 	private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
 		$frameCleanPath = Filesystem::cleanPath($filePath);
 		if(strpos($frameCleanPath, Filesystem::CLEAN_PATH_SRC_PREFIX) !== 0){
-			$this->addLine();
 			if($crashFrame){
-				$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
 				$this->data->plugin_involvement = self::PLUGIN_INVOLVEMENT_DIRECT;
 			}else{
-				$this->addLine("A PLUGIN WAS INVOLVED IN THIS CRASH");
 				$this->data->plugin_involvement = self::PLUGIN_INVOLVEMENT_INDIRECT;
 			}
 
@@ -308,7 +257,6 @@ class CrashDump{
 					$filePath = Filesystem::cleanPath($file->getValue($plugin));
 					if(strpos($frameCleanPath, $filePath) === 0){
 						$this->data->plugin = $plugin->getName();
-						$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
 						break;
 					}
 				}
@@ -319,7 +267,6 @@ class CrashDump{
 	}
 
 	private function generalData() : void{
-		$version = VersionInfo::VERSION();
 		$composerLibraries = [];
 		foreach(InstalledVersions::getInstalledPackages() as $package){
 			$composerLibraries[$package] = sprintf(
@@ -332,7 +279,7 @@ class CrashDump{
 		$this->data->general = new CrashDumpDataGeneral(
 			name: $this->server->getName(),
 			base_version: VersionInfo::BASE_VERSION,
-			build: VersionInfo::BUILD_NUMBER,
+			build: VersionInfo::BUILD_NUMBER(),
 			is_dev: VersionInfo::IS_DEVELOPMENT_BUILD,
 			protocol: ProtocolInfo::CURRENT_PROTOCOL,
 			git: VersionInfo::GIT_HASH(),
@@ -343,29 +290,5 @@ class CrashDump{
 			os: Utils::getOS(),
 			composer_libraries: $composerLibraries,
 		);
-		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
-		$this->addLine("Git commit: " . VersionInfo::GIT_HASH());
-		$this->addLine("uname -a: " . php_uname("a"));
-		$this->addLine("PHP Version: " . phpversion());
-		$this->addLine("Zend version: " . zend_version());
-		$this->addLine("OS: " . PHP_OS . ", " . Utils::getOS());
-		$this->addLine("Composer libraries: ");
-		foreach($composerLibraries as $library => $libraryVersion){
-			$this->addLine("- $library $libraryVersion");
-		}
-	}
-
-	/**
-	 * @param string $line
-	 */
-	public function addLine($line = "") : void{
-		fwrite($this->fp, $line . PHP_EOL);
-	}
-
-	/**
-	 * @param string $str
-	 */
-	public function add($str) : void{
-		fwrite($this->fp, $str);
 	}
 }

src/crash/CrashDumpRenderer.php

@@ -0,0 +1,103 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\crash;
+
+use pocketmine\utils\Utils;
+use pocketmine\utils\VersionString;
+use function count;
+use function date;
+use function fwrite;
+use function implode;
+use const PHP_EOL;
+
+final class CrashDumpRenderer{
+
+	/**
+	 * @param resource $fp
+	 */
+	public function __construct(private $fp, private CrashDumpData $data){
+
+	}
+
+	public function renderHumanReadable() : void{
+		$this->addLine($this->data->general->name . " Crash Dump " . date("D M j H:i:s T Y", (int) $this->data->time));
+		$this->addLine();
+
+		$this->addLine("Error: " . $this->data->error["message"]);
+		$this->addLine("File: " . $this->data->error["file"]);
+		$this->addLine("Line: " . $this->data->error["line"]);
+		$this->addLine("Type: " . $this->data->error["type"]);
+
+		if($this->data->plugin_involvement !== CrashDump::PLUGIN_INVOLVEMENT_NONE){
+			$this->addLine();
+			$this->addLine(match($this->data->plugin_involvement){
+				CrashDump::PLUGIN_INVOLVEMENT_DIRECT => "THIS CRASH WAS CAUSED BY A PLUGIN",
+				CrashDump::PLUGIN_INVOLVEMENT_INDIRECT => "A PLUGIN WAS INVOLVED IN THIS CRASH",
+				default => "Unknown plugin involvement!"
+			});
+		}
+		if($this->data->plugin !== ""){
+			$this->addLine("BAD PLUGIN: " . $this->data->plugin);
+		}
+
+		$this->addLine();
+		$this->addLine("Code:");
+
+		foreach($this->data->code as $lineNumber => $line){
+			$this->addLine("[$lineNumber] $line");
+		}
+
+		$this->addLine();
+		$this->addLine("Backtrace:");
+		foreach($this->data->trace as $line){
+			$this->addLine($line);
+		}
+		$this->addLine();
+
+		$version = new VersionString($this->data->general->base_version, $this->data->general->is_dev, $this->data->general->build);
+
+		$this->addLine($this->data->general->name . " version: " . $version->getFullVersion(true) . " [Protocol " . $this->data->general->protocol . "]");
+		$this->addLine("Git commit: " . $this->data->general->git);
+		$this->addLine("uname -a: " . $this->data->general->uname);
+		$this->addLine("PHP Version: " . $this->data->general->php);
+		$this->addLine("Zend version: " . $this->data->general->zend);
+		$this->addLine("OS: " . $this->data->general->php_os . ", " . $this->data->general->os);
+		$this->addLine("Composer libraries: ");
+		foreach(Utils::stringifyKeys($this->data->general->composer_libraries) as $library => $libraryVersion){
+			$this->addLine("- $library $libraryVersion");
+		}
+
+		if(count($this->data->plugins) > 0){
+			$this->addLine();
+			$this->addLine("Loaded plugins:");
+			foreach($this->data->plugins as $p){
+				$this->addLine($p->name . " " . $p->version . " by " . implode(", ", $p->authors) . " for API(s) " . implode(", ", $p->api));
+			}
+		}
+	}
+
+	public function addLine(string $line = "") : void{
+		fwrite($this->fp, $line . PHP_EOL);
+	}
+}

src/data/SavedDataLoadingException.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\data;
+
+final class SavedDataLoadingException extends \RuntimeException{
+
+}

src/data/bedrock/LegacyBiomeIdToStringIdMap.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock;
+
+use pocketmine\utils\SingletonTrait;
+use Webmozart\PathUtil\Path;
+
+final class LegacyBiomeIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
+	use SingletonTrait;
+
+	public function __construct(){
+		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'biome_id_map.json'));
+	}
+}

src/entity/EntityDataHelper.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
@@ -38,34 +39,40 @@ final class EntityDataHelper{
 		//NOOP
 	}
 
+	/**
+	 * @throws SavedDataLoadingException
+	 */
 	public static function parseLocation(CompoundTag $nbt, World $world) : Location{
 		$pos = self::parseVec3($nbt, "Pos", false);
 
 		$yawPitch = $nbt->getTag("Rotation");
 		if(!($yawPitch instanceof ListTag) or $yawPitch->getTagType() !== NBT::TAG_Float){
-			throw new \UnexpectedValueException("'Rotation' should be a List<Float>");
+			throw new SavedDataLoadingException("'Rotation' should be a List<Float>");
 		}
 		/** @var FloatTag[] $values */
 		$values = $yawPitch->getValue();
 		if(count($values) !== 2){
-			throw new \UnexpectedValueException("Expected exactly 2 entries for 'Rotation'");
+			throw new SavedDataLoadingException("Expected exactly 2 entries for 'Rotation'");
 		}
 
 		return Location::fromObject($pos, $world, $values[0]->getValue(), $values[1]->getValue());
 	}
 
+	/**
+	 * @throws SavedDataLoadingException
+	 */
 	public static function parseVec3(CompoundTag $nbt, string $tagName, bool $optional) : Vector3{
 		$pos = $nbt->getTag($tagName);
 		if($pos === null and $optional){
 			return new Vector3(0, 0, 0);
 		}
 		if(!($pos instanceof ListTag) or ($pos->getTagType() !== NBT::TAG_Double && $pos->getTagType() !== NBT::TAG_Float)){
-			throw new \UnexpectedValueException("'$tagName' should be a List<Double> or List<Float>");
+			throw new SavedDataLoadingException("'$tagName' should be a List<Double> or List<Float>");
 		}
 		/** @var DoubleTag[]|FloatTag[] $values */
 		$values = $pos->getValue();
 		if(count($values) !== 3){
-			throw new \UnexpectedValueException("Expected exactly 3 entries in '$tagName' tag");
+			throw new SavedDataLoadingException("Expected exactly 3 entries in '$tagName' tag");
 		}
 		return new Vector3($values[0]->getValue(), $values[1]->getValue(), $values[2]->getValue());
 	}

src/entity/EntityFactory.php

@@ -30,6 +30,7 @@ use pocketmine\block\BlockFactory;
 use pocketmine\data\bedrock\EntityLegacyIds;
 use pocketmine\data\bedrock\PotionTypeIdMap;
 use pocketmine\data\bedrock\PotionTypeIds;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\object\ExperienceOrb;
 use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\ItemEntity;
@@ -45,7 +46,7 @@ use pocketmine\entity\projectile\SplashPotion;
 use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\NbtDataException;
+use pocketmine\nbt\NbtException;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
@@ -113,12 +114,12 @@ final class EntityFactory{
 		$this->register(ItemEntity::class, function(World $world, CompoundTag $nbt) : ItemEntity{
 			$itemTag = $nbt->getCompoundTag("Item");
 			if($itemTag === null){
-				throw new \UnexpectedValueException("Expected \"Item\" NBT tag not found");
+				throw new SavedDataLoadingException("Expected \"Item\" NBT tag not found");
 			}
 
 			$item = Item::nbtDeserialize($itemTag);
 			if($item->isNull()){
-				throw new \UnexpectedValueException("Item is invalid");
+				throw new SavedDataLoadingException("Item is invalid");
 			}
 			return new ItemEntity(EntityDataHelper::parseLocation($nbt, $world), $item, $nbt);
 		}, ['Item', 'minecraft:item'], EntityLegacyIds::ITEM);
@@ -126,7 +127,7 @@ final class EntityFactory{
 		$this->register(Painting::class, function(World $world, CompoundTag $nbt) : Painting{
 			$motive = PaintingMotive::getMotiveByName($nbt->getString("Motive"));
 			if($motive === null){
-				throw new \UnexpectedValueException("Unknown painting motive");
+				throw new SavedDataLoadingException("Unknown painting motive");
 			}
 			$blockIn = new Vector3($nbt->getInt("TileX"), $nbt->getInt("TileY"), $nbt->getInt("TileZ"));
 			if(($directionTag = $nbt->getTag("Direction")) instanceof ByteTag){
@@ -134,7 +135,7 @@ final class EntityFactory{
 			}elseif(($facingTag = $nbt->getTag("Facing")) instanceof ByteTag){
 				$facing = Painting::DATA_TO_FACING[$facingTag->getValue()] ?? Facing::NORTH;
 			}else{
-				throw new \UnexpectedValueException("Missing facing info");
+				throw new SavedDataLoadingException("Missing facing info");
 			}
 
 			return new Painting(EntityDataHelper::parseLocation($nbt, $world), $blockIn, $facing, $motive, $nbt);
@@ -151,7 +152,7 @@ final class EntityFactory{
 		$this->register(SplashPotion::class, function(World $world, CompoundTag $nbt) : SplashPotion{
 			$potionType = PotionTypeIdMap::getInstance()->fromId($nbt->getShort("PotionId", PotionTypeIds::WATER));
 			if($potionType === null){
-				throw new \UnexpectedValueException("No such potion type");
+				throw new SavedDataLoadingException("No such potion type");
 			}
 			return new SplashPotion(EntityDataHelper::parseLocation($nbt, $world), null, $potionType, $nbt);
 		}, ['ThrownPotion', 'minecraft:potion', 'thrownpotion'], EntityLegacyIds::SPLASH_POTION);
@@ -222,25 +223,28 @@ final class EntityFactory{
 	/**
 	 * Creates an entity from data stored on a chunk.
 	 *
-	 * @throws \RuntimeException
-	 * @throws NbtDataException
+	 * @throws SavedDataLoadingException
 	 * @internal
 	 */
 	public function createFromData(World $world, CompoundTag $nbt) : ?Entity{
-		$saveId = $nbt->getTag("id") ?? $nbt->getTag("identifier");
-		$func = null;
-		if($saveId instanceof StringTag){
-			$func = $this->creationFuncs[$saveId->getValue()] ?? null;
-		}elseif($saveId instanceof IntTag){ //legacy MCPE format
-			$func = $this->creationFuncs[$saveId->getValue() & 0xff] ?? null;
-		}
-		if($func === null){
-			return null;
-		}
-		/** @var Entity $entity */
-		$entity = $func($world, $nbt);
+		try{
+			$saveId = $nbt->getTag("id") ?? $nbt->getTag("identifier");
+			$func = null;
+			if($saveId instanceof StringTag){
+				$func = $this->creationFuncs[$saveId->getValue()] ?? null;
+			}elseif($saveId instanceof IntTag){ //legacy MCPE format
+				$func = $this->creationFuncs[$saveId->getValue() & 0xff] ?? null;
+			}
+			if($func === null){
+				return null;
+			}
+			/** @var Entity $entity */
+			$entity = $func($world, $nbt);
 
-		return $entity;
+			return $entity;
+		}catch(NbtException $e){
+			throw new SavedDataLoadingException($e->getMessage(), 0, $e);
+		}
 	}
 
 	public function injectSaveId(string $class, CompoundTag $saveData) : void{

src/entity/Human.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\animation\TotemUseAnimation;
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\VanillaEffects;
@@ -104,12 +105,12 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
 
 	/**
 	 * @throws InvalidSkinException
-	 * @throws \UnexpectedValueException
+	 * @throws SavedDataLoadingException
 	 */
 	public static function parseSkinNBT(CompoundTag $nbt) : Skin{
 		$skinTag = $nbt->getCompoundTag("Skin");
 		if($skinTag === null){
-			throw new \UnexpectedValueException("Missing skin data");
+			throw new SavedDataLoadingException("Missing skin data");
 		}
 		return new Skin( //this throws if the skin is invalid
 			$skinTag->getString("Name"),

src/entity/projectile/Projectile.php

@@ -166,7 +166,7 @@ abstract class Projectile extends Entity{
 		return $this->blockHit === null and parent::hasMovementUpdate();
 	}
 
-	public function move(float $dx, float $dy, float $dz) : void{
+	protected function move(float $dx, float $dy, float $dz) : void{
 		$this->blocksAround = null;
 
 		Timings::$entityMove->startTiming();

src/item/Item.php

@@ -31,6 +31,7 @@ use pocketmine\block\BlockBreakInfo;
 use pocketmine\block\BlockToolType;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\data\bedrock\EnchantmentIdMap;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
 use pocketmine\item\enchantment\EnchantmentInstance;
 use pocketmine\math\Vector3;
@@ -671,6 +672,8 @@ class Item implements \JsonSerializable{
 
 	/**
 	 * Deserializes an Item from an NBT CompoundTag
+	 * @throws NbtException
+	 * @throws SavedDataLoadingException
 	 */
 	public static function nbtDeserialize(CompoundTag $tag) : Item{
 		if($tag->getTag("id") === null or $tag->getTag("Count") === null){
@@ -692,7 +695,7 @@ class Item implements \JsonSerializable{
 			}
 			$item->setCount($count);
 		}else{
-			throw new \InvalidArgumentException("Item CompoundTag ID must be an instance of StringTag or ShortTag, " . get_class($idTag) . " given");
+			throw new SavedDataLoadingException("Item CompoundTag ID must be an instance of StringTag or ShortTag, " . get_class($idTag) . " given");
 		}
 
 		$itemNBT = $tag->getCompoundTag("tag");

src/item/ItemFactory.php

@@ -252,6 +252,7 @@ class ItemFactory{
 		$this->register(new Steak(new ItemIdentifier(ItemIds::STEAK, 0), "Steak"));
 		$this->register(new Stick(new ItemIdentifier(ItemIds::STICK, 0), "Stick"));
 		$this->register(new StringItem(new ItemIdentifier(ItemIds::STRING, 0), "String"));
+		$this->register(new SweetBerries(new ItemIdentifier(ItemIds::SWEET_BERRIES, 0), "Sweet Berries"));
 		$this->register(new Totem(new ItemIdentifier(ItemIds::TOTEM, 0), "Totem of Undying"));
 		$this->register(new WheatSeeds(new ItemIdentifier(ItemIds::WHEAT_SEEDS, 0), "Wheat Seeds"));
 		$this->register(new WritableBook(new ItemIdentifier(ItemIds::WRITABLE_BOOK, 0), "Book & Quill"));
@@ -327,7 +328,6 @@ class ItemFactory{
 		//TODO: minecraft:shield
 		//TODO: minecraft:sparkler
 		//TODO: minecraft:spawn_egg
-		$this->register(new SweetBerries(new ItemIdentifier(ItemIds::SWEET_BERRIES, 0), "Sweet Berries"));
 		//TODO: minecraft:tnt_minecart
 		//TODO: minecraft:trident
 		//TODO: minecraft:turtle_helmet

src/item/StringToItemParser.php

@@ -158,6 +158,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("chemical_heat", fn() => VanillaBlocks::CHEMICAL_HEAT());
 		$result->registerBlock("chemistry_table", fn() => VanillaBlocks::COMPOUND_CREATOR());
 		$result->registerBlock("chest", fn() => VanillaBlocks::CHEST());
+		$result->registerBlock("chipped_anvil", fn() => VanillaBlocks::ANVIL()->setDamage(1));
 		$result->registerBlock("chiseled_quartz", fn() => VanillaBlocks::CHISELED_QUARTZ());
 		$result->registerBlock("chiseled_red_sandstone", fn() => VanillaBlocks::CHISELED_RED_SANDSTONE());
 		$result->registerBlock("chiseled_sandstone", fn() => VanillaBlocks::CHISELED_SANDSTONE());
@@ -165,6 +166,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("clay_block", fn() => VanillaBlocks::CLAY());
 		$result->registerBlock("coal_block", fn() => VanillaBlocks::COAL());
 		$result->registerBlock("coal_ore", fn() => VanillaBlocks::COAL_ORE());
+		$result->registerBlock("coarse_dirt", fn() => VanillaBlocks::DIRT()->setCoarse(true));
 		$result->registerBlock("cobble", fn() => VanillaBlocks::COBBLESTONE());
 		$result->registerBlock("cobble_stairs", fn() => VanillaBlocks::COBBLESTONE_STAIRS());
 		$result->registerBlock("cobble_wall", fn() => VanillaBlocks::COBBLESTONE_WALL());
@@ -200,6 +202,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("cut_sandstone", fn() => VanillaBlocks::CUT_SANDSTONE());
 		$result->registerBlock("cut_sandstone_slab", fn() => VanillaBlocks::CUT_SANDSTONE_SLAB());
 		$result->registerBlock("cyan_glazed_terracotta", fn() => VanillaBlocks::CYAN_GLAZED_TERRACOTTA());
+		$result->registerBlock("damaged_anvil", fn() => VanillaBlocks::ANVIL()->setDamage(2));
 		$result->registerBlock("dandelion", fn() => VanillaBlocks::DANDELION());
 		$result->registerBlock("dark_oak_button", fn() => VanillaBlocks::DARK_OAK_BUTTON());
 		$result->registerBlock("dark_oak_door", fn() => VanillaBlocks::DARK_OAK_DOOR());
@@ -214,6 +217,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("dark_oak_sign", fn() => VanillaBlocks::DARK_OAK_SIGN());
 		$result->registerBlock("dark_oak_slab", fn() => VanillaBlocks::DARK_OAK_SLAB());
 		$result->registerBlock("dark_oak_stairs", fn() => VanillaBlocks::DARK_OAK_STAIRS());
+		$result->registerBlock("dark_oak_standing_sign", fn() => VanillaBlocks::DARK_OAK_SIGN());
 		$result->registerBlock("dark_oak_trapdoor", fn() => VanillaBlocks::DARK_OAK_TRAPDOOR());
 		$result->registerBlock("dark_oak_wall_sign", fn() => VanillaBlocks::DARK_OAK_WALL_SIGN());
 		$result->registerBlock("dark_oak_wood", fn() => VanillaBlocks::DARK_OAK_WOOD());
@@ -609,6 +613,8 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("jungle_trapdoor", fn() => VanillaBlocks::JUNGLE_TRAPDOOR());
 		$result->registerBlock("jungle_wall_sign", fn() => VanillaBlocks::JUNGLE_WALL_SIGN());
 		$result->registerBlock("jungle_wood", fn() => VanillaBlocks::JUNGLE_WOOD());
+		$result->registerBlock("jungle_wood_stairs", fn() => VanillaBlocks::JUNGLE_STAIRS());
+		$result->registerBlock("jungle_wooden_stairs", fn() => VanillaBlocks::JUNGLE_STAIRS());
 		$result->registerBlock("lab_table", fn() => VanillaBlocks::LAB_TABLE());
 		$result->registerBlock("ladder", fn() => VanillaBlocks::LADDER());
 		$result->registerBlock("lantern", fn() => VanillaBlocks::LANTERN());
@@ -695,6 +701,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("oak_sign", fn() => VanillaBlocks::OAK_SIGN());
 		$result->registerBlock("oak_slab", fn() => VanillaBlocks::OAK_SLAB());
 		$result->registerBlock("oak_stairs", fn() => VanillaBlocks::OAK_STAIRS());
+		$result->registerBlock("oak_standing_sign", fn() => VanillaBlocks::OAK_SIGN());
 		$result->registerBlock("oak_trapdoor", fn() => VanillaBlocks::OAK_TRAPDOOR());
 		$result->registerBlock("oak_wall_sign", fn() => VanillaBlocks::OAK_WALL_SIGN());
 		$result->registerBlock("oak_wood", fn() => VanillaBlocks::OAK_WOOD());

src/lang/KnownTranslationFactory.php

@@ -1666,10 +1666,11 @@ final class KnownTranslationFactory{
 		]);
 	}
 
-	public static function pocketmine_plugin_aliasError(Translatable|string $param0, Translatable|string $param1) : Translatable{
+	public static function pocketmine_plugin_aliasError(Translatable|string $param0, Translatable|string $param1, Translatable|string $param2) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_ALIASERROR, [
 			0 => $param0,
 			1 => $param1,
+			2 => $param2,
 		]);
 	}
 
@@ -1689,10 +1690,11 @@ final class KnownTranslationFactory{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_CIRCULARDEPENDENCY, []);
 	}
 
-	public static function pocketmine_plugin_commandError(Translatable|string $param0, Translatable|string $param1) : Translatable{
+	public static function pocketmine_plugin_commandError(Translatable|string $param0, Translatable|string $param1, Translatable|string $param2) : Translatable{
 		return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_COMMANDERROR, [
 			0 => $param0,
 			1 => $param1,
+			2 => $param2,
 		]);
 	}
 

src/network/mcpe/ChunkRequestTask.php

@@ -69,7 +69,7 @@ class ChunkRequestTask extends AsyncTask{
 
 	public function onRun() : void{
 		$chunk = FastChunkSerializer::deserializeTerrain($this->chunk);
-		$subCount = ChunkSerializer::getSubChunkCount($chunk);
+		$subCount = ChunkSerializer::getSubChunkCount($chunk) + ChunkSerializer::LOWER_PADDING_SIZE;
 		$encoderContext = new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary());
 		$payload = ChunkSerializer::serializeFullChunk($chunk, RuntimeBlockMapping::getInstance(), $encoderContext, $this->tiles);
 		$this->setResult($this->compressor->compress(PacketBatch::fromPackets($encoderContext, LevelChunkPacket::create($this->chunkX, $this->chunkZ, $subCount, null, $payload))->getBuffer()));

src/network/mcpe/convert/ItemTranslator.php

@@ -27,6 +27,7 @@ use pocketmine\data\bedrock\LegacyItemIdToStringIdMap;
 use pocketmine\network\mcpe\protocol\serializer\ItemTypeDictionary;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
 use Webmozart\PathUtil\Path;
 use function array_key_exists;
 use function file_get_contents;
@@ -73,10 +74,6 @@ final class ItemTranslator{
 			throw new AssumptionFailedError("Invalid item table format");
 		}
 
-		$legacyStringToIntMapRaw = file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'item_id_map.json'));
-		if($legacyStringToIntMapRaw === false){
-			throw new AssumptionFailedError("Missing required resource file");
-		}
 		$legacyStringToIntMap = LegacyItemIdToStringIdMap::getInstance();
 
 		/** @phpstan-var array<string, int> $simpleMappings */
@@ -92,7 +89,7 @@ final class ItemTranslator{
 			}
 			$simpleMappings[$newId] = $intId;
 		}
-		foreach($legacyStringToIntMap->getStringToLegacyMap() as $stringId => $intId){
+		foreach(Utils::stringifyKeys($legacyStringToIntMap->getStringToLegacyMap()) as $stringId => $intId){
 			if(isset($simpleMappings[$stringId])){
 				throw new \UnexpectedValueException("Old ID $stringId collides with new ID");
 			}

src/network/mcpe/handler/PreSpawnPacketHandler.php

@@ -104,6 +104,7 @@ class PreSpawnPacketHandler extends PacketHandler{
 			false,
 			sprintf("%s %s", VersionInfo::NAME, VersionInfo::VERSION()->getFullVersion(true)),
 			[],
+			0,
 			GlobalItemTypeDictionary::getInstance()->getDictionary()->getEntries()
 		));
 

src/network/mcpe/serializer/ChunkSerializer.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\network\mcpe\serializer;
 
 use pocketmine\block\tile\Spawnable;
+use pocketmine\data\bedrock\BiomeIds;
+use pocketmine\data\bedrock\LegacyBiomeIdToStringIdMap;
 use pocketmine\nbt\TreeRoot;
 use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use pocketmine\network\mcpe\protocol\serializer\NetworkNbtSerializer;
@@ -32,10 +34,14 @@ use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
 use pocketmine\utils\Binary;
 use pocketmine\utils\BinaryStream;
 use pocketmine\world\format\Chunk;
+use pocketmine\world\format\PalettedBlockArray;
 use pocketmine\world\format\SubChunk;
+use function chr;
 use function count;
+use function str_repeat;
 
 final class ChunkSerializer{
+	public const LOWER_PADDING_SIZE = 4;
 
 	private function __construct(){
 		//NOOP
@@ -58,11 +64,22 @@ final class ChunkSerializer{
 
 	public static function serializeFullChunk(Chunk $chunk, RuntimeBlockMapping $blockMapper, PacketSerializerContext $encoderContext, ?string $tiles = null) : string{
 		$stream = PacketSerializer::encoder($encoderContext);
+
+		//TODO: HACK! fill in fake subchunks to make up for the new negative space client-side
+		for($y = 0; $y < self::LOWER_PADDING_SIZE; $y++){
+			$stream->putByte(8); //subchunk version 8
+			$stream->putByte(0); //0 layers - client will treat this as all-air
+		}
+
 		$subChunkCount = self::getSubChunkCount($chunk);
 		for($y = Chunk::MIN_SUBCHUNK_INDEX, $writtenCount = 0; $writtenCount < $subChunkCount; ++$y, ++$writtenCount){
 			self::serializeSubChunk($chunk->getSubChunk($y), $blockMapper, $stream, false);
 		}
-		$stream->put($chunk->getBiomeIdArray());
+
+		//TODO: right now we don't support 3D natively, so we just 3Dify our 2D biomes so they fill the column
+		$encodedBiomePalette = self::serializeBiomesAsPalette($chunk);
+		$stream->put(str_repeat($encodedBiomePalette, 25));
+
 		$stream->putByte(0); //border block array count
 		//Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client.
 
@@ -116,4 +133,39 @@ final class ChunkSerializer{
 
 		return $stream->getBuffer();
 	}
+
+	private static function serializeBiomesAsPalette(Chunk $chunk) : string{
+		$biomeIdMap = LegacyBiomeIdToStringIdMap::getInstance();
+		$biomePalette = new PalettedBlockArray($chunk->getBiomeId(0, 0));
+		for($x = 0; $x < 16; ++$x){
+			for($z = 0; $z < 16; ++$z){
+				$biomeId = $chunk->getBiomeId($x, $z);
+				if($biomeIdMap->legacyToString($biomeId) === null){
+					//make sure we aren't sending bogus biomes - the 1.18.0 client crashes if we do this
+					$biomeId = BiomeIds::OCEAN;
+				}
+				for($y = 0; $y < 16; ++$y){
+					$biomePalette->set($x, $y, $z, $biomeId);
+				}
+			}
+		}
+
+		$biomePaletteBitsPerBlock = $biomePalette->getBitsPerBlock();
+		$encodedBiomePalette =
+			chr(($biomePaletteBitsPerBlock << 1) | 1) . //the last bit is non-persistence (like for blocks), though it has no effect on biomes since they always use integer IDs
+			$biomePalette->getWordArray();
+
+		//these LSHIFT by 1 uvarints are optimizations: the client expects zigzag varints here
+		//but since we know they are always unsigned, we can avoid the extra fcall overhead of
+		//zigzag and just shift directly.
+		$biomePaletteArray = $biomePalette->getPalette();
+		if($biomePaletteBitsPerBlock !== 0){
+			$encodedBiomePalette .= Binary::writeUnsignedVarInt(count($biomePaletteArray) << 1);
+		}
+		foreach($biomePaletteArray as $p){
+			$encodedBiomePalette .= Binary::writeUnsignedVarInt($p << 1);
+		}
+
+		return $encodedBiomePalette;
+	}
 }

src/network/query/QueryInfo.php

@@ -233,7 +233,7 @@ final class QueryInfo{
 			$query .= $key . "\x00" . $value . "\x00";
 		}
 
-		foreach($this->extraData as $key => $value){
+		foreach(Utils::stringifyKeys($this->extraData) as $key => $value){
 			$query .= $key . "\x00" . $value . "\x00";
 		}
 

src/permission/PermissibleInternal.php

@@ -27,6 +27,7 @@ use pocketmine\plugin\Plugin;
 use pocketmine\plugin\PluginException;
 use pocketmine\timings\Timings;
 use pocketmine\utils\ObjectSet;
+use pocketmine\utils\Utils;
 use function count;
 use function spl_object_id;
 
@@ -143,7 +144,7 @@ class PermissibleInternal implements Permissible{
 		$oldPermissions = $this->permissions;
 		$this->permissions = [];
 
-		foreach($this->rootPermissions as $name => $isGranted){
+		foreach(Utils::stringifyKeys($this->rootPermissions) as $name => $isGranted){
 			$perm = $permManager->getPermission($name);
 			if($perm === null){
 				throw new \LogicException("Unregistered root permission $name");
@@ -187,11 +188,12 @@ class PermissibleInternal implements Permissible{
 	}
 
 	/**
-	 * @param bool[]                    $children
+	 * @param bool[] $children
+	 * @phpstan-param array<string, bool> $children
 	 */
 	private function calculateChildPermissions(array $children, bool $invert, ?PermissionAttachment $attachment, ?PermissionAttachmentInfo $parent) : void{
 		$permManager = PermissionManager::getInstance();
-		foreach($children as $name => $v){
+		foreach(Utils::stringifyKeys($children) as $name => $v){
 			$perm = $permManager->getPermission($name);
 			$value = ($v xor $invert);
 			$this->permissions[$name] = new PermissionAttachmentInfo($name, $attachment, $value, $parent);

src/permission/PermissionParser.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\permission;
 
+use pocketmine\utils\Utils;
 use function is_bool;
 use function strtolower;
 
@@ -83,7 +84,7 @@ class PermissionParser{
 	 */
 	public static function loadPermissions(array $data, string $default = self::DEFAULT_FALSE) : array{
 		$result = [];
-		foreach($data as $name => $entry){
+		foreach(Utils::stringifyKeys($data) as $name => $entry){
 			$desc = null;
 			if(isset($entry["default"])){
 				$default = PermissionParser::defaultFromString($entry["default"]);

src/plugin/PluginBase.php

@@ -32,6 +32,7 @@ use pocketmine\scheduler\TaskScheduler;
 use pocketmine\Server;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Config;
+use pocketmine\utils\Utils;
 use Webmozart\PathUtil\Path;
 use function count;
 use function dirname;
@@ -162,9 +163,9 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 	private function registerYamlCommands() : void{
 		$pluginCmds = [];
 
-		foreach($this->getDescription()->getCommands() as $key => $data){
+		foreach(Utils::stringifyKeys($this->getDescription()->getCommands()) as $key => $data){
 			if(strpos($key, ":") !== false){
-				$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->getDescription()->getFullName())));
+				$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->getDescription()->getFullName(), ":")));
 				continue;
 			}
 
@@ -180,7 +181,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
 			$aliasList = [];
 			foreach($data->getAliases() as $alias){
 				if(strpos($alias, ":") !== false){
-					$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->getDescription()->getFullName())));
+					$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->getDescription()->getFullName(), ":")));
 					continue;
 				}
 				$aliasList[] = $alias;

src/plugin/PluginLoadabilityChecker.php

@@ -76,7 +76,7 @@ final class PluginLoadabilityChecker{
 			}
 		}
 
-		foreach($description->getRequiredExtensions() as $extensionName => $versionConstrs){
+		foreach(Utils::stringifyKeys($description->getRequiredExtensions()) as $extensionName => $versionConstrs){
 			$gotVersion = phpversion($extensionName);
 			if($gotVersion === false){
 				return KnownTranslationFactory::pocketmine_plugin_extensionNotLoaded($extensionName);

src/plugin/PluginManager.php

@@ -181,7 +181,7 @@ class PluginManager{
 		}
 		$opRoot = $permManager->getPermission(DefaultPermissions::ROOT_OPERATOR);
 		$everyoneRoot = $permManager->getPermission(DefaultPermissions::ROOT_USER);
-		foreach($description->getPermissions() as $default => $perms){
+		foreach(Utils::stringifyKeys($description->getPermissions()) as $default => $perms){
 			foreach($perms as $perm){
 				$permManager->addPermission($perm);
 				switch($default){
@@ -345,7 +345,7 @@ class PluginManager{
 
 		while(count($triage->plugins) > 0){
 			$loadedThisLoop = 0;
-			foreach($triage->plugins as $name => $entry){
+			foreach(Utils::stringifyKeys($triage->plugins) as $name => $entry){
 				$this->checkDepsForTriage($name, "hard", $triage->dependencies, $loadedPlugins, $triage);
 				$this->checkDepsForTriage($name, "soft", $triage->softDependencies, $loadedPlugins, $triage);
 
@@ -377,7 +377,7 @@ class PluginManager{
 				//No plugins loaded :(
 
 				//check for skippable soft dependencies first, in case the dependents could resolve hard dependencies
-				foreach($triage->plugins as $name => $file){
+				foreach(Utils::stringifyKeys($triage->plugins) as $name => $file){
 					if(isset($triage->softDependencies[$name]) && !isset($triage->dependencies[$name])){
 						foreach($triage->softDependencies[$name] as $k => $dependency){
 							if($this->getPlugin($dependency) === null && !array_key_exists($dependency, $triage->plugins)){
@@ -392,7 +392,7 @@ class PluginManager{
 					}
 				}
 
-				foreach($triage->plugins as $name => $file){
+				foreach(Utils::stringifyKeys($triage->plugins) as $name => $file){
 					if(isset($triage->dependencies[$name])){
 						$unknownDependencies = [];
 
@@ -415,7 +415,7 @@ class PluginManager{
 					}
 				}
 
-				foreach($triage->plugins as $name => $file){
+				foreach(Utils::stringifyKeys($triage->plugins) as $name => $file){
 					$this->server->getLogger()->critical($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_loadError($name, KnownTranslationFactory::pocketmine_plugin_circularDependency())));
 				}
 				break;

src/plugin/ScriptPluginLoader.php

@@ -23,13 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\plugin;
 
+use pocketmine\utils\Utils;
+use function count;
 use function file;
+use function implode;
 use function is_file;
-use function preg_match;
 use function strlen;
 use function strpos;
 use function substr;
-use function trim;
 use const FILE_IGNORE_NEW_LINES;
 use const FILE_SKIP_EMPTY_LINES;
 
@@ -60,30 +61,27 @@ class ScriptPluginLoader implements PluginLoader{
 			return null;
 		}
 
-		$data = [];
-
 		$insideHeader = false;
+
+		$docCommentLines = [];
 		foreach($content as $line){
-			if(!$insideHeader and strpos($line, "/**") !== false){
-				$insideHeader = true;
-			}
-
-			if(preg_match("/^[ \t]+\\*[ \t]+@([a-zA-Z]+)([ \t]+(.*))?$/", $line, $matches) > 0){
-				$key = $matches[1];
-				$content = trim($matches[3] ?? "");
-
-				if($key === "notscript"){
-					return null;
+			if(!$insideHeader){
+				if(strpos($line, "/**") !== false){
+					$insideHeader = true;
+				}else{
+					continue;
 				}
-
-				$data[$key] = $content;
 			}
 
-			if($insideHeader and strpos($line, "*/") !== false){
+			$docCommentLines[] = $line;
+
+			if(strpos($line, "*/") !== false){
 				break;
 			}
 		}
-		if($insideHeader){
+
+		$data = Utils::parseDocComment(implode("\n", $docCommentLines));
+		if(count($data) !== 0){
 			return new PluginDescription($data);
 		}
 

src/stats/SendUsageTask.php

@@ -123,9 +123,7 @@ class SendUsageTask extends AsyncTask{
 				];
 
 				//This anonymizes the user ids so they cannot be reversed to the original
-				foreach($playerList as $k => $v){
-					$playerList[$k] = md5($v);
-				}
+				$playerList = array_map('md5', $playerList);
 
 				$players = array_map(function(Player $p) : string{ return md5($p->getUniqueId()->getBytes()); }, $server->getOnlinePlayers());
 

src/utils/Config.php

@@ -425,7 +425,7 @@ class Config{
 	public function set($k, $v = true) : void{
 		$this->config[$k] = $v;
 		$this->changed = true;
-		foreach($this->nestedCache as $nestedKey => $nvalue){
+		foreach(Utils::stringifyKeys($this->nestedCache) as $nestedKey => $nvalue){
 			if(substr($nestedKey, 0, strlen($k) + 1) === ($k . ".")){
 				unset($this->nestedCache[$nestedKey]);
 			}
@@ -487,7 +487,7 @@ class Config{
 	 */
 	private function fillDefaults(array $default, &$data) : int{
 		$changed = 0;
-		foreach($default as $k => $v){
+		foreach(Utils::stringifyKeys($default) as $k => $v){
 			if(is_array($v)){
 				if(!isset($data[$k]) or !is_array($data[$k])){
 					$data[$k] = [];
@@ -536,7 +536,7 @@ class Config{
 	 */
 	public static function writeProperties(array $config) : string{
 		$content = "#Properties Config file\r\n#" . date("D M j H:i:s T Y") . "\r\n";
-		foreach($config as $k => $v){
+		foreach(Utils::stringifyKeys($config) as $k => $v){
 			if(is_bool($v)){
 				$v = $v ? "on" : "off";
 			}

src/utils/Filesystem.php

@@ -163,7 +163,8 @@ final class Filesystem{
 		$result = str_replace([DIRECTORY_SEPARATOR, ".php", "phar://"], ["/", "", ""], $path);
 
 		//remove relative paths
-		foreach(self::$cleanedPaths as $cleanPath => $replacement){
+		//this should probably never have integer keys, but it's safer than making PHPStan ignore it
+		foreach(Utils::stringifyKeys(self::$cleanedPaths) as $cleanPath => $replacement){
 			$cleanPath = rtrim(str_replace([DIRECTORY_SEPARATOR, "phar://"], ["/", ""], $cleanPath), "/");
 			if(strpos($result, $cleanPath) === 0){
 				$result = ltrim(str_replace($cleanPath, $replacement, $result), "/");

src/utils/StringToTParser.php

@@ -75,7 +75,7 @@ abstract class StringToTParser{
 		return strtolower(str_replace([" ", "minecraft:"], ["_", ""], trim($input)));
 	}
 
-	/** @return string[] */
+	/** @return string[]|int[] */
 	public function getKnownAliases() : array{
 		return array_keys($this->callbackMap);
 	}

src/utils/Utils.php

@@ -506,7 +506,7 @@ final class Utils{
 		if($rawDocComment === false){ //usually empty doc comment, but this is safer and statically analysable
 			return [];
 		}
-		preg_match_all('/(*ANYCRLF)^[\t ]*(?:\* )?@([a-zA-Z]+)(?:[\t ]+(.+?))?[\t ]*$/m', $rawDocComment, $matches);
+		preg_match_all('/(*ANYCRLF)^[\t ]*(?:\* )?@([a-zA-Z\-]+)(?:[\t ]+(.+?))?[\t ]*$/m', $rawDocComment, $matches);
 
 		return array_combine($matches[1], $matches[2]);
 	}
@@ -571,6 +571,22 @@ final class Utils{
 		}
 	}
 
+	/**
+	 * Generator which forces array keys to string during iteration.
+	 * This is necessary because PHP has an anti-feature where it casts numeric string keys to integers, leading to
+	 * various crashes.
+	 *
+	 * @phpstan-template TKeyType of string
+	 * @phpstan-template TValueType
+	 * @phpstan-param array<TKeyType, TValueType> $array
+	 * @phpstan-return \Generator<TKeyType, TValueType, void, void>
+	 */
+	public static function stringifyKeys(array $array) : \Generator{
+		foreach($array as $key => $value){ // @phpstan-ignore-line - this is where we fix the stupid bullshit with array keys :)
+			yield (string) $key => $value;
+		}
+	}
+
 	public static function checkUTF8(string $string) : void{
 		if(!mb_check_encoding($string, 'UTF-8')){
 			throw new \InvalidArgumentException("Text must be valid UTF-8");

src/wizard/SetupWizard.php

@@ -35,6 +35,7 @@ use pocketmine\player\GameMode;
 use pocketmine\utils\Config;
 use pocketmine\utils\Internet;
 use pocketmine\utils\InternetException;
+use pocketmine\utils\Utils;
 use pocketmine\VersionInfo;
 use Webmozart\PathUtil\Path;
 use function fgets;
@@ -69,7 +70,7 @@ class SetupWizard{
 		}
 
 		$this->message("Please select a language");
-		foreach($langs as $short => $native){
+		foreach(Utils::stringifyKeys($langs) as $short => $native){
 			$this->writeLine(" $native => $short");
 		}
 

src/world/Explosion.php

@@ -134,8 +134,7 @@ class Explosion{
 								$blastForce -= ($blastResistance / 5 + 0.3) * $this->stepLen;
 								if($blastForce > 0){
 									if(!isset($this->affectedBlocks[World::blockHash($vBlockX, $vBlockY, $vBlockZ)])){
-										$_block = $blockFactory->fromFullBlock($state);
-										$_block->position($this->world, $vBlockX, $vBlockY, $vBlockZ);
+										$_block = $this->world->getBlockAt($vBlockX, $vBlockY, $vBlockZ, true, false);
 										foreach($_block->getAffectedBlocks() as $_affectedBlock){
 											$_affectedBlockPos = $_affectedBlock->getPosition();
 											$this->affectedBlocks[World::blockHash($_affectedBlockPos->x, $_affectedBlockPos->y, $_affectedBlockPos->z)] = $_affectedBlock;

src/world/World.php

@@ -36,6 +36,7 @@ use pocketmine\block\tile\TileFactory;
 use pocketmine\block\UnknownBlock;
 use pocketmine\block\VanillaBlocks;
 use pocketmine\data\bedrock\BiomeIds;
+use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Entity;
 use pocketmine\entity\EntityFactory;
 use pocketmine\entity\Location;
@@ -57,7 +58,6 @@ use pocketmine\item\LegacyStringToItemParser;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
@@ -2466,13 +2466,34 @@ class World implements ChunkManager{
 
 	private function initChunk(int $chunkX, int $chunkZ, ChunkData $chunkData) : void{
 		$logger = new \PrefixedLogger($this->logger, "Loading chunk $chunkX $chunkZ");
+
+		$this->timings->syncChunkLoadFixInvalidBlocks->startTiming();
+		$blockFactory = BlockFactory::getInstance();
+		$invalidBlocks = 0;
+		foreach($chunkData->getChunk()->getSubChunks() as $subChunk){
+			foreach($subChunk->getBlockLayers() as $blockLayer){
+				foreach($blockLayer->getPalette() as $blockStateId){
+					$mappedStateId = $blockFactory->getMappedStateId($blockStateId);
+					if($mappedStateId !== $blockStateId){
+						$blockLayer->replaceAll($blockStateId, $mappedStateId);
+						$invalidBlocks++;
+					}
+				}
+			}
+		}
+		if($invalidBlocks > 0){
+			$logger->debug("Fixed $invalidBlocks invalid blockstates");
+			$chunkData->getChunk()->setTerrainDirtyFlag(Chunk::DIRTY_FLAG_BLOCKS, true);
+		}
+		$this->timings->syncChunkLoadFixInvalidBlocks->stopTiming();
+
 		if(count($chunkData->getEntityNBT()) !== 0){
 			$this->timings->syncChunkLoadEntities->startTiming();
 			$entityFactory = EntityFactory::getInstance();
 			foreach($chunkData->getEntityNBT() as $k => $nbt){
 				try{
 					$entity = $entityFactory->createFromData($this, $nbt);
-				}catch(NbtDataException $e){
+				}catch(SavedDataLoadingException $e){
 					$logger->error("Bad entity data at list position $k: " . $e->getMessage());
 					$logger->logException($e);
 					continue;
@@ -2500,7 +2521,7 @@ class World implements ChunkManager{
 			foreach($chunkData->getTileNBT() as $k => $nbt){
 				try{
 					$tile = $tileFactory->createFromData($this, $nbt);
-				}catch(NbtDataException $e){
+				}catch(SavedDataLoadingException $e){
 					$logger->error("Bad tile entity data at list position $k: " . $e->getMessage());
 					$logger->logException($e);
 					continue;

src/world/WorldTimings.php

@@ -45,6 +45,7 @@ class WorldTimings{
 
 	public TimingsHandler $syncChunkLoad;
 	public TimingsHandler $syncChunkLoadData;
+	public TimingsHandler $syncChunkLoadFixInvalidBlocks;
 	public TimingsHandler $syncChunkLoadEntities;
 	public TimingsHandler $syncChunkLoadTileEntities;
 	public TimingsHandler $syncChunkSave;
@@ -64,14 +65,15 @@ class WorldTimings{
 		$this->entityTick = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Tick Entities");
 
 		Timings::init(); //make sure the timers we want are available
-		$this->syncChunkSend = new TimingsHandler("** " . $name . "Player Send Chunks", Timings::$playerChunkSend);
-		$this->syncChunkSendPrepare = new TimingsHandler("** " . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend);
+		$this->syncChunkSend = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunks", Timings::$playerChunkSend);
+		$this->syncChunkSendPrepare = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend);
 
-		$this->syncChunkLoad = new TimingsHandler("** " . $name . "Chunk Load", Timings::$worldLoad);
-		$this->syncChunkLoadData = new TimingsHandler("** " . $name . "Chunk Load - Data");
-		$this->syncChunkLoadEntities = new TimingsHandler("** " . $name . "Chunk Load - Entities");
-		$this->syncChunkLoadTileEntities = new TimingsHandler("** " . $name . "Chunk Load - TileEntities");
-		$this->syncChunkSave = new TimingsHandler("** " . $name . "Chunk Save", Timings::$worldSave);
+		$this->syncChunkLoad = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load", Timings::$worldLoad);
+		$this->syncChunkLoadData = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Data");
+		$this->syncChunkLoadFixInvalidBlocks = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Fix Invalid Blocks");
+		$this->syncChunkLoadEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Entities");
+		$this->syncChunkLoadTileEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - TileEntities");
+		$this->syncChunkSave = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Save", Timings::$worldSave);
 
 		$this->doTick = new TimingsHandler($name . "World Tick");
 	}

src/world/format/io/WorldProviderManager.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\format\io;
 
+use pocketmine\utils\Utils;
 use pocketmine\world\format\io\leveldb\LevelDB;
 use pocketmine\world\format\io\region\Anvil;
 use pocketmine\world\format\io\region\McRegion;
@@ -77,7 +78,7 @@ final class WorldProviderManager{
 	 */
 	public function getMatchingProviders(string $path) : array{
 		$result = [];
-		foreach($this->providers as $alias => $providerEntry){
+		foreach(Utils::stringifyKeys($this->providers) as $alias => $providerEntry){
 			if($providerEntry->isValid($path)){
 				$result[$alias] = $providerEntry;
 			}

src/world/format/io/region/LegacyAnvilChunkTrait.php

@@ -51,7 +51,7 @@ trait LegacyAnvilChunkTrait{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	protected function deserializeChunk(string $data) : ChunkData{
+	protected function deserializeChunk(string $data) : ?ChunkData{
 		$decompressed = @zlib_decode($data);
 		if($decompressed === false){
 			throw new CorruptedChunkException("Failed to decompress chunk NBT");

src/world/format/io/region/McRegion.php

@@ -29,6 +29,7 @@ use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\nbt\BigEndianNbtSerializer;
 use pocketmine\nbt\NbtDataException;
 use pocketmine\nbt\tag\ByteArrayTag;
+use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntArrayTag;
 use pocketmine\nbt\tag\ListTag;
@@ -45,7 +46,7 @@ class McRegion extends RegionWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	protected function deserializeChunk(string $data) : ChunkData{
+	protected function deserializeChunk(string $data) : ?ChunkData{
 		$decompressed = @zlib_decode($data);
 		if($decompressed === false){
 			throw new CorruptedChunkException("Failed to decompress chunk NBT");
@@ -61,6 +62,14 @@ class McRegion extends RegionWorldProvider{
 			throw new CorruptedChunkException("'Level' key is missing from chunk NBT");
 		}
 
+		$legacyGeneratedTag = $chunk->getTag("TerrainGenerated");
+		if($legacyGeneratedTag instanceof ByteTag && $legacyGeneratedTag->getValue() === 0){
+			//In legacy PM before 3.0, PM used to save MCRegion chunks even when they weren't generated. In these cases
+			//(we'll see them in old worlds), some of the tags which we expect to always be present, will be missing.
+			//If TerrainGenerated (PM-specific tag from the olden days) is false, toss the chunk data and don't bother
+			//trying to read it.
+			return null;
+		}
 		$subChunks = [];
 		$fullIds = self::readFixedSizeByteArray($chunk, "Blocks", 32768);
 		$fullData = self::readFixedSizeByteArray($chunk, "Data", 16384);

src/world/format/io/region/RegionWorldProvider.php

@@ -146,7 +146,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 	/**
 	 * @throws CorruptedChunkException
 	 */
-	abstract protected function deserializeChunk(string $data) : ChunkData;
+	abstract protected function deserializeChunk(string $data) : ?ChunkData;
 
 	/**
 	 * @return CompoundTag[]
@@ -173,6 +173,9 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 	protected static function readFixedSizeByteArray(CompoundTag $chunk, string $tagName, int $length) : string{
 		$tag = $chunk->getTag($tagName);
 		if(!($tag instanceof ByteArrayTag)){
+			if($tag === null){
+				throw new CorruptedChunkException("'$tagName' key is missing from chunk NBT");
+			}
 			throw new CorruptedChunkException("Expected TAG_ByteArray for '$tagName'");
 		}
 		$data = $tag->getValue();

src/world/generator/GeneratorManager.php

@@ -105,7 +105,7 @@ final class GeneratorManager{
 	 */
 	public function getGeneratorName(string $class) : string{
 		Utils::testValidInstance($class, Generator::class);
-		foreach($this->list as $name => $c){
+		foreach(Utils::stringifyKeys($this->list) as $name => $c){
 			if($c->getGeneratorClass() === $class){
 				return $name;
 			}

tests/phpstan/bootstrap.php

@@ -28,3 +28,6 @@ if(!defined('LEVELDB_ZLIB_RAW_COMPRESSION')){
 if(!extension_loaded('libdeflate')){
 	function libdeflate_deflate_compress(string $data, int $level = 6) : string{}
 }
+
+//opcache breaks PHPStan when dynamic reflection is used - see https://github.com/phpstan/phpstan-src/pull/801#issuecomment-978431013
+ini_set('opcache.enable', 'off');

tests/phpstan/configs/actual-problems.neon

@@ -465,16 +465,6 @@ parameters:
 			count: 1
 			path: ../../../src/command/SimpleCommandMap.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
-			count: 1
-			path: ../../../src/command/defaults/BanIpCommand.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
-			count: 1
-			path: ../../../src/command/defaults/PardonIpCommand.php
-
 		-
 			message: "#^Cannot call method addParticle\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
 			count: 1
@@ -516,8 +506,8 @@ parameters:
 			path: ../../../src/command/defaults/TimingsCommand.php
 
 		-
-			message: "#^Property pocketmine\\\\console\\\\ConsoleReader\\:\\:\\$stdin \\(resource\\) does not accept resource\\|false\\.$#"
-			count: 1
+			message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#"
+			count: 2
 			path: ../../../src/console/ConsoleReader.php
 
 		-
@@ -1450,11 +1440,6 @@ parameters:
 			count: 2
 			path: ../../../src/world/light/SkyLightUpdate.php
 
-		-
-			message: "#^Cannot call method getSubChunks\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
-			count: 1
-			path: ../../../src/world/light/SkyLightUpdate.php
-
 		-
 			message: "#^Cannot call method setHeightMap\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
 			count: 2

tests/phpstan/configs/phpstan-bugs.neon

@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: ../../../src/block/BaseBanner.php
 
-		-
-			message: "#^Call to function is_resource\\(\\) with resource will always evaluate to true\\.$#"
-			count: 2
-			path: ../../../src/console/ConsoleReader.php
-
 		-
 			message: "#^Method pocketmine\\\\crafting\\\\CraftingManager\\:\\:getDestructorCallbacks\\(\\) should return pocketmine\\\\utils\\\\ObjectSet\\<Closure\\(\\)\\: void\\> but returns pocketmine\\\\utils\\\\ObjectSet\\<Closure\\(\\)\\: void\\>\\|pocketmine\\\\utils\\\\ObjectSet\\<object\\>\\.$#"
 			count: 1
@@ -20,11 +15,6 @@ parameters:
 			count: 1
 			path: ../../../src/crafting/CraftingManager.php
 
-		-
-			message: "#^Property pocketmine\\\\crash\\\\CrashDumpData\\:\\:\\$extensions \\(array\\<string, string\\>\\) does not accept array\\<int\\|string, string\\>\\.$#"
-			count: 1
-			path: ../../../src/crash/CrashDump.php
-
 		-
 			message: "#^Call to function assert\\(\\) with false and 'unknown hit type' will always evaluate to false\\.$#"
 			count: 1
@@ -40,6 +30,11 @@ parameters:
 			count: 1
 			path: ../../../src/plugin/PluginManager.php
 
+		-
+			message: "#^Parameter \\#1 \\$yamlString of class pocketmine\\\\plugin\\\\PluginDescription constructor expects array\\|string, array\\<string\\> given\\.$#"
+			count: 1
+			path: ../../../src/plugin/ScriptPluginLoader.php
+
 		-
 			message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
 			count: 1

tests/phpstan/configs/pthreads-bugs.neon

@@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Variable \\$GLOBALS in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: ../../../src/MemoryManager.php
-

tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php

@@ -0,0 +1,90 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\phpstan\rules;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Foreach_;
+use PHPStan\Analyser\Scope;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\ClassStringType;
+use PHPStan\Type\IntegerType;
+use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeTraverser;
+use PHPStan\Type\VerbosityLevel;
+use function sprintf;
+
+/**
+ * @implements Rule<Foreach_>
+ */
+final class UnsafeForeachArrayOfStringRule implements Rule{
+
+	public function getNodeType() : string{
+		return Foreach_::class;
+	}
+
+	public function processNode(Node $node, Scope $scope) : array{
+		/** @var Foreach_ $node */
+		if($node->keyVar === null){
+			return [];
+		}
+		$iterableType = $scope->getType($node->expr);
+
+		if($iterableType->isArray()->no()){
+			return [];
+		}
+		if($iterableType->isIterableAtLeastOnce()->no()){
+			return [];
+		}
+
+		$hasCastableKeyTypes = false;
+		$expectsIntKeyTypes = false;
+		TypeTraverser::map($iterableType->getIterableKeyType(), function(Type $type, callable $traverse) use (&$hasCastableKeyTypes, &$expectsIntKeyTypes) : Type{
+			if($type instanceof IntegerType){
+				$expectsIntKeyTypes = true;
+				return $type;
+			}
+			if(!$type instanceof StringType){
+				return $traverse($type);
+			}
+			if($type->isNumericString()->no() || $type instanceof ClassStringType){
+				//class-string cannot be numeric, even if PHPStan thinks they can be
+				return $type;
+			}
+			$hasCastableKeyTypes = true;
+			return $type;
+		});
+		if($hasCastableKeyTypes && !$expectsIntKeyTypes){
+			return [
+				RuleErrorBuilder::message(sprintf(
+					"Unsafe foreach on array with key type %s (they might be casted to int).",
+					$iterableType->getIterableKeyType()->describe(VerbosityLevel::value())
+				))->tip("Use Utils::foreachWithStringKeys() for a safe Generator-based iterator.")->build()
+			];
+		}
+		return [];
+	}
+
+}

tests/phpunit/block/BlockTest.php

@@ -107,7 +107,6 @@ class BlockTest extends TestCase{
 	public function blockGetProvider() : array{
 		return [
 			[BlockLegacyIds::STONE, 5],
-			[BlockLegacyIds::STONE, 15],
 			[BlockLegacyIds::GOLD_BLOCK, 0],
 			[BlockLegacyIds::WOODEN_PLANKS, 5],
 			[BlockLegacyIds::SAND, 0],

tests/phpunit/utils/UtilsTest.php

@@ -90,6 +90,12 @@ class UtilsTest extends TestCase{
 		self::assertCount(0, $tags);
 	}
 
+	public function testParseDocCommentWithTagsContainingHyphens() : void{
+		$tags = Utils::parseDocComment("/** @phpstan-return list<string> */");
+		self::assertArrayHasKey("phpstan-return", $tags);
+		self::assertEquals("list<string>", $tags["phpstan-return"]);
+	}
+
 	public function testNamespacedNiceClosureName() : void{
 		//be careful with this test. The closure has to be declared on the same line as the assertion.
 		self::assertSame('closure@' . Filesystem::cleanPath(__FILE__) . '#L' . __LINE__, Utils::getNiceClosureName(function() : void{}));

tests/travis.sh

@@ -20,7 +20,7 @@ mkdir "$DATA_DIR"
 mkdir "$PLUGINS_DIR"
 
 cd tests/plugins/DevTools
-php -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out "$PLUGINS_DIR/DevTools.phar"
+php -dphar.readonly=0 ./src/ConsoleScript.php --make ./ --relative ./ --out "$PLUGINS_DIR/DevTools.phar"
 cd ../../..
 composer make-server
 

tools/generate-permission-doc.php

@@ -26,6 +26,7 @@ namespace pocketmine\generate_permission_doc;
 use pocketmine\permission\DefaultPermissions;
 use pocketmine\permission\PermissionManager;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Utils;
 use pocketmine\VersionInfo;
 use Webmozart\PathUtil\Path;
 use function count;
@@ -90,7 +91,7 @@ foreach($permissions as $permission){
 	fwrite($doc, "|:-----|:----:|\n");
 	$children = $permission->getChildren();
 	ksort($children, SORT_STRING);
-	foreach($children as $childName => $isGranted){
+	foreach(Utils::stringifyKeys($children) as $childName => $isGranted){
 		fwrite($doc, "| `$childName` | " . ($isGranted ? "Granted" : "Denied") . " |\n");
 	}
 	fwrite($doc, "\n");

tools/simulate-chunk-selector.php

@@ -6,6 +6,7 @@ namespace pocketmine\tools\simulate_chunk_selector;
 
 use pocketmine\player\ChunkSelector;
 use pocketmine\utils\AssumptionFailedError;
+use pocketmine\utils\Utils;
 use pocketmine\world\format\Chunk;
 use pocketmine\world\World;
 use Webmozart\PathUtil\Path;
@@ -115,7 +116,7 @@ if(count(getopt("", ["help"])) !== 0){
 	exit(0);
 }
 
-foreach(getopt("", ["radius:", "baseX:", "baseZ:", "scale:", "chunksPerStep:"]) as $name => $value){
+foreach(Utils::stringifyKeys(getopt("", ["radius:", "baseX:", "baseZ:", "scale:", "chunksPerStep:"])) as $name => $value){
 	if(!is_string($value) || (string) ((int) $value) !== $value){
 		fwrite(STDERR, "Value for --$name must be an integer\n");
 		exit(1);
@@ -136,7 +137,7 @@ if($radius === null){
 }
 
 $outputDirectory = null;
-foreach(getopt("", ["output:"]) as $name => $value){
+foreach(Utils::stringifyKeys(getopt("", ["output:"])) as $name => $value){
 	assert($name === "output");
 	if(!is_string($value)){
 		fwrite(STDERR, "Value for --$name must be a string\n");