Release 3.12.1

broken userdata isn't a core bug, so it shouldn't be flooding our crash archives.

.gitignore

@@ -13,6 +13,7 @@ server.properties
 memory_dumps/*
 resource_packs/
 server.lock
+/phpstan.neon
 
 # Common IDEs
 .idea/

.gitmodules

@@ -7,9 +7,9 @@
 [submodule "tests/plugins/PocketMine-DevTools"]
 	path = tests/plugins/PocketMine-DevTools
 	url = https://github.com/pmmp/PocketMine-DevTools.git
-[submodule "src/pocketmine/resources/vanilla"]
-	path = src/pocketmine/resources/vanilla
-	url = https://github.com/pmmp/BedrockData.git
 [submodule "build/php"]
 	path = build/php
 	url = https://github.com/pmmp/php-build-scripts.git
+[submodule "src/pocketmine/resources/vanilla"]
+	path = src/pocketmine/resources/vanilla
+	url = https://github.com/pmmp/BedrockData.git

.travis.yml

@@ -5,21 +5,30 @@ php:
  - 7.3
 
 before_script:
+ - phpenv config-rm xdebug.ini
 # - pecl install channel://pecl.php.net/pthreads-3.1.6
  - echo | pecl install channel://pecl.php.net/yaml-2.0.4
  - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 6ca019c58b4fa09ee2ff490f2444e34bef0773d0
+ - git checkout 1b7da492b944146fa9680f6399bd9c6c6c6095e0
  - phpize
  - ./configure
  - make
  - make install
  - cd ..
  - echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - composer install
 
 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

@@ -0,0 +1,38 @@
+# Building
+## Pre-requisites
+- A bash shell (git bash is sufficient for Windows)
+- [`git`](https://git-scm.com) available in your shell
+- PHP 7.2 or newer available in your shell
+- [`composer`](https://getcomposer.org) available in your shell
+
+## 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)
+- [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`.
+
+## Setting up environment
+1. `git clone --recursive https://github.com/pmmp/PocketMine-MP.git`
+2. `composer install`
+
+## Checking out a different branch to build
+1. `git checkout <branch to checkout>`
+2. `git submodule update --init`
+3. Re-run `composer install` to synchronize dependencies.
+
+## Optimizing for release builds
+1. Add the flags `--no-dev --classmap-authoritative` to your `composer install` command. This will reduce build size and improve autoloading speed.
+2. Preprocess the source code by running `build/preprocessor/PreProcessor.php`. Usage instructions are provided in `build/preprocessor/README.md`.
+
+### Note
+Preprocessor requires that the `cpp` (c preprocessor) is available in your PATH.
+
+## Building `PocketMine-MP.phar`
+Run `build/server.phar` 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.
+
+## Running PocketMine-MP from source code
+Run `src/pocketmine/PocketMine.php` using your preferred PHP binary.

README.md

@@ -5,25 +5,28 @@
 
 [![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
 
-### Getting started
+## Getting started
 - [Documentation](http://pmmp.readthedocs.org/)
 - [Installation instructions](https://pmmp.readthedocs.io/en/rtfd/installation.html)
 - [Docker image](https://hub.docker.com/r/pmmp/pocketmine-mp)
 - [Plugin repository](https://poggit.pmmp.io/plugins)
 
-### Discussion
+## Discussion/Help
 - [Forums](https://forums.pmmp.io/)
-- [Community Discord](https://discord.gg/bmSAZBG)
+- [Discord](https://discord.gg/bmSAZBG)
+- [StackOverflow](https://stackoverflow.com/tags/pocketmine)
 
-### For developers
+## For developers
+ * [Building and running from source](BUILDING.md)
  * [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
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  * [Contributing Guidelines](CONTRIBUTING.md)
 
-### Donate
+## Donate
 - Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear`
 - Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
+- Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`
 - [Patreon](https://www.patreon.com/pocketminemp)
 
 ## Licensing information

build/make-release.php

@@ -21,14 +21,13 @@
 
 declare(strict_types=1);
 
-namespace pocketmine\build_script;
+namespace pocketmine\build\make_release;
 
 use pocketmine\utils\VersionString;
 use function dirname;
 use function fgets;
 use function file_get_contents;
 use function file_put_contents;
-use function preg_quote;
 use function preg_replace;
 use function sleep;
 use function sprintf;
@@ -36,20 +35,8 @@ use function system;
 use const pocketmine\BASE_VERSION;
 use const STDIN;
 
-require_once dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 
-if(isset($argv[1])){
-	$currentVer = new VersionString($argv[1]);
-}else{
-	$currentVer = new VersionString(BASE_VERSION);
-}
-$nextVer = new VersionString(sprintf(
-	"%u.%u.%u",
-	$currentVer->getMajor(),
-	$currentVer->getMinor(),
-	$currentVer->getPatch() + 1
-));
 
 function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev) : void{
 	$versionInfo = file_get_contents($versionInfoPath);
@@ -60,22 +47,45 @@ function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev
 	);
 	$versionInfo = preg_replace(
 		'/^const IS_DEVELOPMENT_BUILD = (?:true|false);$/m',
-		'const IS_DEVELOPMENT_BUILD = ' . ($isDev ? 'true' : 'false'). ';',
+		'const IS_DEVELOPMENT_BUILD = ' . ($isDev ? 'true' : 'false') . ';',
 		$versionInfo
 	);
 	file_put_contents($versionInfoPath, $versionInfo);
 }
-$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"');
-system('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"');
-system('git tag ' . $currentVer->getBaseVersion());
-replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true);
-system('git add "' . $versionInfoPath . '"');
-system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
-echo "pushing changes in 10 seconds\n";
-sleep(10);
-system('git push origin HEAD ' . $currentVer->getBaseVersion());
+/**
+ * @param string[] $argv
+ * @phpstan-param list<string> $argv
+ */
+function main(array $argv) : void{
+	if(isset($argv[1])){
+		$currentVer = new VersionString($argv[1]);
+	}else{
+		$currentVer = new VersionString(BASE_VERSION);
+	}
+	$nextVer = new VersionString(sprintf(
+		"%u.%u.%u",
+		$currentVer->getMajor(),
+		$currentVer->getMinor(),
+		$currentVer->getPatch() + 1
+	));
+
+	$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"');
+	system('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"');
+	system('git tag ' . $currentVer->getBaseVersion());
+	replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true);
+	system('git add "' . $versionInfoPath . '"');
+	system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
+	echo "pushing changes in 5 seconds\n";
+	sleep(5);
+	system('git push origin HEAD ' . $currentVer->getBaseVersion());
+}
+
+if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+	main($argv);
+}

build/server-phar.php

@@ -0,0 +1,174 @@
+<?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\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;
+use function getopt;
+use function implode;
+use function ini_get;
+use function microtime;
+use function preg_quote;
+use function realpath;
+use function round;
+use function rtrim;
+use function sprintf;
+use function str_replace;
+use function unlink;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+/**
+ * @param string[]    $strings
+ *
+ * @return string[]
+ */
+function preg_quote_array(array $strings, string $delim = null) : array{
+	return array_map(function(string $str) use ($delim) : string{ return preg_quote($str, $delim); }, $strings);
+}
+
+/**
+ * @param string[] $includedPaths
+ * @param mixed[]  $metadata
+ * @phpstan-param array<string, mixed> $metadata
+ *
+ * @return \Generator|string[]
+ */
+function buildPhar(string $pharPath, string $basePath, array $includedPaths, array $metadata, string $stub, int $signatureAlgo = \Phar::SHA1, ?int $compression = null){
+	$basePath = rtrim(str_replace("/", DIRECTORY_SEPARATOR, $basePath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+	$includedPaths = array_map(function(string $path) : string{
+		return rtrim(str_replace("/", DIRECTORY_SEPARATOR, $path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+	}, $includedPaths);
+	yield "Creating output file $pharPath";
+	if(file_exists($pharPath)){
+		yield "Phar file already exists, overwriting...";
+		try{
+			\Phar::unlinkArchive($pharPath);
+		}catch(\PharException $e){
+			//unlinkArchive() doesn't like dodgy phars
+			unlink($pharPath);
+		}
+	}
+
+	yield "Adding files...";
+
+	$start = microtime(true);
+	$phar = new \Phar($pharPath);
+	$phar->setMetadata($metadata);
+	$phar->setStub($stub);
+	$phar->setSignatureAlgorithm($signatureAlgo);
+	$phar->startBuffering();
+
+	//If paths contain any of these, they will be excluded
+	$excludedSubstrings = preg_quote_array([
+		realpath($pharPath), //don't add the phar to itself
+	], '/');
+
+	$folderPatterns = preg_quote_array([
+		DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR,
+		DIRECTORY_SEPARATOR . '.' //"Hidden" files, git dirs etc
+	], '/');
+
+	//Only exclude these within the basedir, otherwise the project won't get built if it itself is in a directory that matches these patterns
+	$basePattern = preg_quote(rtrim($basePath, DIRECTORY_SEPARATOR), '/');
+	foreach($folderPatterns as $p){
+		$excludedSubstrings[] = $basePattern . '.*' . $p;
+	}
+
+	$regex = sprintf('/^(?!.*(%s))^%s(%s).*/i',
+		 implode('|', $excludedSubstrings), //String may not contain any of these substrings
+		 preg_quote($basePath, '/'), //String must start with this path...
+		 implode('|', preg_quote_array($includedPaths, '/')) //... and must be followed by one of these relative paths, if any were specified. If none, this will produce a null capturing group which will allow anything.
+	);
+
+	$directory = new \RecursiveDirectoryIterator($basePath, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS | \FilesystemIterator::CURRENT_AS_PATHNAME); //can't use fileinfo because of symlinks
+	$iterator = new \RecursiveIteratorIterator($directory);
+	$regexIterator = new \RegexIterator($iterator, $regex);
+
+	$count = count($phar->buildFromIterator($regexIterator, $basePath));
+	yield "Added $count files";
+
+	if($compression !== null){
+		yield "Compressing files...";
+		$phar->compressFiles($compression);
+		yield "Finished compression";
+	}
+	$phar->stopBuffering();
+
+	yield "Done in " . round(microtime(true) - $start, 3) . "s";
+}
+
+function main() : void{
+	if(ini_get("phar.readonly") == 1){
+		echo "Set phar.readonly to 0 with -dphar.readonly=0" . PHP_EOL;
+		exit(1);
+	}
+
+	$opts = getopt("", ["out:", "git:"]);
+	if(isset($opts["git"])){
+		$gitHash = $opts["git"];
+	}else{
+		$gitHash = Git::getRepositoryStatePretty(dirname(__DIR__));
+		echo "Git hash detected as $gitHash" . PHP_EOL;
+	}
+	foreach(buildPhar(
+		$opts["out"] ?? getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar",
+		dirname(__DIR__) . DIRECTORY_SEPARATOR,
+		[
+			'src',
+			'vendor'
+		],
+		[
+			'git' => $gitHash
+		],
+		<<<'STUB'
+<?php
+
+$tmpDir = sys_get_temp_dir();
+if(!is_readable($tmpDir) or !is_writable($tmpDir)){
+	echo "ERROR: tmpdir $tmpDir is not accessible." . PHP_EOL;
+	echo "Check that the directory exists, and that the current user has read/write permissions for it." . PHP_EOL;
+	echo "Alternatively, set 'sys_temp_dir' to a different directory in your php.ini file." . PHP_EOL;
+	exit(1);
+}
+
+require("phar://" . __FILE__ . "/src/pocketmine/PocketMine.php");
+__HALT_COMPILER();
+STUB
+,
+		\Phar::SHA1,
+		\Phar::GZ
+	) as $line){
+		echo $line . PHP_EOL;
+	}
+}
+
+if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+	main();
+}

changelogs/3.10.md

@@ -0,0 +1,20 @@
+**For Minecraft: Bedrock Edition 1.13.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.10.0
+- Added support for Minecraft: Bedrock Edition 1.13.0
+- Removed compatibility with 1.12.0
+
+## Note about skins
+PocketMine-MP **does not support skins made in the Charactor Creator** (known as Persona skins), due to technical changes which would require premature backwards compatibility breaks. The dev team has decided not to support Persona yet.
+These skins will be **replaced with a random solid-colour skin. This is not a bug.**
+Skins chosen from the Classic tab (classic skins) will continue to work as normal.
+
+# 3.10.1
+- Fixed custom plugin-created skins being invisible when no geometry name was specified.
+- Updated RakLib to 0.12.6 to fix security bugs.

changelogs/3.11.md

@@ -0,0 +1,97 @@
+**For Minecraft: Bedrock Edition 1.14.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.11.0
+- Added support for Minecraft: Bedrock Edition 1.14.0
+- Removed compatibility with 1.13.0
+
+# 3.11.1
+- Fixed blocks with incorrect properties when placed or interacted with.
+
+# 3.11.2
+## Core
+- PHPStan 0.12.3 with level 5 is now used for automated static analysis.
+- Fixed a possible crash when plugins override the `EnderChest` tile class with something incompatible.
+- Fixed disconnected players being considered as never played.
+- Fixed enchantments with IDs outside the range 0-255 in item NBT crashing the server.
+- Fixed particles rendering incorrectly.
+- Timings handlers are no longer able to underflow; they now throw exceptions when attempting to be stopped more times than they were started.
+- Fixed explosion rays getting stuck in empty subchunks (possible incorrect behaviour in large caves).
+- Fixed bad tile/entity NBT data being propagated from world providers in some cases.
+- Fixed a possible crash when detecting timezone on CentOS.
+- Fixed many cases of incorrectly documented types in the API found by PHPStan.
+- Generation tasks no longer assume that generator instances stored in TLS are always valid, fixing a possible crash.
+
+## Protocol
+- Fixed skin animation image corruption in LoginPacket handling caused by incorrect data handling.
+- Fixed skin animation extra data not being decoded from LoginPacket.
+- `SkinImage` now throws `InvalidArgumentException` if it receives an unexpected amount of bytes for the given image heigh/width.
+- Fixed broken code in `PlayerAuthInputPacket::create()`.
+- Removed some dead constants from `NetworkInventoryAction`.
+
+# 3.11.3
+- Fixed some PHPStan false-positives in release builds.
+- Git hash is now correctly detected for source builds when the working directory is not the repository root.
+- Added a specialized build script `build/server-phar.php` for creating server phars.
+- Fixed timings crashing the server.
+- Timings chains now work correctly.
+- Fixed some minor timing errors in chained timings.
+- Forcing resource packs no longer causes removal of client-sided resource packs. If this behaviour is desired, use a vanilla resource pack at the bottom of your resource stack (as was necessary for non-forced packs).
+- Added documentation to the API to clarify that effect durations are in ticks.
+
+# 3.11.4
+- Fixed performance issue in leaf decay.
+- Fixed entity position desync when entities stop moving, but still have velocity on the client.
+- Fixed a crash when encountering truncated `level.dat` files in LevelDB worlds.
+- Core code is now analyzed using PHPStan level 6.
+- The core constants `pocketmine\PATH` and `pocketmine\RESOURCE_PATH` are now unconditionally available when including the Composer autoloader.
+- Populate type information in lots of places where it was previously missing; this will improve the quality of static analysis for plugins.
+- `MainLogger::logException()` now logs previous exceptions recursively.
+- `MainLogger::logException()` now always logs exceptions as `critical`.
+
+# 3.11.5
+- PHPStan and PHPUnit are now managed as Composer dev dependencies.
+- Core code is now analyzed using PHPStan level 6 (full, including iterable types checking).
+- Improved type information available to PHPStan in many areas.
+- Mass-removal of useless PHPDoc.
+- Fixed incorrect documentation of `Internet::getURL()`, `Internet::postURL()` and `Internet::simpleCurl()`.
+- Fixed crash on use of case-mismatched recursive command aliases.
+- Basic build instructions are now provided in `BUILDING.md`.
+- `build/server-phar.php` now uses GZIP compression on created phars, providing a 75% size reduction.
+- `ClientboundMapItemDataPacket` now uses `MapDecoration` objects for decorations instead of associative arrays.
+- Updated Composer dependencies to get bug fixes in `pocketmine/nbt` and other libraries.
+- Packages `pocketmine/classloader` and `pocketmine/log` are now required; these provide classes previously part of `pocketmine/spl`. This change has no effect on API compatibility.
+
+# 3.11.6
+- Core code, tests and build scripts are now analyzed using `phpstan-strict-rules` and `phpstan-phpunit` rules.
+- Added more PHPStan-specific type annotations to improve static analysis.
+- Fixed more incorrect PHPDoc types.
+- Added a workaround for player movement not working since 1.14.30.
+- Fixed lava and water buckets being edible since 1.13.
+- `AutoUpdater` is now created before any plugins are loaded.
+- Fixed trees not generating below y=2 in custom generators.
+- Fixed crash when opening a chest improperly unpaired from its pair (destroyed, setBlock(), unloaded, etc.).
+- `ThreadManager` is now lazily initialized.
+- Removed raw NBT storage from `Item` internals. The following methods are now deprecated:
+  - `Item::setCompoundTag()`
+
+# 3.11.7
+- Build system: Fixed crash reports of Jenkins builds being rejected by the crash archive as invalid.
+- Introduced a new dependency on `pocketmine/log-pthreads`, which contains classes separated from `pocketmine/log`.
+- Fixed minimum composer stability preventing any newer version of `pocketmine/pocketmine-mp` being installed than 3.3.4 by replacing `daverandom/callback-validator` with [`pocketmine/callback-validator`](https://github.com/pmmp/CallbackValidator).
+- Fixed every player seeing eating particles when any player eats.
+- Fixed setting held item not working during `BlockBreakEvent`, `PlayerInteractEvent` and `EntityDamageEvent`.
+- Fixed some incorrect documented types in `PlayerQuitEvent` reported by PHPStan.
+- Fixed documentation of `Item->pop()` return value.
+- Fixed server crash on encountering corrupted compressed data stored in region files.
+- Protocol: Split screen header is now properly accounted for during decoding. Note that split screen is still not supported natively, but their packets can be decoded properly now.
+- Protocol: Fixed wrong order of fields in `UpdateTradePacket`.
+- Protocol: Fixed loss of `fullSkinId` when decoding network skins.
+- Fixed RCON not being able to bind to port after a fast server restart.
+
+

changelogs/3.12.md

@@ -0,0 +1,18 @@
+**For Minecraft: Bedrock Edition 1.14.60**
+
+### 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.12.0
+- Added support for Minecraft: Bedrock Edition 1.14.60
+- Removed compatibility with 1.14.0-1.14.30
+
+# 3.12.1
+- Fixed parsing of single-line doc comments for event handlers, e.g. `/** @ignoreCancelled */` should now work correctly.
+- The server will no longer crash on failure to load `level.dat` contents, but will gracefully shutdown instead without producing a crashdump.
+- Fixed some bugs in login verification that could cause undefined behaviour.
+- Fixed item-use behaviour when sneaking - sneaking and clicking a block with an empty hand, and sneaking and using an item, both now follow vanilla behaviour.
+- `start.sh` will now work on platforms where `/bin/bash` is not available, as long as `/usr/bin/env` knows where bash is.

changelogs/3.9.md

@@ -69,3 +69,61 @@ Plugin developers should **only** update their required API to this version if y
   - `Entity->despawnFromAll()`
 - Fixed plugin `softdepend` not influencing load order when a soft-depended plugin had an unresolved soft dependency of its own.
 - Fixed endless falling of sand on top of fences.
+
+# 3.9.5
+- Fixed some issues with multiple consecutive commas inside quotes in form responses.
+- Fixed server crash when the manifest json does not contain a json object in a resource pack.
+- Ender pearls no longer collide with blocks that do not have any collision boxes.
+
+# 3.9.6
+- Updated Composer dependencies to their latest versions.
+- Prevent clients repeating the resource pack sequence. This fixes error spam with bugged 1.12 clients.
+- `Internet::simpleCurl()` now includes the PocketMine-MP version in the user-agent string.
+- Spawn protection is now disabled by default in the setup wizard.
+- Default difficulty is now NORMAL(2) instead of EASY(1).
+- Fixed crashing on corrupted world manifest and unsupported world formats.
+- Fixed `/transferserver` being usable without appropriate permissions.
+- `RegionLoader->removeChunk()` now writes the region header as appropriate.
+- Fixed performance issue when loading large regions (bug in header validation).
+- Fixed skin geometry being removed when the JSON contained comments.
+- Added new constants to `EventPacket`.
+- Added encode/decode for `StructureTemplateDataExportRequestPacket` and `StructureTemplateDataExportResponsePacket`.
+- Fixed broken type asserts in `LevelChunkPacket::withCache()` and `ClientCacheMissResponsePacket::create()`.
+- `types\CommandParameter` field `byte1` has been renamed to `flags`.
+- Cleaned up public interface of `AvailableCommandsPacket`, removing fields which exposed details of the encoding scheme.
+- Improved documentation for the following API methods:
+  - `pocketmine\item\Item`:
+    - `addCreativeItem()`
+    - `removeCreativeItem()`
+    - `clearCreativeItems()`
+  - `pocketmine\level\Explosion`:
+    - `explodeA()`
+    - `explodeB()`
+- Fixed various cosmetic documentation inconsistencies in the core and dependencies.
+
+# 3.9.7
+- Fixed a crash that could occur during timezone detection.
+- Squid no longer spin around constantly in enclosed spaces. Their performance impact is reduced.
+- Cleaned up the bootstrap file.
+
+# 3.9.8
+- Added [PHPStan](https://github.com/phpstan/phpstan) configuration. PHPStan is now used on CI for automated QA, which should improve stability and quality going forward.
+- The following constants are now autoloaded when loading the Composer autoloader:
+  - `pocketmine\NAME`
+  - `pocketmine\BASE_VERSION`
+  - `pocketmine\IS_DEVELOPMENT_BUILD`
+  - `pocketmine\BUILD_NUMBER`
+  - `INT32_MIN`
+  - `INT32_MAX`
+  - `INT32_MASK`
+- Fixed memory leaks and crashes caused by plugin use of `Player->showPlayer()` and `Entity->spawnTo()`.
+- Fixed crashes that could occur when tile classes were overridden with classes incompatible with the originals.
+- Fixed improper handling of non-Compound root NBT tags on network itemstack decoding.
+- Fixed paintings dropping multiple items when destroyed by block updates.
+- Fixed `var_dump()` not showing private and protected properties of `DataPacket` subclasses.
+- Fixed overloads with zero arguments being missing when decoding `AvailableCommandsPacket`.
+- `CraftingDataPacket` now retains the `cleanRecipes` field when decoding.
+- Fixed `Block->getMetadata()` returning null (non-iterable).
+- `PlayerChatEvent` documentation has been updated to specify that `CommandSender` recipients are accepted. This behaviour was already present in previous versions, but incorrectly documented.
+- Fixed various issues with PHPDoc comments reported by PHPStan.
+- Fixed various minor code nits reported by PHPStan.

composer.json

@@ -24,49 +24,37 @@
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "^0.12.5",
-      "pocketmine/spl": "^0.3.0",
+      "pocketmine/raklib": "^0.12.7",
+      "pocketmine/spl": "^0.4.0",
       "pocketmine/binaryutils": "^0.1.9",
       "pocketmine/nbt": "^0.2.10",
       "pocketmine/math": "^0.2.0",
       "pocketmine/snooze": "^0.1.0",
-      "daverandom/callback-validator": "dev-master",
-      "adhocore/json-comment": "^0.0.7"
+      "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"
+   },
+   "require-dev": {
+      "phpstan/phpstan": "^0.12.25",
+      "irstea/phpunit-shim": "^8.5",
+      "phpstan/phpstan-phpunit": "^0.12.6",
+      "phpstan/phpstan-strict-rules": "^0.12.2"
    },
    "autoload": {
       "psr-4": {
          "": ["src"]
-      }
+      },
+      "files": [
+         "src/pocketmine/CoreConstants.php",
+         "src/pocketmine/GlobalConstants.php",
+         "src/pocketmine/VersionInfo.php"
+      ]
    },
    "autoload-dev": {
       "psr-4": {
          "pocketmine\\": "tests/phpunit/"
       }
-   },
-   "repositories": [
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/RakLib"
-      },
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/SPL"
-      },
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/BinaryUtils"
-      },
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/NBT"
-      },
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/Math"
-      },
-      {
-         "type": "vcs",
-         "url": "https://github.com/pmmp/Snooze"
-      }
-   ]
+   }
 }

composer.lock

@@ -4,27 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "377d9e0ab5f1a9a4ef9b664706d26f5b",
+    "content-hash": "f9441d6ef46bddf299b260c672bfa54b",
     "packages": [
         {
             "name": "adhocore/json-comment",
-            "version": "v0.0.7",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/adhocore/php-json-comment.git",
-                "reference": "135356c7e7336ef59924f1d921c770045f937a76"
+                "reference": "8448076039389f558f39ad0553aab87db3f81614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/135356c7e7336ef59924f1d921c770045f937a76",
-                "reference": "135356c7e7336ef59924f1d921c770045f937a76",
+                "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/8448076039389f558f39ad0553aab87db3f81614",
+                "reference": "8448076039389f558f39ad0553aab87db3f81614",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5"
+                "phpunit/phpunit": "^6.5 || ^7.5"
             },
             "type": "library",
             "autoload": {
@@ -48,28 +48,65 @@
                 "json",
                 "strip-comment"
             ],
-            "time": "2018-08-01T12:27:26+00:00"
+            "time": "2020-01-03T13:51:23+00:00"
         },
         {
-            "name": "daverandom/callback-validator",
-            "version": "dev-master",
+            "name": "pocketmine/binaryutils",
+            "version": "0.1.11",
             "source": {
                 "type": "git",
-                "url": "https://github.com/DaveRandom/CallbackValidator.git",
-                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f"
+                "url": "https://github.com/pmmp/BinaryUtils.git",
+                "reference": "e8cb65db1b7998eebb739b124f2a989fe87366eb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DaveRandom/CallbackValidator/zipball/d87a08cddbc6099816ed01e50ce25cdfc43b542f",
-                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/e8cb65db1b7998eebb739b124f2a989fe87366eb",
+                "reference": "e8cb65db1b7998eebb739b124f2a989fe87366eb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "php-64bit": "*"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\utils\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Classes and methods for conveniently handling binary data",
+            "time": "2020-01-28T12:09:56+00:00"
+        },
+        {
+            "name": "pocketmine/callback-validator",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/CallbackValidator.git",
+                "reference": "4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/CallbackValidator/zipball/4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a",
+                "reference": "4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a",
                 "shasum": ""
             },
             "require": {
                 "ext-reflection": "*",
-                "php": ">=7.0"
+                "php": ">=7.1"
+            },
+            "replace": {
+                "daverandom/callback-validator": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
             "type": "library",
             "autoload": {
@@ -87,89 +124,168 @@
                     "email": "cw@daverandom.com"
                 }
             ],
-            "description": "Tools for validating callback signatures",
-            "time": "2017-04-03T15:22:41+00:00"
+            "description": "Fork of daverandom/callback-validator - Tools for validating callback signatures",
+            "time": "2020-03-17T12:04:22+00:00"
         },
         {
-            "name": "pocketmine/binaryutils",
-            "version": "0.1.9",
+            "name": "pocketmine/classloader",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "8b3b1160679398387cb896fd5d06018413437dfa"
+                "url": "https://github.com/pmmp/ClassLoader.git",
+                "reference": "4ccdb30e48f030bfcad04bb0a208d198ec631993"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/8b3b1160679398387cb896fd5d06018413437dfa",
-                "reference": "8b3b1160679398387cb896fd5d06018413437dfa",
+                "url": "https://api.github.com/repos/pmmp/ClassLoader/zipball/4ccdb30e48f030bfcad04bb0a208d198ec631993",
+                "reference": "4ccdb30e48f030bfcad04bb0a208d198ec631993",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2",
-                "php-64bit": "*"
+                "ext-pthreads": "~3.2.0",
+                "ext-reflection": "*",
+                "php": ">=7.2.0"
+            },
+            "conflict": {
+                "pocketmine/spl": "<0.4"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "pocketmine\\utils\\": "src/"
-                }
+                "classmap": [
+                    "./src"
+                ]
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0"
             ],
-            "description": "Classes and methods for conveniently handling binary data",
-            "support": {
-                "source": "https://github.com/pmmp/BinaryUtils/tree/0.1.9",
-                "issues": "https://github.com/pmmp/BinaryUtils/issues"
-            },
-            "time": "2019-07-22T13:15:53+00:00"
+            "description": "Ad-hoc autoloading components used by PocketMine-MP",
+            "time": "2020-01-31T14:25:52+00:00"
         },
         {
-            "name": "pocketmine/math",
-            "version": "0.2.2",
+            "name": "pocketmine/log",
+            "version": "0.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/Math.git",
-                "reference": "b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c"
+                "url": "https://github.com/pmmp/Log.git",
+                "reference": "e59bedb5d4bbeb9a26647cb7c367cb2fa72addfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Math/zipball/b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c",
-                "reference": "b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c",
+                "url": "https://api.github.com/repos/pmmp/Log/zipball/e59bedb5d4bbeb9a26647cb7c367cb2fa72addfa",
+                "reference": "e59bedb5d4bbeb9a26647cb7c367cb2fa72addfa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "conflict": {
+                "pocketmine/spl": "<0.4"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8",
+                "phpstan/phpstan-strict-rules": "^0.12.2"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Logging components used by PocketMine-MP and related projects",
+            "time": "2020-03-31T15:43:47+00:00"
+        },
+        {
+            "name": "pocketmine/log-pthreads",
+            "version": "0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/LogPthreads.git",
+                "reference": "9bbcef398b01487ab47c234a6a7054722abbe067"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/LogPthreads/zipball/9bbcef398b01487ab47c234a6a7054722abbe067",
+                "reference": "9bbcef398b01487ab47c234a6a7054722abbe067",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pthreads": "~3.2.0",
+                "php": ">=7.2",
+                "pocketmine/log": "^0.2.0"
+            },
+            "conflict": {
+                "pocketmine/spl": "<0.4"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.18"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "Logging components specialized for pthreads used by PocketMine-MP and related projects",
+            "time": "2020-03-31T16:17:19+00:00"
+        },
+        {
+            "name": "pocketmine/math",
+            "version": "0.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/Math.git",
+                "reference": "b1c28b236df8b795d7b06cf8421f9962b12ac410"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/b1c28b236df8b795d7b06cf8421f9962b12ac410",
+                "reference": "b1c28b236df8b795d7b06cf8421f9962b12ac410",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.0",
                 "php-64bit": "*"
             },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "pocketmine\\math\\": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0"
             ],
             "description": "PHP library containing math related code used in PocketMine-MP",
-            "support": {
-                "source": "https://github.com/pmmp/Math/tree/0.2.2",
-                "issues": "https://github.com/pmmp/Math/issues"
-            },
-            "time": "2019-01-04T15:42:36+00:00"
+            "time": "2020-01-28T14:11:54+00:00"
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.10",
+            "version": "0.2.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "2db27aebe7dc89772aaa8df53361eef801f60063"
+                "reference": "b31dca98443328c4bab76dc1b84c1473c79be20e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/2db27aebe7dc89772aaa8df53361eef801f60063",
-                "reference": "2db27aebe7dc89772aaa8df53361eef801f60063",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/b31dca98443328c4bab76dc1b84c1473c79be20e",
+                "reference": "b31dca98443328c4bab76dc1b84c1473c79be20e",
                 "shasum": ""
             },
             "require": {
@@ -178,51 +294,51 @@
                 "php-64bit": "*",
                 "pocketmine/binaryutils": "^0.1.9"
             },
+            "require-dev": {
+                "irstea/phpunit-shim": "^7.5 || ^8.0",
+                "phpstan/phpstan": "^0.12.11"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "pocketmine\\nbt\\": "src/"
                 }
             },
-            "autoload-dev": {
-                "psr-4": {
-                    "pocketmine\\nbt\\": "tests/phpunit/"
-                }
-            },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0"
             ],
             "description": "PHP library for working with Named Binary Tags",
-            "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.10",
-                "issues": "https://github.com/pmmp/NBT/issues"
-            },
-            "time": "2019-07-22T15:22:23+00:00"
+            "time": "2020-04-15T11:29:25+00:00"
         },
         {
             "name": "pocketmine/raklib",
-            "version": "0.12.5",
+            "version": "0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "874db2d3c24117db2221c1e4550380478aeea852"
+                "reference": "9fea763ffc922db083e4528d4acd0b13d0ea83a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/874db2d3c24117db2221c1e4550380478aeea852",
-                "reference": "874db2d3c24117db2221c1e4550380478aeea852",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/9fea763ffc922db083e4528d4acd0b13d0ea83a4",
+                "reference": "9fea763ffc922db083e4528d4acd0b13d0ea83a4",
                 "shasum": ""
             },
             "require": {
-                "ext-bcmath": "*",
                 "ext-pthreads": "~3.2.0",
                 "ext-sockets": "*",
                 "php": ">=7.2.0",
                 "php-64bit": "*",
                 "php-ipv6": "*",
                 "pocketmine/binaryutils": "^0.1.9",
-                "pocketmine/snooze": "^0.1.0",
-                "pocketmine/spl": "^0.3.0"
+                "pocketmine/log": "^0.2.0",
+                "pocketmine/log-pthreads": "^0.1.0",
+                "pocketmine/snooze": "^0.1.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.18",
+                "phpstan/phpstan-strict-rules": "^0.12.2"
             },
             "type": "library",
             "autoload": {
@@ -230,89 +346,303 @@
                     "raklib\\": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "GPL-3.0"
             ],
             "description": "A RakNet server implementation written in PHP",
-            "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/0.12",
-                "issues": "https://github.com/pmmp/RakLib/issues"
-            },
-            "time": "2019-07-22T14:38:20+00:00"
+            "time": "2020-03-31T17:28:28+00:00"
         },
         {
             "name": "pocketmine/snooze",
-            "version": "0.1.1",
+            "version": "0.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Snooze.git",
-                "reference": "b7bd231bdb75e69300cac89ccd515fc731c38c40"
+                "reference": "88420da3d9335dbcb3ee2decfd5e5453d057dcdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/b7bd231bdb75e69300cac89ccd515fc731c38c40",
-                "reference": "b7bd231bdb75e69300cac89ccd515fc731c38c40",
+                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/88420da3d9335dbcb3ee2decfd5e5453d057dcdf",
+                "reference": "88420da3d9335dbcb3ee2decfd5e5453d057dcdf",
                 "shasum": ""
             },
             "require": {
                 "ext-pthreads": ">=3.1.7dev",
                 "php-64bit": ">=7.2.0"
             },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "pocketmine\\snooze\\": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0"
             ],
             "description": "Thread notification management library for code using the pthreads extension",
-            "support": {
-                "source": "https://github.com/pmmp/Snooze/tree/0.1.1",
-                "issues": "https://github.com/pmmp/Snooze/issues"
-            },
-            "time": "2019-01-04T15:54:45+00:00"
+            "time": "2020-01-28T19:08:10+00:00"
         },
         {
             "name": "pocketmine/spl",
-            "version": "0.3.2",
+            "version": "0.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/SPL.git",
-                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49"
+                "reference": "ff0579a0be41bbe65d3637607715c0f87728a838"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/SPL/zipball/7fd53857cd000491ba69e8db865792a024dd2c49",
-                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ff0579a0be41bbe65d3637607715c0f87728a838",
+                "reference": "ff0579a0be41bbe65d3637607715c0f87728a838",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.8"
+            },
             "type": "library",
             "autoload": {
-                "exclude-from-classmap": [
-                    "stubs"
-                ],
                 "classmap": [
-                    "./"
+                    "./src"
                 ]
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "LGPL-3.0"
             ],
             "description": "Standard library files required by PocketMine-MP and related projects",
-            "support": {
-                "source": "https://github.com/pmmp/SPL/tree/master"
-            },
-            "time": "2018-08-12T15:17:39+00:00"
+            "time": "2020-01-31T16:18:03+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "irstea/phpunit-shim",
+            "version": "8.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://gitlab.irstea.fr/pole-is/tools/phpunit-shim.git",
+                "reference": "25b3ffe1502bfd35d5cd23dc37f2f2e70cdf0b54"
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2"
+            },
+            "replace": {
+                "phpunit/phpunit": "self.version"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "autoload": {
+                "exclude-from-classmap": [
+                    "phpunit"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Shim repository for phpunit/phpunit",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "shim",
+                "testing",
+                "xunit"
+            ],
+            "time": "2020-04-24T02:20:21+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "0.12.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9619551d68b2d4c0d681a8df73f3c847c798ee64",
+                "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-10T20:36:16+00:00"
+        },
+        {
+            "name": "phpstan/phpstan-phpunit",
+            "version": "0.12.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan-phpunit.git",
+                "reference": "7232c17e2493dc598173da784477ce0afb2c4e0e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/7232c17e2493dc598173da784477ce0afb2c4e0e",
+                "reference": "7232c17e2493dc598173da784477ce0afb2c4e0e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.1",
+                "phpstan/phpstan": "^0.12.6"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<7.0"
+            },
+            "require-dev": {
+                "consistence/coding-standard": "^3.5",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+                "ergebnis/composer-normalize": "^2.0.2",
+                "jakub-onderka/php-parallel-lint": "^1.0",
+                "phing/phing": "^2.16.0",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^7.0",
+                "satooshi/php-coveralls": "^1.0",
+                "slevomat/coding-standard": "^4.7.2"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon",
+                        "rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPUnit extensions and rules for PHPStan",
+            "time": "2020-04-17T08:04:10+00:00"
+        },
+        {
+            "name": "phpstan/phpstan-strict-rules",
+            "version": "0.12.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan-strict-rules.git",
+                "reference": "a670a59aff7cf96f75d21b974860ada10e25b2ee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/a670a59aff7cf96f75d21b974860ada10e25b2ee",
+                "reference": "a670a59aff7cf96f75d21b974860ada10e25b2ee",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.1",
+                "phpstan/phpstan": "^0.12.6"
+            },
+            "require-dev": {
+                "consistence/coding-standard": "^3.0.1",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+                "ergebnis/composer-normalize": "^2.0.2",
+                "jakub-onderka/php-parallel-lint": "^1.0",
+                "phing/phing": "^2.16.0",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0",
+                "slevomat/coding-standard": "^4.5.2"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Extra strict and opinionated rules for PHPStan",
+            "time": "2020-01-20T13:08:52+00:00"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "daverandom/callback-validator": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -336,5 +666,6 @@
         "ext-zip": "*",
         "ext-zlib": ">=1.2.11"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

phpstan.neon.dist

@@ -0,0 +1,36 @@
+includes:
+	- tests/phpstan/configs/actual-problems.neon
+	- tests/phpstan/configs/com-dotnet-magic.neon
+	- tests/phpstan/configs/custom-leveldb.neon
+	- tests/phpstan/configs/gc-hacks.neon
+	- tests/phpstan/configs/php-bugs.neon
+	- tests/phpstan/configs/phpstan-bugs.neon
+	- tests/phpstan/configs/phpunit-wiring-tests.neon
+	- tests/phpstan/configs/pthreads-bugs.neon
+	- tests/phpstan/configs/runtime-type-checks.neon
+	- vendor/phpstan/phpstan-phpunit/extension.neon
+	- vendor/phpstan/phpstan-phpunit/rules.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
+
+parameters:
+	level: 6
+	autoload_files:
+		- tests/phpstan/bootstrap.php
+		- src/pocketmine/PocketMine.php
+		- build/make-release.php
+		- build/server-phar.php
+		- vendor/irstea/phpunit-shim/phpunit
+	paths:
+		- src
+		- build/make-release.php
+		- build/server-phar.php
+		- tests/phpunit
+	dynamicConstantNames:
+		- pocketmine\IS_DEVELOPMENT_BUILD
+		- pocketmine\DEBUG
+	stubFiles:
+		- tests/phpstan/stubs/pthreads.stub
+		- tests/phpstan/stubs/chunkutils.stub
+	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
+	staticReflectionClassNamePatterns:
+		- "#^COM$#"

src/pocketmine/Achievement.php

@@ -30,9 +30,7 @@ use pocketmine\utils\TextFormat;
  * Handles the achievement list and a bit more
  */
 abstract class Achievement{
-	/**
-	 * @var array[]
-	 */
+	/** @var array[] */
 	public static $list = [
 		/*"openInventory" => array(
 			"name" => "Taking Inventory",
@@ -106,13 +104,6 @@ abstract class Achievement{
 
 	];
 
-
-	/**
-	 * @param Player $player
-	 * @param string $achievementId
-	 *
-	 * @return bool
-	 */
 	public static function broadcast(Player $player, string $achievementId) : bool{
 		if(isset(Achievement::$list[$achievementId])){
 			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
@@ -129,11 +120,7 @@ abstract class Achievement{
 	}
 
 	/**
-	 * @param string $achievementId
-	 * @param string $achievementName
-	 * @param array  $requires
-	 *
-	 * @return bool
+	 * @param string[] $requires
 	 */
 	public static function add(string $achievementId, string $achievementName, array $requires = []) : bool{
 		if(!isset(Achievement::$list[$achievementId])){

src/pocketmine/Collectable.php

@@ -25,12 +25,16 @@ namespace pocketmine;
 
 abstract class Collectable extends \Threaded{
 
+	/** @var bool */
 	private $isGarbage = false;
 
 	public function isGarbage() : bool{
 		return $this->isGarbage;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function setGarbage(){
 		$this->isGarbage = true;
 	}

src/pocketmine/CoreConstants.php

@@ -0,0 +1,37 @@
+<?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;
+
+use function define;
+use function defined;
+use function dirname;
+
+// composer autoload doesn't use require_once and also pthreads can inherit things
+if(defined('pocketmine\_CORE_CONSTANTS_INCLUDED')){
+	return;
+}
+define('pocketmine\_CORE_CONSTANTS_INCLUDED', true);
+
+define('pocketmine\PATH', dirname(__DIR__, 2) . '/');
+define('pocketmine\RESOURCE_PATH', __DIR__ . '/resources/');

src/pocketmine/CrashDump.php

@@ -96,8 +96,14 @@ class CrashDump{
 
 	/** @var Server */
 	private $server;
+	/** @var resource */
 	private $fp;
+	/** @var int */
 	private $time;
+	/**
+	 * @var mixed[]
+	 * @phpstan-var array<string, mixed>
+	 */
 	private $data = [];
 	/** @var string */
 	private $encodedData = "";
@@ -134,15 +140,22 @@ class CrashDump{
 		return $this->path;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getEncodedData(){
 		return $this->encodedData;
 	}
 
+	/**
+	 * @return mixed[]
+	 * @phpstan-return array<string, mixed>
+	 */
 	public function getData() : array{
 		return $this->data;
 	}
 
-	private function encodeData(){
+	private function encodeData() : void{
 		$this->addLine();
 		$this->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
 		$this->addLine();
@@ -158,7 +171,7 @@ class CrashDump{
 		$this->addLine("===END CRASH DUMP===");
 	}
 
-	private function pluginsData(){
+	private function pluginsData() : void{
 		if($this->server->getPluginManager() instanceof PluginManager){
 			$this->addLine();
 			$this->addLine("Loaded plugins:");
@@ -182,7 +195,7 @@ class CrashDump{
 		}
 	}
 
-	private function extraData(){
+	private function extraData() : void{
 		global $argv;
 
 		if($this->server->getProperty("auto-report.send-settings", true) !== false){
@@ -209,7 +222,7 @@ class CrashDump{
 		}
 	}
 
-	private function baseCrash(){
+	private function baseCrash() : void{
 		global $lastExceptionError, $lastError;
 
 		if(isset($lastExceptionError)){
@@ -317,7 +330,7 @@ class CrashDump{
 		return false;
 	}
 
-	private function generalData(){
+	private function generalData() : void{
 		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
 		$this->data["general"] = [];
 		$this->data["general"]["name"] = $this->server->getName();
@@ -333,17 +346,27 @@ class CrashDump{
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
 		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
-		$this->addLine("Git commit: " . GIT_COMMIT);
+		$this->addLine("Git commit: " . \pocketmine\GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());
 		$this->addLine("Zend version: " . zend_version());
 		$this->addLine("OS : " . PHP_OS . ", " . Utils::getOS());
 	}
 
+	/**
+	 * @param string $line
+	 *
+	 * @return void
+	 */
 	public function addLine($line = ""){
 		fwrite($this->fp, $line . PHP_EOL);
 	}
 
+	/**
+	 * @param string $str
+	 *
+	 * @return void
+	 */
 	public function add($str){
 		fwrite($this->fp, $str);
 	}

src/pocketmine/GlobalConstants.php

@@ -0,0 +1,32 @@
+<?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);
+
+// composer autoload doesn't use require_once and also pthreads can inherit things
+if(defined('pocketmine\_GLOBAL_CONSTANTS_INCLUDED')){
+	return;
+}
+define('pocketmine\_GLOBAL_CONSTANTS_INCLUDED', true);
+
+const INT32_MIN = -0x80000000;
+const INT32_MAX = 0x7fffffff;
+const INT32_MASK = 0xffffffff;

src/pocketmine/IPlayer.php

@@ -27,33 +27,21 @@ use pocketmine\permission\ServerOperator;
 
 interface IPlayer extends ServerOperator{
 
-	/**
-	 * @return bool
-	 */
 	public function isOnline() : bool;
 
-	/**
-	 * @return string
-	 */
 	public function getName() : string;
 
-	/**
-	 * @return bool
-	 */
 	public function isBanned() : bool;
 
 	/**
-	 * @param bool $banned
+	 * @return void
 	 */
 	public function setBanned(bool $banned);
 
-	/**
-	 * @return bool
-	 */
 	public function isWhitelisted() : bool;
 
 	/**
-	 * @param bool $value
+	 * @return void
 	 */
 	public function setWhitelisted(bool $value);
 
@@ -72,9 +60,6 @@ interface IPlayer extends ServerOperator{
 	 */
 	public function getLastPlayed();
 
-	/**
-	 * @return bool
-	 */
 	public function hasPlayedBefore() : bool;
 
 }

src/pocketmine/MemoryManager.php

@@ -115,7 +115,7 @@ class MemoryManager{
 		$this->init();
 	}
 
-	private function init(){
+	private function init() : void{
 		$this->memoryLimit = ((int) $this->server->getProperty("memory.main-limit", 0)) * 1024 * 1024;
 
 		$defaultMemory = 1024;
@@ -169,38 +169,25 @@ class MemoryManager{
 		gc_enable();
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isLowMemory() : bool{
 		return $this->lowMemory;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function canUseChunkCache() : bool{
 		return !$this->lowMemory or !$this->lowMemDisableChunkCache;
 	}
 
 	/**
 	 * Returns the allowed chunk radius based on the current memory usage.
-	 *
-	 * @param int $distance
-	 *
-	 * @return int
 	 */
 	public function getViewDistance(int $distance) : int{
-		return ($this->lowMemory and $this->lowMemChunkRadiusOverride > 0) ? (int) min($this->lowMemChunkRadiusOverride, $distance) : $distance;
+		return ($this->lowMemory and $this->lowMemChunkRadiusOverride > 0) ? min($this->lowMemChunkRadiusOverride, $distance) : $distance;
 	}
 
 	/**
 	 * Triggers garbage collection and cache cleanup to try and free memory.
 	 *
-	 * @param int  $memory
-	 * @param int  $limit
-	 * @param bool $global
-	 * @param int  $triggerCount
+	 * @return void
 	 */
 	public function trigger(int $memory, int $limit, bool $global = false, int $triggerCount = 0){
 		$this->server->getLogger()->debug(sprintf("[Memory Manager] %sLow memory triggered, limit %gMB, using %gMB",
@@ -230,6 +217,8 @@ class MemoryManager{
 
 	/**
 	 * Called every tick to update the memory manager state.
+	 *
+	 * @return void
 	 */
 	public function check(){
 		Timings::$memoryManagerTimer->startTiming();
@@ -268,9 +257,6 @@ class MemoryManager{
 		Timings::$memoryManagerTimer->stopTiming();
 	}
 
-	/**
-	 * @return int
-	 */
 	public function triggerGarbageCollector() : int{
 		Timings::$garbageCollectorTimer->startTiming();
 
@@ -294,9 +280,7 @@ class MemoryManager{
 	/**
 	 * Dumps the server memory into the specified output folder.
 	 *
-	 * @param string $outputFolder
-	 * @param int    $maxNesting
-	 * @param int    $maxStringSize
+	 * @return void
 	 */
 	public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
 		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
@@ -314,11 +298,8 @@ class MemoryManager{
 	 * Static memory dumper accessible from any thread.
 	 *
 	 * @param mixed   $startingObject
-	 * @param string  $outputFolder
-	 * @param int     $maxNesting
-	 * @param int     $maxStringSize
-	 * @param \Logger $logger
 	 *
+	 * @return void
 	 * @throws \ReflectionException
 	 */
 	public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger){
@@ -356,7 +337,7 @@ class MemoryManager{
 				}
 
 				$staticCount++;
-				self::continueDump($property->getValue(), $staticProperties[$className][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+				$staticProperties[$className][$property->getName()] = self::continueDump($property->getValue(), $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 			}
 
 			if(count($staticProperties[$className]) === 0){
@@ -389,14 +370,14 @@ class MemoryManager{
 				}
 
 				$globalCount++;
-				self::continueDump($value, $globalVariables[$varName], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+				$globalVariables[$varName] = self::continueDump($value, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 			}
 
 			file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 			$logger->info("[Dump] Wrote $globalCount global variables");
 		}
 
-		self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+		$data = self::continueDump($startingObject, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 
 		do{
 			$continue = false;
@@ -444,14 +425,13 @@ class MemoryManager{
 							$property->setAccessible(true);
 						}
 
-						self::continueDump($property->getValue($object), $info["properties"][$name], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+						$info["properties"][$name] = self::continueDump($property->getValue($object), $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 					}
 				}
 
 				fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
 			}
 
-
 		}while($continue);
 
 		$logger->info("[Dump] Wrote " . count($objects) . " objects");
@@ -472,17 +452,14 @@ class MemoryManager{
 
 	/**
 	 * @param mixed    $from
-	 * @param mixed    &$data
-	 * @param object[] &$objects
-	 * @param int[]    &$refCounts
-	 * @param int      $recursion
-	 * @param int      $maxNesting
-	 * @param int      $maxStringSize
+	 * @param object[] $objects reference parameter
+	 * @param int[]    $refCounts reference parameter
+	 *
+	 * @return mixed
 	 */
-	private static function continueDump($from, &$data, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize){
+	private static function continueDump($from, array &$objects, array &$refCounts, int $recursion, int $maxNesting, int $maxStringSize){
 		if($maxNesting <= 0){
-			$data = "(error) NESTING LIMIT REACHED";
-			return;
+			return "(error) NESTING LIMIT REACHED";
 		}
 
 		--$maxNesting;
@@ -498,12 +475,11 @@ class MemoryManager{
 			$data = "(object) $hash@" . get_class($from);
 		}elseif(is_array($from)){
 			if($recursion >= 5){
-				$data = "(error) ARRAY RECURSION LIMIT REACHED";
-				return;
+				return "(error) ARRAY RECURSION LIMIT REACHED";
 			}
 			$data = [];
 			foreach($from as $key => $value){
-				self::continueDump($value, $data[$key], $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
+				$data[$key] = self::continueDump($value, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
 			}
 		}elseif(is_string($from)){
 			$data = "(string) len(" . strlen($from) . ") " . substr(Utils::printable($from), 0, $maxStringSize);
@@ -512,5 +488,7 @@ class MemoryManager{
 		}else{
 			$data = $from;
 		}
+
+		return $data;
 	}
 }

src/pocketmine/OfflinePlayer.php

@@ -37,10 +37,6 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	/** @var CompoundTag|null */
 	private $namedtag = null;
 
-	/**
-	 * @param Server $server
-	 * @param string $name
-	 */
 	public function __construct(Server $server, string $name){
 		$this->server = $server;
 		$this->name = $name;
@@ -57,6 +53,9 @@ class OfflinePlayer implements IPlayer, Metadatable{
 		return $this->name;
 	}
 
+	/**
+	 * @return Server
+	 */
 	public function getServer(){
 		return $this->server;
 	}

src/pocketmine/PocketMine.php

@@ -21,13 +21,9 @@
 
 declare(strict_types=1);
 
-namespace {
-	const INT32_MIN = -0x80000000;
-	const INT32_MAX = 0x7fffffff;
-}
-
 namespace pocketmine {
 
+	use pocketmine\utils\Git;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\ServerKiller;
 	use pocketmine\utils\Terminal;
@@ -40,6 +36,10 @@ namespace pocketmine {
 
 	const MIN_PHP_VERSION = "7.2.0";
 
+	/**
+	 * @param string $message
+	 * @return void
+	 */
 	function critical_error($message){
 		echo "[ERROR] $message" . PHP_EOL;
 	}
@@ -57,18 +57,18 @@ namespace pocketmine {
 		if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
 			//If PHP version isn't high enough, anything below might break, so don't bother checking it.
 			return [
-				\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "."
+				"PHP >= " . MIN_PHP_VERSION . " is required, but you have PHP " . PHP_VERSION . "."
 			];
 		}
 
 		$messages = [];
 
 		if(PHP_INT_SIZE < 8){
-			$messages[] = "Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
+			$messages[] = "32-bit systems/PHP are no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
 		}
 
 		if(php_sapi_name() !== "cli"){
-			$messages[] = "You must run " . \pocketmine\NAME . " using the CLI.";
+			$messages[] = "Only PHP CLI is supported.";
 		}
 
 		$extensions = [
@@ -121,8 +121,41 @@ namespace pocketmine {
 		return $messages;
 	}
 
+	/**
+	 * @param \Logger $logger
+	 * @return void
+	 */
+	function emit_performance_warnings(\Logger $logger){
+		if(extension_loaded("xdebug")){
+			$logger->warning("Xdebug extension is enabled. This has a major impact on performance.");
+		}
+		if(!extension_loaded("pocketmine_chunkutils")){
+			$logger->warning("ChunkUtils extension is missing. Anvil-format worlds will experience degraded performance.");
+		}
+		if(((int) ini_get('zend.assertions')) !== -1){
+			$logger->warning("Debugging assertions are enabled. This may degrade performance. To disable them, set `zend.assertions = -1` in php.ini.");
+		}
+		if(\Phar::running(true) === ""){
+			$logger->warning("Non-packaged installation detected. This will degrade autoloading speed and make startup times longer.");
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	function set_ini_entries(){
+		ini_set("allow_url_fopen", '1');
+		ini_set("display_errors", '1');
+		ini_set("display_startup_errors", '1');
+		ini_set("default_charset", "utf-8");
+		ini_set('assert.exception', '1');
+	}
+
+	/**
+	 * @return void
+	 */
 	function server(){
-		if(!empty($messages = check_platform_dependencies())){
+		if(count($messages = check_platform_dependencies()) > 0){
 			echo PHP_EOL;
 			$binary = version_compare(PHP_VERSION, "5.4") >= 0 ? PHP_BINARY : "unknown";
 			critical_error("Selected PHP binary ($binary) does not satisfy some requirements.");
@@ -136,47 +169,41 @@ namespace pocketmine {
 		unset($messages);
 
 		error_reporting(-1);
-
-		if(\Phar::running(true) !== ""){
-			define('pocketmine\PATH', \Phar::running(true) . "/");
-		}else{
-			define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
-		}
+		set_ini_entries();
 
 		$opts = getopt("", ["bootstrap:"]);
 		if(isset($opts["bootstrap"])){
-			$bootstrap = realpath($opts["bootstrap"]) ?: $opts["bootstrap"];
+			$bootstrap = ($real = realpath($opts["bootstrap"])) !== false ? $real : $opts["bootstrap"];
 		}else{
-			$bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
+			$bootstrap = dirname(__FILE__, 3) . '/vendor/autoload.php';
 		}
-		define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
 
-		if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
-			require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
-		}else{
+		if($bootstrap === false or !is_file($bootstrap)){
 			critical_error("Composer autoloader not found at " . $bootstrap);
 			critical_error("Please install/update Composer dependencies or use provided builds.");
 			exit(1);
 		}
+		define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
+		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
 
 		set_error_handler([Utils::class, 'errorExceptionHandler']);
 
-		/*
-		 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
-		 */
-		$autoloader = new \BaseClassLoader();
-		$autoloader->register(false);
+		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+		define('pocketmine\VERSION', $version->getFullVersion(true));
 
-		set_time_limit(0); //Who set it to 30 seconds?!?!
+		$gitHash = str_repeat("00", 20);
 
-		ini_set("allow_url_fopen", '1');
-		ini_set("display_errors", '1');
-		ini_set("display_startup_errors", '1');
-		ini_set("default_charset", "utf-8");
+		if(\Phar::running(true) === ""){
+			$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
+		}else{
+			$phar = new \Phar(\Phar::running(false));
+			$meta = $phar->getMetadata();
+			if(isset($meta["git"])){
+				$gitHash = $meta["git"];
+			}
+		}
 
-		ini_set("memory_limit", '-1');
-
-		define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
+		define('pocketmine\GIT_COMMIT', $gitHash);
 
 		$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
 
@@ -187,8 +214,7 @@ namespace pocketmine {
 			mkdir(\pocketmine\DATA, 0777, true);
 		}
 
-		define('pocketmine\LOCK_FILE_PATH', \pocketmine\DATA . 'server.lock');
-		define('pocketmine\LOCK_FILE', fopen(\pocketmine\LOCK_FILE_PATH, "a+b"));
+		define('pocketmine\LOCK_FILE', fopen(\pocketmine\DATA . 'server.lock', "a+b"));
 		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
@@ -222,42 +248,7 @@ namespace pocketmine {
 		}
 		unset($tzError);
 
-		if(extension_loaded("xdebug")){
-			$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
-		}
-		if(!extension_loaded("pocketmine_chunkutils")){
-			$logger->warning("ChunkUtils extension is missing. Anvil-format worlds will experience degraded performance.");
-		}
-
-		if(\Phar::running(true) === ""){
-			$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
-		}
-
-		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
-		define('pocketmine\VERSION', $version->getFullVersion(true));
-
-		$gitHash = str_repeat("00", 20);
-
-		if(\Phar::running(true) === ""){
-			if(Utils::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
-				$gitHash = trim($out);
-				if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
-					$gitHash .= "-dirty";
-				}
-			}
-		}else{
-			$phar = new \Phar(\Phar::running(false));
-			$meta = $phar->getMetadata();
-			if(isset($meta["git"])){
-				$gitHash = $meta["git"];
-			}
-		}
-
-		define('pocketmine\GIT_COMMIT', $gitHash);
-
-
-		@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-		@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
+		emit_performance_warnings($logger);
 
 		$exitCode = 0;
 		do{
@@ -271,7 +262,13 @@ namespace pocketmine {
 
 			//TODO: move this to a Server field
 			define('pocketmine\START_TIME', microtime(true));
-			ThreadManager::init();
+
+			/*
+			 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
+			 */
+			$autoloader = new \BaseClassLoader();
+			$autoloader->register(false);
+
 			new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
 
 			$logger->info("Stopping other threads");
@@ -281,9 +278,7 @@ namespace pocketmine {
 			usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
 
 			if(ThreadManager::getInstance()->stopAll() > 0){
-				if(\pocketmine\DEBUG > 1){
-					echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
-				}
+				$logger->debug("Some threads could not be stopped, performing a force-kill");
 				Utils::kill(getmypid());
 			}
 		}while(false);
@@ -296,5 +291,7 @@ namespace pocketmine {
 		exit($exitCode);
 	}
 
-	\pocketmine\server();
+	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+		\pocketmine\server();
+	}
 }

src/pocketmine/Thread.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
+use const PTHREADS_INHERIT_ALL;
+
 /**
  * This class must be extended by all custom threading classes
  */
@@ -33,12 +35,19 @@ abstract class Thread extends \Thread{
 	/** @var string|null */
 	protected $composerAutoloaderPath;
 
+	/** @var bool */
 	protected $isKilled = false;
 
+	/**
+	 * @return \ClassLoader|null
+	 */
 	public function getClassLoader(){
 		return $this->classLoader;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function setClassLoader(\ClassLoader $loader = null){
 		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
 
@@ -54,6 +63,8 @@ abstract class Thread extends \Thread{
 	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
 	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
 	 * (unless you are using a custom autoloader).
+	 *
+	 * @return void
 	 */
 	public function registerClassLoader(){
 		if($this->composerAutoloaderPath !== null){
@@ -64,7 +75,12 @@ abstract class Thread extends \Thread{
 		}
 	}
 
-	public function start(?int $options = \PTHREADS_INHERIT_ALL){
+	/**
+	 * @param int|null $options TODO: pthreads bug
+	 *
+	 * @return bool
+	 */
+	public function start(?int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if($this->getClassLoader() === null){
@@ -75,6 +91,8 @@ abstract class Thread extends \Thread{
 
 	/**
 	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 *
+	 * @return void
 	 */
 	public function quit(){
 		$this->isKilled = true;

src/pocketmine/ThreadManager.php

@@ -28,9 +28,13 @@ use function spl_object_hash;
 
 class ThreadManager extends \Volatile{
 
-	/** @var ThreadManager */
+	/** @var ThreadManager|null */
 	private static $instance = null;
 
+	/**
+	 * @deprecated
+	 * @return void
+	 */
 	public static function init(){
 		self::$instance = new ThreadManager();
 	}
@@ -39,24 +43,31 @@ class ThreadManager extends \Volatile{
 	 * @return ThreadManager
 	 */
 	public static function getInstance(){
+		if(self::$instance === null){
+			self::$instance = new ThreadManager();
+		}
 		return self::$instance;
 	}
 
 	/**
 	 * @param Worker|Thread $thread
+	 *
+	 * @return void
 	 */
 	public function add($thread){
 		if($thread instanceof Thread or $thread instanceof Worker){
-			$this->{spl_object_hash($thread)} = $thread;
+			$this[spl_object_hash($thread)] = $thread;
 		}
 	}
 
 	/**
 	 * @param Worker|Thread $thread
+	 *
+	 * @return void
 	 */
 	public function remove($thread){
 		if($thread instanceof Thread or $thread instanceof Worker){
-			unset($this->{spl_object_hash($thread)});
+			unset($this[spl_object_hash($thread)]);
 		}
 	}
 

src/pocketmine/VersionInfo.php

@@ -19,9 +19,20 @@
  *
 */
 
+declare(strict_types=1);
+
 namespace pocketmine;
 
+use function defined;
+
+// composer autoload doesn't use require_once and also pthreads can inherit things
+// TODO: drop this file and use a final class with constants
+if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
+	return;
+}
+const _VERSION_INFO_INCLUDED = true;
+
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.9.4";
+const BASE_VERSION = "3.12.1";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/Worker.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
+use const PTHREADS_INHERIT_ALL;
+
 /**
  * This class must be extended by all custom threading classes
  */
@@ -33,12 +35,19 @@ abstract class Worker extends \Worker{
 	/** @var string|null */
 	protected $composerAutoloaderPath;
 
+	/** @var bool */
 	protected $isKilled = false;
 
+	/**
+	 * @return \ClassLoader|null
+	 */
 	public function getClassLoader(){
 		return $this->classLoader;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function setClassLoader(\ClassLoader $loader = null){
 		$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
 
@@ -54,6 +63,8 @@ abstract class Worker extends \Worker{
 	 * WARNING: This method MUST be called from any descendent threads' run() method to make autoloading usable.
 	 * If you do not do this, you will not be able to use new classes that were not loaded when the thread was started
 	 * (unless you are using a custom autoloader).
+	 *
+	 * @return void
 	 */
 	public function registerClassLoader(){
 		if($this->composerAutoloaderPath !== null){
@@ -64,7 +75,12 @@ abstract class Worker extends \Worker{
 		}
 	}
 
-	public function start(?int $options = \PTHREADS_INHERIT_ALL){
+	/**
+	 * @param int|null $options TODO: pthreads bug
+	 *
+	 * @return bool
+	 */
+	public function start(?int $options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if($this->getClassLoader() === null){
@@ -75,6 +91,8 @@ abstract class Worker extends \Worker{
 
 	/**
 	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 *
+	 * @return void
 	 */
 	public function quit(){
 		$this->isKilled = true;

src/pocketmine/block/Air.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 
-
 /**
  * Air block
  */

src/pocketmine/block/Anvil.php

@@ -78,7 +78,7 @@ class Anvil extends Fallable{
 	public function recalculateBoundingBox() : ?AxisAlignedBB{
 		$inset = 0.125;
 
-		if($this->meta & 0x01){ //east/west
+		if(($this->meta & 0x01) !== 0){ //east/west
 			return new AxisAlignedBB(
 				$this->x,
 				$this->y,

src/pocketmine/block/BaseRail.php

@@ -99,6 +99,11 @@ abstract class BaseRail extends Flowable{
 		return false;
 	}
 
+	/**
+	 * @param int[]   $connections
+	 * @param int[][] $lookup
+	 * @phpstan-param array<int, list<int>> $lookup
+	 */
 	protected static function searchState(array $connections, array $lookup) : int{
 		$meta = array_search($connections, $lookup, true);
 		if($meta === false){
@@ -114,9 +119,7 @@ abstract class BaseRail extends Flowable{
 	/**
 	 * Returns a meta value for the rail with the given connections.
 	 *
-	 * @param array $connections
-	 *
-	 * @return int
+	 * @param int[] $connections
 	 *
 	 * @throws \InvalidArgumentException if no state matches the given connections
 	 */
@@ -164,6 +167,12 @@ abstract class BaseRail extends Flowable{
 		return $connections;
 	}
 
+	/**
+	 * @param int[] $constraints
+	 *
+	 * @return true[]
+	 * @phpstan-return array<int, true>
+	 */
 	private function getPossibleConnectionDirections(array $constraints) : array{
 		switch(count($constraints)){
 			case 0:
@@ -188,6 +197,10 @@ abstract class BaseRail extends Flowable{
 		}
 	}
 
+	/**
+	 * @return true[]
+	 * @phpstan-return array<int, true>
+	 */
 	protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
 		$opposite = Vector3::getOppositeSide($constraint & ~self::FLAG_ASCEND);
 
@@ -247,6 +260,9 @@ abstract class BaseRail extends Flowable{
 		}
 	}
 
+	/**
+	 * @param int[] $connections
+	 */
 	private function updateState(array $connections) : void{
 		if(count($connections) === 1){
 			$connections[] = Vector3::getOppositeSide($connections[0] & ~self::FLAG_ASCEND);

src/pocketmine/block/Bed.php

@@ -69,13 +69,13 @@ class Bed extends Transparent{
 		return ($this->meta & self::BITFLAG_HEAD) !== 0;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isOccupied() : bool{
 		return ($this->meta & self::BITFLAG_OCCUPIED) !== 0;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function setOccupied(bool $occupied = true){
 		if($occupied){
 			$this->meta |= self::BITFLAG_OCCUPIED;
@@ -90,12 +90,6 @@ class Bed extends Transparent{
 		}
 	}
 
-	/**
-	 * @param int  $meta
-	 * @param bool $isHead
-	 *
-	 * @return int
-	 */
 	public static function getOtherHalfSide(int $meta, bool $isHead = false) : int{
 		$rotation = $meta & 0x03;
 		$side = -1;
@@ -122,9 +116,6 @@ class Bed extends Transparent{
 		return $side;
 	}
 
-	/**
-	 * @return Bed|null
-	 */
 	public function getOtherHalf() : ?Bed{
 		$other = $this->getSide(self::getOtherHalfSide($this->meta, $this->isHeadPart()));
 		if($other instanceof Bed and $other->getId() === $this->getId() and $other->isHeadPart() !== $this->isHeadPart() and (($other->getDamage() & 0x03) === ($this->getDamage() & 0x03))){

src/pocketmine/block/Block.php

@@ -40,6 +40,7 @@ use pocketmine\network\mcpe\protocol\types\RuntimeBlockMapping;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use function array_merge;
+use function count;
 use function get_class;
 use const PHP_INT_MAX;
 
@@ -49,12 +50,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * Returns a new Block instance with the specified ID, meta and position.
 	 *
 	 * This function redirects to {@link BlockFactory#get}.
-	 *
-	 * @param int           $id
-	 * @param int           $meta
-	 * @param Position|null $pos
-	 *
-	 * @return Block
 	 */
 	public static function get(int $id, int $meta = 0, Position $pos = null) : Block{
 		return BlockFactory::get($id, $meta, $pos);
@@ -69,10 +64,9 @@ class Block extends Position implements BlockIds, Metadatable{
 	/** @var int|null */
 	protected $itemId;
 
-	/** @var AxisAlignedBB */
+	/** @var AxisAlignedBB|null */
 	protected $boundingBox = null;
 
-
 	/** @var AxisAlignedBB[]|null */
 	protected $collisionBoxes = null;
 
@@ -89,16 +83,10 @@ class Block extends Position implements BlockIds, Metadatable{
 		$this->itemId = $itemId;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getName() : string{
 		return $this->fallbackName ?? "Unknown";
 	}
 
-	/**
-	 * @return int
-	 */
 	final public function getId() : int{
 		return $this->id;
 	}
@@ -106,8 +94,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns the ID of the item form of the block.
 	 * Used for drops for blocks (some blocks such as doors have a different item ID).
-	 *
-	 * @return int
 	 */
 	public function getItemId() : int{
 		return $this->itemId ?? $this->getId();
@@ -115,22 +101,15 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * @internal
-	 * @return int
 	 */
 	public function getRuntimeId() : int{
 		return RuntimeBlockMapping::toStaticRuntimeId($this->getId(), $this->getDamage());
 	}
 
-	/**
-	 * @return int
-	 */
 	final public function getDamage() : int{
 		return $this->meta;
 	}
 
-	/**
-	 * @param int $meta
-	 */
 	final public function setDamage(int $meta) : void{
 		if($meta < 0 or $meta > 0xf){
 			throw new \InvalidArgumentException("Block damage values must be 0-15, not $meta");
@@ -144,8 +123,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	 *
 	 * If your block should not have any meta value when it's dropped as an item, override this to return 0 in
 	 * descendent classes.
-	 *
-	 * @return int
 	 */
 	public function getVariantBitmask() : int{
 		return -1;
@@ -153,24 +130,18 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns the block meta, stripped of non-variant flags.
-	 * @return int
 	 */
 	public function getVariant() : int{
 		return $this->meta & $this->getVariantBitmask();
 	}
 
-
 	/**
 	 * AKA: Block->isPlaceable
-	 * @return bool
 	 */
 	public function canBePlaced() : bool{
 		return true;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function canBeReplaced() : bool{
 		return false;
 	}
@@ -181,15 +152,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Places the Block, using block space and block target, and side. Returns if the block has been placed.
-	 *
-	 * @param Item        $item
-	 * @param Block       $blockReplace
-	 * @param Block       $blockClicked
-	 * @param int         $face
-	 * @param Vector3     $clickVector
-	 * @param Player|null $player
-	 *
-	 * @return bool
 	 */
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		return $this->getLevel()->setBlock($this, $this, true, true);
@@ -197,18 +159,11 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns if the block can be broken with an specific Item
-	 *
-	 * @param Item $item
-	 *
-	 * @return bool
 	 */
 	public function isBreakable(Item $item) : bool{
 		return true;
 	}
 
-	/**
-	 * @return int
-	 */
 	public function getToolType() : int{
 		return BlockToolType::TYPE_NONE;
 	}
@@ -222,8 +177,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * Otherwise, 1 should be returned if a tool is required, 0 if not.
 	 *
 	 * @see Item::getBlockToolHarvestLevel()
-	 *
-	 * @return int
 	 */
 	public function getToolHarvestLevel() : int{
 		return 0;
@@ -235,10 +188,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	 *
 	 * In most cases this is also used to determine whether block drops should be created or not, except in some
 	 * special cases such as vines.
-	 *
-	 * @param Item $tool
-	 *
-	 * @return bool
 	 */
 	public function isCompatibleWithTool(Item $tool) : bool{
 		if($this->getHardness() < 0){
@@ -253,23 +202,14 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Do the actions needed so the block is broken with the Item
-	 *
-	 * @param Item        $item
-	 * @param Player|null $player
-	 *
-	 * @return bool
 	 */
 	public function onBreak(Item $item, Player $player = null) : bool{
 		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
 	}
 
-
 	/**
 	 * Returns the seconds that this block takes to be broken using an specific Item
 	 *
-	 * @param Item $item
-	 *
-	 * @return float
 	 * @throws \InvalidArgumentException if the item efficiency is not a positive number
 	 */
 	public function getBreakTime(Item $item) : float{
@@ -299,8 +239,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns whether random block updates will be done on this block.
-	 *
-	 * @return bool
 	 */
 	public function ticksRandomly() : bool{
 		return false;
@@ -323,11 +261,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Do actions when activated by Item. Returns if it has done anything
-	 *
-	 * @param Item        $item
-	 * @param Player|null $player
-	 *
-	 * @return bool
 	 */
 	public function onActivate(Item $item, Player $player = null) : bool{
 		return false;
@@ -335,7 +268,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns a base value used to compute block break times.
-	 * @return float
 	 */
 	public function getHardness() : float{
 		return 10;
@@ -343,15 +275,11 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns the block's resistance to explosions. Usually 5x hardness.
-	 * @return float
 	 */
 	public function getBlastResistance() : float{
 		return $this->getHardness() * 5;
 	}
 
-	/**
-	 * @return float
-	 */
 	public function getFrictionFactor() : float{
 		return 0.6;
 	}
@@ -379,16 +307,11 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * Examples of this behaviour include leaves and cobwebs.
 	 *
 	 * Light-diffusing blocks are included by the heightmap.
-	 *
-	 * @return bool
 	 */
 	public function diffusesSkyLight() : bool{
 		return false;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isTransparent() : bool{
 		return false;
 	}
@@ -399,7 +322,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * AKA: Block->isFlowable
-	 * @return bool
 	 */
 	public function canBeFlowedInto() : bool{
 		return false;
@@ -415,21 +337,17 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns whether entities can climb up this block.
-	 * @return bool
 	 */
 	public function canClimb() : bool{
 		return false;
 	}
 
-
 	public function addVelocityToEntity(Entity $entity, Vector3 $vector) : void{
 
 	}
 
 	/**
 	 * Sets the block position to a new Position object
-	 *
-	 * @param Position $v
 	 */
 	final public function position(Position $v) : void{
 		$this->x = (int) $v->x;
@@ -442,8 +360,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns an array of Item objects to be dropped
 	 *
-	 * @param Item $item
-	 *
 	 * @return Item[]
 	 */
 	public function getDrops(Item $item) : array{
@@ -461,8 +377,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns an array of Items to be dropped when the block is broken using the correct tool type.
 	 *
-	 * @param Item $item
-	 *
 	 * @return Item[]
 	 */
 	public function getDropsForCompatibleTool(Item $item) : array{
@@ -474,8 +388,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns an array of Items to be dropped when the block is broken using a compatible Silk Touch-enchanted tool.
 	 *
-	 * @param Item $item
-	 *
 	 * @return Item[]
 	 */
 	public function getSilkTouchDrops(Item $item) : array{
@@ -486,10 +398,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns how much XP will be dropped by breaking this block with the given item.
-	 *
-	 * @param Item $item
-	 *
-	 * @return int
 	 */
 	public function getXpDropForTool(Item $item) : int{
 		if($item->hasEnchantment(Enchantment::SILK_TOUCH) or !$this->isCompatibleWithTool($item)){
@@ -501,8 +409,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns how much XP this block will drop when broken with an appropriate tool.
-	 *
-	 * @return int
 	 */
 	protected function getXpDropAmount() : int{
 		return 0;
@@ -511,8 +417,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns whether Silk Touch enchanted tools will cause this block to drop as itself. Since most blocks drop
 	 * themselves anyway, this is implicitly true.
-	 *
-	 * @return bool
 	 */
 	public function isAffectedBySilkTouch() : bool{
 		return true;
@@ -520,7 +424,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns the item that players will equip when middle-clicking on this block.
-	 * @return Item
 	 */
 	public function getPickedItem() : Item{
 		return ItemFactory::get($this->getItemId(), $this->getVariant());
@@ -528,7 +431,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns the time in ticks which the block will fuel a furnace for.
-	 * @return int
 	 */
 	public function getFuelTime() : int{
 		return 0;
@@ -537,8 +439,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns the chance that the block will catch fire from nearby fire sources. Higher values lead to faster catching
 	 * fire.
-	 *
-	 * @return int
 	 */
 	public function getFlameEncouragement() : int{
 		return 0;
@@ -546,8 +446,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns the base flammability of this block. Higher values lead to the block burning away more quickly.
-	 *
-	 * @return int
 	 */
 	public function getFlammability() : int{
 		return 0;
@@ -555,8 +453,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns whether fire lit on this block will burn indefinitely.
-	 *
-	 * @return bool
 	 */
 	public function burnsForever() : bool{
 		return false;
@@ -564,8 +460,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Returns whether this block can catch fire.
-	 *
-	 * @return bool
 	 */
 	public function isFlammable() : bool{
 		return $this->getFlammability() > 0;
@@ -581,9 +475,6 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Returns the Block on the side $side, works like Vector3::getSide()
 	 *
-	 * @param int $side
-	 * @param int $step
-	 *
 	 * @return Block
 	 */
 	public function getSide(int $side, int $step = 1){
@@ -642,10 +533,6 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	/**
 	 * Checks for collision against an AxisAlignedBB
-	 *
-	 * @param AxisAlignedBB $bb
-	 *
-	 * @return bool
 	 */
 	public function collidesWithBB(AxisAlignedBB $bb) : bool{
 		foreach($this->getCollisionBoxes() as $bb2){
@@ -657,9 +544,6 @@ class Block extends Position implements BlockIds, Metadatable{
 		return false;
 	}
 
-	/**
-	 * @param Entity $entity
-	 */
 	public function onEntityCollide(Entity $entity) : void{
 
 	}
@@ -679,16 +563,13 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return AxisAlignedBB[]
 	 */
 	protected function recalculateCollisionBoxes() : array{
-		if($bb = $this->recalculateBoundingBox()){
+		if(($bb = $this->recalculateBoundingBox()) !== null){
 			return [$bb];
 		}
 
 		return [];
 	}
 
-	/**
-	 * @return AxisAlignedBB|null
-	 */
 	public function getBoundingBox() : ?AxisAlignedBB{
 		if($this->boundingBox === null){
 			$this->boundingBox = $this->recalculateBoundingBox();
@@ -696,9 +577,6 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $this->boundingBox;
 	}
 
-	/**
-	 * @return AxisAlignedBB|null
-	 */
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
 			$this->x,
@@ -719,15 +597,9 @@ class Block extends Position implements BlockIds, Metadatable{
 		$this->collisionBoxes = null;
 	}
 
-	/**
-	 * @param Vector3 $pos1
-	 * @param Vector3 $pos2
-	 *
-	 * @return RayTraceResult|null
-	 */
 	public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?RayTraceResult{
 		$bbs = $this->getCollisionBoxes();
-		if(empty($bbs)){
+		if(count($bbs) === 0){
 			return null;
 		}
 
@@ -763,7 +635,7 @@ class Block extends Position implements BlockIds, Metadatable{
 			return $this->level->getBlockMetadata()->getMetadata($this, $metadataKey);
 		}
 
-		return null;
+		return [];
 	}
 
 	public function hasMetadata(string $metadataKey) : bool{

src/pocketmine/block/BlockFactory.php

@@ -32,23 +32,47 @@ use function min;
  * Manages block registration and instance creation
  */
 class BlockFactory{
-	/** @var \SplFixedArray<Block> */
-	private static $fullList = null;
+	/**
+	 * @var \SplFixedArray|Block[]
+	 * @phpstan-var \SplFixedArray<Block>
+	 */
+	private static $fullList;
 
-	/** @var \SplFixedArray<bool> */
-	public static $solid = null;
-	/** @var \SplFixedArray<bool> */
-	public static $transparent = null;
-	/** @var \SplFixedArray<float> */
-	public static $hardness = null;
-	/** @var \SplFixedArray<int> */
-	public static $light = null;
-	/** @var \SplFixedArray<int> */
-	public static $lightFilter = null;
-	/** @var \SplFixedArray<bool> */
-	public static $diffusesSkyLight = null;
-	/** @var \SplFixedArray<float> */
-	public static $blastResistance = null;
+	/**
+	 * @var \SplFixedArray|bool[]
+	 * @phpstan-var \SplFixedArray<bool>
+	 */
+	public static $solid;
+	/**
+	 * @var \SplFixedArray|bool[]
+	 * @phpstan-var \SplFixedArray<bool>
+	 */
+	public static $transparent;
+	/**
+	 * @var \SplFixedArray|float[]
+	 * @phpstan-var \SplFixedArray<float>
+	 */
+	public static $hardness;
+	/**
+	 * @var \SplFixedArray|int[]
+	 * @phpstan-var \SplFixedArray<int>
+	 */
+	public static $light;
+	/**
+	 * @var \SplFixedArray|int[]
+	 * @phpstan-var \SplFixedArray<int>
+	 */
+	public static $lightFilter;
+	/**
+	 * @var \SplFixedArray|bool[]
+	 * @phpstan-var \SplFixedArray<bool>
+	 */
+	public static $diffusesSkyLight;
+	/**
+	 * @var \SplFixedArray|float[]
+	 * @phpstan-var \SplFixedArray<float>
+	 */
+	public static $blastResistance;
 
 	/**
 	 * Initializes the block factory. By default this is called only once on server start, however you may wish to use
@@ -334,7 +358,6 @@ class BlockFactory{
 	 * NOTE: If you are registering a new block type, you will need to add it to the creative inventory yourself - it
 	 * will not automatically appear there.
 	 *
-	 * @param Block $block
 	 * @param bool  $override Whether to override existing registrations
 	 *
 	 * @throws \RuntimeException if something attempted to override an already-registered block without specifying the
@@ -364,12 +387,6 @@ class BlockFactory{
 
 	/**
 	 * Returns a new Block instance with the specified ID, meta and position.
-	 *
-	 * @param int      $id
-	 * @param int      $meta
-	 * @param Position $pos
-	 *
-	 * @return Block
 	 */
 	public static function get(int $id, int $meta = 0, Position $pos = null) : Block{
 		if($meta < 0 or $meta > 0xf){
@@ -398,7 +415,7 @@ class BlockFactory{
 
 	/**
 	 * @internal
-	 * @return \SplFixedArray
+	 * @phpstan-return \SplFixedArray<Block>
 	 */
 	public static function getBlockStatesArray() : \SplFixedArray{
 		return self::$fullList;
@@ -406,10 +423,6 @@ class BlockFactory{
 
 	/**
 	 * Returns whether a specified block ID is already registered in the block factory.
-	 *
-	 * @param int $id
-	 *
-	 * @return bool
 	 */
 	public static function isRegistered(int $id) : bool{
 		$b = self::$fullList[$id << 4];
@@ -419,11 +432,6 @@ class BlockFactory{
 	/**
 	 * @internal
 	 * @deprecated
-	 *
-	 * @param int $id
-	 * @param int $meta
-	 *
-	 * @return int
 	 */
 	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
 		return RuntimeBlockMapping::toStaticRuntimeId($id, $meta);
@@ -433,8 +441,6 @@ class BlockFactory{
 	 * @deprecated
 	 * @internal
 	 *
-	 * @param int $runtimeId
-	 *
 	 * @return int[] [id, meta]
 	 */
 	public static function fromStaticRuntimeId(int $runtimeId) : array{

src/pocketmine/block/BurningFurnace.php

@@ -80,6 +80,9 @@ class BurningFurnace extends Solid{
 			$furnace = $this->getLevel()->getTile($this);
 			if(!($furnace instanceof TileFurnace)){
 				$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
+				if(!($furnace instanceof TileFurnace)){
+					return true;
+				}
 			}
 
 			if(!$furnace->canOpenWith($item->getCustomName())){

src/pocketmine/block/Chest.php

@@ -109,11 +109,14 @@ class Chest extends Transparent{
 				$chest = $t;
 			}else{
 				$chest = Tile::createTile(Tile::CHEST, $this->getLevel(), TileChest::createNBT($this));
+				if(!($chest instanceof TileChest)){
+					return true;
+				}
 			}
 
 			if(
 				!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
-				($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
+				(($pair = $chest->getPair()) !== null and !$pair->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
 				!$chest->canOpenWith($item->getCustomName())
 			){
 				return true;

src/pocketmine/block/CobblestoneWall.php

@@ -111,6 +111,9 @@ class CobblestoneWall extends Transparent{
 		);
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}

src/pocketmine/block/ConcretePowder.php

@@ -53,16 +53,10 @@ class ConcretePowder extends Fallable{
 		}
 	}
 
-	/**
-	 * @return null|Block
-	 */
 	public function tickFalling() : ?Block{
 		return $this->checkAdjacentWater();
 	}
 
-	/**
-	 * @return null|Block
-	 */
 	private function checkAdjacentWater() : ?Block{
 		for($i = 1; $i < 6; ++$i){ //Do not check underneath
 			if($this->getSide($i) instanceof Water){

src/pocketmine/block/Crops.php

@@ -41,7 +41,6 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($this->meta < 7 and $item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
 			$block = clone $this;
@@ -56,7 +55,7 @@ abstract class Crops extends Flowable{
 				$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 			}
 
-			$item->count--;
+			$item->pop();
 
 			return true;
 		}

src/pocketmine/block/Dandelion.php

@@ -39,7 +39,6 @@ class Dandelion extends Flowable{
 		return "Dandelion";
 	}
 
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){

src/pocketmine/block/Door.php

@@ -29,14 +29,13 @@ use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
-
 abstract class Door extends Transparent{
 
 	public function isSolid() : bool{
 		return false;
 	}
 
-	private function getFullDamage(){
+	private function getFullDamage() : int{
 		$damage = $this->getDamage();
 		$isUp = ($damage & 0x08) > 0;
 

src/pocketmine/block/DoublePlant.php

@@ -68,10 +68,9 @@ class DoublePlant extends Flowable{
 
 	/**
 	 * Returns whether this double-plant has a corresponding other half.
-	 * @return bool
 	 */
 	public function isValidHalfPlant() : bool{
-		if($this->meta & self::BITFLAG_TOP){
+		if(($this->meta & self::BITFLAG_TOP) !== 0){
 			$other = $this->getSide(Vector3::SIDE_DOWN);
 		}else{
 			$other = $this->getSide(Vector3::SIDE_UP);
@@ -103,7 +102,7 @@ class DoublePlant extends Flowable{
 	}
 
 	public function getDrops(Item $item) : array{
-		if($this->meta & self::BITFLAG_TOP){
+		if(($this->meta & self::BITFLAG_TOP) !== 0){
 			if($this->isCompatibleWithTool($item)){
 				return parent::getDrops($item);
 			}

src/pocketmine/block/EnderChest.php

@@ -84,6 +84,9 @@ class EnderChest extends Chest{
 				$enderChest = $t;
 			}else{
 				$enderChest = Tile::createTile(Tile::ENDER_CHEST, $this->getLevel(), TileEnderChest::createNBT($this));
+				if(!($enderChest instanceof TileEnderChest)){
+					return true;
+				}
 			}
 
 			if(!$this->getSide(Vector3::SIDE_UP)->isTransparent()){

src/pocketmine/block/Fallable.php

@@ -45,9 +45,6 @@ abstract class Fallable extends Solid{
 		}
 	}
 
-	/**
-	 * @return null|Block
-	 */
 	public function tickFalling() : ?Block{
 		return null;
 	}

src/pocketmine/block/Farmland.php

@@ -48,7 +48,6 @@ class Farmland extends Transparent{
 		return BlockToolType::TYPE_SHOVEL;
 	}
 
-
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
 			$this->x,

src/pocketmine/block/Fence.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
+use function count;
 
 abstract class Fence extends Transparent{
 
@@ -85,7 +86,7 @@ abstract class Fence extends Transparent{
 			);
 		}
 
-		if(empty($bbs)){
+		if(count($bbs) === 0){
 			//centre post AABB (only needed if not connected on any axis - other BBs overlapping will do this if any connections are made)
 			return [
 				new AxisAlignedBB(
@@ -102,6 +103,9 @@ abstract class Fence extends Transparent{
 		return $bbs;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}

src/pocketmine/block/FenceGate.php

@@ -39,7 +39,6 @@ class FenceGate extends Transparent{
 		return BlockToolType::TYPE_AXE;
 	}
 
-
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 
 		if(($this->getDamage() & 0x04) > 0){

src/pocketmine/block/Furnace.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 class Furnace extends BurningFurnace{
 
 	protected $id = self::FURNACE;

src/pocketmine/block/GlazedTerracotta.php

@@ -1,6 +1,5 @@
 <?php
 
-
 /*
  *
  *  ____            _        _   __  __ _                  __  __ ____

src/pocketmine/block/GlowingObsidian.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 use pocketmine\item\TieredTool;
 
 class GlowingObsidian extends Solid{

src/pocketmine/block/Grass.php

@@ -99,7 +99,7 @@ class Grass extends Solid{
 
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){
-			$item->count--;
+			$item->pop();
 			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
 			return true;

src/pocketmine/block/ItemFrame.php

@@ -47,6 +47,9 @@ class ItemFrame extends Flowable{
 		$tile = $this->level->getTile($this);
 		if(!($tile instanceof TileItemFrame)){
 			$tile = Tile::createTile(Tile::ITEM_FRAME, $this->getLevel(), TileItemFrame::createNBT($this));
+			if(!($tile instanceof TileItemFrame)){
+				return true;
+			}
 		}
 
 		if($tile->hasItem()){

src/pocketmine/block/Ladder.php

@@ -90,7 +90,6 @@ class Ladder extends Transparent{
 		);
 	}
 
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if(!$blockClicked->isTransparent()){
 			$faces = [

src/pocketmine/block/Leaves.php

@@ -39,6 +39,7 @@ class Leaves extends Transparent{
 	public const DARK_OAK = 1;
 
 	protected $id = self::LEAVES;
+	/** @var int */
 	protected $woodType = self::WOOD;
 
 	public function __construct(int $meta = 0){
@@ -67,8 +68,11 @@ class Leaves extends Transparent{
 		return true;
 	}
 
-
-	protected function findLog(Block $pos, array $visited, int $distance, ?int $fromSide = null) : bool{
+	/**
+	 * @param true[] $visited reference parameter
+	 * @phpstan-param array<string, true> $visited
+	 */
+	protected function findLog(Block $pos, array &$visited, int $distance, ?int $fromSide = null) : bool{
 		$index = $pos->x . "." . $pos->y . "." . $pos->z;
 		if(isset($visited[$index])){
 			return false;
@@ -168,7 +172,7 @@ class Leaves extends Transparent{
 	}
 
 	public function getDrops(Item $item) : array{
-		if($item->getBlockToolType() & BlockToolType::TYPE_SHEARS){
+		if(($item->getBlockToolType() & BlockToolType::TYPE_SHEARS) !== 0){
 			return $this->getDropsForCompatibleTool($item);
 		}
 

src/pocketmine/block/Leaves2.php

@@ -29,6 +29,7 @@ use pocketmine\item\ItemFactory;
 class Leaves2 extends Leaves{
 
 	protected $id = self::LEAVES2;
+	/** @var int */
 	protected $woodType = self::WOOD2;
 
 	public function getName() : string{

src/pocketmine/block/Liquid.php

@@ -38,6 +38,7 @@ use function min;
 
 abstract class Liquid extends Transparent{
 
+	/** @var int */
 	public $adjacentSources = 0;
 
 	/** @var Vector3|null */
@@ -90,6 +91,9 @@ abstract class Liquid extends Transparent{
 
 	abstract public function getBucketEmptySound() : int;
 
+	/**
+	 * @return float
+	 */
 	public function getFluidHeightPercent(){
 		$d = $this->meta;
 		if($d >= 8){
@@ -207,8 +211,6 @@ abstract class Liquid extends Transparent{
 
 	/**
 	 * Returns how many liquid levels are lost per block flowed horizontally. Affects how far the liquid can flow.
-	 *
-	 * @return int
 	 */
 	public function getFlowDecayPerBlock() : int{
 		return 1;
@@ -430,6 +432,9 @@ abstract class Liquid extends Transparent{
 		return ($decay >= 0 && $blockDecay >= $decay) ? $decay : $blockDecay;
 	}
 
+	/**
+	 * @return void
+	 */
 	protected function checkForHarden(){
 
 	}

src/pocketmine/block/MossyCobblestone.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 class MossyCobblestone extends Cobblestone{
 
 	protected $id = self::MOSSY_COBBLESTONE;

src/pocketmine/block/NetherWartPlant.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;

src/pocketmine/block/Sapling.php

@@ -72,7 +72,7 @@ class Sapling extends Flowable{
 			//TODO: change log type
 			Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant());
 
-			$item->count--;
+			$item->pop();
 
 			return true;
 		}

src/pocketmine/block/SignPost.php

@@ -57,7 +57,6 @@ class SignPost extends Transparent{
 		return null;
 	}
 
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($face !== Vector3::SIDE_DOWN){
 

src/pocketmine/block/Sponge.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 class Sponge extends Solid{
 
 	protected $id = self::SPONGE;

src/pocketmine/block/Sugarcane.php

@@ -62,7 +62,7 @@ class Sugarcane extends Flowable{
 				$this->getLevel()->setBlock($this, $this, true);
 			}
 
-			$item->count--;
+			$item->pop();
 
 			return true;
 		}

src/pocketmine/block/TNT.php

@@ -74,6 +74,9 @@ class TNT extends Solid{
 		}
 	}
 
+	/**
+	 * @return void
+	 */
 	public function ignite(int $fuse = 80){
 		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
 

src/pocketmine/block/Thin.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
+use function count;
 
 abstract class Thin extends Transparent{
 
@@ -77,7 +78,7 @@ abstract class Thin extends Transparent{
 			);
 		}
 
-		if(empty($bbs)){
+		if(count($bbs) === 0){
 			//centre post AABB (only needed if not connected on any axis - other BBs overlapping will do this if any connections are made)
 			return [
 				new AxisAlignedBB(

src/pocketmine/block/Transparent.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 abstract class Transparent extends Block{
 
 	public function isTransparent() : bool{

src/pocketmine/block/Vine.php

@@ -197,7 +197,7 @@ class Vine extends Flowable{
 	}
 
 	public function getDrops(Item $item) : array{
-		if($item->getBlockToolType() & BlockToolType::TYPE_SHEARS){
+		if(($item->getBlockToolType() & BlockToolType::TYPE_SHEARS) !== 0){
 			return $this->getDropsForCompatibleTool($item);
 		}
 

src/pocketmine/block/WaterLily.php

@@ -55,7 +55,6 @@ class WaterLily extends Flowable{
 		);
 	}
 
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($blockClicked instanceof Water){
 			$up = $blockClicked->getSide(Vector3::SIDE_UP);

src/pocketmine/block/Wood2.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-
 class Wood2 extends Wood{
 
 	public const ACACIA = 0;

src/pocketmine/command/Command.php

@@ -50,12 +50,10 @@ abstract class Command{
 	/** @var string[] */
 	private $aliases = [];
 
-	/**
-	 * @var string[]
-	 */
+	/** @var string[] */
 	private $activeAliases = [];
 
-	/** @var CommandMap */
+	/** @var CommandMap|null */
 	private $commandMap = null;
 
 	/** @var string */
@@ -67,16 +65,13 @@ abstract class Command{
 	/** @var string|null */
 	private $permission = null;
 
-	/** @var string */
+	/** @var string|null */
 	private $permissionMessage = null;
 
-	/** @var TimingsHandler */
-	public $timings;
+	/** @var TimingsHandler|null */
+	public $timings = null;
 
 	/**
-	 * @param string   $name
-	 * @param string   $description
-	 * @param string   $usageMessage
 	 * @param string[] $aliases
 	 */
 	public function __construct(string $name, string $description = "", string $usageMessage = null, array $aliases = []){
@@ -88,18 +83,13 @@ abstract class Command{
 	}
 
 	/**
-	 * @param CommandSender $sender
-	 * @param string        $commandLabel
-	 * @param string[]      $args
+	 * @param string[] $args
 	 *
 	 * @return mixed
 	 * @throws CommandException
 	 */
 	abstract public function execute(CommandSender $sender, string $commandLabel, array $args);
 
-	/**
-	 * @return string
-	 */
 	public function getName() : string{
 		return $this->name;
 	}
@@ -111,19 +101,13 @@ abstract class Command{
 		return $this->permission;
 	}
 
-
 	/**
-	 * @param string|null $permission
+	 * @return void
 	 */
 	public function setPermission(string $permission = null){
 		$this->permission = $permission;
 	}
 
-	/**
-	 * @param CommandSender $target
-	 *
-	 * @return bool
-	 */
 	public function testPermission(CommandSender $target) : bool{
 		if($this->testPermissionSilent($target)){
 			return true;
@@ -138,11 +122,6 @@ abstract class Command{
 		return false;
 	}
 
-	/**
-	 * @param CommandSender $target
-	 *
-	 * @return bool
-	 */
 	public function testPermissionSilent(CommandSender $target) : bool{
 		if($this->permission === null or $this->permission === ""){
 			return true;
@@ -157,9 +136,6 @@ abstract class Command{
 		return false;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getLabel() : string{
 		return $this->label;
 	}
@@ -181,10 +157,6 @@ abstract class Command{
 
 	/**
 	 * Registers the command into a Command map
-	 *
-	 * @param CommandMap $commandMap
-	 *
-	 * @return bool
 	 */
 	public function register(CommandMap $commandMap) : bool{
 		if($this->allowChangesFrom($commandMap)){
@@ -196,11 +168,6 @@ abstract class Command{
 		return false;
 	}
 
-	/**
-	 * @param CommandMap $commandMap
-	 *
-	 * @return bool
-	 */
 	public function unregister(CommandMap $commandMap) : bool{
 		if($this->allowChangesFrom($commandMap)){
 			$this->commandMap = null;
@@ -213,18 +180,10 @@ abstract class Command{
 		return false;
 	}
 
-	/**
-	 * @param CommandMap $commandMap
-	 *
-	 * @return bool
-	 */
 	private function allowChangesFrom(CommandMap $commandMap) : bool{
 		return $this->commandMap === null or $this->commandMap === $commandMap;
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isRegistered() : bool{
 		return $this->commandMap !== null;
 	}
@@ -236,29 +195,22 @@ abstract class Command{
 		return $this->activeAliases;
 	}
 
-	/**
-	 * @return string|null
-	 */
 	public function getPermissionMessage() : ?string{
 		return $this->permissionMessage;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getDescription() : string{
 		return $this->description;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getUsage() : string{
 		return $this->usageMessage;
 	}
 
 	/**
 	 * @param string[] $aliases
+	 *
+	 * @return void
 	 */
 	public function setAliases(array $aliases){
 		$this->aliases = $aliases;
@@ -268,30 +220,30 @@ abstract class Command{
 	}
 
 	/**
-	 * @param string $description
+	 * @return void
 	 */
 	public function setDescription(string $description){
 		$this->description = $description;
 	}
 
 	/**
-	 * @param string $permissionMessage
+	 * @return void
 	 */
 	public function setPermissionMessage(string $permissionMessage){
 		$this->permissionMessage = $permissionMessage;
 	}
 
 	/**
-	 * @param string $usage
+	 * @return void
 	 */
 	public function setUsage(string $usage){
 		$this->usageMessage = $usage;
 	}
 
 	/**
-	 * @param CommandSender        $source
 	 * @param TextContainer|string $message
-	 * @param bool                 $sendToSource
+	 *
+	 * @return void
 	 */
 	public static function broadcastCommandMessage(CommandSender $source, $message, bool $sendToSource = true){
 		if($message instanceof TextContainer){
@@ -326,9 +278,6 @@ abstract class Command{
 		}
 	}
 
-	/**
-	 * @return string
-	 */
 	public function __toString() : string{
 		return $this->name;
 	}

src/pocketmine/command/CommandExecutor.php

@@ -23,16 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-
 interface CommandExecutor{
 
 	/**
-	 * @param CommandSender $sender
-	 * @param Command       $command
-	 * @param string        $label
 	 * @param string[]      $args
-	 *
-	 * @return bool
 	 */
 	public function onCommand(CommandSender $sender, Command $command, string $label, array $args) : bool;
 

src/pocketmine/command/CommandMap.php

@@ -23,30 +23,17 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-
 interface CommandMap{
 
 	/**
-	 * @param string    $fallbackPrefix
 	 * @param Command[] $commands
+	 *
+	 * @return void
 	 */
 	public function registerAll(string $fallbackPrefix, array $commands);
 
-	/**
-	 * @param string      $fallbackPrefix
-	 * @param Command     $command
-	 * @param string|null $label
-	 *
-	 * @return bool
-	 */
 	public function register(string $fallbackPrefix, Command $command, string $label = null) : bool;
 
-	/**
-	 * @param CommandSender $sender
-	 * @param string        $cmdLine
-	 *
-	 * @return bool
-	 */
 	public function dispatch(CommandSender $sender, string $cmdLine) : bool;
 
 	/**
@@ -55,11 +42,8 @@ interface CommandMap{
 	public function clearCommands();
 
 	/**
-	 * @param string $name
-	 *
 	 * @return Command|null
 	 */
 	public function getCommand(string $name);
 
-
 }

src/pocketmine/command/CommandReader.php

@@ -54,7 +54,9 @@ class CommandReader extends Thread{
 
 	/** @var \Threaded */
 	protected $buffer;
+	/** @var bool */
 	private $shutdown = false;
+	/** @var int */
 	private $type = self::TYPE_STREAM;
 
 	/** @var SleeperNotifier|null */
@@ -71,6 +73,9 @@ class CommandReader extends Thread{
 		}
 	}
 
+	/**
+	 * @return void
+	 */
 	public function shutdown(){
 		$this->shutdown = true;
 	}
@@ -94,7 +99,7 @@ class CommandReader extends Thread{
 		throw new \ThreadException($message);
 	}
 
-	private function initStdin(){
+	private function initStdin() : void{
 		if(is_resource(self::$stdin)){
 			fclose(self::$stdin);
 		}
@@ -111,8 +116,6 @@ class CommandReader extends Thread{
 	 * Checks if the specified stream is a FIFO pipe.
 	 *
 	 * @param resource $stream
-	 *
-	 * @return bool
 	 */
 	private function isPipe($stream) : bool{
 		return is_resource($stream) and (!stream_isatty($stream) or ((fstat($stream)["mode"] & 0170000) === 0010000));
@@ -141,6 +144,7 @@ class CommandReader extends Thread{
 				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
@@ -150,7 +154,7 @@ class CommandReader extends Thread{
 				case self::TYPE_PIPED:
 					if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
 						$this->initStdin();
-						$this->synchronized(function(){
+						$this->synchronized(function() : void{
 							$this->wait(200000);
 						}); //prevent CPU waste if it's end of pipe
 						return true; //loop back round
@@ -184,6 +188,9 @@ class CommandReader extends Thread{
 		return null;
 	}
 
+	/**
+	 * @return void
+	 */
 	public function run(){
 		$this->registerClassLoader();
 

src/pocketmine/command/CommandSender.php

@@ -31,6 +31,8 @@ interface CommandSender extends Permissible{
 
 	/**
 	 * @param TextContainer|string $message
+	 *
+	 * @return void
 	 */
 	public function sendMessage($message);
 
@@ -39,23 +41,18 @@ interface CommandSender extends Permissible{
 	 */
 	public function getServer();
 
-	/**
-	 * @return string
-	 */
 	public function getName() : string;
 
 	/**
 	 * Returns the line height of the command-sender's screen. Used for determining sizes for command output pagination
 	 * such as in the /help command.
-	 *
-	 * @return int
 	 */
 	public function getScreenLineHeight() : int;
 
 	/**
 	 * Sets the line height used for command output pagination for this command sender. `null` will reset it to default.
 	 *
-	 * @param int|null $height
+	 * @return void
 	 */
 	public function setScreenLineHeight(int $height = null);
 }

src/pocketmine/command/ConsoleCommandSender.php

@@ -37,6 +37,7 @@ use const PHP_INT_MAX;
 
 class ConsoleCommandSender implements CommandSender{
 
+	/** @var PermissibleBase */
 	private $perm;
 
 	/** @var int|null */
@@ -48,8 +49,6 @@ class ConsoleCommandSender implements CommandSender{
 
 	/**
 	 * @param Permission|string $name
-	 *
-	 * @return bool
 	 */
 	public function isPermissionSet($name) : bool{
 		return $this->perm->isPermissionSet($name);
@@ -57,27 +56,16 @@ class ConsoleCommandSender implements CommandSender{
 
 	/**
 	 * @param Permission|string $name
-	 *
-	 * @return bool
 	 */
 	public function hasPermission($name) : bool{
 		return $this->perm->hasPermission($name);
 	}
 
-	/**
-	 * @param Plugin $plugin
-	 * @param string $name
-	 * @param bool   $value
-	 *
-	 * @return PermissionAttachment
-	 */
 	public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment{
 		return $this->perm->addAttachment($plugin, $name, $value);
 	}
 
 	/**
-	 * @param PermissionAttachment $attachment
-	 *
 	 * @return void
 	 */
 	public function removeAttachment(PermissionAttachment $attachment){
@@ -104,6 +92,8 @@ class ConsoleCommandSender implements CommandSender{
 
 	/**
 	 * @param TextContainer|string $message
+	 *
+	 * @return void
 	 */
 	public function sendMessage($message){
 		if($message instanceof TextContainer){
@@ -117,22 +107,16 @@ class ConsoleCommandSender implements CommandSender{
 		}
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getName() : string{
 		return "CONSOLE";
 	}
 
-	/**
-	 * @return bool
-	 */
 	public function isOp() : bool{
 		return true;
 	}
 
 	/**
-	 * @param bool $value
+	 * @return void
 	 */
 	public function setOp(bool $value){
 

src/pocketmine/command/FormattedCommandAlias.php

@@ -32,10 +32,10 @@ use function strpos;
 use function substr;
 
 class FormattedCommandAlias extends Command{
+	/** @var string[] */
 	private $formatStrings = [];
 
 	/**
-	 * @param string   $alias
 	 * @param string[] $formatStrings
 	 */
 	public function __construct(string $alias, array $formatStrings){
@@ -65,10 +65,7 @@ class FormattedCommandAlias extends Command{
 	}
 
 	/**
-	 * @param string $formatString
-	 * @param array  $args
-	 *
-	 * @return string
+	 * @param string[] $args
 	 */
 	private function buildCommand(string $formatString, array $args) : string{
 		$index = strpos($formatString, '$');
@@ -143,13 +140,6 @@ class FormattedCommandAlias extends Command{
 		return $formatString;
 	}
 
-	/**
-	 * @param int $i
-	 * @param int $j
-	 * @param int $k
-	 *
-	 * @return bool
-	 */
 	private static function inRange(int $i, int $j, int $k) : bool{
 		return $i >= $j and $i <= $k;
 	}

src/pocketmine/command/PluginCommand.php

@@ -34,10 +34,6 @@ class PluginCommand extends Command implements PluginIdentifiableCommand{
 	/** @var CommandExecutor */
 	private $executor;
 
-	/**
-	 * @param string $name
-	 * @param Plugin $owner
-	 */
 	public function __construct(string $name, Plugin $owner){
 		parent::__construct($name);
 		$this->owningPlugin = $owner;
@@ -69,15 +65,12 @@ class PluginCommand extends Command implements PluginIdentifiableCommand{
 	}
 
 	/**
-	 * @param CommandExecutor $executor
+	 * @return void
 	 */
 	public function setExecutor(CommandExecutor $executor){
 		$this->executor = $executor;
 	}
 
-	/**
-	 * @return Plugin
-	 */
 	public function getPlugin() : Plugin{
 		return $this->owningPlugin;
 	}

src/pocketmine/command/PluginIdentifiableCommand.php

@@ -27,8 +27,5 @@ use pocketmine\plugin\Plugin;
 
 interface PluginIdentifiableCommand{
 
-	/**
-	 * @return Plugin
-	 */
 	public function getPlugin() : Plugin;
 }

src/pocketmine/command/RemoteConsoleCommandSender.php

@@ -41,6 +41,9 @@ class RemoteConsoleCommandSender extends ConsoleCommandSender{
 		$this->messages .= trim($message, "\r\n") . "\n";
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getMessage(){
 		return $this->messages;
 	}

src/pocketmine/command/SimpleCommandMap.php

@@ -72,6 +72,7 @@ use function explode;
 use function implode;
 use function min;
 use function preg_match_all;
+use function strcasecmp;
 use function stripslashes;
 use function strpos;
 use function strtolower;
@@ -79,9 +80,7 @@ use function trim;
 
 class SimpleCommandMap implements CommandMap{
 
-	/**
-	 * @var Command[]
-	 */
+	/** @var Command[] */
 	protected $knownCommands = [];
 
 	/** @var Server */
@@ -92,7 +91,7 @@ class SimpleCommandMap implements CommandMap{
 		$this->setDefaultCommands();
 	}
 
-	private function setDefaultCommands(){
+	private function setDefaultCommands() : void{
 		$this->registerAll("pocketmine", [
 			new BanCommand("ban"),
 			new BanIpCommand("ban-ip"),
@@ -137,20 +136,12 @@ class SimpleCommandMap implements CommandMap{
 		]);
 	}
 
-
 	public function registerAll(string $fallbackPrefix, array $commands){
 		foreach($commands as $command){
 			$this->register($fallbackPrefix, $command);
 		}
 	}
 
-	/**
-	 * @param string      $fallbackPrefix
-	 * @param Command     $command
-	 * @param string|null $label
-	 *
-	 * @return bool
-	 */
 	public function register(string $fallbackPrefix, Command $command, string $label = null) : bool{
 		if($label === null){
 			$label = $command->getName();
@@ -177,11 +168,6 @@ class SimpleCommandMap implements CommandMap{
 		return $registered;
 	}
 
-	/**
-	 * @param Command $command
-	 *
-	 * @return bool
-	 */
 	public function unregister(Command $command) : bool{
 		foreach($this->knownCommands as $lbl => $cmd){
 			if($cmd === $command){
@@ -194,21 +180,13 @@ class SimpleCommandMap implements CommandMap{
 		return true;
 	}
 
-	/**
-	 * @param Command $command
-	 * @param bool    $isAlias
-	 * @param string  $fallbackPrefix
-	 * @param string  $label
-	 *
-	 * @return bool
-	 */
 	private function registerAlias(Command $command, bool $isAlias, string $fallbackPrefix, string $label) : bool{
 		$this->knownCommands[$fallbackPrefix . ":" . $label] = $command;
 		if(($command instanceof VanillaCommand or $isAlias) and isset($this->knownCommands[$label])){
 			return false;
 		}
 
-		if(isset($this->knownCommands[$label]) and $this->knownCommands[$label]->getLabel() !== null and $this->knownCommands[$label]->getLabel() === $label){
+		if(isset($this->knownCommands[$label]) and $this->knownCommands[$label]->getLabel() === $label){
 			return false;
 		}
 
@@ -226,8 +204,8 @@ class SimpleCommandMap implements CommandMap{
 	 * This method is intended to provide capability for handling commands with spaces in their name.
 	 * The referenced parameters will be modified accordingly depending on the resulting matched command.
 	 *
-	 * @param string   &$commandName
-	 * @param string[] &$args
+	 * @param string   $commandName reference parameter
+	 * @param string[] $args reference parameter
 	 *
 	 * @return Command|null
 	 */
@@ -296,7 +274,6 @@ class SimpleCommandMap implements CommandMap{
 		return $this->knownCommands;
 	}
 
-
 	/**
 	 * @return void
 	 */
@@ -318,22 +295,21 @@ class SimpleCommandMap implements CommandMap{
 				$commandName = "";
 				$command = $this->matchCommand($commandName, $args);
 
-
 				if($command === null){
 					$bad[] = $commandString;
-				}elseif($commandName === $alias){
+				}elseif(strcasecmp($commandName, $alias) === 0){
 					$recursive[] = $commandString;
 				}else{
 					$targets[] = $commandString;
 				}
 			}
 
-			if(!empty($recursive)){
+			if(count($recursive) > 0){
 				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.recursive", [$alias, implode(", ", $recursive)]));
 				continue;
 			}
 
-			if(!empty($bad)){
+			if(count($bad) > 0){
 				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.notFound", [$alias, implode(", ", $bad)]));
 				continue;
 			}

src/pocketmine/command/defaults/BanIpCommand.php

@@ -75,7 +75,7 @@ class BanIpCommand extends VanillaCommand{
 		return true;
 	}
 
-	private function processIPBan(string $ip, CommandSender $sender, string $reason){
+	private function processIPBan(string $ip, CommandSender $sender, string $reason) : void{
 		$sender->getServer()->getIPBans()->addBan($ip, $reason, null, $sender->getName());
 
 		foreach($sender->getServer()->getOnlinePlayers() as $player){

src/pocketmine/command/defaults/BanListCommand.php

@@ -63,7 +63,7 @@ class BanListCommand extends VanillaCommand{
 		}
 
 		$list = $list->getEntries();
-		$message = implode(", ", array_map(function(BanEntry $entry){
+		$message = implode(", ", array_map(function(BanEntry $entry) : string{
 			return $entry->getName();
 		}, $list));
 

src/pocketmine/command/defaults/EffectCommand.php

@@ -76,7 +76,7 @@ class EffectCommand extends VanillaCommand{
 		}
 
 		if($effect === null){
-			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.effect.notFound", [(string) $args[1]]));
+			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.effect.notFound", [$args[1]]));
 			return true;
 		}
 
@@ -124,7 +124,6 @@ class EffectCommand extends VanillaCommand{
 			self::broadcastCommandMessage($sender, new TranslationContainer("%commands.effect.success", [$effect->getName(), $instance->getAmplifier(), $player->getDisplayName(), $instance->getDuration() / 20, $effect->getId()]));
 		}
 
-
 		return true;
 	}
 }

src/pocketmine/command/defaults/EnchantCommand.php

@@ -88,7 +88,6 @@ class EnchantCommand extends VanillaCommand{
 		$item->addEnchantment(new EnchantmentInstance($enchantment, $level));
 		$player->getInventory()->setItemInHand($item);
 
-
 		self::broadcastCommandMessage($sender, new TranslationContainer("%commands.enchant.success", [$player->getName()]));
 		return true;
 	}

src/pocketmine/command/defaults/GamemodeCommand.php

@@ -60,7 +60,6 @@ class GamemodeCommand extends VanillaCommand{
 			return true;
 		}
 
-		$target = $sender;
 		if(isset($args[1])){
 			$target = $sender->getServer()->getPlayer($args[1]);
 			if($target === null){
@@ -68,7 +67,9 @@ class GamemodeCommand extends VanillaCommand{
 
 				return true;
 			}
-		}elseif(!($sender instanceof Player)){
+		}elseif($sender instanceof Player){
+			$target = $sender;
+		}else{
 			throw new InvalidCommandSyntaxException();
 		}
 

src/pocketmine/command/defaults/HelpCommand.php

@@ -57,22 +57,22 @@ class HelpCommand extends VanillaCommand{
 		}
 
 		if(count($args) === 0){
-			$command = "";
+			$commandName = "";
 			$pageNumber = 1;
 		}elseif(is_numeric($args[count($args) - 1])){
 			$pageNumber = (int) array_pop($args);
 			if($pageNumber <= 0){
 				$pageNumber = 1;
 			}
-			$command = implode(" ", $args);
+			$commandName = implode(" ", $args);
 		}else{
-			$command = implode(" ", $args);
+			$commandName = implode(" ", $args);
 			$pageNumber = 1;
 		}
 
 		$pageHeight = $sender->getScreenLineHeight();
 
-		if($command === ""){
+		if($commandName === ""){
 			/** @var Command[][] $commands */
 			$commands = [];
 			foreach($sender->getServer()->getCommandMap()->getCommands() as $command){
@@ -82,7 +82,7 @@ class HelpCommand extends VanillaCommand{
 			}
 			ksort($commands, SORT_NATURAL | SORT_FLAG_CASE);
 			$commands = array_chunk($commands, $pageHeight);
-			$pageNumber = (int) min(count($commands), $pageNumber);
+			$pageNumber = min(count($commands), $pageNumber);
 			if($pageNumber < 1){
 				$pageNumber = 1;
 			}
@@ -95,7 +95,7 @@ class HelpCommand extends VanillaCommand{
 
 			return true;
 		}else{
-			if(($cmd = $sender->getServer()->getCommandMap()->getCommand(strtolower($command))) instanceof Command){
+			if(($cmd = $sender->getServer()->getCommandMap()->getCommand(strtolower($commandName))) instanceof Command){
 				if($cmd->testPermissionSilent($sender)){
 					$message = TextFormat::YELLOW . "--------- " . TextFormat::WHITE . " Help: /" . $cmd->getName() . TextFormat::YELLOW . " ---------\n";
 					$message .= TextFormat::GOLD . "Description: " . TextFormat::WHITE . $cmd->getDescription() . "\n";
@@ -105,7 +105,7 @@ class HelpCommand extends VanillaCommand{
 					return true;
 				}
 			}
-			$sender->sendMessage(TextFormat::RED . "No help for " . strtolower($command));
+			$sender->sendMessage(TextFormat::RED . "No help for " . strtolower($commandName));
 
 			return true;
 		}

src/pocketmine/command/defaults/KickCommand.php

@@ -68,7 +68,6 @@ class KickCommand extends VanillaCommand{
 			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
 		}
 
-
 		return true;
 	}
 }

src/pocketmine/command/defaults/ListCommand.php

@@ -47,9 +47,9 @@ class ListCommand extends VanillaCommand{
 			return true;
 		}
 
-		$playerNames = array_map(function(Player $player){
+		$playerNames = array_map(function(Player $player) : string{
 			return $player->getName();
-		}, array_filter($sender->getServer()->getOnlinePlayers(), function(Player $player) use ($sender){
+		}, array_filter($sender->getServer()->getOnlinePlayers(), function(Player $player) use ($sender) : bool{
 			return $player->isOnline() and (!($sender instanceof Player) or $sender->canSee($player));
 		}));
 

src/pocketmine/command/defaults/ParticleCommand.php

@@ -119,7 +119,6 @@ class ParticleCommand extends VanillaCommand{
 			return true;
 		}
 
-
 		$sender->sendMessage(new TranslationContainer("commands.particle.success", [$name, $count]));
 
 		$random = new Random((int) (microtime(true) * 1000) + mt_rand());
@@ -137,13 +136,6 @@ class ParticleCommand extends VanillaCommand{
 	}
 
 	/**
-	 * @param string   $name
-	 * @param Vector3  $pos
-	 * @param float    $xd
-	 * @param float    $yd
-	 * @param float    $zd
-	 * @param int|null $data
-	 *
 	 * @return Particle|null
 	 */
 	private function getParticle(string $name, Vector3 $pos, float $xd, float $yd, float $zd, int $data = null){

src/pocketmine/command/defaults/TeleportCommand.php

@@ -52,7 +52,7 @@ class TeleportCommand extends VanillaCommand{
 			return true;
 		}
 
-		$args = array_values(array_filter($args, function($arg){
+		$args = array_values(array_filter($args, function(string $arg) : bool{
 			return $arg !== "";
 		}));
 		if(count($args) < 1 or count($args) > 6){

src/pocketmine/command/defaults/TimeCommand.php

@@ -85,7 +85,6 @@ class TimeCommand extends VanillaCommand{
 			return true;
 		}
 
-
 		if(count($args) < 2){
 			throw new InvalidCommandSyntaxException();
 		}

src/pocketmine/command/defaults/TimingsCommand.php

@@ -126,18 +126,25 @@ class TimingsCommand extends VanillaCommand{
 					/** @var string */
 					private $host;
 
+					/**
+					 * @param string[] $data
+					 * @phpstan-param array<string, string> $data
+					 */
 					public function __construct(CommandSender $sender, string $host, string $agent, array $data){
 						parent::__construct([
-							["page" => "https://$host?upload=true", "extraOpts" => [
-								CURLOPT_HTTPHEADER => [
-									"User-Agent: $agent",
-									"Content-Type: application/x-www-form-urlencoded"
-								],
-								CURLOPT_POST => true,
-								CURLOPT_POSTFIELDS => http_build_query($data),
-								CURLOPT_AUTOREFERER => false,
-								CURLOPT_FOLLOWLOCATION => false
-							]]
+							[
+								"page" => "https://$host?upload=true",
+								"extraOpts" => [
+									CURLOPT_HTTPHEADER => [
+										"User-Agent: $agent",
+										"Content-Type: application/x-www-form-urlencoded"
+									],
+									CURLOPT_POST => true,
+									CURLOPT_POSTFIELDS => http_build_query($data),
+									CURLOPT_AUTOREFERER => false,
+									CURLOPT_FOLLOWLOCATION => false
+								]
+							]
 						], $sender);
 						$this->host = $host;
 					}

src/pocketmine/command/defaults/TransferServerCommand.php

@@ -21,10 +21,8 @@
 
 declare(strict_types=1);
 
-
 namespace pocketmine\command\defaults;
 
-
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\Player;
@@ -42,6 +40,10 @@ class TransferServerCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
+		if(!$this->testPermission($sender)){
+			return true;
+		}
+
 		if(count($args) < 1){
 			throw new InvalidCommandSyntaxException();
 		}elseif(!($sender instanceof Player)){

src/pocketmine/command/defaults/VanillaCommand.php

@@ -36,12 +36,7 @@ abstract class VanillaCommand extends Command{
 	public const MIN_COORD = -30000000;
 
 	/**
-	 * @param CommandSender $sender
 	 * @param mixed         $value
-	 * @param int           $min
-	 * @param int           $max
-	 *
-	 * @return int
 	 */
 	protected function getInteger(CommandSender $sender, $value, int $min = self::MIN_COORD, int $max = self::MAX_COORD) : int{
 		$i = (int) $value;
@@ -55,15 +50,6 @@ abstract class VanillaCommand extends Command{
 		return $i;
 	}
 
-	/**
-	 * @param float         $original
-	 * @param CommandSender $sender
-	 * @param string        $input
-	 * @param float         $min
-	 * @param float         $max
-	 *
-	 * @return float
-	 */
 	protected function getRelativeDouble(float $original, CommandSender $sender, string $input, float $min = self::MIN_COORD, float $max = self::MAX_COORD) : float{
 		if($input[0] === "~"){
 			$value = $this->getDouble($sender, substr($input, 1));
@@ -75,12 +61,7 @@ abstract class VanillaCommand extends Command{
 	}
 
 	/**
-	 * @param CommandSender $sender
 	 * @param mixed         $value
-	 * @param float         $min
-	 * @param float         $max
-	 *
-	 * @return float
 	 */
 	protected function getDouble(CommandSender $sender, $value, float $min = self::MIN_COORD, float $max = self::MAX_COORD) : float{
 		$i = (double) $value;

src/pocketmine/command/defaults/VersionCommand.php

@@ -84,7 +84,7 @@ class VersionCommand extends VanillaCommand{
 		return true;
 	}
 
-	private function describeToSender(Plugin $plugin, CommandSender $sender){
+	private function describeToSender(Plugin $plugin, CommandSender $sender) : void{
 		$desc = $plugin->getDescription();
 		$sender->sendMessage(TextFormat::DARK_GREEN . $desc->getName() . TextFormat::WHITE . " version " . TextFormat::DARK_GREEN . $desc->getVersion());
 

src/pocketmine/entity/Ageable.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
-
 interface Ageable{
 	public function isBaby() : bool;
 }

src/pocketmine/entity/Animal.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
-
 abstract class Animal extends Creature implements Ageable{
 
 	public function isBaby() : bool{

src/pocketmine/entity/Attribute.php

@@ -46,14 +46,22 @@ class Attribute{
 	public const HORSE_JUMP_STRENGTH = 14;
 	public const ZOMBIE_SPAWN_REINFORCEMENTS = 15;
 
+	/** @var int */
 	private $id;
+	/** @var float */
 	protected $minValue;
+	/** @var float */
 	protected $maxValue;
+	/** @var float */
 	protected $defaultValue;
+	/** @var float */
 	protected $currentValue;
+	/** @var string */
 	protected $name;
+	/** @var bool */
 	protected $shouldSend;
 
+	/** @var bool */
 	protected $desynchronized = true;
 
 	/** @var Attribute[] */
@@ -79,15 +87,6 @@ class Attribute{
 	}
 
 	/**
-	 * @param int    $id
-	 * @param string $name
-	 * @param float  $minValue
-	 * @param float  $maxValue
-	 * @param float  $defaultValue
-	 * @param bool   $shouldSend
-	 *
-	 * @return Attribute
-	 *
 	 * @throws \InvalidArgumentException
 	 */
 	public static function addAttribute(int $id, string $name, float $minValue, float $maxValue, float $defaultValue, bool $shouldSend = true) : Attribute{
@@ -98,20 +97,10 @@ class Attribute{
 		return self::$attributes[$id] = new Attribute($id, $name, $minValue, $maxValue, $defaultValue, $shouldSend);
 	}
 
-	/**
-	 * @param int $id
-	 *
-	 * @return Attribute|null
-	 */
 	public static function getAttribute(int $id) : ?Attribute{
 		return isset(self::$attributes[$id]) ? clone self::$attributes[$id] : null;
 	}
 
-	/**
-	 * @param string $name
-	 *
-	 * @return Attribute|null
-	 */
 	public static function getAttributeByName(string $name) : ?Attribute{
 		foreach(self::$attributes as $a){
 			if($a->getName() === $name){
@@ -137,6 +126,9 @@ class Attribute{
 		return $this->minValue;
 	}
 
+	/**
+	 * @return $this
+	 */
 	public function setMinValue(float $minValue){
 		if($minValue > ($max = $this->getMaxValue())){
 			throw new \InvalidArgumentException("Minimum $minValue is greater than the maximum $max");
@@ -153,6 +145,9 @@ class Attribute{
 		return $this->maxValue;
 	}
 
+	/**
+	 * @return $this
+	 */
 	public function setMaxValue(float $maxValue){
 		if($maxValue < ($min = $this->getMinValue())){
 			throw new \InvalidArgumentException("Maximum $maxValue is less than the minimum $min");
@@ -169,6 +164,9 @@ class Attribute{
 		return $this->defaultValue;
 	}
 
+	/**
+	 * @return $this
+	 */
 	public function setDefaultValue(float $defaultValue){
 		if($defaultValue > $this->getMaxValue() or $defaultValue < $this->getMinValue()){
 			throw new \InvalidArgumentException("Default $defaultValue is outside the range " . $this->getMinValue() . " - " . $this->getMaxValue());
@@ -190,10 +188,6 @@ class Attribute{
 	}
 
 	/**
-	 * @param float $value
-	 * @param bool  $fit
-	 * @param bool  $forceSend
-	 *
 	 * @return $this
 	 */
 	public function setValue(float $value, bool $fit = false, bool $forceSend = false){