Release 3.19.0

This reverts commit c7cdaeae85.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help & support on Discord
+    url: https://discord.gg/bmSAZBG
+    about: We don't accept support requests on the issue tracker. Please try asking on Discord instead.
+  - name: Help & support on forums
+    url: https://forums.pmmp.io
+    about: We don't accept support requests on the issue tracker. Please try asking on forums instead.
+  - name: Documentation
+    url: https://pmmp.rtfd.io
+    about: PocketMine-MP documentation

.github/ISSUE_TEMPLATE/crash.md

@@ -9,6 +9,7 @@ assignees: ''
 
 <!--- submit crashdump files to https://crash.pmmp.io -->
 <!--- or, copy the data between ===BEGIN CRASH DUMP=== and ===END CRASH DUMP and paste it on a site like https://pastebin.com -->
+<!--- DON'T JUST PASTE the crashdump into an issue -->
 Link to crashdump: 
 
 <!--- write additional information about the crash to help us find the problem -->

.github/ISSUE_TEMPLATE/help---support.md

@@ -1,14 +0,0 @@
----
-name: Help & support
-about: We don't accept support requests here. Try the links on the README.
-title: ''
-labels: Support request
-assignees: ''
-
----
-
-We don't accept support requests on the issue tracker. Please try the following links instead:
-
-Documentation: http://pmmp.rtfd.io
-Forums: https://forums.pmmp.io
-Discord: https://discord.gg/bmSAZBG

.github/ISSUE_TEMPLATE/security-dos-vulnerability.md

@@ -1,12 +0,0 @@
----
-name: Security/DoS vulnerability
-about: 'Bug or exploit that can be used to attack servers (hint: don''t report it
-  on a public issue tracker)'
-title: ''
-labels: 'Auto: Spam'
-assignees: ''
-
----
-
-Please DO NOT report security vulnerabilities here.
-Instead, send an email to team@pmmp.io or contact a developer directly, IN PRIVATE.

.github/support.yml

@@ -1,16 +0,0 @@
-# Configuration for support-requests - https://github.com/dessant/support-requests
-
-# Label used to mark issues as support requests
-supportLabel: "Support request"
-# Comment to post on issues marked as support requests. Add a link
-# to a support page, or set to `false` to disable
-supportComment: >
-  Thanks, but this issue tracker is not intended for support requests. Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
-
-
-  [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
-
-# Whether to close issues marked as support requests
-close: true
-# Whether to lock issues marked as support requests
-lock: false

.github/workflows/main.yml

@@ -0,0 +1,281 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-php:
+    name: Prepare PHP
+    runs-on: ${{ matrix.image }}
+
+    strategy:
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2 #needed for build.sh
+      - name: Check for PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Compile PHP
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: ./tests/gh-actions/build.sh "${{ matrix.php }}"
+
+  phpstan:
+    name: PHPStan analysis
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
+
+  phpunit:
+    name: PHPUnit tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --prefer-dist --no-interaction
+
+      - name: Run PHPUnit tests
+        run: ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
+
+  integration:
+    name: Integration tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --no-dev --prefer-dist --no-interaction
+
+      - name: Run integration tests
+        run: ./tests/travis.sh -t4
+
+  preprocessor:
+    name: Preprocessor tests
+    needs: build-php
+    runs-on: ${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [ubuntu-20.04]
+        php: [7.3.27, 7.4.16]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Restore PHP build cache
+        id: php-build-cache
+        uses: actions/cache@v2
+        with:
+          path: "./bin"
+          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+
+      - name: Kill build on PHP build cache miss (should never happen)
+        if: steps.php-build-cache.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Install cached PHP's dependencies
+        if: steps.php-build-cache.outputs.cache-hit == 'true'
+        run: chmod +x ./bin/php7/install-dependencies.sh && ./bin/php7/install-dependencies.sh
+
+      - name: Prefix PHP to PATH
+        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
+
+      - name: Install Composer
+        run: curl -sS https://getcomposer.org/installer | php
+
+      - name: Restore Composer package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/composer/files
+            ~/.cache/composer/vcs
+          key: "composer-v2-cache-${{ matrix.php }}-${{ hashFiles('./composer.lock') }}"
+          restore-keys: |
+            composer-v2-cache-
+
+      - name: Install Composer dependencies
+        run: php composer.phar install --no-dev --prefer-dist --no-interaction
+
+      - name: Run preprocessor
+        run: |
+          PM_PREPROCESSOR_PATH="$GITHUB_WORKSPACE/build/preprocessor"
+          php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path=src --multisize || (echo "Preprocessor exited with code $?" && exit 1)
+
+          #dump the diff of preprocessor replacements to a patch in case it has bugs
+          git diff > preprocessor_diff.patch
+
+          VENDOR_PM="$GITHUB_WORKSPACE/vendor"
+          VENDOR_PM_BACKUP="$GITHUB_WORKSPACE/vendor-before-preprocess"
+          cp -r "$VENDOR_PM" "$VENDOR_PM_BACKUP"
+          for f in $(ls $VENDOR_PM/pocketmine); do
+            echo "Processing directory \"$f\"..."
+            php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f" --multisize || (echo "Preprocessor exited with code $?" && exit 1)
+            echo "Checking for changes in \"$f\"..."
+            DIFF=$(git diff --no-index "$VENDOR_PM_BACKUP/pocketmine/$f" "$VENDOR_PM/pocketmine/$f" || true)
+            if [ "$DIFF" != "" ]; then
+              PATCH="$GITHUB_WORKSPACE/preprocessor_diff_$f.patch"
+              echo "$DIFF" > "$PATCH"
+              echo "Generated patch file \"$PATCH\""
+            else
+              echo "No diff generated for \"$f\" (preprocessor made no changes)"
+            fi
+          done
+
+      - name: Upload preprocessor diffs
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: preprocessor_diffs_${{ matrix.php }}_${{ matrix.image }}
+          path: ${{ github.workspace }}/preprocessor_diff*.patch
+
+  codestyle:
+    name: Code Style checks
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP and tools
+        uses: shivammathur/setup-php@2.9.0
+        with:
+          php-version: 7.4
+          tools: php-cs-fixer
+
+      - name: Run PHP-CS-Fixer
+        run: php-cs-fixer fix --dry-run --diff --diff-format=udiff

.github/workflows/support.yml

@@ -0,0 +1,22 @@
+name: 'Manage support request issues'
+
+on:
+  issues:
+    types: [labeled, unlabeled, reopened]
+
+jobs:
+  support:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/support-requests@v2
+        with:
+          github-token: ${{ github.token }}
+          support-label:  "Support request"
+          issue-comment: >
+            Thanks, but this issue tracker is not intended for support requests. Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
+
+
+            [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
+
+          close-issue: true
+          lock-issue: false

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "src/pocketmine/lang/locale"]
 	path = src/pocketmine/lang/locale
-	url = https://github.com/pmmp/PocketMine-Language.git
+	url = https://github.com/pmmp/Language.git
 [submodule "tests/preprocessor"]
 	path = build/preprocessor
 	url = https://github.com/pmmp/preprocessor.git
-[submodule "tests/plugins/PocketMine-DevTools"]
-	path = tests/plugins/PocketMine-DevTools
-	url = https://github.com/pmmp/PocketMine-DevTools.git
+[submodule "tests/plugins/DevTools"]
+	path = tests/plugins/DevTools
+	url = https://github.com/pmmp/DevTools.git
 [submodule "build/php"]
 	path = build/php
 	url = https://github.com/pmmp/php-build-scripts.git

.php_cs

@@ -0,0 +1,71 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+	->in(__DIR__ . '/src')
+	->in(__DIR__ . '/build')
+	->in(__DIR__ . '/tests')
+	->notPath('plugins/DevTools')
+	->notPath('preprocessor')
+	->notContains('#ifndef COMPILE') //preprocessor will break if these are changed
+	->notName('PocketMine.php');
+
+return PhpCsFixer\Config::create()
+	->setRiskyAllowed(true)
+	->setRules([
+		'align_multiline_comment' => [
+			'comment_type' => 'phpdocs_only'
+		],
+		'array_indentation' => true,
+		'array_syntax' => [
+			'syntax' => 'short'
+		],
+		'blank_line_after_namespace' => true,
+		'blank_line_after_opening_tag' => true,
+		'blank_line_before_statement' => [
+			'statements' => [
+				'declare'
+			]
+		],
+		'cast_spaces' => [
+			'space' => 'single'
+		],
+		'concat_space' => [
+			'spacing' => 'one'
+		],
+		'declare_strict_types' => true,
+		'elseif' => true,
+		'global_namespace_import' => [
+			'import_constants' => true,
+			'import_functions' => true,
+			'import_classes' => null,
+		],
+		'indentation_type' => true,
+		'native_function_invocation' => [
+		    'scope' => 'namespaced'
+		],
+		'no_closing_tag' => true,
+		'no_empty_phpdoc' => true,
+		'no_extra_blank_lines' => true,
+		'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+		],
+		'no_trailing_whitespace' => true,
+		'no_trailing_whitespace_in_comment' => true,
+		'no_whitespace_in_blank_line' => true,
+		'no_unused_imports' => true,
+		'ordered_imports' => [
+			'imports_order' => [
+				'class',
+				'function',
+				'const',
+			],
+			'sort_algorithm' => 'alpha'
+		],
+		'phpdoc_trim' => true,
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'single_import_per_statement' => true,
+		'strict_param' => true,
+	])
+	->setFinder($finder)
+	->setIndent("\t")
+	->setLineEnding("\n");

.travis.yml

@@ -1,32 +0,0 @@
-language: php
-
-php:
- - 7.3
-
-before_script:
- - phpenv config-rm xdebug.ini
- - echo | pecl install channel://pecl.php.net/yaml-2.1.0
- - git clone https://github.com/pmmp/pthreads.git
- - cd pthreads
- - git checkout 646dac62ae0d48c1ada7b007e15575fb84f7d71d
- - phpize
- - ./configure
- - make
- - make install
- - cd ..
- - echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-
-script:
- - composer install --prefer-dist
- - ./vendor/bin/phpstan analyze --no-progress --memory-limit=2G
- - ./vendor/bin/phpunit --bootstrap vendor/autoload.php --fail-on-warning tests/phpunit
- - composer install --no-dev --prefer-dist
- - ./tests/travis.sh -t4
-
-cache:
- directories:
-  - $HOME/.composer/cache/files
-  - $HOME/.composer/cache/vcs
-
-notifications:
- email: false

BUILDING.md

@@ -8,7 +8,7 @@
 ## Custom PHP binaries
 Because PocketMine-MP requires several non-standard PHP extensions and configuration, PMMP provides scripts to build custom binaries for running PocketMine-MP, as well as prebuilt binaries.
 
-- [Prebuilt binaries](https://jenkins.pmmp.io/job/PHP-7.3-Aggregate)
+- [Prebuilt binaries](https://jenkins.pmmp.io/job/PHP-7.4-Aggregate)
 - [Compile scripts](https://github.com/pmmp/php-build-scripts) are provided as a submodule in the path `build/php`
 
 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`.
@@ -30,9 +30,15 @@ If you use a custom binary, you'll need to replace `composer` usages in this gui
 Preprocessor requires that the `cpp` (c preprocessor) is available in your PATH.
 
 ## Building `PocketMine-MP.phar`
-Run `build/server-phar.php` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
+Run `composer make-server` using your preferred PHP binary. It'll drop a `PocketMine-MP.phar` into the current working directory.
 
 You can also use the `--out` option to change the output filename.
 
+There is a bug in PHP that might cause an error which looks like this:
+```
+Fatal error: Uncaught BadMethodCallException: unable to create temporary file in PocketMine-MP/build/server-phar.php:119
+```
+You can work around it by setting `ulimit -n` to some bigger number, e.g. `8192`, or by updating your PHP version to at least 7.4.16 or 8.0.3.
+
 ## Running PocketMine-MP from source code
 Run `src/pocketmine/PocketMine.php` using your preferred PHP binary.

CONTRIBUTING.md

@@ -116,7 +116,7 @@ class ExampleClass{
 <!-- TODO: RFC and voting on the forums instead -->
 ### RFC and Voting
 * These are big Pull Requests or contributions that change important behavior.
-* RFCs will be tagged with the *PR: RFC* label
+* RFCs will be tagged with the *Type: Request For Comments* label
 * A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
 * Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
 * If your comment is a voting comment, specify the reason of your vote or it won't be counted.

README.md

@@ -3,7 +3,12 @@
 	<b>A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP</b>
 </p>
 
-[![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
+<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>
+	<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>
 
 ## Getting started
 - [Documentation](http://pmmp.readthedocs.org/)
@@ -18,8 +23,9 @@
 
 ## For developers
  * [Building and running from source](BUILDING.md)
+ * [Developer documentation](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers
  * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development
- * [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
+ * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  * [Contributing Guidelines](CONTRIBUTING.md)
 

SECURITY.md

@@ -0,0 +1,33 @@
+# Security Policy
+
+## Supported Versions
+The following release lines are currently receiving active security updates and bug fixes:
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| 3.15.x   | :white_check_mark: |
+| < 3.15.0 | :x:                |
+
+## Reporting a Vulnerability
+
+**DO NOT report vulnerabilities on the GitHub issue tracker.**
+GitHub is public and anyone can see the issues you post on the issue tracker, including people who would exploit vulnerabilities for their own gain.
+
+**WARNING: You may put live servers at risk by reporting a vulnerability on the GitHub issue tracker.**
+
+**Contact us** by sending an email to [**team@pmmp.io**](mailto:team@pmmp.io?subject=Security%20Vulnerability%20in%20PocketMine-MP). Include the following information:
+
+- Version of PocketMine-MP
+- Detailed description of the vulnerability (e.g. how to exploit it, what the effects are)
+
+Please note that we can't guarantee a reply to every email.
+
+## FAQ
+### Do you offer a bug bounty?
+No.
+
+### How soon can I expect a fix for a vulnerability I've reported?
+This depends on the nature of the problem. We can't provide any general ETA (nor would it be wise to provide one).
+In general, it depends on when developers have time to look into the problem, how complex the problem is to fix, and how many users it impacts.
+
+When a fix for a severe vulnerability is pushed, a patch release for the target version will usually be released within 24 hours so that users can update.

build/make-release.php

@@ -37,7 +37,6 @@ use const STDIN;
 
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
-
 function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev) : void{
 	$versionInfo = file_get_contents($versionInfoPath);
 	$versionInfo = preg_replace(
@@ -72,7 +71,7 @@ function main(array $argv) : void{
 
 	$versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
 	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false);
-	
+
 	echo "please add appropriate notes to the changelog and press enter...";
 	fgets(STDIN);
 	system('git add "' . dirname(__DIR__) . '/changelogs"');
@@ -86,6 +85,4 @@ function main(array $argv) : void{
 	system('git push origin HEAD ' . $currentVer->getBaseVersion());
 }
 
-if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-	main($argv);
-}
+main($argv);

build/server-phar.php

@@ -26,7 +26,6 @@ namespace pocketmine\build\server_phar;
 use pocketmine\utils\Git;
 use function array_map;
 use function count;
-use function defined;
 use function dirname;
 use function file_exists;
 use function getcwd;
@@ -41,6 +40,7 @@ use function rtrim;
 use function sprintf;
 use function str_replace;
 use function unlink;
+use const PHP_EOL;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
@@ -49,7 +49,7 @@ require dirname(__DIR__) . '/vendor/autoload.php';
  *
  * @return string[]
  */
-function preg_quote_array(array $strings, string $delim = null) : array{
+function preg_quote_array(array $strings, string $delim) : array{
 	return array_map(function(string $str) use ($delim) : string{ return preg_quote($str, $delim); }, $strings);
 }
 
@@ -129,6 +129,10 @@ function main() : void{
 		echo "Set phar.readonly to 0 with -dphar.readonly=0" . PHP_EOL;
 		exit(1);
 	}
+	if(file_exists(dirname(__DIR__) . '/vendor/phpunit')){
+		echo "Remove Composer dev dependencies before building (composer install --no-dev)" . PHP_EOL;
+		exit(1);
+	}
 
 	$opts = getopt("", ["out:", "git:"]);
 	if(isset($opts["git"])){
@@ -169,6 +173,4 @@ STUB
 	}
 }
 
-if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-	main();
-}
+main();

changelogs/3.12.md

@@ -50,4 +50,9 @@ Plugin developers should **only** update their required API to this version if y
 - Fixed absorption hearts not being consumed.
 
 # 3.12.5
-- Fixed broken attack cooldowns.
+- Fixed broken attack cooldowns.
+
+# 3.12.6
+- Fixed entities not getting movement updates after teleports.
+- Fixed slow flight in spectator mode when starting from the ground and after teleportation.
+- Errors communicating with the crash archive on automatic crash submission are now logged.

changelogs/3.13.md

@@ -109,3 +109,23 @@ AsyncTask thread-local storage has been improved, making it simpler and easier t
   - `Utils::recursiveUnlink()`
   - `Terminal::write()`
   - `Terminal::writeLine()`
+
+# 3.13.1
+- Fixed issues with `server.lock` not being unlocked on some platforms. Now, the server explicitly releases it before exiting.
+- `/timings` now sends a usage message when using an unknown subcommand. Previously, it would just give no output.
+- `/whitelist` now sends a usage message when using an unknown subcommand. Previously, it would just give no output.
+- The output from `/timings` is now broadcasted on the `pocketmine.broadcast.admin` broadcast channel for auditability, similarly to other operator commands.
+- Fixed `ShapedRecipe` deprecation warning on PHP 7.4.
+- Fixed some potential crashes with Bedrock worlds when chunk data is corrupted or missing.
+- Fixed a bug in region handling that caused region loaders to overestimate the amount of space used in the file. This resulted in an up to 4 MB growth of the file size every time the region was reloaded after writing a chunk.
+- Region handlers now try to reuse free space in region files before putting the chunk at the end of the file. Previously, space was only reused if the new version of the chunk was <= the size of the old. This fixes endless growth of region files.
+- Regions now never directly overwrite old copies of chunks when saving; instead they try to find an alternative location (preferring unused space within the file first). This avoids chunk corruption on power failure (the old copy of the chunk won't be damaged, so a rollback might occur instead), and as happy side effect, causes oversized regions to gradually shrink towards their most packed state over time, saving disk space.
+- Regions now have a hard size cap at 64 GB. This is because the header pointers will overflow beyond 64 GB (besides, a normal region shouldn't be this big anyway).
+- Fixed a crash that could occur when reading a too-short region header.
+- `VerifyLoginTask` now only copies JWTs to verify instead of the entire login packet. This reduces the amount of data copied between threads, improving performance.
+- Added a fast-fail check to `VerifyLoginTask` by checking the JWT header's `x5u` against the expected public key.
+- `Skin->validate()` now throws `InvalidSkinException` instead of `\InvalidArgumentException`.
+- A debug message is now logged when a player is kicked for having an invalid skin, giving a brief line of detail why.
+- Fixed players not being kicked for having an invalid `resourcePatch`.
+- Fixed block meta value of cake being preserved when using pick-block.
+- Fixed explosions not fully destroying multi-block objects like beds and doors.

changelogs/3.14.md

@@ -0,0 +1,40 @@
+**For Minecraft: Bedrock Edition 1.16.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.14.0
+- Added support for Minecraft: Bedrock Edition 1.16.0.
+- Removed compatibility with 1.14.60.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.14.1
+- All skins are now trusted, bypassing the client-side trusted skin setting. Note that this means that NSFW skin filtering will **not** apply.
+- Fixed projectile motion being altered by ladders.
+- Fixed client-sided crashes when pressing E repeatedly very quickly on a high-latency connection.
+- `/plugins`, `/whitelist list`, `/banlist` and `/list` now show output in alphabetical order.
+- Some `pocketmine\event` APIs which accept arrays now have more robust type checking, fixing type errors caused by plugin input occurring in core code.
+- `Attribute::getAttributeByName()` is now aware of the `minecraft:lava_movement` attribute.
+
+# 3.14.2
+- Exception stack traces are now logged as CRITICAL. It's hoped that users will recognize that they are just as important as the error message and not leave them out when asking for help with errors on Discord.
+- `TaskScheduler` no longer accepts tasks that already have a handler. This fixes undefined behaviour which occurs when scheduling the same task instance twice, but it does break plugins such as **MyPlot** which unintentionally used this buggy behaviour.
+- Players will now correctly receive the needed number of spawn chunks if they are teleported between `PlayerLoginEvent` and `PlayerJoinEvent`. This fixes a bug that could occur when teleporting players in delayed tasks between login and join.
+- `PlayerRespawnEvent->setRespawnPosition()` now throws an exception if the provided `Position` has an invalid world associated with it (null or unloaded).
+- Fixed a crash that occurred when stats reporting was enabled.
+
+# 3.14.3
+- Fixed deprecation error when running `/whitelist list` on PHP 7.4.
+- Fixed podzol breaking animation being incorrect (incorrect hardness).
+- `Entity::getSaveId()` now reports the class name in the message thrown for unregistered entities.
+- Fixed `CraftingManager->validate()` producing different results when called multiple times for the same transaction.
+- Fixed various issues with batch-crafting items using the recipe book and shift-clicking.
+- `tests/plugins/PocketMine-DevTools` submodule has been renamed to `tests/plugins/DevTools`.

changelogs/3.15.md

@@ -0,0 +1,54 @@
+**For Minecraft: Bedrock Edition 1.16.20**
+
+### 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.15.0
+- Added support for Minecraft: Bedrock Edition 1.16.20.
+- Removed compatibility with 1.16.0.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.15.1
+- Fixed various PHP 7.4 compatibility issues in Composer dependencies (primarily callback-validator).
+- Fixed LevelDB worlds with corrupted `level.dat` crashing the server instead of failing gracefully.
+- Fixed error spam when using strings for layers in flatworld presets (`e.g. bedrock,3xdirt,grass`).
+- Fixed blocks not getting updated properly on explosions.
+- Fixed `BlockGrowEvent` not being called when sugarcane grows.
+- Potato crops now drop poisonous potatoes when harvested.
+- Fixed the wrong number of potatoes being dropped when harvesting potato crops.
+- Players no longer get pullbacks when sprinting on slabs, stairs and various other blocks when `player.anti-cheat.allow-movement-cheats` is set to `false`. (This bug has been around for over 5 years, so many of you will be used to its existence.)
+- Fixed entity collision box calculation not taking clip distance into account.
+- Entities now step up the correct height of the target block, instead of jumping into the air 0.6 blocks and falling back down.
+
+# 3.15.2
+- Fixed issues with preloading `SubChunk`.
+- `/gc` and automatic garbage collection will now release unused heap blocks back to the OS. Previously, the PHP process might hold onto these blocks indefinitely even when not used, causing elevated real memory usage.
+- Added some documentation to `FurnaceBurnEvent`.
+
+# 3.15.3
+- Fixed fall damage accumulation over continuous knockbacks (e.g. combo attacks in PvP).
+- Fixed a bug in `Human->addXp()` that would cause a crash when saving player data.
+- `Human->addXp()` will no longer modify the target's total XP if `PlayerExperienceChangeEvent` was cancelled.
+- `AsyncPool->getTaskQueueSizes()` has been added to allow external detection of async pool overload. This is planned to be implemented as a core feature in the future, but it hasn't been done yet.
+- `BaseInventory->canAddItem()` behaviour now matches `addItem()` by considering the max stack size of the given item.
+- Fixed a bug in generator options handling for worlds loaded via `pocketmine.yml`. This fix has the following side effects:
+  - It's now possible to provide generator options as an `options` key when loading a world via `pocketmine.yml`.
+  - If generator options are not provided, the options from `server.properties` will be used, instead of using an empty preset. (It's not clear whether this is desired behaviour, but it was clearly intended, since there is code to do this which was broken until this release. As such, this behaviour is subject to change in the future.)
+- Fixed a bug in region-based world loading where some files without filename extensions and names containing a region filename extension (e.g a file named `amca` in a McRegion world) would cause the world not to load. These files are now ignored.
+- Default network compression level has been lowered to 6, due to level 7 being 25% more expensive for only a marginal improvement in bandwidth.
+- Fixed a performance issue with chunk requesting when players trigger chunk generation on first join.
+- Setup wizard will now always show IP information, even if the user chose to skip the setup wizard when prompted. (This doesn't affect `--no-wizard` in any way.)
+- `Maximum memory (system)` is no longer reported in `/status` due to having a misleading output (it was the same as the current memory usage).
+- The `Player Chunk Send` timer on timings reports now actually reports measurements of chunk sending, not chunk loading.
+- A new parent timer `World Load` has been added to timings reports, which aggregates timings from `syncChunkLoad` and subtimings from all worlds.
+
+# 3.15.4
+- Fixed a bug in the inventory transaction system that caused the server to freeze under some circumstances.

changelogs/3.16.md

@@ -0,0 +1,24 @@
+**For Minecraft: Bedrock Edition 1.16.100**
+
+### 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.16.0
+- Added support for Minecraft: Bedrock Edition 1.16.100.
+- Removed compatibility with earlier versions.
+- Added new custom composer commands `make-server` and `make-devtools` to ease setting up a development environment and building the server.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.16.1
+- Fixed incorrect encoding of skins in the protocol.
+- `/version` no longer crashes when a plugin provides `string[]` for the `author` field in `plugin.yml`.
+- `author` in `plugin.yml` now accepts arrays, just like `authors`.
+- Fixed `HellBiome` never being registered.

changelogs/3.17.md

@@ -0,0 +1,63 @@
+**For Minecraft: Bedrock Edition 1.16.200**
+
+### 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.17.0
+- Added support for Minecraft: Bedrock Edition 1.16.200.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+
+# 3.17.1
+- Fixed some instances of plugin-caused crashes not being detected (eval()'d code, custom plugin paths).
+- Server uptime is now included in crash reports.
+- Hoes now take damage when used to break sponges.
+- Using lava as fuel in a furnace now leaves behind an empty bucket.
+
+# 3.17.2
+- Fixed region header corruption when chunks with larger-than-expected lengths are found. These chunks are now treated as corrupted, instead of automatically attempting to salvage them (which usually fails anyway).
+- `RegionLoader->removeChunk()` now allows the space used by the removed chunk to be reused by future region saves.
+- Extracted `Living->applyConsumptionResults()` from `Living->consumeObject()` (preparation for a future bug fix).
+
+# 3.17.3
+- Improved performance of chunk loading in Region-based worlds.
+- Improved performance of region header validation in Region-based worlds (indirect improvement to chunk loading performance).
+- Fixed some PHP 8.0 language-level compatibility issues.
+- Source installations will now exit with an error when Composer dependencies are not in sync with the current Git revision. Now, it's required to run `composer install` after every git pull to make sure the correct dependency versions are installed.
+
+# 3.17.4
+- Removed `readline` support. This hasn't been maintained for many years, never worked correctly, and isn't thread-safe in any case.
+- Fixed false-positives of region corruption in Region-based worlds (outdated file stat cache).
+- Fixed more deprecation warnings on PHP 8.0 (optional parameter before required).
+- `CraftItemEvent->getInputs()` now returns a list starting at offset 0, instead of random offsets. (Note that the contents still won't be ordered.)
+- `CraftItemEvent->getOutputs()` now returns a list starting at offset 0, instead of random offsets. (Note that the contents still won't be ordered.)
+- Fixed a bug that broke synchronized building, bridging, towering and more.
+- Objects in memory dumps no longer show inherited properties multiple times.
+
+# 3.17.5
+- Reduced CPU wastage by the logger thread.
+- Fixed LevelDB deprecation errors on PHP 8.0.
+- Added some protocol changes for 1.16.200 which were previously overlooked.
+- Player XUIDs are now tracked. If a player's XUID does not match the previously recorded XUID when they next join the server, they will be kicked. This can be disabled by the `player.verify-xuid` setting in `pocketmine.yml`.
+- `BUILDING.md` now has a note about `build/server-phar.php`'s compression bug (a bug in PHP).
+
+# 3.17.6
+- Fixed core race conditions that could have led to server freezes (race conditions in pmmp/Snooze).
+- The log message about Xbox Live authentication being enabled has been reduced to INFO, and the tip on how to turn it off removed (disabling it should usually only be done by power users anyway).
+- Fixed `PlayerMoveEvent->getFrom()` returning incorrect results for players who experienced movement reversions.
+- Fixed a bug in `ResourcePackClientResponsePacket` decoding that caused unexpected results when decoding the packet twice.
+- XUID verification now compares XUIDs against players who are already on the server to detect mismatches to avoid unnecessary loading of playerdata.
+- Fixed an inventory duplication bug which could occur when the same player joined with two devices at the same time.
+- Fixed cursor item not being synced on inventory transaction rollbacks.
+- Fixed items with TAG_Float in their NBT not being able to be moved around in the inventory.
+
+# 3.17.7
+- Fixed crash caused by preprocessor in 3.17.6.

changelogs/3.18.md

@@ -0,0 +1,31 @@
+**For Minecraft: Bedrock Edition 1.16.210**
+
+### 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.18.0
+- Added support for Minecraft: Bedrock Edition 1.16.210.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist
+- Items can't be removed from item frames in Survival mode
+
+# 3.18.1
+- UPnP is now supported on all platforms instead of just Windows. Note that it's still experimental. Please file issues for any bugs that you find.
+- Fixed server joining when default game mode is set to Spectator mode.
+- Fixed items not being able to be removed from item frames in Survival mode.
+- Fixed field order in ClientCacheBlobStatusPacket (hits and misses were inverted).
+- Fixed a deadlock that could occur when MainLogger->syncFlushBuffer() was used (usually only used during exception logging).
+- Updated constants for various things in the protocol.
+
+# 3.18.2
+- Fixed `InventoryCloseEvent` not being called on server-initiated inventory closures.
+- `PlayerToggleFlightEvent` may now be pre-cancelled if the player attempted to enable flight when flying was not allowed. This replaces the previous behaviour of kicking the player.
+- Fixed being unable to change the item in hand from the inventory window when looking at an entity.

changelogs/3.19.md

@@ -0,0 +1,17 @@
+**For Minecraft: Bedrock Edition 1.16.220**
+
+### 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.19.0
+- Added support for Minecraft: Bedrock Edition 1.16.220.
+- Removed compatibility with earlier versions.
+
+## Known issues (please don't open issues for these)
+- Walls don't connect to each other
+- Pumpkin and melon stems may not connect to their corresponding pumpkin/melon
+- New blocks, items & mobs aren't implemented
+- Nether doesn't exist

composer.json

@@ -5,11 +5,10 @@
    "homepage": "https://pmmp.io",
    "license": "LGPL-3.0",
    "require": {
-      "php": ">=7.3.0",
+      "php": "^7.3 || ^8.0",
       "php-64bit": "*",
-      "ext-bcmath": "*",
-      "ext-curl": "*",
       "ext-ctype": "*",
+      "ext-curl": "*",
       "ext-date": "*",
       "ext-hash": "*",
       "ext-json": "*",
@@ -19,29 +18,30 @@
       "ext-phar": "*",
       "ext-pthreads": "~3.2.0",
       "ext-reflection": "*",
+      "ext-simplexml": "*",
       "ext-sockets": "*",
       "ext-spl": "*",
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "^0.12.7",
-      "pocketmine/spl": "^0.4.0",
+      "composer-runtime-api": "^2.0",
+      "adhocore/json-comment": "^1.1",
       "pocketmine/binaryutils": "^0.1.9",
-      "pocketmine/nbt": "^0.2.10",
-      "pocketmine/math": "^0.2.0",
-      "pocketmine/snooze": "^0.1.0",
+      "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/classloader": "^0.1.0",
       "pocketmine/log": "^0.2.0",
       "pocketmine/log-pthreads": "^0.1.0",
-      "pocketmine/callback-validator": "^1.0.1",
-      "adhocore/json-comment": "^0.1.0",
-      "ocramius/package-versions": "^1.5"
+      "pocketmine/math": "^0.2.0",
+      "pocketmine/nbt": "^0.2.18",
+      "pocketmine/raklib": "^0.12.7",
+      "pocketmine/snooze": "^0.1.0",
+      "pocketmine/spl": "^0.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "^0.12.25",
+      "phpstan/phpstan": "0.12.83",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2",
-      "phpunit/phpunit": "^8.5"
+      "phpunit/phpunit": "^9.2"
    },
    "autoload": {
       "psr-4": {
@@ -57,5 +57,18 @@
       "psr-4": {
          "pocketmine\\": "tests/phpunit/"
       }
+   },
+   "config": {
+      "platform": {
+         "php": "7.3.0"
+      },
+      "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-server": [
+         "@composer install --no-dev --classmap-authoritative",
+         "@php -dphar.readonly=0 build/server-phar.php"
+      ]
    }
 }

doxygen/index.md

@@ -5,6 +5,6 @@ This site contains auto-generated API documentation for PocketMine-MP (and depen
 This site can be accessed via https://apidoc.pmmp.io.
 
 ### Additional developer resources
- - [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
+ - [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
  - [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
- - [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API
+ - [DeveloperDocs](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers

phpstan.neon.dist

@@ -1,7 +1,6 @@
 includes:
 	- tests/phpstan/configs/actual-problems.neon
-	- tests/phpstan/configs/com-dotnet-magic.neon
-	- tests/phpstan/configs/custom-leveldb.neon
+	- tests/phpstan/configs/check-explicit-mixed-baseline.neon
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/l7-baseline.neon
 	- tests/phpstan/configs/l8-baseline.neon
@@ -16,8 +15,13 @@ includes:
 
 parameters:
 	level: 8
-	autoload_files:
+	checkExplicitMixed: true
+	checkMissingCallableSignature: true
+	bootstrapFiles:
 		- tests/phpstan/bootstrap.php
+	scanDirectories:
+	    - tests/plugins/TesterPlugin
+	scanFiles:
 		- src/pocketmine/PocketMine.php
 		- build/make-release.php
 		- build/server-phar.php
@@ -26,12 +30,20 @@ parameters:
 		- build/make-release.php
 		- build/server-phar.php
 		- tests/phpunit
+		- tests/plugins/TesterPlugin
 	dynamicConstantNames:
 		- pocketmine\IS_DEVELOPMENT_BUILD
 		- pocketmine\DEBUG
 	stubFiles:
 		- tests/phpstan/stubs/pthreads.stub
 		- tests/phpstan/stubs/chunkutils.stub
+		- tests/phpstan/stubs/leveldb.stub
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
 	staticReflectionClassNamePatterns:
 		- "#^COM$#"
+	typeAliases:
+	    #variadics don't work for this - mixed probably shouldn't work either, but for now it does
+	    #what we actually need is something that accepts an infinite number of parameters, but in the absence of that,
+	    #we'll just fill it with 10 - it's very unlikely to encounter a callable with 10 parameters anyway.
+	    anyCallable: 'callable(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed) : mixed'
+	    anyClosure: '\Closure(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed) : mixed'

src/pocketmine/CrashDump.php

@@ -23,11 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
-use PackageVersions\Versions;
+use Composer\InstalledVersions;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\plugin\PluginManager;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
 use function base64_encode;
@@ -46,6 +47,7 @@ use function is_resource;
 use function json_encode;
 use function json_last_error_msg;
 use function max;
+use function microtime;
 use function mkdir;
 use function ob_end_clean;
 use function ob_get_contents;
@@ -54,10 +56,10 @@ use function php_uname;
 use function phpinfo;
 use function phpversion;
 use function preg_replace;
+use function sprintf;
 use function str_split;
 use function strpos;
 use function substr;
-use function time;
 use function zend_version;
 use function zlib_encode;
 use const E_COMPILE_ERROR;
@@ -88,7 +90,7 @@ class CrashDump{
 	 * having their content changed, version format changing, etc.
 	 * It is not necessary to increase this when adding new fields.
 	 */
-	private const FORMAT_VERSION = 3;
+	private const FORMAT_VERSION = 4;
 
 	private const PLUGIN_INVOLVEMENT_NONE = "none";
 	private const PLUGIN_INVOLVEMENT_DIRECT = "direct";
@@ -98,7 +100,7 @@ class CrashDump{
 	private $server;
 	/** @var resource */
 	private $fp;
-	/** @var int */
+	/** @var float */
 	private $time;
 	/**
 	 * @var mixed[]
@@ -111,12 +113,12 @@ class CrashDump{
 	private $path;
 
 	public function __construct(Server $server){
-		$this->time = time();
+		$this->time = microtime(true);
 		$this->server = $server;
 		if(!is_dir($this->server->getDataPath() . "crashdumps")){
 			mkdir($this->server->getDataPath() . "crashdumps");
 		}
-		$this->path = $this->server->getDataPath() . "crashdumps/" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
+		$this->path = $this->server->getDataPath() . "crashdumps/" . 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");
@@ -124,7 +126,8 @@ class CrashDump{
 		$this->fp = $fp;
 		$this->data["format_version"] = self::FORMAT_VERSION;
 		$this->data["time"] = $this->time;
-		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
+		$this->data["uptime"] = $this->time - \pocketmine\START_TIME;
+		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", (int) $this->time));
 		$this->addLine();
 		$this->baseCrash();
 		$this->generalData();
@@ -165,7 +168,9 @@ class CrashDump{
 		if($json === false){
 			throw new \RuntimeException("Failed to encode crashdump JSON: " . json_last_error_msg());
 		}
-		$this->encodedData = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
+		$zlibEncoded = zlib_encode($json, ZLIB_ENCODING_DEFLATE, 9);
+		if($zlibEncoded === false) throw new AssumptionFailedError("ZLIB compression failed");
+		$this->encodedData = $zlibEncoded;
 		foreach(str_split(base64_encode($this->encodedData), 76) as $line){
 			$this->addLine($line);
 		}
@@ -201,9 +206,16 @@ class CrashDump{
 
 		if($this->server->getProperty("auto-report.send-settings", true) !== false){
 			$this->data["parameters"] = (array) $argv;
-			$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
-			$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
-			$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
+			if(($serverDotProperties = @file_get_contents($this->server->getDataPath() . "server.properties")) !== false){
+				$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $serverDotProperties);
+			}else{
+				$this->data["server.properties"] = $serverDotProperties;
+			}
+			if(($pocketmineDotYml = @file_get_contents($this->server->getDataPath() . "pocketmine.yml")) !== false){
+				$this->data["pocketmine.yml"] = $pocketmineDotYml;
+			}else{
+				$this->data["pocketmine.yml"] = "";
+			}
 		}else{
 			$this->data["pocketmine.yml"] = "";
 			$this->data["server.properties"] = "";
@@ -309,8 +321,8 @@ class CrashDump{
 	}
 
 	private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
-		$frameCleanPath = Utils::cleanPath($filePath); //this will be empty in phar stub
-		if(strpos($frameCleanPath, "plugins") === 0 and file_exists($filePath)){
+		$frameCleanPath = Utils::cleanPath($filePath);
+		if(strpos($frameCleanPath, Utils::CLEAN_PATH_SRC_PREFIX) !== 0){
 			$this->addLine();
 			if($crashFrame){
 				$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
@@ -320,15 +332,17 @@ class CrashDump{
 				$this->data["plugin_involvement"] = self::PLUGIN_INVOLVEMENT_INDIRECT;
 			}
 
-			$reflection = new \ReflectionClass(PluginBase::class);
-			$file = $reflection->getProperty("file");
-			$file->setAccessible(true);
-			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
-				$filePath = Utils::cleanPath($file->getValue($plugin));
-				if(strpos($frameCleanPath, $filePath) === 0){
-					$this->data["plugin"] = $plugin->getName();
-					$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
-					break;
+			if(file_exists($filePath)){
+				$reflection = new \ReflectionClass(PluginBase::class);
+				$file = $reflection->getProperty("file");
+				$file->setAccessible(true);
+				foreach($this->server->getPluginManager()->getPlugins() as $plugin){
+					$filePath = Utils::cleanPath($file->getValue($plugin));
+					if(strpos($frameCleanPath, $filePath) === 0){
+						$this->data["plugin"] = $plugin->getName();
+						$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
+						break;
+					}
 				}
 			}
 			return true;
@@ -338,6 +352,15 @@ class CrashDump{
 
 	private function generalData() : void{
 		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+		$composerLibraries = [];
+		foreach(InstalledVersions::getInstalledPackages() as $package){
+			$composerLibraries[$package] = sprintf(
+				"%s@%s",
+				InstalledVersions::getPrettyVersion($package) ?? "unknown",
+				InstalledVersions::getReference($package) ?? "unknown"
+			);
+		}
+
 		$this->data["general"] = [];
 		$this->data["general"]["name"] = $this->server->getName();
 		$this->data["general"]["base_version"] = \pocketmine\BASE_VERSION;
@@ -350,7 +373,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->data["general"]["composer_libraries"] = Versions::VERSIONS;
+		$this->data["general"]["composer_libraries"] = $composerLibraries;
 		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
 		$this->addLine("Git commit: " . \pocketmine\GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
@@ -358,7 +381,7 @@ class CrashDump{
 		$this->addLine("Zend version: " . zend_version());
 		$this->addLine("OS : " . PHP_OS . ", " . Utils::getOS());
 		$this->addLine("Composer libraries: ");
-		foreach(Versions::VERSIONS as $library => $libraryVersion){
+		foreach($composerLibraries as $library => $libraryVersion){
 			$this->addLine("- $library $libraryVersion");
 		}
 	}

src/pocketmine/MemoryManager.php

@@ -40,6 +40,7 @@ use function fwrite;
 use function gc_collect_cycles;
 use function gc_disable;
 use function gc_enable;
+use function gc_mem_caches;
 use function get_class;
 use function get_declared_classes;
 use function implode;
@@ -50,6 +51,7 @@ use function is_object;
 use function is_resource;
 use function is_string;
 use function json_encode;
+use function mb_strtoupper;
 use function min;
 use function mkdir;
 use function preg_match;
@@ -58,7 +60,6 @@ use function round;
 use function spl_object_hash;
 use function sprintf;
 use function strlen;
-use function strtoupper;
 use function substr;
 use const JSON_PRETTY_PRINT;
 use const JSON_UNESCAPED_SLASHES;
@@ -127,7 +128,7 @@ class MemoryManager{
 			if($m <= 0){
 				$defaultMemory = 0;
 			}else{
-				switch(strtoupper($matches[2])){
+				switch(mb_strtoupper($matches[2])){
 					case "K":
 						$defaultMemory = $m / 1024;
 						break;
@@ -273,6 +274,7 @@ class MemoryManager{
 		}
 
 		$cycles = gc_collect_cycles();
+		gc_mem_caches();
 
 		Timings::$garbageCollectorTimer->stopTiming();
 
@@ -421,8 +423,12 @@ class MemoryManager{
 						}
 
 						$name = $property->getName();
-						if($reflection !== $original and !$property->isPublic()){
-							$name = $reflection->getName() . ":" . $name;
+						if($reflection !== $original){
+							if($property->isPrivate()){
+								$name = $reflection->getName() . ":" . $name;
+							}else{
+								continue;
+							}
 						}
 						if(!$property->isPublic()){
 							$property->setAccessible(true);

src/pocketmine/PocketMine.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine {
 
+	use Composer\InstalledVersions;
 	use pocketmine\utils\Git;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Process;
@@ -73,7 +74,6 @@ namespace pocketmine {
 		}
 
 		$extensions = [
-			"bcmath" => "BC Math",
 			"curl" => "cURL",
 			"ctype" => "ctype",
 			"date" => "Date",
@@ -206,6 +206,19 @@ namespace pocketmine {
 
 		define('pocketmine\GIT_COMMIT', $gitHash);
 
+		$composerGitHash = InstalledVersions::getReference('pocketmine/pocketmine-mp');
+		if($composerGitHash !== null){
+			$currentGitHash = explode("-", \pocketmine\GIT_COMMIT)[0];
+			if($currentGitHash !== $composerGitHash){
+				critical_error("Composer dependencies and/or autoloader are out of sync.");
+				critical_error("- Current revision is $currentGitHash");
+				critical_error("- Composer dependencies were last synchronized for revision $composerGitHash");
+				critical_error("Out-of-sync Composer dependencies may result in crashes and classes not being found.");
+				critical_error("Please synchronize Composer dependencies before running the server.");
+				exit(1);
+			}
+		}
+
 		$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
 
 		define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
@@ -215,7 +228,12 @@ namespace pocketmine {
 			mkdir(\pocketmine\DATA, 0777, true);
 		}
 
-		define('pocketmine\LOCK_FILE', fopen(\pocketmine\DATA . 'server.lock', "a+b"));
+		$lockFile = fopen(\pocketmine\DATA . 'server.lock', "a+b");
+		if($lockFile === false){
+			critical_error("Unable to open server.lock file. Please check that the current user has read/write permissions to it.");
+			exit(1);
+		}
+		define('pocketmine\LOCK_FILE', $lockFile);
 		if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){
 			//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the
 			//other server wrote its PID and released exclusive lock before we get our lock
@@ -280,7 +298,7 @@ namespace pocketmine {
 
 			if(ThreadManager::getInstance()->stopAll() > 0){
 				$logger->debug("Some threads could not be stopped, performing a force-kill");
-				Process::kill(getmypid());
+				Process::kill(Process::pid());
 			}
 		}while(false);
 
@@ -289,10 +307,16 @@ namespace pocketmine {
 
 		echo Terminal::$FORMAT_RESET . PHP_EOL;
 
+		if(!flock(\pocketmine\LOCK_FILE, LOCK_UN)){
+			critical_error("Failed to release the server.lock file.");
+		}
+
+		if(!fclose(\pocketmine\LOCK_FILE)){
+			critical_error("Could not close server.lock resource.");
+		}
+
 		exit($exitCode);
 	}
 
-	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
-		\pocketmine\server();
-	}
+	\pocketmine\server();
 }

src/pocketmine/Server.php

@@ -126,7 +126,6 @@ use function file_put_contents;
 use function filemtime;
 use function function_exists;
 use function get_class;
-use function getmypid;
 use function getopt;
 use function gettype;
 use function implode;
@@ -693,29 +692,32 @@ class Server{
 		return $result;
 	}
 
+	private function getPlayerDataPath(string $username) : string{
+		return $this->getDataPath() . '/players/' . strtolower($username) . '.dat';
+	}
+
 	/**
 	 * Returns whether the server has stored any saved data for this player.
 	 */
 	public function hasOfflinePlayerData(string $name) : bool{
-		$name = strtolower($name);
-		return file_exists($this->getDataPath() . "players/$name.dat");
+		return file_exists($this->getPlayerDataPath($name));
 	}
 
 	public function getOfflinePlayerData(string $name) : CompoundTag{
 		$name = strtolower($name);
-		$path = $this->getDataPath() . "players/";
+		$path = $this->getPlayerDataPath($name);
 		if($this->shouldSavePlayerData()){
-			if(file_exists($path . "$name.dat")){
+			if(file_exists($path)){
 				try{
 					$nbt = new BigEndianNBTStream();
-					$compound = $nbt->readCompressed(file_get_contents($path . "$name.dat"));
+					$compound = $nbt->readCompressed(file_get_contents($path));
 					if(!($compound instanceof CompoundTag)){
 						throw new \RuntimeException("Invalid data found in \"$name.dat\", expected " . CompoundTag::class . ", got " . (is_object($compound) ? get_class($compound) : gettype($compound)));
 					}
 
 					return $compound;
 				}catch(\Throwable $e){ //zlib decode error / corrupt data
-					rename($path . "$name.dat", $path . "$name.dat.bak");
+					rename($path, $path . '.bak');
 					$this->logger->notice($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name]));
 				}
 			}else{
@@ -776,7 +778,7 @@ class Server{
 		if(!$ev->isCancelled()){
 			$nbt = new BigEndianNBTStream();
 			try{
-				file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
+				file_put_contents($this->getPlayerDataPath($name), $nbt->writeCompressed($ev->getSaveData()));
 			}catch(\Throwable $e){
 				$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
 				$this->logger->logException($e);
@@ -1397,10 +1399,10 @@ class Server{
 				Network::$BATCH_THRESHOLD = -1;
 			}
 
-			$this->networkCompressionLevel = (int) $this->getProperty("network.compression-level", 7);
+			$this->networkCompressionLevel = (int) $this->getProperty("network.compression-level", 6);
 			if($this->networkCompressionLevel < 1 or $this->networkCompressionLevel > 9){
-				$this->logger->warning("Invalid network compression level $this->networkCompressionLevel set, setting to default 7");
-				$this->networkCompressionLevel = 7;
+				$this->logger->warning("Invalid network compression level $this->networkCompressionLevel set, setting to default 6");
+				$this->networkCompressionLevel = 6;
 			}
 			$this->networkCompressionAsync = (bool) $this->getProperty("network.async-compression", true);
 
@@ -1459,8 +1461,7 @@ class Server{
 
 			$this->onlineMode = $this->getConfigBool("xbox-auth", true);
 			if($this->onlineMode){
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.auth.enabled"));
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.authProperty.enabled"));
+				$this->logger->info($this->getLanguage()->translateString("pocketmine.server.auth.enabled"));
 			}else{
 				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.auth.disabled"));
 				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authWarning"));
@@ -1540,7 +1541,7 @@ class Server{
 					if(isset($options["generator"])){
 						$generatorOptions = explode(":", $options["generator"]);
 						$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
-						if(count($options) > 0){
+						if(count($generatorOptions) > 0){
 							$options["preset"] = implode(":", $generatorOptions);
 						}
 					}else{
@@ -1936,7 +1937,7 @@ class Server{
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
 			$this->logger->emergency("Crashed while crashing, killing process");
-			@Process::kill(getmypid());
+			@Process::kill(Process::pid());
 		}
 
 	}
@@ -2129,7 +2130,7 @@ class Server{
 			echo "--- Waiting $spacing seconds to throttle automatic restart (you can kill the process safely now) ---" . PHP_EOL;
 			sleep($spacing);
 		}
-		@Process::kill(getmypid());
+		@Process::kill(Process::pid());
 		exit(1);
 	}
 

src/pocketmine/Thread.php

@@ -76,11 +76,9 @@ abstract class Thread extends \Thread{
 	}
 
 	/**
-	 * @param int|null $options TODO: pthreads bug
-	 *
 	 * @return bool
 	 */
-	public function start(?int $options = PTHREADS_INHERIT_ALL){
+	public function start(int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if($this->getClassLoader() === null){

src/pocketmine/VersionInfo.php

@@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.13.0";
+const BASE_VERSION = "3.19.0";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/Worker.php

@@ -76,11 +76,9 @@ abstract class Worker extends \Worker{
 	}
 
 	/**
-	 * @param int|null $options TODO: pthreads bug
-	 *
 	 * @return bool
 	 */
-	public function start(?int $options = PTHREADS_INHERIT_ALL){
+	public function start(int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if($this->getClassLoader() === null){

src/pocketmine/block/Block.php

@@ -36,7 +36,7 @@ use pocketmine\math\RayTraceResult;
 use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
-use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use function array_merge;

src/pocketmine/block/BlockFactory.php

@@ -25,7 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Position;
-use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
+use pocketmine\network\mcpe\convert\RuntimeBlockMapping;
 use function min;
 
 /**

src/pocketmine/block/BlockToolType.php

@@ -35,5 +35,6 @@ interface BlockToolType{
 	public const TYPE_PICKAXE = 1 << 2;
 	public const TYPE_AXE = 1 << 3;
 	public const TYPE_SHEARS = 1 << 4;
+	public const TYPE_HOE = 1 << 5;
 
 }

src/pocketmine/block/Cake.php

@@ -109,6 +109,10 @@ class Cake extends Transparent implements FoodSource{
 		return true;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+
 	/**
 	 * @return Block
 	 */

src/pocketmine/block/CraftingTable.php

@@ -25,7 +25,10 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\CraftingGrid;
 use pocketmine\item\Item;
+use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
+use pocketmine\network\mcpe\protocol\types\WindowTypes;
 use pocketmine\Player;
+use function array_key_exists;
 
 class CraftingTable extends Solid{
 
@@ -50,6 +53,19 @@ class CraftingTable extends Solid{
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
 			$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
+
+			if(!array_key_exists($windowId = Player::HARDCODED_CRAFTING_GRID_WINDOW_ID, $player->openHardcodedWindows)){
+				//TODO: HACK! crafting grid doesn't fit very well into the current PM container system, so this hack allows
+				//it to carry on working approximately the same way as it did in 1.14
+				$pk = new ContainerOpenPacket();
+				$pk->windowId = $windowId;
+				$pk->type = WindowTypes::WORKBENCH;
+				$pk->x = $this->getFloorX();
+				$pk->y = $this->getFloorY();
+				$pk->z = $this->getFloorZ();
+				$player->sendDataPacket($pk);
+				$player->openHardcodedWindows[$windowId] = true;
+			}
 		}
 
 		return true;

src/pocketmine/block/Ladder.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -58,7 +59,7 @@ class Ladder extends Transparent{
 	}
 
 	public function onEntityCollide(Entity $entity) : void{
-		if($entity->asVector3()->floor()->distanceSquared($this) < 1){ //entity coordinates must be inside block
+		if($entity instanceof Living and $entity->asVector3()->floor()->distanceSquared($this) < 1){ //entity coordinates must be inside block
 			$entity->resetFallDistance();
 			$entity->onGround = true;
 		}

src/pocketmine/block/Liquid.php

@@ -418,6 +418,9 @@ abstract class Liquid extends Transparent{
 		return $isOptimalFlowDirection;
 	}
 
+	/**
+	 * @phpstan-impure This function modifies the adjacent sources count (premature optimisation)
+	 */
 	private function getSmallestFlowDecay(Block $block, int $decay) : int{
 		$blockDecay = $this->getFlowDecay($block);
 

src/pocketmine/block/Podzol.php

@@ -40,6 +40,6 @@ class Podzol extends Solid{
 	}
 
 	public function getHardness() : float{
-		return 2.5;
+		return 0.5;
 	}
 }

src/pocketmine/block/Potato.php

@@ -40,9 +40,13 @@ class Potato extends Crops{
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
-		return [
-			ItemFactory::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 4) : 1)
+		$result = [
+			ItemFactory::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 5) : 1)
 		];
+		if($this->getDamage() >= 7 && mt_rand(0, 49) === 0){
+			$result[] = ItemFactory::get(Item::POISONOUS_POTATO);
+		}
+		return $result;
 	}
 
 	public function getPickedItem() : Item{

src/pocketmine/block/Rail.php

@@ -71,6 +71,7 @@ class Rail extends BaseRail{
 	}
 
 	protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
+		/** @var int[] $horizontal */
 		static $horizontal = [
 			Vector3::SIDE_NORTH,
 			Vector3::SIDE_SOUTH,

src/pocketmine/block/Sponge.php

@@ -31,6 +31,10 @@ class Sponge extends Solid{
 		$this->meta = $meta;
 	}
 
+	public function getToolType() : int{
+		return BlockToolType::TYPE_HOE;
+	}
+
 	public function getHardness() : float{
 		return 0.6;
 	}

src/pocketmine/block/Sugarcane.php

@@ -87,7 +87,12 @@ class Sugarcane extends Flowable{
 				for($y = 1; $y < 3; ++$y){
 					$b = $this->getLevelNonNull()->getBlockAt($this->x, $this->y + $y, $this->z);
 					if($b->getId() === self::AIR){
-						$this->getLevelNonNull()->setBlock($b, BlockFactory::get(Block::SUGARCANE_BLOCK), true);
+						$ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK));
+						$ev->call();
+						if($ev->isCancelled()){
+							break;
+						}
+						$this->getLevelNonNull()->setBlock($b, $ev->getNewState(), true);
 						break;
 					}
 				}

src/pocketmine/command/CommandReader.php

@@ -25,23 +25,18 @@ namespace pocketmine\command;
 
 use pocketmine\snooze\SleeperNotifier;
 use pocketmine\Thread;
-use pocketmine\utils\Utils;
-use function extension_loaded;
 use function fclose;
 use function fgets;
 use function fopen;
 use function fstat;
-use function getopt;
 use function is_resource;
 use function microtime;
 use function preg_replace;
 use function readline;
-use function readline_add_history;
 use function stream_isatty;
 use function stream_select;
 use function trim;
 use function usleep;
-use const STDIN;
 
 class CommandReader extends Thread{
 
@@ -65,12 +60,6 @@ class CommandReader extends Thread{
 	public function __construct(?SleeperNotifier $notifier = null){
 		$this->buffer = new \Threaded;
 		$this->notifier = $notifier;
-
-		$opts = getopt("", ["disable-readline", "enable-readline"]);
-
-		if(extension_loaded("readline") and (Utils::getOS() === Utils::OS_WINDOWS ? isset($opts["enable-readline"]) : !isset($opts["disable-readline"])) and !$this->isPipe(STDIN)){
-			$this->type = self::TYPE_READLINE;
-		}
 	}
 
 	/**
@@ -127,44 +116,28 @@ class CommandReader extends Thread{
 	 * @return bool if the main execution should continue reading lines
 	 */
 	private function readLine() : bool{
-		$line = "";
-		if($this->type === self::TYPE_READLINE){
-			if(($raw = readline("> ")) !== false and ($line = trim($raw)) !== ""){
-				readline_add_history($line);
-			}else{
-				return true;
-			}
-		}else{
-			if(!is_resource(self::$stdin)){
-				$this->initStdin();
-			}
-
-			switch($this->type){
-				/** @noinspection PhpMissingBreakStatementInspection */
-				case self::TYPE_STREAM:
-					//stream_select doesn't work on piped streams for some reason
-					$r = [self::$stdin];
-					$w = $e = null;
-					if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
-						return true;
-					}elseif($count === false){ //stream error
-						$this->initStdin();
-					}
-
-				case self::TYPE_PIPED:
-					if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
-						$this->initStdin();
-						$this->synchronized(function() : void{
-							$this->wait(200000);
-						}); //prevent CPU waste if it's end of pipe
-						return true; //loop back round
-					}
-
-					$line = trim($raw);
-					break;
-			}
+		if(!is_resource(self::$stdin)){
+			$this->initStdin();
 		}
 
+		$r = [self::$stdin];
+		$w = $e = null;
+		if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
+			return true;
+		}elseif($count === false){ //stream error
+			$this->initStdin();
+		}
+
+		if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
+			$this->initStdin();
+			$this->synchronized(function() : void{
+				$this->wait(200000);
+			}); //prevent CPU waste if it's end of pipe
+			return true; //loop back round
+		}
+
+		$line = trim($raw);
+
 		if($line !== ""){
 			$this->buffer[] = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", $line);
 			if($this->notifier !== null){
@@ -193,17 +166,11 @@ class CommandReader extends Thread{
 	 */
 	public function run(){
 		$this->registerClassLoader();
-
-		if($this->type !== self::TYPE_READLINE){
-			$this->initStdin();
-		}
+		$this->initStdin();
 
 		while(!$this->shutdown and $this->readLine());
 
-		if($this->type !== self::TYPE_READLINE){
-			fclose(self::$stdin);
-		}
-
+		fclose(self::$stdin);
 	}
 
 	public function getThreadName() : string{

src/pocketmine/command/defaults/BanListCommand.php

@@ -30,7 +30,9 @@ use pocketmine\permission\BanEntry;
 use function array_map;
 use function count;
 use function implode;
+use function sort;
 use function strtolower;
+use const SORT_STRING;
 
 class BanListCommand extends VanillaCommand{
 
@@ -62,10 +64,11 @@ class BanListCommand extends VanillaCommand{
 			$args[0] = "players";
 		}
 
-		$list = $list->getEntries();
-		$message = implode(", ", array_map(function(BanEntry $entry) : string{
+		$list = array_map(function(BanEntry $entry) : string{
 			return $entry->getName();
-		}, $list));
+		}, $list->getEntries());
+		sort($list, SORT_STRING);
+		$message = implode(", ", $list);
 
 		if($args[0] === "ips"){
 			$sender->sendMessage(new TranslationContainer("commands.banlist.ips", [count($list)]));

src/pocketmine/command/defaults/ListCommand.php

@@ -30,6 +30,8 @@ use function array_filter;
 use function array_map;
 use function count;
 use function implode;
+use function sort;
+use const SORT_STRING;
 
 class ListCommand extends VanillaCommand{
 
@@ -52,6 +54,7 @@ class ListCommand extends VanillaCommand{
 		}, array_filter($sender->getServer()->getOnlinePlayers(), function(Player $player) use ($sender) : bool{
 			return $player->isOnline() and (!($sender instanceof Player) or $sender->canSee($player));
 		}));
+		sort($playerNames, SORT_STRING);
 
 		$sender->sendMessage(new TranslationContainer("commands.players.list", [count($playerNames), $sender->getServer()->getMaxPlayers()]));
 		$sender->sendMessage(implode(", ", $playerNames));

src/pocketmine/command/defaults/PluginsCommand.php

@@ -30,6 +30,8 @@ use pocketmine\utils\TextFormat;
 use function array_map;
 use function count;
 use function implode;
+use function sort;
+use const SORT_STRING;
 
 class PluginsCommand extends VanillaCommand{
 
@@ -51,6 +53,7 @@ class PluginsCommand extends VanillaCommand{
 		$list = array_map(function(Plugin $plugin) : string{
 			return ($plugin->isEnabled() ? TextFormat::GREEN : TextFormat::RED) . $plugin->getDescription()->getFullName();
 		}, $sender->getServer()->getPluginManager()->getPlugins());
+		sort($list, SORT_STRING);
 
 		$sender->sendMessage(new TranslationContainer("pocketmine.command.plugins.success", [count($list), implode(TextFormat::WHITE . ", ", $list)]));
 		return true;

src/pocketmine/command/defaults/StatusCommand.php

@@ -54,9 +54,9 @@ class StatusCommand extends VanillaCommand{
 		$server = $sender->getServer();
 		$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----");
 
-		$time = microtime(true) - \pocketmine\START_TIME;
+		$time = (int) (microtime(true) - \pocketmine\START_TIME);
 
-		$seconds = floor($time % 60);
+		$seconds = $time % 60;
 		$minutes = null;
 		$hours = null;
 		$days = null;
@@ -100,7 +100,6 @@ class StatusCommand extends VanillaCommand{
 		$sender->sendMessage(TextFormat::GOLD . "Total memory: " . TextFormat::RED . number_format(round(($mUsage[1] / 1024) / 1024, 2), 2) . " MB.");
 		$sender->sendMessage(TextFormat::GOLD . "Total virtual memory: " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2), 2) . " MB.");
 		$sender->sendMessage(TextFormat::GOLD . "Heap memory: " . TextFormat::RED . number_format(round(($rUsage[0] / 1024) / 1024, 2), 2) . " MB.");
-		$sender->sendMessage(TextFormat::GOLD . "Maximum memory (system): " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2), 2) . " MB.");
 
 		if($server->getProperty("memory.global-limit") > 0){
 			$sender->sendMessage(TextFormat::GOLD . "Maximum memory (manager): " . TextFormat::RED . number_format(round($server->getProperty("memory.global-limit"), 2), 2) . " MB.");

src/pocketmine/command/defaults/TeleportCommand.php

@@ -27,11 +27,11 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\TranslationContainer;
-use pocketmine\math\Vector3;
+use pocketmine\level\Location;
 use pocketmine\Player;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\TextFormat;
-use function array_filter;
-use function array_values;
+use function array_shift;
 use function count;
 use function round;
 
@@ -47,84 +47,83 @@ class TeleportCommand extends VanillaCommand{
 		$this->setPermission("pocketmine.command.teleport");
 	}
 
+	private function findPlayer(CommandSender $sender, string $playerName) : ?Player{
+		$subject = $sender->getServer()->getPlayer($playerName);
+		if($subject === null){
+			$sender->sendMessage(TextFormat::RED . "Can't find player " . $playerName);
+			return null;
+		}
+		return $subject;
+	}
+
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
 		if(!$this->testPermission($sender)){
 			return true;
 		}
 
-		$args = array_values(array_filter($args, function(string $arg) : bool{
-			return $arg !== "";
-		}));
-		if(count($args) < 1 or count($args) > 6){
-			throw new InvalidCommandSyntaxException();
-		}
-
-		$target = null;
-		$origin = $sender;
-
-		if(count($args) === 1 or count($args) === 3){
-			if($sender instanceof Player){
-				$target = $sender;
-			}else{
-				$sender->sendMessage(TextFormat::RED . "Please provide a player!");
-
-				return true;
-			}
-			if(count($args) === 1){
-				$target = $sender->getServer()->getPlayer($args[0]);
-				if($target === null){
-					$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
-
+		switch(count($args)){
+			case 1: // /tp targetPlayer
+			case 3: // /tp x y z
+			case 5: // /tp x y z yaw pitch - TODO: 5 args could be target x y z yaw :(
+				if(!($sender instanceof Player)){
+					$sender->sendMessage(TextFormat::RED . "Please provide a player!");
 					return true;
 				}
-			}
-		}else{
-			$target = $sender->getServer()->getPlayer($args[0]);
-			if($target === null){
-				$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
-
-				return true;
-			}
-			if(count($args) === 2){
-				$origin = $target;
-				$target = $sender->getServer()->getPlayer($args[1]);
-				if($target === null){
-					$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[1]);
 
+				$subject = $sender;
+				$targetArgs = $args;
+				break;
+			case 2: // /tp player1 player2
+			case 4: // /tp player1 x y z - TODO: 4 args could be x y z yaw :(
+			case 6: // /tp player1 x y z yaw pitch
+				$subject = $this->findPlayer($sender, $args[0]);
+				if($subject === null){
 					return true;
 				}
-			}
+				$targetArgs = $args;
+				array_shift($targetArgs);
+				break;
+			default:
+				throw new InvalidCommandSyntaxException();
 		}
 
-		if(count($args) < 3){
-			$origin->teleport($target);
-			Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success", [$origin->getName(), $target->getName()]));
+		switch(count($targetArgs)){
+			case 1:
+				$targetPlayer = $this->findPlayer($sender, $targetArgs[0]);
+				if($targetPlayer === null){
+					return true;
+				}
 
-			return true;
-		}elseif($target->isValid()){
-			if(count($args) === 4 or count($args) === 6){
-				$pos = 1;
-			}else{
-				$pos = 0;
-			}
+				$subject->teleport($targetPlayer->getLocation());
+				Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success", [$subject->getName(), $targetPlayer->getName()]));
 
-			$x = $this->getRelativeDouble($target->x, $sender, $args[$pos++]);
-			$y = $this->getRelativeDouble($target->y, $sender, $args[$pos++], 0, 256);
-			$z = $this->getRelativeDouble($target->z, $sender, $args[$pos++]);
-			$yaw = $target->getYaw();
-			$pitch = $target->getPitch();
+				return true;
+			case 3:
+			case 5:
+				$base = $subject->getLocation();
+				if(count($targetArgs) === 5){
+					$yaw = (float) $targetArgs[3];
+					$pitch = (float) $targetArgs[4];
+				}else{
+					$yaw = $base->yaw;
+					$pitch = $base->pitch;
+				}
 
-			if(count($args) === 6 or (count($args) === 5 and $pos === 3)){
-				$yaw = (float) $args[$pos++];
-				$pitch = (float) $args[$pos++];
-			}
+				$x = $this->getRelativeDouble($base->x, $sender, $targetArgs[0]);
+				$y = $this->getRelativeDouble($base->y, $sender, $targetArgs[1], 0, 256);
+				$z = $this->getRelativeDouble($base->z, $sender, $targetArgs[2]);
+				$targetLocation = new Location($x, $y, $z, $yaw, $pitch, $base->getLevelNonNull());
 
-			$target->teleport(new Vector3($x, $y, $z), $yaw, $pitch);
-			Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success.coordinates", [$target->getName(), round($x, 2), round($y, 2), round($z, 2)]));
-
-			return true;
+				$subject->teleport($targetLocation);
+				Command::broadcastCommandMessage($sender, new TranslationContainer("commands.tp.success.coordinates", [
+					$subject->getName(),
+					round($targetLocation->x, 2),
+					round($targetLocation->y, 2),
+					round($targetLocation->z, 2)
+				]));
+				return true;
+			default:
+				throw new AssumptionFailedError("This branch should be unreachable (for now)");
 		}
-
-		throw new InvalidCommandSyntaxException();
 	}
 }

src/pocketmine/command/defaults/TimingsCommand.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command\defaults;
 
+use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\TranslationContainer;
@@ -72,12 +73,12 @@ class TimingsCommand extends VanillaCommand{
 
 		if($mode === "on"){
 			TimingsHandler::setEnabled();
-			$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.enable"));
+			Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.enable"));
 
 			return true;
 		}elseif($mode === "off"){
 			TimingsHandler::setEnabled(false);
-			$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.disable"));
+			Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.disable"));
 			return true;
 		}
 
@@ -91,7 +92,7 @@ class TimingsCommand extends VanillaCommand{
 
 		if($mode === "reset"){
 			TimingsHandler::reload();
-			$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.reset"));
+			Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.reset"));
 		}elseif($mode === "merged" or $mode === "report" or $paste){
 			$timings = "";
 			if($paste){
@@ -150,6 +151,7 @@ class TimingsCommand extends VanillaCommand{
 					}
 
 					public function onCompletion(Server $server){
+						/** @var CommandSender $sender */
 						$sender = $this->fetchLocal();
 						if($sender instanceof Player and !$sender->isOnline()){ // TODO replace with a more generic API method for checking availability of CommandSender
 							return;
@@ -159,18 +161,21 @@ class TimingsCommand extends VanillaCommand{
 							$server->getLogger()->logException($result);
 							return;
 						}
-						if(isset($result[0]) && is_array($response = json_decode($result[0], true)) && isset($response["id"])){
-							$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsRead",
+						$response = json_decode($result[0], true);
+						if(is_array($response) && isset($response["id"])){
+							Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.timingsRead",
 								["https://" . $this->host . "/?id=" . $response["id"]]));
 						}else{
-							$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.pasteError"));
+							Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.pasteError"));
 						}
 					}
 				});
 			}else{
 				fclose($fileTimings);
-				$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsWrite", [$timings]));
+				Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.timingsWrite", [$timings]));
 			}
+		}else{
+			throw new InvalidCommandSyntaxException();
 		}
 
 		return true;

src/pocketmine/command/defaults/WhitelistCommand.php

@@ -31,7 +31,9 @@ use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 use function count;
 use function implode;
+use function sort;
 use function strtolower;
+use const SORT_STRING;
 
 class WhitelistCommand extends VanillaCommand{
 
@@ -49,10 +51,6 @@ class WhitelistCommand extends VanillaCommand{
 			return true;
 		}
 
-		if(count($args) === 0 or count($args) > 2){
-			throw new InvalidCommandSyntaxException();
-		}
-
 		if(count($args) === 1){
 			if($this->badPerm($sender, strtolower($args[0]))){
 				return false;
@@ -75,7 +73,8 @@ class WhitelistCommand extends VanillaCommand{
 					return true;
 				case "list":
 					$entries = $sender->getServer()->getWhitelisted()->getAll(true);
-					$result = implode($entries, ", ");
+					sort($entries, SORT_STRING);
+					$result = implode(", ", $entries);
 					$count = count($entries);
 
 					$sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count]));
@@ -112,7 +111,7 @@ class WhitelistCommand extends VanillaCommand{
 			}
 		}
 
-		return true;
+		throw new InvalidCommandSyntaxException();
 	}
 
 	private function badPerm(CommandSender $sender, string $subcommand) : bool{

src/pocketmine/entity/Attribute.php

@@ -45,6 +45,7 @@ class Attribute{
 	public const FALL_DAMAGE = 13;
 	public const HORSE_JUMP_STRENGTH = 14;
 	public const ZOMBIE_SPAWN_REINFORCEMENTS = 15;
+	public const LAVA_MOVEMENT = 16;
 
 	/** @var int */
 	private $id;
@@ -84,6 +85,7 @@ class Attribute{
 		self::addAttribute(self::FALL_DAMAGE, "minecraft:fall_damage", 0.0, 340282346638528859811704183484516925440.0, 1.0);
 		self::addAttribute(self::HORSE_JUMP_STRENGTH, "minecraft:horse.jump_strength", 0.0, 2.0, 0.7);
 		self::addAttribute(self::ZOMBIE_SPAWN_REINFORCEMENTS, "minecraft:zombie.spawn_reinforcements", 0.0, 1.0, 0.0);
+		self::addAttribute(self::LAVA_MOVEMENT, "minecraft:lava_movement", 0.0, 340282346638528859811704183484516925440.0, 0.02);
 	}
 
 	/**

src/pocketmine/entity/Effect.php

@@ -31,7 +31,7 @@ use pocketmine\event\player\PlayerExhaustEvent;
 use pocketmine\utils\Color;
 use function constant;
 use function defined;
-use function strtoupper;
+use function mb_strtoupper;
 
 class Effect{
 	public const SPEED = 1;
@@ -102,7 +102,7 @@ class Effect{
 	}
 
 	public static function getEffectByName(string $name) : ?Effect{
-		$const = self::class . "::" . strtoupper($name);
+		$const = self::class . "::" . mb_strtoupper($name);
 		if(defined($const)){
 			return self::getEffect(constant($const));
 		}

src/pocketmine/entity/Entity.php

@@ -77,9 +77,9 @@ use function abs;
 use function assert;
 use function cos;
 use function count;
-use function current;
 use function deg2rad;
 use function floor;
+use function fmod;
 use function get_class;
 use function in_array;
 use function is_a;
@@ -94,6 +94,7 @@ use const M_PI_2;
 abstract class Entity extends Location implements Metadatable, EntityIds{
 
 	public const MOTION_THRESHOLD = 0.00001;
+	protected const STEP_CLIP_MULTIPLIER = 0.4;
 
 	public const NETWORK_ID = -1;
 
@@ -174,56 +175,56 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_RIDER_ROTATION_LOCKED = 57; //byte
 	public const DATA_RIDER_MAX_ROTATION = 58; //float
 	public const DATA_RIDER_MIN_ROTATION = 59; //float
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 60; //float
-	public const DATA_AREA_EFFECT_CLOUD_WAITING = 61; //int
-	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 62; //int
-	/* 63 (int) shulker-related */
-	public const DATA_SHULKER_ATTACH_FACE = 64; //byte
-	/* 65 (short) shulker-related */
-	public const DATA_SHULKER_ATTACH_POS = 66; //block coords
-	public const DATA_TRADING_PLAYER_EID = 67; //long
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 61; //float
+	public const DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int
+	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int
+	/* 64 (int) shulker-related */
+	public const DATA_SHULKER_ATTACH_FACE = 65; //byte
+	/* 66 (short) shulker-related */
+	public const DATA_SHULKER_ATTACH_POS = 67; //block coords
+	public const DATA_TRADING_PLAYER_EID = 68; //long
 
-	/* 69 (byte) command-block */
-	public const DATA_COMMAND_BLOCK_COMMAND = 70; //string
-	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 71; //string
-	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 72; //byte
-	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 73; //byte
-	public const DATA_STRENGTH = 74; //int
-	public const DATA_MAX_STRENGTH = 75; //int
-	/* 76 (int) */
-	public const DATA_LIMITED_LIFE = 77;
-	public const DATA_ARMOR_STAND_POSE_INDEX = 78; //int
-	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; //int
-	public const DATA_ALWAYS_SHOW_NAMETAG = 80; //byte: -1 = default, 0 = only when looked at, 1 = always
-	public const DATA_COLOR_2 = 81; //byte
-	/* 82 (unknown) */
-	public const DATA_SCORE_TAG = 83; //string
-	public const DATA_BALLOON_ATTACHED_ENTITY = 84; //int64, entity unique ID of owner
-	public const DATA_PUFFERFISH_SIZE = 85; //byte
-	public const DATA_BOAT_BUBBLE_TIME = 86; //int (time in bubble column)
-	public const DATA_PLAYER_AGENT_EID = 87; //long
-	/* 88 (float) related to panda sitting
-	 * 89 (float) related to panda sitting */
-	public const DATA_EAT_COUNTER = 90; //int (used by pandas)
-	public const DATA_FLAGS2 = 91; //long (extended data flags)
-	/* 92 (float) related to panda lying down
-	 * 93 (float) related to panda lying down */
-	public const DATA_AREA_EFFECT_CLOUD_DURATION = 94; //int
-	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 95; //int
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 96; //float, usually negative
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 97; //float
-	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 98; //int
-	public const DATA_INTERACTIVE_TAG = 99; //string (button text)
-	public const DATA_TRADE_TIER = 100; //int
-	public const DATA_MAX_TRADE_TIER = 101; //int
-	public const DATA_TRADE_XP = 102; //int
-	public const DATA_SKIN_ID = 103; //int ???
-	/* 104 (int) related to wither */
-	public const DATA_COMMAND_BLOCK_TICK_DELAY = 105; //int
-	public const DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 106; //byte
-	public const DATA_AMBIENT_SOUND_INTERVAL_MIN = 107; //float
-	public const DATA_AMBIENT_SOUND_INTERVAL_RANGE = 108; //float
-	public const DATA_AMBIENT_SOUND_EVENT = 109; //string
+	/* 70 (byte) command-block */
+	public const DATA_COMMAND_BLOCK_COMMAND = 71; //string
+	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string
+	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte
+	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte
+	public const DATA_STRENGTH = 75; //int
+	public const DATA_MAX_STRENGTH = 76; //int
+	/* 77 (int) */
+	public const DATA_LIMITED_LIFE = 78;
+	public const DATA_ARMOR_STAND_POSE_INDEX = 79; //int
+	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 80; //int
+	public const DATA_ALWAYS_SHOW_NAMETAG = 81; //byte: -1 = default, 0 = only when looked at, 1 = always
+	public const DATA_COLOR_2 = 82; //byte
+	/* 83 (unknown) */
+	public const DATA_SCORE_TAG = 84; //string
+	public const DATA_BALLOON_ATTACHED_ENTITY = 85; //int64, entity unique ID of owner
+	public const DATA_PUFFERFISH_SIZE = 86; //byte
+	public const DATA_BOAT_BUBBLE_TIME = 87; //int (time in bubble column)
+	public const DATA_PLAYER_AGENT_EID = 88; //long
+	/* 89 (float) related to panda sitting
+	 * 90 (float) related to panda sitting */
+	public const DATA_EAT_COUNTER = 91; //int (used by pandas)
+	public const DATA_FLAGS2 = 92; //long (extended data flags)
+	/* 93 (float) related to panda lying down
+	 * 94 (float) related to panda lying down */
+	public const DATA_AREA_EFFECT_CLOUD_DURATION = 95; //int
+	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 96; //int
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 97; //float, usually negative
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 98; //float
+	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 99; //int
+	public const DATA_INTERACTIVE_TAG = 100; //string (button text)
+	public const DATA_TRADE_TIER = 101; //int
+	public const DATA_MAX_TRADE_TIER = 102; //int
+	public const DATA_TRADE_XP = 103; //int
+	public const DATA_SKIN_ID = 104; //int ???
+	/* 105 (int) related to wither */
+	public const DATA_COMMAND_BLOCK_TICK_DELAY = 106; //int
+	public const DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 107; //byte
+	public const DATA_AMBIENT_SOUND_INTERVAL_MIN = 108; //float
+	public const DATA_AMBIENT_SOUND_INTERVAL_RANGE = 109; //float
+	public const DATA_AMBIENT_SOUND_EVENT = 110; //string
 
 	public const DATA_FLAG_ONFIRE = 0;
 	public const DATA_FLAG_SNEAKING = 1;
@@ -311,12 +312,15 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_FLAG_ROARING = 83;
 	public const DATA_FLAG_DELAYED_ATTACKING = 84;
 	public const DATA_FLAG_AVOIDING_MOBS = 85;
-	public const DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = 86;
-	public const DATA_FLAG_HIDDEN_WHEN_INVISIBLE = 87; //??????????????????
-	public const DATA_FLAG_IS_IN_UI = 88;
-	public const DATA_FLAG_STALKING = 89;
-	public const DATA_FLAG_EMOTING = 90;
-	public const DATA_FLAG_CELEBRATING = 91;
+	public const DATA_FLAG_AVOIDING_BLOCK = 86;
+	public const DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = 87;
+	public const DATA_FLAG_HIDDEN_WHEN_INVISIBLE = 88; //??????????????????
+	public const DATA_FLAG_IS_IN_UI = 89;
+	public const DATA_FLAG_STALKING = 90;
+	public const DATA_FLAG_EMOTING = 91;
+	public const DATA_FLAG_CELEBRATING = 92;
+	public const DATA_FLAG_ADMIRING = 93;
+	public const DATA_FLAG_CELEBRATING_SPECIAL = 94;
 
 	public const DATA_PLAYER_FLAG_SLEEP = 1;
 	public const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK
@@ -329,8 +333,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	private static $knownEntities = [];
 	/**
-	 * @var string[][]
-	 * @phpstan-var array<class-string<Entity>, list<string>>
+	 * @var string[]
+	 * @phpstan-var array<class-string<Entity>, string>
 	 */
 	private static $saveNames = [];
 
@@ -409,7 +413,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				self::$knownEntities[$name] = $className;
 			}
 
-			self::$saveNames[$className] = $saveNames;
+			self::$saveNames[$className] = reset($saveNames);
 
 			return true;
 		}
@@ -704,10 +708,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		$this->boundingBox->setBounds(
 			$this->x - $halfWidth,
-			$this->y,
+			$this->y + $this->ySize,
 			$this->z - $halfWidth,
 			$this->x + $halfWidth,
-			$this->y + $this->height,
+			$this->y + $this->height + $this->ySize,
 			$this->z + $halfWidth
 		);
 	}
@@ -865,10 +869,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	public function getSaveId() : string{
 		if(!isset(self::$saveNames[static::class])){
-			throw new \InvalidStateException("Entity is not registered");
+			throw new \InvalidStateException("Entity " . static::class . " is not registered");
 		}
-		reset(self::$saveNames[static::class]);
-		return current(self::$saveNames[static::class]);
+		return self::$saveNames[static::class];
 	}
 
 	public function saveNBT() : void{
@@ -1308,7 +1311,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	public function getDirection() : ?int{
-		$rotation = ($this->yaw - 90) % 360;
+		$rotation = fmod($this->yaw - 90, 360);
 		if($rotation < 0){
 			$rotation += 360.0;
 		}
@@ -1446,8 +1449,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				$this->fall($this->fallDistance);
 				$this->resetFallDistance();
 			}
-		}elseif($distanceThisTick < 0){
+		}elseif($distanceThisTick < $this->fallDistance){
+			//we've fallen some distance (distanceThisTick is negative)
+			//or we ascended back towards where fall distance was measured from initially (distanceThisTick is positive but less than existing fallDistance)
 			$this->fallDistance -= $distanceThisTick;
+		}else{
+			//we ascended past the apex where fall distance was originally being measured from
+			//reset it so it will be measured starting from the new, higher position
+			$this->fallDistance = 0;
 		}
 	}
 
@@ -1535,7 +1544,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($this->keepMovement){
 			$this->boundingBox->offset($dx, $dy, $dz);
 		}else{
-			$this->ySize *= 0.4;
+			$this->ySize *= self::STEP_CLIP_MULTIPLIER;
 
 			/*
 			if($this->isColliding){ //With cobweb?
@@ -1602,7 +1611,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 			$this->boundingBox->offset(0, 0, $dz);
 
-			if($this->stepHeight > 0 and $fallingFlag and $this->ySize < 0.05 and ($movX != $dx or $movZ != $dz)){
+			if($this->stepHeight > 0 and $fallingFlag and ($movX != $dx or $movZ != $dz)){
 				$cx = $dx;
 				$cy = $dy;
 				$cz = $dz;
@@ -1634,13 +1643,20 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 				$this->boundingBox->offset(0, 0, $dz);
 
+				$reverseDY = -$dy;
+				foreach($list as $bb){
+					$reverseDY = $bb->calculateYOffset($this->boundingBox, $reverseDY);
+				}
+				$dy += $reverseDY;
+				$this->boundingBox->offset(0, $reverseDY, 0);
+
 				if(($cx ** 2 + $cz ** 2) >= ($dx ** 2 + $dz ** 2)){
 					$dx = $cx;
 					$dy = $cy;
 					$dz = $cz;
 					$this->boundingBox->setBB($axisalignedbb1);
 				}else{
-					$this->ySize += 0.5; //FIXME: this should be the height of the block it walked up, not fixed 0.5
+					$this->ySize += $dy;
 				}
 			}
 		}

src/pocketmine/entity/Human.php

@@ -54,6 +54,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\Player;
@@ -300,17 +301,20 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		if($consumable instanceof MaybeConsumable and !$consumable->canBeConsumed()){
 			return false;
 		}
+		if($consumable instanceof FoodSource && $consumable->requiresHunger() and !$this->isHungry()){
+			return false;
+		}
 
+		return parent::consumeObject($consumable);
+	}
+
+	protected function applyConsumptionResults(Consumable $consumable) : void{
 		if($consumable instanceof FoodSource){
-			if($consumable->requiresHunger() and !$this->isHungry()){
-				return false;
-			}
-
 			$this->addFood($consumable->getFoodRestore());
 			$this->addSaturation($consumable->getSaturationRestore());
 		}
 
-		return parent::consumeObject($consumable);
+		parent::applyConsumptionResults($consumable);
 	}
 
 	/**
@@ -400,12 +404,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 * @param bool $playSound Whether to play level-up and XP gained sounds.
 	 */
 	public function addXp(int $amount, bool $playSound = true) : bool{
-		$this->totalXp += $amount;
-
 		$oldLevel = $this->getXpLevel();
 		$oldTotal = $this->getCurrentTotalXp();
 
 		if($this->setCurrentTotalXp($oldTotal + $amount)){
+			if($amount > 0){
+				$this->totalXp += $amount;
+			}
+
 			if($playSound){
 				$newLevel = $this->getXpLevel();
 				if((int) ($newLevel / 5) > (int) ($oldLevel / 5)){
@@ -808,7 +814,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		$pk->motion = $this->getMotion();
 		$pk->yaw = $this->yaw;
 		$pk->pitch = $this->pitch;
-		$pk->item = $this->getInventory()->getItemInHand();
+		$pk->item = ItemStackWrapper::legacy($this->getInventory()->getItemInHand());
 		$pk->metadata = $this->propertyManager->getAll();
 		$player->dataPacket($pk);
 

src/pocketmine/entity/InvalidSkinException.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\entity;
+
+final class InvalidSkinException extends \InvalidArgumentException{
+
+}

src/pocketmine/entity/Living.php

@@ -45,6 +45,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
+use pocketmine\nbt\tag\ShortTag;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\MobEffectPacket;
@@ -97,17 +98,15 @@ abstract class Living extends Entity implements Damageable{
 		//TODO: load/save armor inventory contents
 		$this->armorInventory->setEventProcessor(new ArmorInventoryEventProcessor($this));
 
-		$health = $this->getMaxHealth();
-
 		if($this->namedtag->hasTag("HealF", FloatTag::class)){
 			$health = $this->namedtag->getFloat("HealF");
 			$this->namedtag->removeTag("HealF");
-		}elseif($this->namedtag->hasTag("Health")){
-			$healthTag = $this->namedtag->getTag("Health");
-			$health = (float) $healthTag->getValue(); //Older versions of PocketMine-MP incorrectly saved this as a short instead of a float
-			if(!($healthTag instanceof FloatTag)){
-				$this->namedtag->removeTag("Health");
-			}
+		}elseif($this->namedtag->hasTag("Health", ShortTag::class)){
+			//Older versions of PocketMine-MP incorrectly saved this as a short instead of a float
+			$health = $this->namedtag->getShort("Health");
+			$this->namedtag->removeTag("Health");
+		}else{
+			$health = $this->namedtag->getFloat("Health", $this->getMaxHealth());
 		}
 
 		$this->setHealth($health);
@@ -364,13 +363,20 @@ abstract class Living extends Entity implements Damageable{
 			return false;
 		}
 
+		$this->applyConsumptionResults($consumable);
+		return true;
+	}
+
+	/**
+	 * Applies effects from consuming the object. This shouldn't do any can-consume checks (those are expected to be
+	 * handled by the caller).
+	 */
+	protected function applyConsumptionResults(Consumable $consumable) : void{
 		foreach($consumable->getAdditionalEffects() as $effect){
 			$this->addEffect($effect);
 		}
 
 		$consumable->onConsume($this);
-
-		return true;
 	}
 
 	/**

src/pocketmine/entity/Skin.php

@@ -62,24 +62,24 @@ class Skin{
 		try{
 			$this->validate();
 			return true;
-		}catch(\InvalidArgumentException $e){
+		}catch(InvalidSkinException $e){
 			return false;
 		}
 	}
 
 	/**
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidSkinException
 	 */
 	public function validate() : void{
 		if($this->skinId === ""){
-			throw new \InvalidArgumentException("Skin ID must not be empty");
+			throw new InvalidSkinException("Skin ID must not be empty");
 		}
 		$len = strlen($this->skinData);
 		if(!in_array($len, self::ACCEPTED_SKIN_SIZES, true)){
-			throw new \InvalidArgumentException("Invalid skin data size $len bytes (allowed sizes: " . implode(", ", self::ACCEPTED_SKIN_SIZES) . ")");
+			throw new InvalidSkinException("Invalid skin data size $len bytes (allowed sizes: " . implode(", ", self::ACCEPTED_SKIN_SIZES) . ")");
 		}
 		if($this->capeData !== "" and strlen($this->capeData) !== 8192){
-			throw new \InvalidArgumentException("Invalid cape data size " . strlen($this->capeData) . " bytes (must be exactly 8192 bytes)");
+			throw new InvalidSkinException("Invalid cape data size " . strlen($this->capeData) . " bytes (must be exactly 8192 bytes)");
 		}
 		//TODO: validate geometry
 	}

src/pocketmine/entity/object/ItemEntity.php

@@ -30,6 +30,7 @@ use pocketmine\event\inventory\InventoryPickupItemEvent;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\Player;
 use function get_class;
 
@@ -173,7 +174,7 @@ class ItemEntity extends Entity{
 		$pk->entityRuntimeId = $this->getId();
 		$pk->position = $this->asVector3();
 		$pk->motion = $this->getMotion();
-		$pk->item = $this->getItem();
+		$pk->item = ItemStackWrapper::legacy($this->getItem());
 		$pk->metadata = $this->propertyManager->getAll();
 
 		$player->dataPacket($pk);

src/pocketmine/entity/utils/ExperienceUtils.php

@@ -24,6 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\entity\utils;
 
 use pocketmine\math\Math;
+use pocketmine\utils\AssumptionFailedError;
+use function count;
 use function max;
 
 abstract class ExperienceUtils{
@@ -59,6 +61,9 @@ abstract class ExperienceUtils{
 	 * This returns a floating-point number, the decimal part being the progress through the resulting level.
 	 */
 	public static function getLevelFromXp(int $xp) : float{
+		if($xp < 0){
+			throw new \InvalidArgumentException("XP must be at least 0");
+		}
 		if($xp <= self::getXpToReachLevel(16)){
 			$a = 1;
 			$b = 6;
@@ -74,6 +79,9 @@ abstract class ExperienceUtils{
 		}
 
 		$x = Math::solveQuadratic($a, $b, $c - $xp);
+		if(count($x) === 0){
+			throw new AssumptionFailedError("Expected at least 1 solution");
+		}
 
 		return max($x); //we're only interested in the positive solution
 	}

src/pocketmine/event/EventPriority.php

@@ -25,7 +25,7 @@ namespace pocketmine\event;
 
 use function constant;
 use function defined;
-use function strtoupper;
+use function mb_strtoupper;
 
 /**
  * List of event priorities
@@ -79,7 +79,7 @@ abstract class EventPriority{
 	 * @throws \InvalidArgumentException
 	 */
 	public static function fromString(string $name) : int{
-		$name = strtoupper($name);
+		$name = mb_strtoupper($name);
 		$const = self::class . "::" . $name;
 		if($name !== "ALL" and defined($const)){
 			return constant($const);

src/pocketmine/event/block/BlockBreakEvent.php

@@ -48,7 +48,7 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	/**
 	 * @param Item[] $drops
 	 */
-	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops, int $xpDrops = 0){
+	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops = [], int $xpDrops = 0){
 		parent::__construct($block);
 		$this->item = $item;
 		$this->player = $player;

src/pocketmine/event/block/SignChangeEvent.php

@@ -26,6 +26,7 @@ namespace pocketmine\event\block;
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
 use pocketmine\Player;
+use pocketmine\utils\Utils;
 use function count;
 
 /**
@@ -79,6 +80,7 @@ class SignChangeEvent extends BlockEvent implements Cancellable{
 		if(count($lines) !== 4){
 			throw new \InvalidArgumentException("Array size must be 4!");
 		}
+		Utils::validateArrayValueType($lines, function(string $_) : void{});
 		$this->lines = $lines;
 	}
 

src/pocketmine/event/entity/EntityBlockChangeEvent.php

@@ -29,6 +29,7 @@ use pocketmine\event\Cancellable;
 
 /**
  * Called when an Entity, excluding players, changes a block directly
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityBlockChangeEvent extends EntityEvent implements Cancellable{
 	/** @var Block */

src/pocketmine/event/entity/EntityCombustEvent.php

@@ -26,6 +26,9 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityCombustEvent extends EntityEvent implements Cancellable{
 	/** @var int */
 	protected $duration;

src/pocketmine/event/entity/EntityDamageEvent.php

@@ -30,6 +30,7 @@ use function max;
 
 /**
  * Called when an entity takes damage.
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityDamageEvent extends EntityEvent implements Cancellable{
 	public const MODIFIER_ARMOR = 1;

src/pocketmine/event/entity/EntityDeathEvent.php

@@ -25,7 +25,11 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Living;
 use pocketmine\item\Item;
+use pocketmine\utils\Utils;
 
+/**
+ * @phpstan-extends EntityEvent<Living>
+ */
 class EntityDeathEvent extends EntityEvent{
 	/** @var Item[] */
 	private $drops = [];
@@ -59,6 +63,7 @@ class EntityDeathEvent extends EntityEvent{
 	 * @param Item[] $drops
 	 */
 	public function setDrops(array $drops) : void{
+		Utils::validateArrayValueType($drops, function(Item $_) : void{});
 		$this->drops = $drops;
 	}
 

src/pocketmine/event/entity/EntityDespawnEvent.php

@@ -32,6 +32,7 @@ use pocketmine\entity\Vehicle;
 
 /**
  * Called when a entity is despawned
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityDespawnEvent extends EntityEvent{
 	/** @var int */

src/pocketmine/event/entity/EntityEffectEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityEffectEvent extends EntityEvent implements Cancellable{
 	/** @var EffectInstance */
 	private $effect;

src/pocketmine/event/entity/EntityEvent.php

@@ -29,12 +29,19 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Entity;
 use pocketmine\event\Event;
 
+/**
+ * @phpstan-template TEntity of Entity
+ */
 abstract class EntityEvent extends Event{
-	/** @var Entity */
+	/**
+	 * @var Entity
+	 * @phpstan-var TEntity
+	 */
 	protected $entity;
 
 	/**
 	 * @return Entity
+	 * @phpstan-return TEntity
 	 */
 	public function getEntity(){
 		return $this->entity;

src/pocketmine/event/entity/EntityExplodeEvent.php

@@ -27,9 +27,11 @@ use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\level\Position;
+use pocketmine\utils\Utils;
 
 /**
  * Called when a entity explodes
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	/** @var Position */
@@ -66,6 +68,7 @@ class EntityExplodeEvent extends EntityEvent implements Cancellable{
 	 * @param Block[] $blocks
 	 */
 	public function setBlockList(array $blocks) : void{
+		Utils::validateArrayValueType($blocks, function(Block $_) : void{});
 		$this->blocks = $blocks;
 	}
 

src/pocketmine/event/entity/EntityInventoryChangeEvent.php

@@ -29,6 +29,7 @@ use pocketmine\item\Item;
 
 /**
  * Called before a slot in an entity's inventory changes.
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntityInventoryChangeEvent extends EntityEvent implements Cancellable{
 	/** @var Item */

src/pocketmine/event/entity/EntityLevelChangeEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\level\Level;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityLevelChangeEvent extends EntityEvent implements Cancellable{
 	/** @var Level */
 	private $originLevel;

src/pocketmine/event/entity/EntityMotionEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\math\Vector3;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityMotionEvent extends EntityEvent implements Cancellable{
 	/** @var Vector3 */
 	private $mot;

src/pocketmine/event/entity/EntityRegainHealthEvent.php

@@ -26,6 +26,9 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityRegainHealthEvent extends EntityEvent implements Cancellable{
 	public const CAUSE_REGEN = 0;
 	public const CAUSE_EATING = 1;

src/pocketmine/event/entity/EntityShootBowEvent.php

@@ -30,6 +30,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
 use function count;
 
+/**
+ * @phpstan-extends EntityEvent<Living>
+ */
 class EntityShootBowEvent extends EntityEvent implements Cancellable{
 	/** @var Item */
 	private $bow;

src/pocketmine/event/entity/EntitySpawnEvent.php

@@ -33,6 +33,7 @@ use pocketmine\level\Position;
 
 /**
  * Called when a entity is spawned
+ * @phpstan-extends EntityEvent<Entity>
  */
 class EntitySpawnEvent extends EntityEvent{
 	/** @var int */

src/pocketmine/event/entity/EntityTeleportEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
 use pocketmine\level\Position;
 
+/**
+ * @phpstan-extends EntityEvent<Entity>
+ */
 class EntityTeleportEvent extends EntityEvent implements Cancellable{
 	/** @var Position */
 	private $from;

src/pocketmine/event/entity/ExplosionPrimeEvent.php

@@ -28,6 +28,7 @@ use pocketmine\event\Cancellable;
 
 /**
  * Called when a entity decides to explode
+ * @phpstan-extends EntityEvent<Entity>
  */
 class ExplosionPrimeEvent extends EntityEvent implements Cancellable{
 	/** @var float */

src/pocketmine/event/entity/ItemDespawnEvent.php

@@ -26,6 +26,9 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\object\ItemEntity;
 use pocketmine\event\Cancellable;
 
+/**
+ * @phpstan-extends EntityEvent<ItemEntity>
+ */
 class ItemDespawnEvent extends EntityEvent implements Cancellable{
 
 	public function __construct(ItemEntity $item){

src/pocketmine/event/entity/ItemSpawnEvent.php

@@ -25,6 +25,9 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\object\ItemEntity;
 
+/**
+ * @phpstan-extends EntityEvent<ItemEntity>
+ */
 class ItemSpawnEvent extends EntityEvent{
 
 	public function __construct(ItemEntity $item){

src/pocketmine/event/entity/ProjectileHitEvent.php

@@ -28,6 +28,7 @@ use pocketmine\math\RayTraceResult;
 
 /**
  * @allowHandle
+ * @phpstan-extends EntityEvent<Projectile>
  */
 abstract class ProjectileHitEvent extends EntityEvent{
 	/** @var RayTraceResult */

src/pocketmine/event/entity/ProjectileLaunchEvent.php

@@ -26,6 +26,9 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
 
+/**
+ * @phpstan-extends EntityEvent<Projectile>
+ */
 class ProjectileLaunchEvent extends EntityEvent implements Cancellable{
 	public function __construct(Projectile $entity){
 		$this->entity = $entity;

src/pocketmine/event/inventory/FurnaceBurnEvent.php

@@ -28,6 +28,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
 use pocketmine\tile\Furnace;
 
+/**
+ * Called when a furnace is about to consume a new fuel item.
+ */
 class FurnaceBurnEvent extends BlockEvent implements Cancellable{
 	/** @var Furnace */
 	private $furnace;
@@ -53,18 +56,31 @@ class FurnaceBurnEvent extends BlockEvent implements Cancellable{
 		return $this->fuel;
 	}
 
+	/**
+	 * Returns the number of ticks that the furnace will be powered for.
+	 */
 	public function getBurnTime() : int{
 		return $this->burnTime;
 	}
 
+	/**
+	 * Sets the number of ticks that the given fuel will power the furnace for.
+	 */
 	public function setBurnTime(int $burnTime) : void{
 		$this->burnTime = $burnTime;
 	}
 
+	/**
+	 * Returns whether the fuel item will be consumed.
+	 */
 	public function isBurning() : bool{
 		return $this->burning;
 	}
 
+	/**
+	 * Sets whether the fuel will be consumed. If false, the furnace will smelt as if it consumed fuel, but no fuel
+	 * will be deducted.
+	 */
 	public function setBurning(bool $burning) : void{
 		$this->burning = $burning;
 	}

src/pocketmine/event/player/PlayerChatEvent.php

@@ -28,6 +28,7 @@ use pocketmine\event\Cancellable;
 use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
+use pocketmine\utils\Utils;
 use function spl_object_id;
 
 /**
@@ -97,6 +98,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	 * @param CommandSender[] $recipients
 	 */
 	public function setRecipients(array $recipients) : void{
+		Utils::validateArrayValueType($recipients, function(CommandSender $_) : void{});
 		$this->recipients = $recipients;
 	}
 }

src/pocketmine/event/player/PlayerCreationEvent.php

@@ -39,14 +39,22 @@ class PlayerCreationEvent extends Event{
 	/** @var int */
 	private $port;
 
-	/** @var string */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<Player>
+	 */
 	private $baseClass;
-	/** @var string */
+	/**
+	 * @var string
+	 * @phpstan-var class-string<Player>
+	 */
 	private $playerClass;
 
 	/**
 	 * @param string          $baseClass
 	 * @param string          $playerClass
+	 * @phpstan-param class-string<Player> $baseClass
+	 * @phpstan-param class-string<Player> $playerClass
 	 */
 	public function __construct(SourceInterface $interface, $baseClass, $playerClass, string $address, int $port){
 		$this->interface = $interface;
@@ -80,6 +88,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @return string
+	 * @phpstan-return class-string<Player>
 	 */
 	public function getBaseClass(){
 		return $this->baseClass;
@@ -87,6 +96,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @param string $class
+	 * @phpstan-param class-string<Player> $class
 	 *
 	 * @return void
 	 */
@@ -100,6 +110,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @return string
+	 * @phpstan-return class-string<Player>
 	 */
 	public function getPlayerClass(){
 		return $this->playerClass;
@@ -107,6 +118,7 @@ class PlayerCreationEvent extends Event{
 
 	/**
 	 * @param string $class
+	 * @phpstan-param class-string<Player> $class
 	 *
 	 * @return void
 	 */

src/pocketmine/event/player/PlayerExhaustEvent.php

@@ -27,6 +27,9 @@ use pocketmine\entity\Human;
 use pocketmine\event\Cancellable;
 use pocketmine\event\entity\EntityEvent;
 
+/**
+ * @phpstan-extends EntityEvent<Human>
+ */
 class PlayerExhaustEvent extends EntityEvent implements Cancellable{
 	public const CAUSE_ATTACK = 1;
 	public const CAUSE_DAMAGE = 2;

src/pocketmine/event/player/PlayerExperienceChangeEvent.php

@@ -29,6 +29,7 @@ use pocketmine\event\entity\EntityEvent;
 
 /**
  * Called when a player gains or loses XP levels and/or progress.
+ * @phpstan-extends EntityEvent<Human>
  */
 class PlayerExperienceChangeEvent extends EntityEvent implements Cancellable{
 	/** @var Human */

src/pocketmine/event/player/PlayerRespawnEvent.php

@@ -43,6 +43,9 @@ class PlayerRespawnEvent extends PlayerEvent{
 	}
 
 	public function setRespawnPosition(Position $position) : void{
+		if(!$position->isValid()){
+			throw new \InvalidArgumentException("Spawn position must reference a valid and loaded World");
+		}
 		$this->position = $position;
 	}
 }

src/pocketmine/event/server/QueryRegenerateEvent.php

@@ -27,6 +27,7 @@ use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
 use pocketmine\utils\Binary;
+use pocketmine\utils\Utils;
 use function chr;
 use function count;
 use function str_replace;
@@ -76,7 +77,7 @@ class QueryRegenerateEvent extends ServerEvent{
 
 	public function __construct(Server $server){
 		$this->serverName = $server->getMotd();
-		$this->listPlugins = $server->getProperty("settings.query-plugins", true);
+		$this->listPlugins = (bool) $server->getProperty("settings.query-plugins", true);
 		$this->plugins = $server->getPluginManager()->getPlugins();
 		$this->players = [];
 		foreach($server->getOnlinePlayers() as $player){
@@ -145,6 +146,7 @@ class QueryRegenerateEvent extends ServerEvent{
 	 * @param Plugin[] $plugins
 	 */
 	public function setPlugins(array $plugins) : void{
+		Utils::validateArrayValueType($plugins, function(Plugin $_) : void{});
 		$this->plugins = $plugins;
 		$this->destroyCache();
 	}
@@ -160,6 +162,7 @@ class QueryRegenerateEvent extends ServerEvent{
 	 * @param Player[] $players
 	 */
 	public function setPlayerList(array $players) : void{
+		Utils::validateArrayValueType($players, function(Player $_) : void{});
 		$this->players = $players;
 		$this->destroyCache();
 	}

src/pocketmine/inventory/ArmorInventory.php

@@ -28,7 +28,9 @@ use pocketmine\item\Item;
 use pocketmine\network\mcpe\protocol\InventoryContentPacket;
 use pocketmine\network\mcpe\protocol\InventorySlotPacket;
 use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\Player;
+use function array_map;
 use function array_merge;
 
 class ArmorInventory extends BaseInventory{
@@ -96,10 +98,10 @@ class ArmorInventory extends BaseInventory{
 
 		$pk = new MobArmorEquipmentPacket();
 		$pk->entityRuntimeId = $this->getHolder()->getId();
-		$pk->head = $this->getHelmet();
-		$pk->chest = $this->getChestplate();
-		$pk->legs = $this->getLeggings();
-		$pk->feet = $this->getBoots();
+		$pk->head = ItemStackWrapper::legacy($this->getHelmet());
+		$pk->chest = ItemStackWrapper::legacy($this->getChestplate());
+		$pk->legs = ItemStackWrapper::legacy($this->getLeggings());
+		$pk->feet = ItemStackWrapper::legacy($this->getBoots());
 		$pk->encode();
 
 		foreach($target as $player){
@@ -109,7 +111,7 @@ class ArmorInventory extends BaseInventory{
 				$pk2 = new InventorySlotPacket();
 				$pk2->windowId = $player->getWindowId($this);
 				$pk2->inventorySlot = $index;
-				$pk2->item = $this->getItem($index);
+				$pk2->item = ItemStackWrapper::legacy($this->getItem($index));
 				$player->dataPacket($pk2);
 			}else{
 				$player->dataPacket($pk);
@@ -124,17 +126,17 @@ class ArmorInventory extends BaseInventory{
 
 		$pk = new MobArmorEquipmentPacket();
 		$pk->entityRuntimeId = $this->getHolder()->getId();
-		$pk->head = $this->getHelmet();
-		$pk->chest = $this->getChestplate();
-		$pk->legs = $this->getLeggings();
-		$pk->feet = $this->getBoots();
+		$pk->head = ItemStackWrapper::legacy($this->getHelmet());
+		$pk->chest = ItemStackWrapper::legacy($this->getChestplate());
+		$pk->legs = ItemStackWrapper::legacy($this->getLeggings());
+		$pk->feet = ItemStackWrapper::legacy($this->getBoots());
 		$pk->encode();
 
 		foreach($target as $player){
 			if($player === $this->getHolder()){
 				$pk2 = new InventoryContentPacket();
 				$pk2->windowId = $player->getWindowId($this);
-				$pk2->items = $this->getContents(true);
+				$pk2->items = array_map([ItemStackWrapper::class, 'legacy'], $this->getContents(true));
 				$player->dataPacket($pk2);
 			}else{
 				$player->dataPacket($pk);

src/pocketmine/inventory/BaseInventory.php

@@ -31,7 +31,9 @@ use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\InventoryContentPacket;
 use pocketmine\network\mcpe\protocol\InventorySlotPacket;
 use pocketmine\network\mcpe\protocol\types\ContainerIds;
+use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
 use pocketmine\Player;
+use function array_map;
 use function array_slice;
 use function count;
 use function max;
@@ -53,7 +55,7 @@ abstract class BaseInventory implements Inventory{
 	protected $slots;
 	/** @var Player[] */
 	protected $viewers = [];
-	/** @var InventoryEventProcessor */
+	/** @var InventoryEventProcessor|null */
 	protected $eventProcessor;
 
 	/**
@@ -250,11 +252,11 @@ abstract class BaseInventory implements Inventory{
 		for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
 			$slot = $this->getItem($i);
 			if($item->equals($slot)){
-				if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){
+				if(($diff = min($slot->getMaxStackSize(), $item->getMaxStackSize()) - $slot->getCount()) > 0){
 					$count -= $diff;
 				}
 			}elseif($slot->isNull()){
-				$count -= $this->getMaxStackSize();
+				$count -= min($this->getMaxStackSize(), $item->getMaxStackSize());
 			}
 
 			if($count <= 0){
@@ -433,7 +435,7 @@ abstract class BaseInventory implements Inventory{
 		}
 
 		$pk = new InventoryContentPacket();
-		$pk->items = $this->getContents(true);
+		$pk->items = array_map([ItemStackWrapper::class, 'legacy'], $this->getContents(true));
 
 		foreach($target as $player){
 			if(($id = $player->getWindowId($this)) === ContainerIds::NONE){
@@ -455,7 +457,7 @@ abstract class BaseInventory implements Inventory{
 
 		$pk = new InventorySlotPacket();
 		$pk->inventorySlot = $index;
-		$pk->item = $this->getItem($index);
+		$pk->item = ItemStackWrapper::legacy($this->getItem($index));
 
 		foreach($target as $player){
 			if(($id = $player->getWindowId($this)) === ContainerIds::NONE){

src/pocketmine/inventory/ContainerInventory.php

@@ -64,6 +64,7 @@ abstract class ContainerInventory extends BaseInventory{
 	public function onClose(Player $who) : void{
 		$pk = new ContainerClosePacket();
 		$pk->windowId = $who->getWindowId($this);
+		$pk->server = $who->getClosingWindowId() !== $pk->windowId;
 		$who->dataPacket($pk);
 		parent::onClose($who);
 	}