bump version

fixes #2250

.gitignore

@@ -1,5 +1,6 @@
 players/*
 worlds/*
+plugin_data/*
 plugins/*
 bin*/*
 timings/*

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "tests/plugins/PocketMine-TesterPlugin"]
 	path = tests/plugins/PocketMine-TesterPlugin
 	url = https://github.com/pmmp/PocketMine-TesterPlugin.git
+[submodule "src/pocketmine/resources/vanilla"]
+	path = src/pocketmine/resources/vanilla
+	url = https://github.com/pmmp/BedrockData.git

.travis.yml

@@ -18,7 +18,7 @@ before_script:
  - composer install
 
 script:
- - ./tests/travis.sh
+ - ./tests/travis.sh -t4
 
 notifications:
  email: false

CONTRIBUTING.md

@@ -42,7 +42,7 @@ We try to ensure that our project's codebase is as clean as possible and ensure
 - **Details should be provided of tests done.** Simply saying "Tested" or equivalent is not acceptable.
 
 ### Code contributions
-- **Avoid using GitHub Web Editor**. The web editor lacks most useful GIT features and **should only be used for very minor changes**. It is immediately clear if the web editor has been used, and if so the PR is more likely to be rejected. If you want to make serious contributions, **please learn how to use [GIT version control](https://git-scm.com/)**.
+- **Avoid committing changes directly on GitHub. This includes use of the web editor, and also uploading files.** The web editor lacks most useful GIT features and **should only be used for very minor changes**. It is immediately clear if the web editor has been used, and if so the PR is more likely to be rejected. If you want to make serious contributions, **please learn how to use [GIT version control](https://git-scm.com/)**.
 - **Do not copy-paste code**. There are potential license issues implicit with copy-pasting, and copy-paste usually indicates a lack of understanding of the actual code. Copy-pasted code is obvious a mile off and **any PR like this is likely to be closed**. If you want to use somebody else's code from a Git repository, **use [GIT's cherry-pick feature](https://git-scm.com/docs/git-cherry-pick)** to cherry-pick the commit. **Cherry-picking is the politer way to copy somebody's changes** and retains all the original accreditation, so there is no need for copy-pasted commits with descriptions like `Some code, thanks @exampleperson`.
 - **Make sure you can explain your changes**. If you can't provide a good explanation of changes, your PR may be rejected.
 - **Code should use the same style as in PocketMine-MP.** See [below](#code-syntax) for an example.

README.md

@@ -1,6 +1,6 @@
 # [![PocketMine-MP](http://cdn.pocketmine.net/img/PocketMine-MP-h.png)](https://pmmp.io)
 
-__A highly customisable, open source server software for Minecraft: Pocket Edition written in PHP__
+__A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP__
 
 [![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
 
@@ -27,18 +27,6 @@ Yes you can! Contributions are welcomed provided that they comply with our [Cont
 
 **Note: Please avoid development builds unless there is no other alternative for what you need.** Development builds are subject to changes at any time without notice, and it is likely that your server or plugins might break without warning.
 
-## Third-party Libraries/Protocols Used
-* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
-* __[PHP mbstring](http://php.net/manual/en/book.mbstring.php)__
-* __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
-* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
-* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library.
-* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C.
-* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
-* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
-* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
-* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__
-
 ## Licensing information
 
 	This program is free software: you can redistribute it and/or modify

composer.json

@@ -6,8 +6,11 @@
    "license": "LGPL-3.0",
    "require": {
       "php": ">=7.2.0",
+      "php-64bit": "*",
       "ext-bcmath": "*",
       "ext-curl": "*",
+      "ext-ctype": "*",
+      "ext-date": "*",
       "ext-hash": "*",
       "ext-json": "*",
       "ext-mbstring": "*",
@@ -21,17 +24,23 @@
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "0.11.0",
-      "pocketmine/spl": "0.3.0",
-      "pocketmine/binaryutils": "0.0.1",
-      "pocketmine/nbt": "0.1.0",
-      "pocketmine/math": "0.1.0"
+      "pocketmine/raklib": "^0.12.0",
+      "pocketmine/spl": "^0.3.0",
+      "pocketmine/binaryutils": "^0.1.0",
+      "pocketmine/nbt": "^0.2.0",
+      "pocketmine/math": "^0.2.0",
+      "pocketmine/snooze": "^0.1.0"
    },
    "autoload": {
       "psr-4": {
          "": ["src"]
       }
    },
+   "autoload-dev": {
+      "psr-4": {
+         "pocketmine\\": "tests/phpunit/"
+      }
+   },
    "repositories": [
       {
          "type": "vcs",
@@ -52,6 +61,10 @@
       {
          "type": "vcs",
          "url": "https://github.com/pmmp/Math"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/Snooze"
       }
    ]
 }

composer.lock

@@ -1,27 +1,28 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "401dbada37e501304f05b0f1fa818953",
+    "content-hash": "2670b9e2a730ff758909be8b9e9d609a",
     "packages": [
         {
             "name": "pocketmine/binaryutils",
-            "version": "0.0.1",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "03e6851f814aba96487ec64181a6ae948edd9f7a"
+                "reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/03e6851f814aba96487ec64181a6ae948edd9f7a",
-                "reference": "03e6851f814aba96487ec64181a6ae948edd9f7a",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
+                "reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=7.2",
+                "php-64bit": "*"
             },
             "type": "library",
             "autoload": {
@@ -37,24 +38,25 @@
                 "source": "https://github.com/pmmp/BinaryUtils/tree/master",
                 "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2018-03-17T11:57:06+00:00"
+            "time": "2018-04-16T09:05:08+00:00"
         },
         {
             "name": "pocketmine/math",
-            "version": "0.1.0",
+            "version": "0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Math.git",
-                "reference": "1df74f0352309a9c1e6728fa416a3f0493d07b16"
+                "reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Math/zipball/1df74f0352309a9c1e6728fa416a3f0493d07b16",
-                "reference": "1df74f0352309a9c1e6728fa416a3f0493d07b16",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/95ae5600328ed2add44c0bc830a68d3660e9e0ef",
+                "reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.2.0",
+                "php-64bit": "*"
             },
             "type": "library",
             "autoload": {
@@ -70,25 +72,26 @@
                 "source": "https://github.com/pmmp/Math/tree/master",
                 "issues": "https://github.com/pmmp/Math/issues"
             },
-            "time": "2018-03-18T18:01:56+00:00"
+            "time": "2018-06-09T09:26:30+00:00"
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.1.0",
+            "version": "0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "d79f8615442887bb45cfacdb52e1e6eb47c38fd7"
+                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/d79f8615442887bb45cfacdb52e1e6eb47c38fd7",
-                "reference": "d79f8615442887bb45cfacdb52e1e6eb47c38fd7",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
+                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.0",
-                "pocketmine/binaryutils": "0.0.1"
+                "php-64bit": "*",
+                "pocketmine/binaryutils": "^0.1.0"
             },
             "type": "library",
             "autoload": {
@@ -106,61 +109,98 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.1.0",
+                "source": "https://github.com/pmmp/NBT/tree/0.2.0",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2018-04-13T18:43:03+00:00"
+            "time": "2018-06-13T09:56:00+00:00"
         },
         {
             "name": "pocketmine/raklib",
-            "version": "0.11.0",
+            "version": "0.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43"
+                "reference": "922da28efd828e2af6c19db1676ea9b6a267071c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43",
-                "reference": "1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/922da28efd828e2af6c19db1676ea9b6a267071c",
+                "reference": "922da28efd828e2af6c19db1676ea9b6a267071c",
                 "shasum": ""
             },
             "require": {
                 "ext-bcmath": "*",
                 "ext-pthreads": ">=3.1.7dev",
                 "ext-sockets": "*",
-                "php": ">=7.2.0RC3",
-                "pocketmine/binaryutils": "0.0.1",
-                "pocketmine/spl": "0.3.0"
+                "php": ">=7.2.0",
+                "php-64bit": "*",
+                "php-ipv6": "*",
+                "pocketmine/binaryutils": "^0.1.0",
+                "pocketmine/snooze": "^0.1.0",
+                "pocketmine/spl": "^0.3.0"
             },
             "type": "library",
             "autoload": {
-                "classmap": [
-                    "./"
-                ]
+                "psr-4": {
+                    "raklib\\": "src/"
+                }
             },
             "license": [
                 "GPL-3.0"
             ],
             "description": "A RakNet server implementation written in PHP",
             "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/0.11.0",
+                "source": "https://github.com/pmmp/RakLib/tree/0.12.0",
                 "issues": "https://github.com/pmmp/RakLib/issues"
             },
-            "time": "2018-04-13T19:05:24+00:00"
+            "time": "2018-06-13T10:06:14+00:00"
         },
         {
-            "name": "pocketmine/spl",
-            "version": "0.3.0",
+            "name": "pocketmine/snooze",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/SPL.git",
-                "reference": "ee32424c100fd11ae7f7b8df7604623fd475f0ec"
+                "url": "https://github.com/pmmp/Snooze.git",
+                "reference": "3cc9d0164230889acb08e22cc126133809e9d346"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ee32424c100fd11ae7f7b8df7604623fd475f0ec",
-                "reference": "ee32424c100fd11ae7f7b8df7604623fd475f0ec",
+                "url": "https://api.github.com/repos/pmmp/Snooze/zipball/3cc9d0164230889acb08e22cc126133809e9d346",
+                "reference": "3cc9d0164230889acb08e22cc126133809e9d346",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pthreads": ">=3.1.7dev",
+                "php-64bit": ">=7.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\snooze\\": "src/"
+                }
+            },
+            "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.0",
+                "issues": "https://github.com/pmmp/Snooze/issues"
+            },
+            "time": "2018-06-13T09:36:11+00:00"
+        },
+        {
+            "name": "pocketmine/spl",
+            "version": "0.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/SPL.git",
+                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ca3912099543ddc4b4b14f40e258d84ca547dfa5",
+                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5",
                 "shasum": ""
             },
             "type": "library",
@@ -179,7 +219,7 @@
             "support": {
                 "source": "https://github.com/pmmp/SPL/tree/master"
             },
-            "time": "2018-03-17T11:56:20+00:00"
+            "time": "2018-06-09T17:30:36+00:00"
         }
     ],
     "packages-dev": [],
@@ -192,8 +232,11 @@
     "prefer-lowest": false,
     "platform": {
         "php": ">=7.2.0",
+        "php-64bit": "*",
         "ext-bcmath": "*",
         "ext-curl": "*",
+        "ext-ctype": "*",
+        "ext-date": "*",
         "ext-hash": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

doxygen.conf

@@ -38,7 +38,7 @@ PROJECT_NAME           = PocketMine-MP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "PM_VERSION - API PM_API"
+PROJECT_NUMBER         = "PM_VERSION"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

src/pocketmine/Achievement.php

@@ -147,6 +147,4 @@ abstract class Achievement{
 
 		return false;
 	}
-
-
 }

src/pocketmine/CrashDump.php

@@ -64,6 +64,8 @@ class CrashDump{
 		$this->extraData();
 
 		$this->encodeData();
+
+		fclose($this->fp);
 	}
 
 	public function getPath() : string{
@@ -227,13 +229,13 @@ class CrashDump{
 	}
 
 	private function generalData(){
-		$version = new VersionString();
+		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
 		$this->data["general"] = [];
 		$this->data["general"]["name"] = $this->server->getName();
-		$this->data["general"]["version"] = $version->get(false);
+		$this->data["general"]["version"] = $version->getFullVersion(false);
 		$this->data["general"]["build"] = $version->getBuild();
 		$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
-		$this->data["general"]["api"] = \pocketmine\API_VERSION;
+		$this->data["general"]["api"] = \pocketmine\BASE_VERSION;
 		$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
 		$this->data["general"]["raklib"] = RakLib::VERSION;
 		$this->data["general"]["uname"] = php_uname("a");
@@ -241,7 +243,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->addLine($this->server->getName() . " version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
+		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
 		$this->addLine("Git commit: " . GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());
@@ -256,5 +258,4 @@ class CrashDump{
 	public function add($str){
 		fwrite($this->fp, $str);
 	}
-
 }

src/pocketmine/MemoryManager.php

@@ -27,7 +27,6 @@ use pocketmine\event\server\LowMemoryEvent;
 use pocketmine\scheduler\DumpWorkerMemoryTask;
 use pocketmine\scheduler\GarbageCollectionTask;
 use pocketmine\timings\Timings;
-use pocketmine\utils\MainLogger;
 use pocketmine\utils\Utils;
 
 class MemoryManager{
@@ -243,9 +242,9 @@ class MemoryManager{
 		Timings::$garbageCollectorTimer->startTiming();
 
 		if($this->garbageCollectionAsync){
-			$size = $this->server->getScheduler()->getAsyncTaskPoolSize();
-			for($i = 0; $i < $size; ++$i){
-				$this->server->getScheduler()->scheduleAsyncTaskToWorker(new GarbageCollectionTask(), $i);
+			$pool = $this->server->getAsyncPool();
+			foreach($pool->getRunningWorkers() as $i){
+				$pool->submitTaskToWorker(new GarbageCollectionTask(), $i);
 			}
 		}
 
@@ -264,13 +263,13 @@ class MemoryManager{
 	 * @param int    $maxStringSize
 	 */
 	public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
-		MainLogger::getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
-		self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize);
+		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
+		self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize, $this->server->getLogger());
 
 		if($this->dumpWorkers){
-			$scheduler = $this->server->getScheduler();
-			for($i = 0, $size = $scheduler->getAsyncTaskPoolSize(); $i < $size; ++$i){
-				$scheduler->scheduleAsyncTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
+			$pool = $this->server->getAsyncPool();
+			foreach($pool->getRunningWorkers() as $i){
+				$pool->submitTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
 			}
 		}
 	}
@@ -278,14 +277,15 @@ class MemoryManager{
 	/**
 	 * Static memory dumper accessible from any thread.
 	 *
-	 * @param mixed  $startingObject
-	 * @param string $outputFolder
-	 * @param int    $maxNesting
-	 * @param int    $maxStringSize
+	 * @param mixed   $startingObject
+	 * @param string  $outputFolder
+	 * @param int     $maxNesting
+	 * @param int     $maxStringSize
+	 * @param \Logger $logger
 	 *
 	 * @throws \ReflectionException
 	 */
-	public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize){
+	public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger){
 		$hardLimit = ini_get('memory_limit');
 		ini_set('memory_limit', '-1');
 		gc_disable();
@@ -329,7 +329,7 @@ class MemoryManager{
 		}
 
 		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-		MainLogger::getLogger()->info("[Dump] Wrote $staticCount static properties");
+		$logger->info("[Dump] Wrote $staticCount static properties");
 
 		if(isset($GLOBALS)){ //This might be null if we're on a different thread
 			$globalVariables = [];
@@ -357,7 +357,7 @@ class MemoryManager{
 			}
 
 			file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-			MainLogger::getLogger()->info("[Dump] Wrote $globalCount global variables");
+			$logger->info("[Dump] Wrote $globalCount global variables");
 		}
 
 		self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
@@ -411,7 +411,7 @@ class MemoryManager{
 
 		}while($continue);
 
-		MainLogger::getLogger()->info("[Dump] Wrote " . count($objects) . " objects");
+		$logger->info("[Dump] Wrote " . count($objects) . " objects");
 
 		fclose($obData);
 
@@ -421,7 +421,7 @@ class MemoryManager{
 		arsort($instanceCounts, SORT_NUMERIC);
 		file_put_contents($outputFolder . "/instanceCounts.js", json_encode($instanceCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 
-		MainLogger::getLogger()->info("[Dump] Finished!");
+		$logger->info("[Dump] Finished!");
 
 		ini_set('memory_limit', $hardLimit);
 		gc_enable();

src/pocketmine/OfflinePlayer.php

@@ -134,6 +134,4 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
 		$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 	}
-
-
 }

src/pocketmine/Player.php

@@ -76,6 +76,7 @@ use pocketmine\inventory\transaction\CraftingTransaction;
 use pocketmine\inventory\transaction\InventoryTransaction;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\Consumable;
+use pocketmine\item\Durable;
 use pocketmine\item\Item;
 use pocketmine\item\WritableBook;
 use pocketmine\item\WrittenBook;
@@ -86,7 +87,6 @@ use pocketmine\level\format\Chunk;
 use pocketmine\level\Level;
 use pocketmine\level\Location;
 use pocketmine\level\Position;
-use pocketmine\level\WeakPosition;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\metadata\MetadataValue;
@@ -298,7 +298,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	/** @var Vector3|null */
 	protected $sleeping = null;
-	/** @var WeakPosition|null */
+	/** @var Position|null */
 	private $spawnPosition = null;
 
 	//TODO: Abilities
@@ -401,7 +401,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 *
 	 * @return UUID|null
 	 */
-	public function getUniqueId(){
+	public function getUniqueId() : ?UUID{
 		return parent::getUniqueId();
 	}
 
@@ -459,7 +459,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * @param Player $player
 	 */
-	public function spawnTo(Player $player){
+	public function spawnTo(Player $player) : void{
 		if($this->spawned and $player->spawned and $this->isAlive() and $player->isAlive() and $player->getLevel() === $this->level and $player->canSee($this) and !$this->isSpectator()){
 			parent::spawnTo($player);
 		}
@@ -538,7 +538,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return !$this->isSpectator();
 	}
 
-	public function resetFallDistance(){
+	public function resetFallDistance() : void{
 		parent::resetFallDistance();
 		if($this->inAirTicks !== 0){
 			$this->startAirTicks = 5;
@@ -653,7 +653,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 		}
 
-		$this->sendCommandData();
+		if($this->spawned){
+			$this->sendCommandData();
+		}
 	}
 
 	/**
@@ -664,8 +666,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function sendCommandData(){
-		//TODO: this needs fixing
-
 		$pk = new AvailableCommandsPacket();
 		foreach($this->server->getCommandMap()->getCommands() as $name => $command){
 			if(isset($pk->commandData[$command->getName()]) or $command->getName() === "help"){
@@ -686,7 +686,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 			$aliases = $command->getAliases();
 			if(!empty($aliases)){
-				if(!\in_array($data->commandName, $aliases, true)){
+				if(!in_array($data->commandName, $aliases, true)){
 					//work around a client bug which makes the original name not show when aliases are used
 					$aliases[] = $data->commandName;
 				}
@@ -810,7 +810,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 *
 	 * If null is given, will additionally send the skin to the player itself as well as its viewers.
 	 */
-	public function sendSkin(array $targets = null) : void{
+	public function sendSkin(?array $targets = null) : void{
 		parent::sendSkin($targets ?? $this->server->getOnlinePlayers());
 	}
 
@@ -921,12 +921,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	protected function switchLevel(Level $targetLevel) : bool{
 		$oldLevel = $this->level;
 		if(parent::switchLevel($targetLevel)){
-			foreach($this->usedChunks as $index => $d){
-				Level::getXZ($index, $X, $Z);
-				$this->unloadChunk($X, $Z, $oldLevel);
+			if($oldLevel !== null){
+				foreach($this->usedChunks as $index => $d){
+					Level::getXZ($index, $X, $Z);
+					$this->unloadChunk($X, $Z, $oldLevel);
+				}
 			}
 
 			$this->usedChunks = [];
+			$this->loadQueue = [];
 			$this->level->sendTime($this);
 			$this->level->sendDifficulty($this);
 
@@ -1059,9 +1062,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->dataPacket($pk);
 	}
 
-	protected function orderChunks(){
+	protected function orderChunks() : void{
 		if(!$this->isConnected() or $this->viewDistance === -1){
-			return false;
+			return;
 		}
 
 		Timings::$playerChunkOrderTimer->startTiming();
@@ -1146,8 +1149,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->loadQueue = $newOrder;
 
 		Timings::$playerChunkOrderTimer->stopTiming();
-
-		return true;
 	}
 
 	/**
@@ -1167,7 +1168,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * @return bool
 	 */
 	public function hasValidSpawnPosition() : bool{
-		return $this->spawnPosition instanceof WeakPosition and $this->spawnPosition->isValid();
+		return $this->spawnPosition !== null and $this->spawnPosition->isValid();
 	}
 
 	/**
@@ -1182,7 +1183,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}else{
 			$level = $pos->getLevel();
 		}
-		$this->spawnPosition = new WeakPosition($pos->x, $pos->y, $pos->z, $level);
+		$this->spawnPosition = new Position($pos->x, $pos->y, $pos->z, $level);
 		$pk = new SetSpawnPositionPacket();
 		$pk->x = $this->spawnPosition->getFloorX();
 		$pk->y = $this->spawnPosition->getFloorY();
@@ -1485,7 +1486,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return 0;
 	}
 
-	protected function checkGroundState(float $movX, float $movY, float $movZ, float $dx, float $dy, float $dz){
+	protected function checkGroundState(float $movX, float $movY, float $movZ, float $dx, float $dy, float $dz) : void{
 		if(!$this->onGround or $movY != 0){
 			$bb = clone $this->boundingBox;
 			$bb->minY = $this->y - 0.2;
@@ -1500,8 +1501,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return false; //currently has no server-side movement
 	}
 
-	protected function checkNearEntities(int $tickDiff){
-		foreach($this->level->getNearbyEntities($this->boundingBox->grow(1, 0.5, 1), $this) as $entity){
+	protected function checkNearEntities(){
+		foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(1, 0.5, 1), $this) as $entity){
 			$entity->scheduleUpdate();
 
 			if(!$entity->isAlive() or $entity->isFlaggedForDespawn()){
@@ -1635,17 +1636,17 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->newPosition = null;
 	}
 
-	public function jump(){
+	public function jump() : void{
 		$this->server->getPluginManager()->callEvent(new PlayerJumpEvent($this));
 		parent::jump();
 	}
 
-	public function setMotion(Vector3 $mot){
-		if(parent::setMotion($mot)){
+	public function setMotion(Vector3 $motion) : bool{
+		if(parent::setMotion($motion)){
 			$this->broadcastMotion();
 
-			if($this->motionY > 0){
-				$this->startAirTicks = (-log($this->gravity / ($this->gravity + $this->drag * $this->motionY)) / $this->drag) * 2 + 5;
+			if($this->motion->y > 0){
+				$this->startAirTicks = (-log($this->gravity / ($this->gravity + $this->drag * $this->motion->y)) / $this->drag) * 2 + 5;
 			}
 
 			return true;
@@ -1653,11 +1654,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return false;
 	}
 
-	protected function updateMovement(bool $teleport = false){
+	protected function updateMovement(bool $teleport = false) : void{
 
 	}
 
-	protected function tryChangeMovement(){
+	protected function tryChangeMovement() : void{
 
 	}
 
@@ -1700,14 +1701,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		if($this->spawned){
 			$this->processMovement($tickDiff);
-			$this->motionX = $this->motionY = $this->motionZ = 0; //TODO: HACK! (Fixes player knockback being messed up)
+			$this->motion->x = $this->motion->y = $this->motion->z = 0; //TODO: HACK! (Fixes player knockback being messed up)
 
 			Timings::$timerEntityBaseTick->startTiming();
 			$this->entityBaseTick($tickDiff);
 			Timings::$timerEntityBaseTick->stopTiming();
 
 			if(!$this->isSpectator() and $this->isAlive()){
-				$this->checkNearEntities($tickDiff);
+				Timings::$playerCheckNearEntitiesTimer->startTiming();
+				$this->checkNearEntities();
+				Timings::$playerCheckNearEntitiesTimer->stopTiming();
 
 				if($this->speed !== null){
 					if($this->onGround){
@@ -1742,7 +1745,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return true;
 	}
 
-	public function doFoodTick(int $tickDiff = 1){
+	protected function doFoodTick(int $tickDiff = 1) : void{
 		if($this->isSurvival()){
 			parent::doFoodTick($tickDiff);
 		}
@@ -1825,11 +1828,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return ($targetDot - $eyeDot) >= -$maxDiff;
 	}
 
-	protected function initHumanData(){
+	protected function initHumanData() : void{
 		$this->setNameTag($this->username);
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 		$this->addDefaultWindows();
 	}
@@ -1912,7 +1915,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		if(!$packet->skipVerification){
-			$this->server->getScheduler()->scheduleAsyncTask(new VerifyLoginTask($this, $packet));
+			$this->server->getAsyncPool()->submitTask(new VerifyLoginTask($this, $packet));
 		}else{
 			$this->onVerifyCompleted($packet, null, true);
 		}
@@ -1944,7 +1947,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$xuid = "";
 		}
 
-		if($xuid === ""){
+		if($xuid === "" or !is_string($xuid)){
 			if($signedByMojang){
 				$this->server->getLogger()->error($this->getName() . " should have an XUID, but none found");
 			}
@@ -1953,7 +1956,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				return;
 			}
 
-			$this->server->getLogger()->debug($this->getName() . " is NOT logged into to Xbox Live");
+			$this->server->getLogger()->debug($this->getName() . " is NOT logged into Xbox Live");
 		}else{
 			$this->server->getLogger()->debug($this->getName() . " is logged into Xbox Live");
 			$this->xuid = $xuid;
@@ -1992,7 +1995,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(($level = $this->server->getLevelByName($this->namedtag->getString("Level", "", true))) === null){
 			$this->setLevel($this->server->getDefaultLevel());
 			$this->namedtag->setString("Level", $this->level->getFolderName());
-			$spawnLocation = $this->level->getSpawnLocation();
+			$spawnLocation = $this->level->getSafeSpawn();
 			$this->namedtag->setTag(new ListTag("Pos", [
 				new DoubleTag("", $spawnLocation->x),
 				new DoubleTag("", $spawnLocation->y),
@@ -2082,9 +2085,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		if(!$this->hasValidSpawnPosition()){
 			if(($level = $this->server->getLevelByName($this->namedtag->getString("SpawnLevel", ""))) instanceof Level){
-				$this->spawnPosition = new WeakPosition($this->namedtag->getInt("SpawnX"), $this->namedtag->getInt("SpawnY"), $this->namedtag->getInt("SpawnZ"), $level);
+				$this->spawnPosition = new Position($this->namedtag->getInt("SpawnX"), $this->namedtag->getInt("SpawnY"), $this->namedtag->getInt("SpawnZ"), $level);
 			}else{
-				$this->spawnPosition = WeakPosition::fromObject($this->level->getSafeSpawn());
+				$this->spawnPosition = $this->level->getSafeSpawn();
 			}
 		}
 
@@ -2143,8 +2146,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->sendPotionEffects($this);
 		$this->sendData($this);
 
-		$this->inventory->sendContents($this);
-		$this->armorInventory->sendContents($this);
+		$this->sendAllInventories();
 		$this->inventory->sendCreativeContents();
 		$this->inventory->sendHeldItem($this);
 		$this->dataPacket($this->server->getCraftingManager()->getCraftingDataPacket());
@@ -2283,7 +2285,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				if($action !== null){
 					$actions[] = $action;
 				}
-			}catch(\Throwable $e){
+			}catch(\Exception $e){
 				$this->server->getLogger()->debug("Unhandled inventory action from " . $this->getName() . ": " . $e->getMessage());
 				$this->sendAllInventories();
 				return false;
@@ -2504,20 +2506,20 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							$ev->setCancelled();
 						}
 
-						if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->hasEffect(Effect::BLINDNESS) and !$this->isInsideOfWater()){
-							$ev->setDamage($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
+						if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->hasEffect(Effect::BLINDNESS) and !$this->isUnderwater()){
+							$ev->setModifier($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
 						}
 
 						$target->attack($ev);
 
 						if($ev->isCancelled()){
-							if($heldItem->isTool() and $this->isSurvival()){
+							if($heldItem instanceof Durable and $this->isSurvival()){
 								$this->inventory->sendContents($this);
 							}
 							return true;
 						}
 
-						if($ev->getDamage(EntityDamageEvent::MODIFIER_CRITICAL) > 0){
+						if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0){
 							$pk = new AnimatePacket();
 							$pk->action = AnimatePacket::ACTION_CRITICAL_HIT;
 							$pk->entityRuntimeId = $target->getId();
@@ -2527,14 +2529,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							}
 						}
 
-						if($this->isSurvival()){
-							if($heldItem->useOn($target)){
-								$this->inventory->setItemInHand($heldItem);
-							}
-
-							$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
+						if($heldItem->onAttackEntity($target) and $this->isSurvival()){ //always fire the hook, even if we are survival
+							$this->inventory->setItemInHand($heldItem);
 						}
 
+						$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
+
 						return true;
 					default:
 						break; //unknown
@@ -2745,40 +2745,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->jump();
 				return true;
 			case PlayerActionPacket::ACTION_START_SPRINT:
-				$ev = new PlayerToggleSprintEvent($this, true);
-				$this->server->getPluginManager()->callEvent($ev);
-				if($ev->isCancelled()){
-					$this->sendData($this);
-				}else{
-					$this->setSprinting(true);
-				}
+				$this->toggleSprint(true);
 				return true;
 			case PlayerActionPacket::ACTION_STOP_SPRINT:
-				$ev = new PlayerToggleSprintEvent($this, false);
-				$this->server->getPluginManager()->callEvent($ev);
-				if($ev->isCancelled()){
-					$this->sendData($this);
-				}else{
-					$this->setSprinting(false);
-				}
+				$this->toggleSprint(false);
 				return true;
 			case PlayerActionPacket::ACTION_START_SNEAK:
-				$ev = new PlayerToggleSneakEvent($this, true);
-				$this->server->getPluginManager()->callEvent($ev);
-				if($ev->isCancelled()){
-					$this->sendData($this);
-				}else{
-					$this->setSneaking(true);
-				}
+				$this->toggleSneak(true);
 				return true;
 			case PlayerActionPacket::ACTION_STOP_SNEAK:
-				$ev = new PlayerToggleSneakEvent($this, false);
-				$this->server->getPluginManager()->callEvent($ev);
-				if($ev->isCancelled()){
-					$this->sendData($this);
-				}else{
-					$this->setSneaking(false);
-				}
+				$this->toggleSneak(false);
 				return true;
 			case PlayerActionPacket::ACTION_START_GLIDE:
 			case PlayerActionPacket::ACTION_STOP_GLIDE:
@@ -2788,6 +2764,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, BlockFactory::toStaticRuntimeId($block->getId(), $block->getDamage()) | ($packet->face << 24));
 				//TODO: destroy-progress level event
 				break;
+			case PlayerActionPacket::ACTION_START_SWIMMING:
+				break; //TODO
+			case PlayerActionPacket::ACTION_STOP_SWIMMING:
+				//TODO: handle this when it doesn't spam every damn tick (yet another spam bug!!)
+				break;
 			default:
 				$this->server->getLogger()->debug("Unhandled/unknown player action type " . $packet->action . " from " . $this->getName());
 				return false;
@@ -2798,6 +2779,26 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return true;
 	}
 
+	public function toggleSprint(bool $sprint) : void{
+		$ev = new PlayerToggleSprintEvent($this, $sprint);
+		$this->server->getPluginManager()->callEvent($ev);
+		if($ev->isCancelled()){
+			$this->sendData($this);
+		}else{
+			$this->setSprinting($sprint);
+		}
+	}
+
+	public function toggleSneak(bool $sneak) : void{
+		$ev = new PlayerToggleSneakEvent($this, $sneak);
+		$this->server->getPluginManager()->callEvent($ev);
+		if($ev->isCancelled()){
+			$this->sendData($this);
+		}else{
+			$this->setSneaking($sneak);
+		}
+	}
+
 	public function handleAnimate(AnimatePacket $packet) : bool{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
@@ -3281,6 +3282,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk = new TextPacket();
 		if(!$this->server->isLanguageForced()){
 			$pk->type = TextPacket::TYPE_TRANSLATION;
+			$pk->needsTranslation = true;
 			$pk->message = $this->server->getLanguage()->translateString($message, $parameters, "pocketmine.");
 			foreach($parameters as $i => $p){
 				$parameters[$i] = $this->server->getLanguage()->translateString($p, $parameters, "pocketmine.");
@@ -3335,7 +3337,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * @param string               $reason Reason showed in console
 	 * @param bool                 $notify
 	 */
-	final public function close($message = "", string $reason = "generic reason", bool $notify = true){
+	final public function close($message = "", string $reason = "generic reason", bool $notify = true) : void{
 		if($this->isConnected() and !$this->closed){
 
 			try{
@@ -3486,7 +3488,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 	}
 
-	public function kill(){
+	public function kill() : void{
 		if(!$this->spawned){
 			return;
 		}
@@ -3496,7 +3498,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->sendRespawnPacket($this->getSpawn());
 	}
 
-	protected function onDeath(){
+	protected function onDeath() : void{
 		$message = "death.attack.generic";
 
 		$params = [
@@ -3672,8 +3674,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->sendData($this->getViewers());
 
 		$this->sendSettings();
-		$this->inventory->sendContents($this);
-		$this->armorInventory->sendContents($this);
+		$this->sendAllInventories();
 
 		$this->spawnToAll();
 		$this->scheduleUpdate();
@@ -3685,7 +3686,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_DAMAGE);
 	}
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		if(!$this->isAlive()){
 			return;
 		}
@@ -3702,11 +3703,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		parent::attack($source);
 	}
 
-	protected function doHitAnimation() : void{
-		parent::doHitAnimation();
-		if($this->spawned){
-			$this->broadcastEntityEvent(EntityEventPacket::HURT_ANIMATION, null, [$this]);
+	public function broadcastEntityEvent(int $eventId, ?int $eventData = null, ?array $players = null) : void{
+		if($this->spawned and $players === null){
+			$players = $this->getViewers();
+			$players[] = $this;
 		}
+		parent::broadcastEntityEvent($eventId, $eventData, $players);
 	}
 
 	public function getOffsetPosition(Vector3 $vector3) : Vector3{

src/pocketmine/PocketMine.php

@@ -24,49 +24,6 @@ declare(strict_types=1);
 namespace {
 	const INT32_MIN = -0x80000000;
 	const INT32_MAX = 0x7fffffff;
-
-	function safe_var_dump(){
-		static $cnt = 0;
-		foreach(func_get_args() as $var){
-			switch(true){
-				case is_array($var):
-					echo str_repeat("  ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL;
-					foreach($var as $key => $value){
-						echo str_repeat("  ", $cnt + 1) . "[" . (is_int($key) ? $key : '"' . $key . '"') . "]=>" . PHP_EOL;
-						++$cnt;
-						safe_var_dump($value);
-						--$cnt;
-					}
-					echo str_repeat("  ", $cnt) . "}" . PHP_EOL;
-					break;
-				case is_int($var):
-					echo str_repeat("  ", $cnt) . "int(" . $var . ")" . PHP_EOL;
-					break;
-				case is_float($var):
-					echo str_repeat("  ", $cnt) . "float(" . $var . ")" . PHP_EOL;
-					break;
-				case is_bool($var):
-					echo str_repeat("  ", $cnt) . "bool(" . ($var === true ? "true" : "false") . ")" . PHP_EOL;
-					break;
-				case is_string($var):
-					echo str_repeat("  ", $cnt) . "string(" . strlen($var) . ") \"$var\"" . PHP_EOL;
-					break;
-				case is_resource($var):
-					echo str_repeat("  ", $cnt) . "resource() of type (" . get_resource_type($var) . ")" . PHP_EOL;
-					break;
-				case is_object($var):
-					echo str_repeat("  ", $cnt) . "object(" . get_class($var) . ")" . PHP_EOL;
-					break;
-				case is_null($var):
-					echo str_repeat("  ", $cnt) . "NULL" . PHP_EOL;
-					break;
-			}
-		}
-	}
-
-	function dummy(){
-
-	}
 }
 
 namespace pocketmine {
@@ -76,13 +33,13 @@ namespace pocketmine {
 	use pocketmine\utils\Terminal;
 	use pocketmine\utils\Timezone;
 	use pocketmine\utils\Utils;
+	use pocketmine\utils\VersionString;
 	use pocketmine\wizard\SetupWizard;
-	use raklib\RakLib;
 
 	const NAME = "PocketMine-MP";
-	const VERSION = "1.7dev";
-	const API_VERSION = "3.0.0-ALPHA12";
-	const CODENAME = "[REDACTED]";
+	const BASE_VERSION = "3.0.1";
+	const IS_DEVELOPMENT_BUILD = false;
+	const BUILD_NUMBER = 0;
 
 	const MIN_PHP_VERSION = "7.2.0";
 
@@ -98,13 +55,14 @@ namespace pocketmine {
 
 	if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
 		critical_error(\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . ".");
-		critical_error("Please use the installer provided on the homepage, or update to a newer PHP version.");
+		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 		exit(1);
 	}
 
 	if(PHP_INT_SIZE < 8){
 		critical_error("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported.");
 		critical_error("Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.");
+		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 		exit(1);
 	}
 
@@ -120,12 +78,18 @@ namespace pocketmine {
 	$extensions = [
 		"bcmath" => "BC Math",
 		"curl" => "cURL",
+		"ctype" => "ctype",
+		"date" => "Date",
+		"hash" => "Hash",
 		"json" => "JSON",
 		"mbstring" => "Multibyte String",
 		"openssl" => "OpenSSL",
+		"pcre" => "PCRE",
 		"phar" => "Phar",
 		"pthreads" => "pthreads",
+		"reflection" => "Reflection",
 		"sockets" => "Sockets",
+		"spl" => "SPL",
 		"yaml" => "YAML",
 		"zip" => "Zip",
 		"zlib" => "Zlib"
@@ -143,8 +107,8 @@ namespace pocketmine {
 		if(substr_count($pthreads_version, ".") < 2){
 			$pthreads_version = "0.$pthreads_version";
 		}
-		if(version_compare($pthreads_version, "3.1.7-dev") < 0){
-			critical_error("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
+		if(version_compare($pthreads_version, "3.1.7dev") < 0){
+			critical_error("pthreads >= 3.1.7dev is required, while you have $pthreads_version.");
 			++$errors;
 		}
 	}
@@ -163,22 +127,12 @@ namespace pocketmine {
 	}
 
 	if($errors > 0){
-		critical_error("Please use the installer provided on the homepage, or recompile PHP again.");
+		critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
 		exit(1);
 	}
 
 	error_reporting(-1);
 
-	function error_handler($severity, $message, $file, $line){
-		if(error_reporting() & $severity){
-			throw new \ErrorException($message, 0, $severity, $file, $line);
-		}else{ //stfu operator
-			return true;
-		}
-	}
-
-	set_error_handler('\pocketmine\error_handler');
-
 	if(\Phar::running(true) !== ""){
 		define('pocketmine\PATH', \Phar::running(true) . "/");
 	}else{
@@ -187,27 +141,15 @@ namespace pocketmine {
 
 	define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
 
-	function composer_error_die($message){
-		critical_error($message);
+	if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
+		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
+	}else{
+		critical_error("Composer autoloader not found.");
 		critical_error("Please install/update Composer dependencies or use provided builds.");
 		exit(1);
 	}
 
-	if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
-		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
-	}else{
-		composer_error_die("Composer autoloader not found.");
-	}
-
-	if(!class_exists(RakLib::class)){
-		composer_error_die("Unable to find the RakLib library.");
-	}
-	if(version_compare(RakLib::VERSION, "0.11.0") < 0){ //TODO: remove this check (it's managed by Composer now)
-		composer_error_die("RakLib version 0.11.0 is required, while you have version " . RakLib::VERSION . ".");
-	}
-	if(!class_exists(\BaseClassLoader::class)){
-		composer_error_die("Unable to find the PocketMine-SPL library.");
-	}
+	set_error_handler([Utils::class, 'errorExceptionHandler']);
 
 	/*
 	 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
@@ -227,14 +169,10 @@ namespace pocketmine {
 
 	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
 
-	$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-profiler"]);
+	$opts = getopt("", ["data:", "plugins:", "no-wizard"]);
 
-	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \realpath(\getcwd()) . DIRECTORY_SEPARATOR);
-	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \realpath(\getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
-
-	Terminal::init();
-
-	define('pocketmine\ANSI', Terminal::hasFormattingCodes());
+	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
+	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
 
 	if(!file_exists(\pocketmine\DATA)){
 		mkdir(\pocketmine\DATA, 0777, true);
@@ -251,15 +189,6 @@ namespace pocketmine {
 	}
 	unset($tzError);
 
-	if(isset($opts["enable-profiler"])){
-		if(function_exists("profiler_enable")){
-			\profiler_enable();
-			$logger->notice("Execution is being profiled");
-		}else{
-			$logger->notice("No profiler found. Please install https://github.com/krakjoe/profiler");
-		}
-	}
-
 	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);
 	}
@@ -268,10 +197,13 @@ namespace pocketmine {
 		$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){
+		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";

src/pocketmine/Server.php

@@ -47,10 +47,11 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\lang\BaseLang;
 use pocketmine\lang\TextContainer;
+use pocketmine\level\biome\Biome;
 use pocketmine\level\format\io\LevelProvider;
 use pocketmine\level\format\io\LevelProviderManager;
-use pocketmine\level\generator\biome\Biome;
 use pocketmine\level\generator\Generator;
+use pocketmine\level\generator\GeneratorManager;
 use pocketmine\level\Level;
 use pocketmine\level\LevelException;
 use pocketmine\metadata\EntityMetadataStore;
@@ -87,9 +88,11 @@ use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\plugin\PluginManager;
 use pocketmine\plugin\ScriptPluginLoader;
 use pocketmine\resourcepacks\ResourcePackManager;
+use pocketmine\scheduler\AsyncPool;
 use pocketmine\scheduler\FileWriteTask;
 use pocketmine\scheduler\SendUsageTask;
-use pocketmine\scheduler\ServerScheduler;
+use pocketmine\snooze\SleeperHandler;
+use pocketmine\snooze\SleeperNotifier;
 use pocketmine\tile\Tile;
 use pocketmine\timings\Timings;
 use pocketmine\timings\TimingsHandler;
@@ -101,7 +104,6 @@ use pocketmine\utils\Terminal;
 use pocketmine\utils\TextFormat;
 use pocketmine\utils\Utils;
 use pocketmine\utils\UUID;
-use pocketmine\utils\VersionString;
 
 /**
  * The class that manages everything
@@ -116,6 +118,9 @@ class Server{
 	/** @var \Threaded */
 	private static $sleeper = null;
 
+	/** @var SleeperHandler */
+	private $tickSleeper;
+
 	/** @var BanList */
 	private $banByName = null;
 
@@ -131,18 +136,20 @@ class Server{
 	/** @var bool */
 	private $isRunning = true;
 
+	/** @var bool */
 	private $hasStopped = false;
 
 	/** @var PluginManager */
 	private $pluginManager = null;
 
+	/** @var float */
 	private $profilingTickRate = 20;
 
 	/** @var AutoUpdater */
 	private $updater = null;
 
-	/** @var ServerScheduler */
-	private $scheduler = null;
+	/** @var AsyncPool */
+	private $asyncPool;
 
 	/**
 	 * Counts the ticks since the server start
@@ -150,17 +157,24 @@ class Server{
 	 * @var int
 	 */
 	private $tickCounter = 0;
+	/** @var int */
 	private $nextTick = 0;
+	/** @var float[] */
 	private $tickAverage = [20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20];
+	/** @var float[] */
 	private $useAverage = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+	/** @var float */
 	private $currentTPS = 20;
+	/** @var float */
 	private $currentUse = 0;
 
 	/** @var bool */
 	private $doTitleTick = true;
 
+	/** @var int */
 	private $sendUsageTicker = 0;
 
+	/** @var bool */
 	private $dispatchSignals = false;
 
 	/** @var \AttachableThreadedLogger */
@@ -207,29 +221,41 @@ class Server{
 
 	/** @var Network */
 	private $network;
-
+	/** @var bool */
 	private $networkCompressionAsync = true;
+	/** @var int */
 	public $networkCompressionLevel = 7;
 
+	/** @var bool */
 	private $autoTickRate = true;
+	/** @var int */
 	private $autoTickRateLimit = 20;
+	/** @var bool */
 	private $alwaysTickPlayers = false;
+	/** @var int */
 	private $baseTickRate = 1;
 
+	/** @var int */
 	private $autoSaveTicker = 0;
+	/** @var int */
 	private $autoSaveTicks = 6000;
 
 	/** @var BaseLang */
 	private $baseLang;
-
+	/** @var bool */
 	private $forceLanguage = false;
 
+	/** @var UUID */
 	private $serverID;
 
+	/** @var \ClassLoader */
 	private $autoloader;
+	/** @var string */
 	private $dataPath;
+	/** @var string */
 	private $pluginPath;
 
+	/** @var string[] */
 	private $uniquePlayers = [];
 
 	/** @var QueryHandler */
@@ -240,7 +266,7 @@ class Server{
 
 	/** @var Config */
 	private $properties;
-
+	/** @var mixed[] */
 	private $propertyCache = [];
 
 	/** @var Config */
@@ -282,13 +308,6 @@ class Server{
 		return \pocketmine\VERSION;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getCodename() : string{
-		return \pocketmine\CODENAME;
-	}
-
 	/**
 	 * @return string
 	 */
@@ -300,7 +319,7 @@ class Server{
 	 * @return string
 	 */
 	public function getApiVersion() : string{
-		return \pocketmine\API_VERSION;
+		return \pocketmine\BASE_VERSION;
 	}
 
 	/**
@@ -385,7 +404,8 @@ class Server{
 	 * @return string
 	 */
 	public function getIp() : string{
-		return $this->getConfigString("server-ip", "0.0.0.0");
+		$str = $this->getConfigString("server-ip");
+		return $str !== "" ? $str : "0.0.0.0";
 	}
 
 	/**
@@ -568,7 +588,7 @@ class Server{
 	}
 
 	/**
-	 * @return MainLogger
+	 * @return \AttachableThreadedLogger
 	 */
 	public function getLogger(){
 		return $this->logger;
@@ -623,11 +643,8 @@ class Server{
 		return $this->resourceManager;
 	}
 
-	/**
-	 * @return ServerScheduler
-	 */
-	public function getScheduler(){
-		return $this->scheduler;
+	public function getAsyncPool() : AsyncPool{
+		return $this->asyncPool;
 	}
 
 	/**
@@ -797,7 +814,7 @@ class Server{
 			$nbt = new BigEndianNBTStream();
 			try{
 				if($async){
-					$this->getScheduler()->scheduleAsyncTask(new FileWriteTask($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData())));
+					$this->asyncPool->submitTask(new FileWriteTask($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData())));
 				}else{
 					file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
 				}
@@ -1000,16 +1017,16 @@ class Server{
 
 		$path = $this->getDataPath() . "worlds/" . $name . "/";
 
-		$provider = LevelProviderManager::getProvider($path);
+		$providerClass = LevelProviderManager::getProvider($path);
 
-		if($provider === null){
+		if($providerClass === null){
 			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Cannot identify format of world"]));
 
 			return false;
 		}
 
 		try{
-			$level = new Level($this, $name, $path, $provider);
+			$level = new Level($this, $name, new $providerClass($path));
 		}catch(\Throwable $e){
 
 			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, $e->getMessage()]));
@@ -1019,8 +1036,6 @@ class Server{
 
 		$this->levels[$level->getId()] = $level;
 
-		$level->initLevel();
-
 		$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
 
 		$level->setTickRate($this->baseTickRate);
@@ -1050,23 +1065,21 @@ class Server{
 		}
 
 		if(!($generator !== null and class_exists($generator, true) and is_subclass_of($generator, Generator::class))){
-			$generator = Generator::getGenerator($this->getLevelType());
+			$generator = GeneratorManager::getGenerator($this->getLevelType());
 		}
 
-		if(($provider = LevelProviderManager::getProviderByName($providerName = $this->getProperty("level-settings.default-format", "pmanvil"))) === null){
-			$provider = LevelProviderManager::getProviderByName($providerName = "pmanvil");
+		if(($providerClass = LevelProviderManager::getProviderByName($this->getProperty("level-settings.default-format", "pmanvil"))) === null){
+			$providerClass = LevelProviderManager::getProviderByName("pmanvil");
 		}
 
 		try{
 			$path = $this->getDataPath() . "worlds/" . $name . "/";
-			/** @var LevelProvider $provider */
-			$provider::generate($path, $name, $seed, $generator, $options);
+			/** @var LevelProvider $providerClass */
+			$providerClass::generate($path, $name, $seed, $generator, $options);
 
-			$level = new Level($this, $name, $path, (string) $provider);
+			$level = new Level($this, $name, new $providerClass($path));
 			$this->levels[$level->getId()] = $level;
 
-			$level->initLevel();
-
 			$level->setTickRate($this->baseTickRate);
 		}catch(\Throwable $e){
 			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.generationError", [$name, $e->getMessage()]));
@@ -1393,17 +1406,18 @@ class Server{
 	}
 
 	/**
-	 * @param \ClassLoader    $autoloader
-	 * @param \ThreadedLogger $logger
-	 * @param string          $dataPath
-	 * @param string          $pluginPath
+	 * @param \ClassLoader              $autoloader
+	 * @param \AttachableThreadedLogger $logger
+	 * @param string                    $dataPath
+	 * @param string                    $pluginPath
 	 */
-	public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, string $dataPath, string $pluginPath){
+	public function __construct(\ClassLoader $autoloader, \AttachableThreadedLogger $logger, string $dataPath, string $pluginPath){
 		if(self::$instance !== null){
 			throw new \InvalidStateException("Only one server instance can exist at once");
 		}
 		self::$instance = $this;
 		self::$sleeper = new \Threaded;
+		$this->tickSleeper = new SleeperHandler();
 		$this->autoloader = $autoloader;
 		$this->logger = $logger;
 
@@ -1423,14 +1437,10 @@ class Server{
 			$this->dataPath = realpath($dataPath) . DIRECTORY_SEPARATOR;
 			$this->pluginPath = realpath($pluginPath) . DIRECTORY_SEPARATOR;
 
-			$this->console = new CommandReader();
-
-			$version = new VersionString($this->getPocketMineVersion());
-
 			$this->logger->info("Loading pocketmine.yml...");
 			if(!file_exists($this->dataPath . "pocketmine.yml")){
 				$content = file_get_contents(\pocketmine\RESOURCE_PATH . "pocketmine.yml");
-				if($version->isDev()){
+				if(\pocketmine\IS_DEVELOPMENT_BUILD){
 					$content = str_replace("preferred-channel: stable", "preferred-channel: beta", $content);
 				}
 				@file_put_contents($this->dataPath . "pocketmine.yml", $content);
@@ -1439,6 +1449,19 @@ class Server{
 
 			define('pocketmine\DEBUG', (int) $this->getProperty("debug.level", 1));
 
+			$this->forceLanguage = (bool) $this->getProperty("settings.force-language", false);
+			$this->baseLang = new BaseLang($this->getProperty("settings.language", BaseLang::FALLBACK_LANGUAGE));
+			$this->logger->info($this->getLanguage()->translateString("language.selected", [$this->getLanguage()->getName(), $this->getLanguage()->getLang()]));
+
+			if(\pocketmine\IS_DEVELOPMENT_BUILD and !((bool) $this->getProperty("settings.enable-dev-builds", false))){
+				$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME]));
+				$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error2"));
+				$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error3"));
+				$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"]));
+				$this->forceShutdown();
+				return;
+			}
+
 			if(((int) ini_get('zend.assertions')) > 0 and ((bool) $this->getProperty("debug.assertions.warn-if-enabled", true)) !== false){
 				$this->logger->warning("Debugging assertions are enabled, this may impact on performance. To disable them, set `zend.assertions = -1` in php.ini.");
 			}
@@ -1477,26 +1500,22 @@ class Server{
 				"xbox-auth" => true
 			]);
 
-			$this->forceLanguage = (bool) $this->getProperty("settings.force-language", false);
-			$this->baseLang = new BaseLang($this->getProperty("settings.language", BaseLang::FALLBACK_LANGUAGE));
-			$this->logger->info($this->getLanguage()->translateString("language.selected", [$this->getLanguage()->getName(), $this->getLanguage()->getLang()]));
-
 			$this->memoryManager = new MemoryManager($this);
 
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.start", [TextFormat::AQUA . $this->getVersion() . TextFormat::RESET]));
 
 			if(($poolSize = $this->getProperty("settings.async-workers", "auto")) === "auto"){
-				$poolSize = ServerScheduler::$WORKERS;
+				$poolSize = 2;
 				$processors = Utils::getCoreCount() - 2;
 
 				if($processors > 0){
 					$poolSize = max(1, $processors);
 				}
 			}else{
-				$poolSize = (int) $poolSize;
+				$poolSize = max(1, (int) $poolSize);
 			}
 
-			ServerScheduler::$WORKERS = $poolSize;
+			$this->asyncPool = new AsyncPool($this, $poolSize, (int) max(-1, (int) $this->getProperty("memory.async-worker-hard-limit", 256)), $this->autoloader, $this->logger);
 
 			if($this->getProperty("network.batch-threshold", 256) >= 0){
 				Network::$BATCH_THRESHOLD = (int) $this->getProperty("network.batch-threshold", 256);
@@ -1509,16 +1528,21 @@ class Server{
 				$this->logger->warning("Invalid network compression level $this->networkCompressionLevel set, setting to default 7");
 				$this->networkCompressionLevel = 7;
 			}
-			$this->networkCompressionAsync = $this->getProperty("network.async-compression", true);
+			$this->networkCompressionAsync = (bool) $this->getProperty("network.async-compression", true);
 
 			$this->autoTickRate = (bool) $this->getProperty("level-settings.auto-tick-rate", true);
 			$this->autoTickRateLimit = (int) $this->getProperty("level-settings.auto-tick-rate-limit", 20);
-			$this->alwaysTickPlayers = (int) $this->getProperty("level-settings.always-tick-players", false);
+			$this->alwaysTickPlayers = (bool) $this->getProperty("level-settings.always-tick-players", false);
 			$this->baseTickRate = (int) $this->getProperty("level-settings.base-tick-rate", 1);
 
-			$this->doTitleTick = (bool) $this->getProperty("console.title-tick", true);
+			$this->doTitleTick = ((bool) $this->getProperty("console.title-tick", true)) && Terminal::hasFormattingCodes();
 
-			$this->scheduler = new ServerScheduler();
+			$consoleNotifier = new SleeperNotifier();
+			$this->console = new CommandReader($consoleNotifier);
+			$this->tickSleeper->addNotifier($consoleNotifier, function() : void{
+				$this->checkConsole();
+			});
+			$this->console->start(PTHREADS_INHERIT_NONE);
 
 			if($this->getConfigBool("enable-rcon", false)){
 				try{
@@ -1526,11 +1550,10 @@ class Server{
 						$this,
 						$this->getConfigString("rcon.password", ""),
 						$this->getConfigInt("rcon.port", $this->getPort()),
-						($ip = $this->getIp()) != "" ? $ip : "0.0.0.0",
-						$this->getConfigInt("rcon.threads", 1),
-						$this->getConfigInt("rcon.clients-per-thread", 50)
+						$this->getIp(),
+						$this->getConfigInt("rcon.max-clients", 50)
 					);
-				}catch(\Throwable $e){
+				}catch(\Exception $e){
 					$this->getLogger()->critical("RCON can't be started: " . $e->getMessage());
 				}
 			}
@@ -1572,7 +1595,7 @@ class Server{
 				@cli_set_process_title($this->getName() . " " . $this->getPocketMineVersion());
 			}
 
-			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp() === "" ? "*" : $this->getIp(), $this->getPort()]));
+			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp(), $this->getPort()]));
 			define("BOOTUP_RANDOM", random_bytes(16));
 			$this->serverID = Utils::getMachineUniqueId($this->getIp() . $this->getPort());
 
@@ -1585,9 +1608,7 @@ class Server{
 
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.info", [
 				$this->getName(),
-				($version->isDev() ? TextFormat::YELLOW : "") . $version->get(true) . TextFormat::RESET,
-				$this->getCodename(),
-				$this->getApiVersion()
+				(\pocketmine\IS_DEVELOPMENT_BUILD ? TextFormat::YELLOW : "") . $this->getPocketMineVersion() . TextFormat::RESET
 			]));
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.license", [$this->getName()]));
 
@@ -1601,6 +1622,7 @@ class Server{
 			Entity::init();
 			Tile::init();
 			BlockFactory::init();
+			BlockFactory::registerStaticRuntimeIdMappings();
 			Enchantment::init();
 			ItemFactory::init();
 			Item::initCreativeItems();
@@ -1608,13 +1630,13 @@ class Server{
 
 			$this->craftingManager = new CraftingManager();
 
-			$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR);
+			$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR, $this->logger);
 
-			$this->pluginManager = new PluginManager($this, $this->commandMap);
+			$this->pluginManager = new PluginManager($this, $this->commandMap, ((bool) $this->getProperty("plugins.legacy-data-dir", true)) ? null : $this->getDataPath() . "plugin_data" . DIRECTORY_SEPARATOR);
 			$this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);
 			$this->profilingTickRate = (float) $this->getProperty("settings.profile-report-trigger", 20);
-			$this->pluginManager->registerInterface(PharPluginLoader::class);
-			$this->pluginManager->registerInterface(ScriptPluginLoader::class);
+			$this->pluginManager->registerInterface(new PharPluginLoader($this->autoloader));
+			$this->pluginManager->registerInterface(new ScriptPluginLoader());
 
 			register_shutdown_function([$this, "crashDump"]);
 
@@ -1633,31 +1655,24 @@ class Server{
 				$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
 			}
 
-			Generator::registerDefaultGenerators();
+			GeneratorManager::registerDefaultGenerators();
 
 			foreach((array) $this->getProperty("worlds", []) as $name => $options){
 				if(!is_array($options)){
 					continue;
 				}
 				if(!$this->loadLevel($name)){
-					$seed = $options["seed"] ?? time();
-					if(is_string($seed) and !is_numeric($seed)){
-						$seed = Utils::javaStringHash($seed);
-					}elseif(!is_int($seed)){
-						$seed = (int) $seed;
-					}
-
 					if(isset($options["generator"])){
 						$generatorOptions = explode(":", $options["generator"]);
-						$generator = Generator::getGenerator(array_shift($generatorOptions));
+						$generator = GeneratorManager::getGenerator(array_shift($generatorOptions));
 						if(count($options) > 0){
 							$options["preset"] = implode(":", $generatorOptions);
 						}
 					}else{
-						$generator = Generator::getGenerator("default");
+						$generator = GeneratorManager::getGenerator("default");
 					}
 
-					$this->generateLevel($name, $seed, $generator, $options);
+					$this->generateLevel($name, Generator::convertSeed((string) ($options["seed"] ?? "")), $generator, $options);
 				}
 			}
 
@@ -1669,13 +1684,7 @@ class Server{
 					$this->setConfigString("level-name", "world");
 				}
 				if(!$this->loadLevel($default)){
-					$seed = getopt("", ["level-seed::"])["level-seed"] ?? $this->properties->get("level-seed", time());
-					if(!is_numeric($seed) or bccomp($seed, "9223372036854775807") > 0){
-						$seed = Utils::javaStringHash($seed);
-					}elseif(PHP_INT_SIZE === 8){
-						$seed = (int) $seed;
-					}
-					$this->generateLevel($default, $seed === 0 ? time() : $seed);
+					$this->generateLevel($default, Generator::convertSeed($this->getConfigString("level-seed")));
 				}
 
 				$this->setDefaultLevel($this->getLevelByName($default));
@@ -1775,11 +1784,11 @@ class Server{
 	}
 
 	/**
-	 * @param string $title
-	 * @param string $subtitle
-	 * @param int    $fadeIn Duration in ticks for fade-in. If -1 is given, client-sided defaults will be used.
-	 * @param int    $stay Duration in ticks to stay on screen for
-	 * @param int    $fadeOut Duration in ticks for fade-out.
+	 * @param string        $title
+	 * @param string        $subtitle
+	 * @param int           $fadeIn Duration in ticks for fade-in. If -1 is given, client-sided defaults will be used.
+	 * @param int           $stay Duration in ticks to stay on screen for
+	 * @param int           $fadeOut Duration in ticks for fade-out.
 	 * @param Player[]|null $recipients
 	 *
 	 * @return int
@@ -1871,7 +1880,7 @@ class Server{
 
 			if(!$forceSync and !$immediate and $this->networkCompressionAsync){
 				$task = new CompressBatchedTask($pk, $targets);
-				$this->getScheduler()->scheduleAsyncTask($task);
+				$this->asyncPool->submitTask($task);
 			}else{
 				$this->broadcastPacketsCallback($pk, $targets, $immediate);
 			}
@@ -1925,7 +1934,7 @@ class Server{
 
 	public function checkConsole(){
 		Timings::$serverCommandTimer->startTiming();
-		if(($line = $this->console->getLine()) !== null){
+		while(($line = $this->console->getLine()) !== null){
 			$this->pluginManager->callEvent($ev = new ServerCommandEvent($this->consoleSender, $line));
 			if(!$ev->isCancelled()){
 				$this->dispatchCommand($ev->getSender(), $ev->getCommand());
@@ -1981,8 +1990,8 @@ class Server{
 			$this->getNetwork()->blockAddress($entry->getName(), -1);
 		}
 
-		$this->pluginManager->registerInterface(PharPluginLoader::class);
-		$this->pluginManager->registerInterface(ScriptPluginLoader::class);
+		$this->pluginManager->registerInterface(new PharPluginLoader($this->autoloader));
+		$this->pluginManager->registerInterface(new ScriptPluginLoader());
 		$this->pluginManager->loadPlugins($this->pluginPath);
 		$this->enablePlugins(PluginLoadOrder::STARTUP);
 		$this->enablePlugins(PluginLoadOrder::POSTWORLD);
@@ -1990,7 +1999,7 @@ class Server{
 	}
 
 	/**
-	 * Shutdowns the server correctly
+	 * Shuts the server down correctly
 	 */
 	public function shutdown(){
 		$this->isRunning = false;
@@ -2035,20 +2044,21 @@ class Server{
 			$this->getLogger()->debug("Removing event handlers");
 			HandlerList::unregisterAll();
 
-			if($this->scheduler instanceof ServerScheduler){
-				$this->getLogger()->debug("Stopping all tasks");
-				$this->scheduler->cancelAllTasks();
-				$this->scheduler->mainThreadHeartbeat(PHP_INT_MAX);
+			if($this->asyncPool instanceof AsyncPool){
+				$this->getLogger()->debug("Shutting down async task worker pool");
+				$this->asyncPool->shutdown();
 			}
 
-			if($this->properties->hasChanged()){
+			if($this->properties !== null and $this->properties->hasChanged()){
 				$this->getLogger()->debug("Saving properties");
 				$this->properties->save();
 			}
 
-			$this->getLogger()->debug("Closing console");
-			$this->console->shutdown();
-			$this->console->notify();
+			if($this->console instanceof CommandReader){
+				$this->getLogger()->debug("Closing console");
+				$this->console->shutdown();
+				$this->console->notify();
+			}
 
 			if($this->network instanceof Network){
 				$this->getLogger()->debug("Stopping network interfaces");
@@ -2098,7 +2108,7 @@ class Server{
 			$this->logger->info("[UPnP] Trying to port forward...");
 			try{
 				UPnP::PortForward($this->getPort());
-			}catch(\Throwable $e){
+			}catch(\Exception $e){
 				$this->logger->alert("UPnP portforward failed: " . $e->getMessage());
 			}
 		}
@@ -2152,7 +2162,7 @@ class Server{
 		$this->logger->logException($e, $trace);
 
 		$lastError = [
-			"type" => \get_class($e),
+			"type" => get_class($e),
 			"message" => $errstr,
 			"fullFile" => $e->getFile(),
 			"file" => $errfile,
@@ -2224,9 +2234,6 @@ class Server{
 			}catch(\Throwable $e){}
 		}
 
-		//$this->checkMemory();
-		//$dump .= "Memory Usage Tracking: \r\n" . chunk_split(base64_encode(gzdeflate(implode(";", $this->memoryStats), 9))) . "\r\n";
-
 		$this->forceShutdown();
 		$this->isRunning = false;
 		@Utils::kill(getmypid());
@@ -2237,18 +2244,18 @@ class Server{
 		return [];
 	}
 
+	public function getTickSleeper() : SleeperHandler{
+		return $this->tickSleeper;
+	}
+
 	private function tickProcessor(){
 		$this->nextTick = microtime(true);
+
 		while($this->isRunning){
 			$this->tick();
-			$next = $this->nextTick - 0.0001;
-			if($next > microtime(true)){
-				try{
-					@time_sleep_until($next);
-				}catch(\Throwable $e){
-					//Sometimes $next is less than the current time. High load?
-				}
-			}
+
+			//sleeps are self-correcting - if we undersleep 1ms on this tick, we'll sleep an extra ms on the next tick
+			$this->tickSleeper->sleepUntil($this->nextTick);
 		}
 	}
 
@@ -2330,7 +2337,7 @@ class Server{
 		$p->dataPacket($pk);
 	}
 
-	private function checkTickUpdates($currentTick, $tickTime){
+	private function checkTickUpdates(int $currentTick, float $tickTime) : void{
 		foreach($this->players as $p){
 			if(!$p->loggedIn and ($tickTime - $p->creationTime) >= 10){
 				$p->close("", "Login timeout");
@@ -2399,7 +2406,7 @@ class Server{
 
 	public function sendUsage($type = SendUsageTask::TYPE_STATUS){
 		if((bool) $this->getProperty("anonymous-statistics.enabled", true)){
-			$this->scheduler->scheduleAsyncTask(new SendUsageTask($this, $type, $this->uniquePlayers));
+			$this->asyncPool->submitTask(new SendUsageTask($this, $type, $this->uniquePlayers));
 		}
 		$this->uniquePlayers = [];
 	}
@@ -2479,31 +2486,28 @@ class Server{
 	/**
 	 * Tries to execute a server tick
 	 */
-	private function tick() : bool{
+	private function tick() : void{
 		$tickTime = microtime(true);
 		if(($tickTime - $this->nextTick) < -0.025){ //Allow half a tick of diff
-			return false;
+			return;
 		}
 
 		Timings::$serverTickTimer->startTiming();
 
 		++$this->tickCounter;
 
-		$this->checkConsole();
-
 		Timings::$connectionTimer->startTiming();
 		$this->network->processInterfaces();
-
-		if($this->rcon !== null){
-			$this->rcon->check();
-		}
-
 		Timings::$connectionTimer->stopTiming();
 
 		Timings::$schedulerTimer->startTiming();
-		$this->scheduler->mainThreadHeartbeat($this->tickCounter);
+		$this->pluginManager->tickSchedulers($this->tickCounter);
 		Timings::$schedulerTimer->stopTiming();
 
+		Timings::$schedulerAsyncTimer->startTiming();
+		$this->asyncPool->collectTasks();
+		Timings::$schedulerAsyncTimer->stopTiming();
+
 		$this->checkTickUpdates($this->tickCounter, $tickTime);
 
 		foreach($this->players as $player){
@@ -2511,7 +2515,7 @@ class Server{
 		}
 
 		if(($this->tickCounter % 20) === 0){
-			if($this->doTitleTick and Terminal::hasFormattingCodes()){
+			if($this->doTitleTick){
 				$this->titleTick();
 			}
 			$this->currentTPS = 20;
@@ -2576,8 +2580,6 @@ class Server{
 		}else{
 			$this->nextTick += 0.05;
 		}
-
-		return true;
 	}
 
 	/**

src/pocketmine/block/Air.php

@@ -81,5 +81,4 @@ class Air extends Transparent{
 	public function getBlastResistance() : float{
 		return 0;
 	}
-
 }

src/pocketmine/block/Bed.php

@@ -85,7 +85,7 @@ class Bed extends Transparent{
 
 		$this->getLevel()->setBlock($this, $this, false, false);
 
-		if(($other = $this->getOtherHalf()) !== null and !$other->isOccupied()){
+		if(($other = $this->getOtherHalf()) !== null and $other->isOccupied() !== $occupied){
 			$other->setOccupied($occupied);
 		}
 	}

src/pocketmine/block/Bedrock.php

@@ -48,5 +48,4 @@ class Bedrock extends Solid{
 	public function isBreakable(Item $item) : bool{
 		return false;
 	}
-
 }

src/pocketmine/block/Block.php

@@ -471,6 +471,30 @@ 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)){
+			return 0;
+		}
+
+		return $this->getXpDropAmount();
+	}
+
+	/**
+	 * Returns how much XP this block will drop when broken with an appropriate tool.
+	 *
+	 * @return int
+	 */
+	protected function getXpDropAmount() : int{
+		return 0;
+	}
+
 	/**
 	 * Returns whether Silk Touch enchanted tools will cause this block to drop as itself. Since most blocks drop
 	 * themselves anyway, this is implicitly true.

src/pocketmine/block/BlockFactory.php

@@ -31,8 +31,6 @@ use pocketmine\utils\MainLogger;
  * Manages block registration and instance creation
  */
 class BlockFactory{
-	/** @var \SplFixedArray<Block> */
-	private static $list = null;
 	/** @var \SplFixedArray<Block> */
 	private static $fullList = null;
 
@@ -65,7 +63,6 @@ class BlockFactory{
 	 * this if you need to reset the block factory back to its original defaults for whatever reason.
 	 */
 	public static function init() : void{
-		self::$list = new \SplFixedArray(256);
 		self::$fullList = new \SplFixedArray(4096);
 
 		self::$light = new \SplFixedArray(256);
@@ -327,17 +324,11 @@ class BlockFactory{
 
 		//TODO: RESERVED6
 
-		foreach(self::$list as $id => $block){
-			if($block === null){
+		for($id = 0, $size = self::$fullList->getSize() >> 4; $id < $size; ++$id){
+			if(self::$fullList[$id << 4] === null){
 				self::registerBlock(new UnknownBlock($id));
 			}
 		}
-
-		/** @var mixed[] $runtimeIdMap */
-		$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
-		foreach($runtimeIdMap as $obj){
-			self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
-		}
 	}
 
 	/**
@@ -360,8 +351,6 @@ class BlockFactory{
 			throw new \RuntimeException("Trying to overwrite an already registered block");
 		}
 
-		self::$list[$id] = clone $block;
-
 		for($meta = 0; $meta < 16; ++$meta){
 			$variant = clone $block;
 			$variant->setDamage($meta);
@@ -372,7 +361,7 @@ class BlockFactory{
 		self::$transparent[$id] = $block->isTransparent();
 		self::$hardness[$id] = $block->getHardness();
 		self::$light[$id] = $block->getLightLevel();
-		self::$lightFilter[$id] = $block->getLightFilter() + 1; //opacity plus 1 standard light filter
+		self::$lightFilter[$id] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
 		self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
 		self::$blastResistance[$id] = $block->getBlastResistance();
 	}
@@ -426,10 +415,18 @@ class BlockFactory{
 	 * @return bool
 	 */
 	public static function isRegistered(int $id) : bool{
-		$b = self::$list[$id];
+		$b = self::$fullList[$id << 4];
 		return $b !== null and !($b instanceof UnknownBlock);
 	}
 
+	public static function registerStaticRuntimeIdMappings() : void{
+		/** @var mixed[] $runtimeIdMap */
+		$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
+		foreach($runtimeIdMap as $obj){
+			self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
+		}
+	}
+
 	/**
 	 * @internal
 	 *

src/pocketmine/block/BrickStairs.php

@@ -52,5 +52,4 @@ class BrickStairs extends Stair{
 	public function getName() : string{
 		return "Brick Stairs";
 	}
-
 }

src/pocketmine/block/BurningFurnace.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Furnace as TileFurnace;
 use pocketmine\tile\Tile;
@@ -83,7 +82,7 @@ class BurningFurnace extends Solid{
 				$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
 			}
 
-			if($furnace->namedtag->hasTag("Lock", StringTag::class) and $furnace->namedtag->getString("Lock") !== $item->getCustomName()){
+			if(!$furnace->canOpenWith($item->getCustomName())){
 				return true;
 			}
 

src/pocketmine/block/Chest.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
-use pocketmine\nbt\tag\StringTag;
 use pocketmine\Player;
 use pocketmine\tile\Chest as TileChest;
 use pocketmine\tile\Tile;
@@ -115,7 +114,7 @@ class Chest extends Transparent{
 			if(
 				!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
 				($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
-				($chest->namedtag->hasTag("Lock", StringTag::class) and $chest->namedtag->getString("Lock") !== $item->getCustomName())
+				!$chest->canOpenWith($item->getCustomName())
 			){
 				return true;
 			}

src/pocketmine/block/CoalOre.php

@@ -57,4 +57,7 @@ class CoalOre extends Solid{
 		];
 	}
 
+	public function getXpDropForTool(Item $item) : int{
+		return mt_rand(0, 2);
+	}
 }

src/pocketmine/block/CobblestoneStairs.php

@@ -48,5 +48,4 @@ class CobblestoneStairs extends Stair{
 	public function getName() : string{
 		return "Cobblestone Stairs";
 	}
-
 }

src/pocketmine/block/CobblestoneWall.php

@@ -90,5 +90,4 @@ class CobblestoneWall extends Transparent{
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}
-
 }

src/pocketmine/block/DiamondOre.php

@@ -56,4 +56,8 @@ class DiamondOre extends Solid{
 			ItemFactory::get(Item::DIAMOND)
 		];
 	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(3, 7);
+	}
 }

src/pocketmine/block/Dirt.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Hoe;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -50,8 +51,8 @@ class Dirt extends Solid{
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
-		if($item->isHoe()){
-			$item->useOn($this);
+		if($item instanceof Hoe){
+			$item->applyDamage(1);
 			if($this->meta === 1){
 				$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
 			}else{

src/pocketmine/block/DoubleSlab.php

@@ -35,7 +35,7 @@ abstract class DoubleSlab extends Solid{
 	abstract public function getSlabId() : int;
 
 	public function getName() : string{
-		return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName() . " Slab";
+		return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName();
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/DoubleStoneSlab2.php

@@ -30,5 +30,4 @@ class DoubleStoneSlab2 extends DoubleStoneSlab{
 	public function getSlabId() : int{
 		return self::STONE_SLAB2;
 	}
-
 }

src/pocketmine/block/EnderChest.php

@@ -106,5 +106,4 @@ class EnderChest extends Chest{
 	public function getFuelTime() : int{
 		return 0;
 	}
-
 }

src/pocketmine/block/Fence.php

@@ -105,5 +105,4 @@ abstract class Fence extends Transparent{
 	public function canConnect(Block $block){
 		return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
 	}
-
 }

src/pocketmine/block/Grass.php

@@ -24,8 +24,10 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
+use pocketmine\item\Hoe;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
+use pocketmine\item\Shovel;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -98,13 +100,13 @@ class Grass extends Solid{
 			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
 			return true;
-		}elseif($item->isHoe()){
-			$item->useOn($this);
+		}elseif($item instanceof Hoe){
+			$item->applyDamage(1);
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND));
 
 			return true;
-		}elseif($item->isShovel() and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
-			$item->useOn($this);
+		}elseif($item instanceof Shovel and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
+			$item->applyDamage(1);
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::GRASS_PATH));
 
 			return true;

src/pocketmine/block/Gravel.php

@@ -55,5 +55,4 @@ class Gravel extends Fallable{
 
 		return parent::getDropsForCompatibleTool($item);
 	}
-
 }

src/pocketmine/block/LapisOre.php

@@ -57,4 +57,7 @@ class LapisOre extends Solid{
 		];
 	}
 
+	protected function getXpDropAmount() : int{
+		return mt_rand(2, 5);
+	}
 }

src/pocketmine/block/Lava.php

@@ -121,5 +121,4 @@ class Lava extends Liquid{
 
 		return $ret;
 	}
-
 }

src/pocketmine/block/Leaves.php

@@ -67,8 +67,7 @@ class Leaves extends Transparent{
 	}
 
 
-	protected function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null) : bool{
-		++$check;
+	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;
@@ -83,45 +82,45 @@ class Leaves extends Transparent{
 			}
 			if($fromSide === null){
 				for($side = 2; $side <= 5; ++$side){
-					if($this->findLog($pos->getSide($side), $visited, $distance + 1, $check, $side)){
+					if($this->findLog($pos->getSide($side), $visited, $distance + 1, $side)){
 						return true;
 					}
 				}
 			}else{ //No more loops
 				switch($fromSide){
 					case 2:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $fromSide)){
 							return true;
 						}
 						break;
 					case 3:
-						if($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
+						if($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $fromSide)){
 							return true;
 						}
 						break;
 					case 4:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $fromSide)){
 							return true;
 						}
 						break;
 					case 5:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $fromSide)){
 							return true;
 						}
 						break;
@@ -147,11 +146,10 @@ class Leaves extends Transparent{
 		if(($this->meta & 0b00001100) === 0x08){
 			$this->meta &= 0x03;
 			$visited = [];
-			$check = 0;
 
 			$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
 
-			if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check)){
+			if($ev->isCancelled() or $this->findLog($this, $visited, 0)){
 				$this->getLevel()->setBlock($this, $this, false, false);
 			}else{
 				$this->getLevel()->useBreakOn($this);

src/pocketmine/block/MonsterSpawner.php

@@ -57,4 +57,8 @@ class MonsterSpawner extends Transparent{
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(15, 43);
+	}
 }

src/pocketmine/block/NetherBrickStairs.php

@@ -48,5 +48,4 @@ class NetherBrickStairs extends Stair{
 	public function getToolHarvestLevel() : int{
 		return TieredTool::TIER_WOODEN;
 	}
-
 }

src/pocketmine/block/NetherQuartzOre.php

@@ -57,4 +57,7 @@ class NetherQuartzOre extends Solid{
 		];
 	}
 
+	protected function getXpDropAmount() : int{
+		return mt_rand(2, 5);
+	}
 }

src/pocketmine/block/NetherReactor.php

@@ -61,5 +61,4 @@ class NetherReactor extends Solid{
 			ItemFactory::get(Item::DIAMOND, 0, 3)
 		];
 	}
-
 }

src/pocketmine/block/PackedIce.php

@@ -46,5 +46,4 @@ class PackedIce extends Solid{
 	public function getToolType() : int{
 		return BlockToolType::TYPE_PICKAXE;
 	}
-
 }

src/pocketmine/block/QuartzStairs.php

@@ -48,5 +48,4 @@ class QuartzStairs extends Stair{
 	public function getName() : string{
 		return "Quartz Stairs";
 	}
-
 }

src/pocketmine/block/RedMushroomBlock.php

@@ -50,5 +50,4 @@ class RedMushroomBlock extends Solid{
 			Item::get(Item::RED_MUSHROOM, 0, mt_rand(0, 2))
 		];
 	}
-
 }

src/pocketmine/block/RedSandstoneStairs.php

@@ -30,5 +30,4 @@ class RedSandstoneStairs extends SandstoneStairs{
 	public function getName() : string{
 		return "Red " . parent::getName();
 	}
-
 }

src/pocketmine/block/RedstoneOre.php

@@ -70,4 +70,8 @@ class RedstoneOre extends Solid{
 			ItemFactory::get(Item::REDSTONE_DUST, 0, mt_rand(4, 5))
 		];
 	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(1, 5);
+	}
 }

src/pocketmine/block/Sand.php

@@ -46,5 +46,4 @@ class Sand extends Fallable{
 
 		return "Sand";
 	}
-
 }

src/pocketmine/block/SandstoneStairs.php

@@ -48,5 +48,4 @@ class SandstoneStairs extends Stair{
 	public function getName() : string{
 		return "Sandstone Stairs";
 	}
-
 }

src/pocketmine/block/Sapling.php

@@ -90,7 +90,7 @@ class Sapling extends Flowable{
 	}
 
 	public function onRandomTick() : void{
-		if(mt_rand(1, 7) === 1){
+		if($this->level->getFullLightAt($this->x, $this->y, $this->z) >= 8 and mt_rand(1, 7) === 1){
 			if(($this->meta & 0x08) === 0x08){
 				Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant());
 			}else{

src/pocketmine/block/SeaLantern.php

@@ -51,5 +51,4 @@ class SeaLantern extends Transparent{
 			ItemFactory::get(Item::PRISMARINE_CRYSTALS, 0, 3)
 		];
 	}
-
 }

src/pocketmine/block/Snow.php

@@ -56,5 +56,4 @@ class Snow extends Solid{
 			ItemFactory::get(Item::SNOWBALL, 0, 4)
 		];
 	}
-
 }

src/pocketmine/block/SoulSand.php

@@ -56,5 +56,4 @@ class SoulSand extends Solid{
 			$this->z + 1
 		);
 	}
-
 }

src/pocketmine/block/Sponge.php

@@ -39,5 +39,4 @@ class Sponge extends Solid{
 	public function getName() : string{
 		return "Sponge";
 	}
-
 }

src/pocketmine/block/StainedGlass.php

@@ -32,5 +32,4 @@ class StainedGlass extends Glass{
 	public function getName() : string{
 		return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Stained Glass";
 	}
-
 }

src/pocketmine/block/StainedGlassPane.php

@@ -32,5 +32,4 @@ class StainedGlassPane extends GlassPane{
 	public function getName() : string{
 		return ColorBlockMetaHelper::getColorFromMeta($this->meta) . " Stained Glass Pane";
 	}
-
 }

src/pocketmine/block/StandingBanner.php

@@ -92,8 +92,8 @@ class StandingBanner extends Transparent{
 		$tile = $this->level->getTile($this);
 
 		$drop = ItemFactory::get(Item::BANNER, ($tile instanceof TileBanner ? $tile->getBaseColor() : 0));
-		if($tile instanceof TileBanner and ($patterns = $tile->namedtag->getListTag(TileBanner::TAG_PATTERNS)) !== null and !$patterns->empty()){
-			$drop->setNamedTagEntry($patterns);
+		if($tile instanceof TileBanner and !($patterns = $tile->getPatterns())->empty()){
+			$drop->setNamedTagEntry(clone $patterns);
 		}
 
 		return [$drop];

src/pocketmine/block/StillLava.php

@@ -30,5 +30,4 @@ class StillLava extends Lava{
 	public function getName() : string{
 		return "Still Lava";
 	}
-
 }

src/pocketmine/block/Stone.php

@@ -76,5 +76,4 @@ class Stone extends Solid{
 
 		return parent::getDropsForCompatibleTool($item);
 	}
-
 }

src/pocketmine/block/StoneBrickStairs.php

@@ -48,5 +48,4 @@ class StoneBrickStairs extends Stair{
 	public function getName() : string{
 		return "Stone Brick Stairs";
 	}
-
 }

src/pocketmine/block/TNT.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\item\FlintSteel;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -46,8 +47,8 @@ class TNT extends Solid{
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
-		if($item->getId() === Item::FLINT_STEEL){
-			$item->useOn($this);
+		if($item instanceof FlintSteel){
+			$item->applyDamage(1);
 			$this->ignite();
 			return true;
 		}

src/pocketmine/command/CommandReader.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
+use pocketmine\snooze\SleeperNotifier;
 use pocketmine\Thread;
 
 class CommandReader extends Thread{
@@ -31,20 +32,26 @@ class CommandReader extends Thread{
 	public const TYPE_STREAM = 1;
 	public const TYPE_PIPED = 2;
 
+	/** @var resource */
+	private static $stdin;
+
 	/** @var \Threaded */
 	protected $buffer;
 	private $shutdown = false;
 	private $type = self::TYPE_STREAM;
 
-	public function __construct(){
+	/** @var SleeperNotifier|null */
+	private $notifier;
+
+	public function __construct(?SleeperNotifier $notifier = null){
 		$this->buffer = new \Threaded;
+		$this->notifier = $notifier;
+
 		$opts = getopt("", ["disable-readline"]);
 
 		if(extension_loaded("readline") and !isset($opts["disable-readline"]) and !$this->isPipe(STDIN)){
 			$this->type = self::TYPE_READLINE;
 		}
-
-		$this->start();
 	}
 
 	public function shutdown(){
@@ -71,14 +78,12 @@ class CommandReader extends Thread{
 	}
 
 	private function initStdin(){
-		global $stdin;
-
-		if(is_resource($stdin)){
-			fclose($stdin);
+		if(is_resource(self::$stdin)){
+			fclose(self::$stdin);
 		}
 
-		$stdin = fopen("php://stdin", "r");
-		if($this->isPipe($stdin)){
+		self::$stdin = fopen("php://stdin", "r");
+		if($this->isPipe(self::$stdin)){
 			$this->type = self::TYPE_PIPED;
 		}else{
 			$this->type = self::TYPE_STREAM;
@@ -92,7 +97,7 @@ class CommandReader extends Thread{
 	 * @return bool
 	 */
 	private function isPipe($stream) : bool{
-		return is_resource($stream) and ((function_exists("posix_isatty") and !posix_isatty($stream)) or ((fstat($stream)["mode"] & 0170000) === 0010000));
+		return is_resource($stream) and (!stream_isatty($stream) or ((fstat($stream)["mode"] & 0170000) === 0010000));
 	}
 
 	/**
@@ -109,9 +114,7 @@ class CommandReader extends Thread{
 				return true;
 			}
 		}else{
-			global $stdin;
-
-			if(!is_resource($stdin)){
+			if(!is_resource(self::$stdin)){
 				$this->initStdin();
 			}
 
@@ -119,7 +122,7 @@ class CommandReader extends Thread{
 				/** @noinspection PhpMissingBreakStatementInspection */
 				case self::TYPE_STREAM:
 					//stream_select doesn't work on piped streams for some reason
-					$r = [$stdin];
+					$r = [self::$stdin];
 					if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
 						return true;
 					}elseif($count === false){ //stream error
@@ -127,7 +130,7 @@ class CommandReader extends Thread{
 					}
 
 				case self::TYPE_PIPED:
-					if(($raw = fgets($stdin)) === false){ //broken pipe or EOF
+					if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
 						$this->initStdin();
 						$this->synchronized(function(){
 							$this->wait(200000);
@@ -142,6 +145,9 @@ class CommandReader extends Thread{
 
 		if($line !== ""){
 			$this->buffer[] = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", $line);
+			if($this->notifier !== null){
+				$this->notifier->wakeupSleeper();
+			}
 		}
 
 		return true;
@@ -161,6 +167,8 @@ class CommandReader extends Thread{
 	}
 
 	public function run(){
+		$this->registerClassLoader();
+
 		if($this->type !== self::TYPE_READLINE){
 			$this->initStdin();
 		}
@@ -168,8 +176,7 @@ class CommandReader extends Thread{
 		while(!$this->shutdown and $this->readLine());
 
 		if($this->type !== self::TYPE_READLINE){
-			global $stdin;
-			fclose($stdin);
+			fclose(self::$stdin);
 		}
 
 	}

src/pocketmine/command/ConsoleCommandSender.php

@@ -145,5 +145,4 @@ class ConsoleCommandSender implements CommandSender{
 		}
 		$this->lineHeight = $height;
 	}
-
 }

src/pocketmine/command/FormattedCommandAlias.php

@@ -47,13 +47,12 @@ class FormattedCommandAlias extends Command{
 		foreach($this->formatStrings as $formatString){
 			try{
 				$commands[] = $this->buildCommand($formatString, $args);
+			}catch(\InvalidArgumentException $e){
+				$sender->sendMessage(TextFormat::RED . $e->getMessage());
+				return false;
 			}catch(\Throwable $e){
-				if($e instanceof \InvalidArgumentException){
-					$sender->sendMessage(TextFormat::RED . $e->getMessage());
-				}else{
-					$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.exception"));
-					$sender->getServer()->getLogger()->logException($e);
-				}
+				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.exception"));
+				$sender->getServer()->getLogger()->logException($e);
 
 				return false;
 			}
@@ -155,5 +154,4 @@ class FormattedCommandAlias extends Command{
 	private static function inRange(int $i, int $j, int $k) : bool{
 		return $i >= $j and $i <= $k;
 	}
-
 }

src/pocketmine/command/PluginCommand.php

@@ -38,7 +38,7 @@ class PluginCommand extends Command implements PluginIdentifiableCommand{
 	 * @param string $name
 	 * @param Plugin $owner
 	 */
-	public function __construct($name, Plugin $owner){
+	public function __construct(string $name, Plugin $owner){
 		parent::__construct($name);
 		$this->owningPlugin = $owner;
 		$this->executor = $owner;

src/pocketmine/command/RemoteConsoleCommandSender.php

@@ -47,6 +47,4 @@ class RemoteConsoleCommandSender extends ConsoleCommandSender{
 	public function getName() : string{
 		return "Rcon";
 	}
-
-
 }

src/pocketmine/command/SimpleCommandMap.php

@@ -345,6 +345,4 @@ class SimpleCommandMap implements CommandMap{
 
 		}
 	}
-
-
 }

src/pocketmine/command/defaults/EnchantCommand.php

@@ -59,7 +59,7 @@ class EnchantCommand extends VanillaCommand{
 
 		$item = $player->getInventory()->getItemInHand();
 
-		if($item->getId() <= 0){
+		if($item->isNull()){
 			$sender->sendMessage(new TranslationContainer("commands.enchant.noItem"));
 			return true;
 		}

src/pocketmine/command/defaults/HelpCommand.php

@@ -99,5 +99,4 @@ class HelpCommand extends VanillaCommand{
 			return true;
 		}
 	}
-
 }

src/pocketmine/command/defaults/TimingsCommand.php

@@ -104,7 +104,7 @@ class TimingsCommand extends VanillaCommand{
 				];
 				fclose($fileTimings);
 
-				$sender->getServer()->getScheduler()->scheduleAsyncTask(new class([
+				$sender->getServer()->getAsyncPool()->submitTask(new class([
 					["page" => "http://paste.ubuntu.com", "extraOpts" => [
 						CURLOPT_HTTPHEADER => ["User-Agent: " . $sender->getServer()->getName() . " " . $sender->getServer()->getPocketMineVersion()],
 						CURLOPT_POST => 1,
@@ -114,7 +114,7 @@ class TimingsCommand extends VanillaCommand{
 					]]
 				], $sender) extends BulkCurlTask{
 					public function onCompletion(Server $server){
-						$sender = $this->fetchLocal($server);
+						$sender = $this->fetchLocal();
 						if($sender instanceof Player and !$sender->isOnline()){ // TODO replace with a more generic API method for checking availability of CommandSender
 							return;
 						}

src/pocketmine/command/defaults/VersionCommand.php

@@ -50,8 +50,6 @@ class VersionCommand extends VanillaCommand{
 			$sender->sendMessage(new TranslationContainer("pocketmine.server.info.extended", [
 				$sender->getServer()->getName(),
 				$sender->getServer()->getPocketMineVersion(),
-				$sender->getServer()->getCodename(),
-				$sender->getServer()->getApiVersion(),
 				$sender->getServer()->getVersion(),
 				ProtocolInfo::CURRENT_PROTOCOL
 			]));

src/pocketmine/entity/Attribute.php

@@ -51,7 +51,7 @@ class Attribute{
 	/** @var Attribute[] */
 	protected static $attributes = [];
 
-	public static function init(){
+	public static function init() : void{
 		self::addAttribute(self::ABSORPTION, "minecraft:absorption", 0.00, 340282346638528859811704183484516925440.00, 0.00);
 		self::addAttribute(self::SATURATION, "minecraft:player.saturation", 0.00, 20.00, 20.00);
 		self::addAttribute(self::EXHAUSTION, "minecraft:player.exhaustion", 0.00, 5.00, 0.0);
@@ -92,7 +92,7 @@ class Attribute{
 	 *
 	 * @return Attribute|null
 	 */
-	public static function getAttribute(int $id){
+	public static function getAttribute(int $id) : ?Attribute{
 		return isset(self::$attributes[$id]) ? clone self::$attributes[$id] : null;
 	}
 
@@ -101,7 +101,7 @@ class Attribute{
 	 *
 	 * @return Attribute|null
 	 */
-	public static function getAttributeByName(string $name){
+	public static function getAttributeByName(string $name) : ?Attribute{
 		foreach(self::$attributes as $a){
 			if($a->getName() === $name){
 				return clone $a;
@@ -170,7 +170,7 @@ class Attribute{
 		return $this;
 	}
 
-	public function resetToDefault(){
+	public function resetToDefault() : void{
 		$this->setValue($this->getDefaultValue());
 	}
 
@@ -219,7 +219,7 @@ class Attribute{
 		return $this->shouldSend and $this->desynchronized;
 	}
 
-	public function markSynchronized(bool $synced = true){
+	public function markSynchronized(bool $synced = true) : void{
 		$this->desynchronized = !$synced;
 	}
 }

src/pocketmine/entity/AttributeMap.php

@@ -27,7 +27,7 @@ class AttributeMap implements \ArrayAccess{
 	/** @var Attribute[] */
 	private $attributes = [];
 
-	public function addAttribute(Attribute $attribute){
+	public function addAttribute(Attribute $attribute) : void{
 		$this->attributes[$attribute->getId()] = $attribute;
 	}
 
@@ -36,7 +36,7 @@ class AttributeMap implements \ArrayAccess{
 	 *
 	 * @return Attribute|null
 	 */
-	public function getAttribute(int $id){
+	public function getAttribute(int $id) : ?Attribute{
 		return $this->attributes[$id] ?? null;
 	}
 
@@ -56,19 +56,28 @@ class AttributeMap implements \ArrayAccess{
 		});
 	}
 
-	public function offsetExists($offset){
+	public function offsetExists($offset) : bool{
 		return isset($this->attributes[$offset]);
 	}
 
-	public function offsetGet($offset){
+	/**
+	 * @param int $offset
+	 *
+	 * @return float
+	 */
+	public function offsetGet($offset) : float{
 		return $this->attributes[$offset]->getValue();
 	}
 
-	public function offsetSet($offset, $value){
+	/**
+	 * @param int   $offset
+	 * @param float $value
+	 */
+	public function offsetSet($offset, $value) : void{
 		$this->attributes[$offset]->setValue($value);
 	}
 
-	public function offsetUnset($offset){
+	public function offsetUnset($offset) : void{
 		throw new \RuntimeException("Could not unset an attribute from an attribute map");
 	}
 }

src/pocketmine/entity/Effect.php

@@ -111,8 +111,8 @@ class Effect{
 	 */
 	public static function getEffectByName(string $name) : ?Effect{
 		$const = self::class . "::" . strtoupper($name);
-		if(\defined($const)){
-			return self::getEffect(\constant($const));
+		if(defined($const)){
+			return self::getEffect(constant($const));
 		}
 		return null;
 	}

src/pocketmine/entity/Entity.php

@@ -53,7 +53,6 @@ use pocketmine\level\Level;
 use pocketmine\level\Location;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\math\Math;
 use pocketmine\math\Vector2;
 use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
@@ -134,9 +133,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_URL_TAG = 41; //string
 	public const DATA_MAX_AIR = 42; //short
 	public const DATA_MARK_VARIANT = 43; //int
-	/* 44 (byte) container stuff
-	 * 45 (int) container stuff
-	 * 46 (int) container stuff */
+	public const DATA_CONTAINER_TYPE = 44; //byte (ContainerComponent)
+	public const DATA_CONTAINER_BASE_SIZE = 45; //int (ContainerComponent)
+	public const DATA_CONTAINER_EXTRA_SLOTS_PER_STRENGTH = 46; //int (used for llamas, inventory size is baseSize + thisProp * strength)
 	public const DATA_BLOCK_TARGET = 47; //block coords (ender crystal)
 	public const DATA_WITHER_INVULNERABLE_TICKS = 48; //int
 	public const DATA_WITHER_TARGET_1 = 49; //long
@@ -171,6 +170,11 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_ARMOR_STAND_POSE_INDEX = 78; //int
 	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; //int
 	/* 80 (byte) something to do with nametag visibility? */
+	public const DATA_COLOR_2 = 81; //byte
+	/* 82 (unknown) */
+	public const DATA_SCORE_TAG = 83; //string
+	public const DATA_BALLOON_ATTACHED_ENTITY = 84; //int64, entity unique ID of owner
+	public const DATA_PUFFERFISH_SIZE = 85; //byte
 
 
 	public const DATA_FLAG_ONFIRE = 0;
@@ -224,6 +228,12 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_FLAG_FIRE_IMMUNE = 48;
 	public const DATA_FLAG_DANCING = 49;
 	public const DATA_FLAG_ENCHANTED = 50;
+	//51 is something to do with tridents
+	public const DATA_FLAG_CONTAINER_PRIVATE = 52; //inventory is private, doesn't drop contents when killed if true
+	//53 TransformationComponent
+	public const DATA_FLAG_SPIN_ATTACK = 54;
+	public const DATA_FLAG_SWIMMING = 55;
+	public const DATA_FLAG_BRIBED = 56; //dolphins have this set when they go to find treasure for the player
 
 	public static $entityCount = 1;
 	/** @var Entity[] */
@@ -377,23 +387,17 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/** @var float|null */
 	public $lastZ = null;
 
-	/** @var float */
-	public $motionX = 0.0;
-	/** @var float */
-	public $motionY = 0.0;
-	/** @var float */
-	public $motionZ = 0.0;
 	/** @var Vector3 */
-	public $temporalVector;
-	/** @var float */
-	public $lastMotionX;
-	/** @var float */
-	public $lastMotionY;
-	/** @var float */
-	public $lastMotionZ;
+	protected $motion;
+	/** @var Vector3 */
+	protected $lastMotion;
 	/** @var bool */
 	protected $forceMovementUpdate = false;
 
+	/** @var Vector3 */
+	public $temporalVector;
+
+
 	/** @var float */
 	public $lastYaw;
 	/** @var float */
@@ -549,9 +553,12 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->setGenericFlag(self::DATA_FLAG_AFFECTED_BY_GRAVITY, true);
 		$this->setGenericFlag(self::DATA_FLAG_HAS_COLLISION, true);
 
+		$this->initEntity();
+		$this->propertyManager->clearDirtyProperties(); //Prevents resending properties that were set during construction
+
 		$this->chunk->addEntity($this);
 		$this->level->addEntity($this);
-		$this->initEntity();
+
 		$this->lastUpdate = $this->server->getTick();
 		$this->server->getPluginManager()->callEvent(new EntitySpawnEvent($this));
 
@@ -562,7 +569,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @return string
 	 */
-	public function getNameTag(){
+	public function getNameTag() : string{
 		return $this->propertyManager->getString(self::DATA_NAMETAG);
 	}
 
@@ -584,21 +591,21 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @param string $name
 	 */
-	public function setNameTag($name){
+	public function setNameTag(string $name) : void{
 		$this->propertyManager->setString(self::DATA_NAMETAG, $name);
 	}
 
 	/**
 	 * @param bool $value
 	 */
-	public function setNameTagVisible(bool $value = true){
+	public function setNameTagVisible(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_CAN_SHOW_NAMETAG, $value);
 	}
 
 	/**
 	 * @param bool $value
 	 */
-	public function setNameTagAlwaysVisible(bool $value = true){
+	public function setNameTagAlwaysVisible(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_ALWAYS_SHOW_NAMETAG, $value);
 	}
 
@@ -612,7 +619,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @param float $value
 	 */
-	public function setScale(float $value){
+	public function setScale(float $value) : void{
 		$multiplier = $value / $this->getScale();
 
 		$this->width *= $multiplier;
@@ -624,7 +631,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->propertyManager->setFloat(self::DATA_SCALE, $value);
 	}
 
-	public function getBoundingBox(){
+	public function getBoundingBox() : AxisAlignedBB{
 		return $this->boundingBox;
 	}
 
@@ -645,7 +652,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return $this->getGenericFlag(self::DATA_FLAG_SNEAKING);
 	}
 
-	public function setSneaking(bool $value = true){
+	public function setSneaking(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_SNEAKING, $value);
 	}
 
@@ -653,7 +660,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return $this->getGenericFlag(self::DATA_FLAG_SPRINTING);
 	}
 
-	public function setSprinting(bool $value = true){
+	public function setSprinting(bool $value = true) : void{
 		if($value !== $this->isSprinting()){
 			$this->setGenericFlag(self::DATA_FLAG_SPRINTING, $value);
 			$attr = $this->attributeMap->getAttribute(Attribute::MOVEMENT_SPEED);
@@ -665,7 +672,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return $this->getGenericFlag(self::DATA_FLAG_IMMOBILE);
 	}
 
-	public function setImmobile(bool $value = true){
+	public function setImmobile(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_IMMOBILE, $value);
 	}
 
@@ -687,9 +694,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 	/**
 	 * Sets whether the entity is able to climb climbable blocks.
+	 *
 	 * @param bool $value
 	 */
-	public function setCanClimb(bool $value = true){
+	public function setCanClimb(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_CAN_CLIMB, $value);
 	}
 
@@ -707,7 +715,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @param bool $value
 	 */
-	public function setCanClimbWalls(bool $value = true){
+	public function setCanClimbWalls(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_WALLCLIMBING, $value);
 	}
 
@@ -715,7 +723,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * Returns the entity ID of the owning entity, or null if the entity doesn't have an owner.
 	 * @return int|null
 	 */
-	public function getOwningEntityId(){
+	public function getOwningEntityId() : ?int{
 		return $this->propertyManager->getLong(self::DATA_OWNER_EID);
 	}
 
@@ -723,7 +731,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * Returns the owning entity, or null if the entity was not found.
 	 * @return Entity|null
 	 */
-	public function getOwningEntity(){
+	public function getOwningEntity() : ?Entity{
 		$eid = $this->getOwningEntityId();
 		if($eid !== null){
 			return $this->server->findEntity($eid, $this->level);
@@ -739,7 +747,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @throws \InvalidArgumentException if the supplied entity is not valid
 	 */
-	public function setOwningEntity(Entity $owner = null){
+	public function setOwningEntity(?Entity $owner) : void{
 		if($owner === null){
 			$this->propertyManager->removeProperty(self::DATA_OWNER_EID);
 		}elseif($owner->closed){
@@ -753,7 +761,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * Returns the entity ID of the entity's target, or null if it doesn't have a target.
 	 * @return int|null
 	 */
-	public function getTargetEntityId(){
+	public function getTargetEntityId() : ?int{
 		return $this->propertyManager->getLong(self::DATA_TARGET_EID);
 	}
 
@@ -763,7 +771,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @return Entity|null
 	 */
-	public function getTargetEntity(){
+	public function getTargetEntity() : ?Entity{
 		$eid = $this->getTargetEntityId();
 		if($eid !== null){
 			return $this->server->findEntity($eid, $this->level);
@@ -779,7 +787,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @throws \InvalidArgumentException if the target entity is not valid
 	 */
-	public function setTargetEntity(Entity $target = null){
+	public function setTargetEntity(?Entity $target) : void{
 		if($target === null){
 			$this->propertyManager->removeProperty(self::DATA_TARGET_EID);
 		}elseif($target->closed){
@@ -812,7 +820,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @return string
 	 */
-	public function getSaveId(){
+	public function getSaveId() : string{
 		if(!isset(self::$saveNames[static::class])){
 			throw new \InvalidStateException("Entity is not registered");
 		}
@@ -820,7 +828,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return current(self::$saveNames[static::class]);
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		if(!($this instanceof Player)){
 			$this->namedtag->setString("id", $this->getSaveId(), true);
 
@@ -839,9 +847,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		]));
 
 		$this->namedtag->setTag(new ListTag("Motion", [
-			new DoubleTag("", $this->motionX),
-			new DoubleTag("", $this->motionY),
-			new DoubleTag("", $this->motionZ)
+			new DoubleTag("", $this->motion->x),
+			new DoubleTag("", $this->motion->y),
+			new DoubleTag("", $this->motion->z)
 		]));
 
 		$this->namedtag->setTag(new ListTag("Rotation", [
@@ -856,7 +864,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->namedtag->setByte("Invulnerable", $this->invulnerable ? 1 : 0);
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		assert($this->namedtag instanceof CompoundTag);
 
 		if($this->namedtag->hasTag("CustomName", StringTag::class)){
@@ -870,18 +878,16 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				$this->setNameTagVisible($this->namedtag->getByte("CustomNameVisible", 1) !== 0);
 			}
 		}
-
-		$this->scheduleUpdate();
 	}
 
-	protected function addAttributes(){
+	protected function addAttributes() : void{
 
 	}
 
 	/**
 	 * @param EntityDamageEvent $source
 	 */
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		$this->server->getPluginManager()->callEvent($source);
 		if($source->isCancelled()){
 			return;
@@ -895,7 +901,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @param EntityRegainHealthEvent $source
 	 */
-	public function heal(EntityRegainHealthEvent $source){
+	public function heal(EntityRegainHealthEvent $source) : void{
 		$this->server->getPluginManager()->callEvent($source);
 		if($source->isCancelled()){
 			return;
@@ -904,7 +910,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->setHealth($this->getHealth() + $source->getAmount());
 	}
 
-	public function kill(){
+	public function kill() : void{
 		$this->health = 0;
 		$this->scheduleUpdate();
 	}
@@ -935,7 +941,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @param float $amount
 	 */
-	public function setHealth(float $amount){
+	public function setHealth(float $amount) : void{
 		if($amount == $this->health){
 			return;
 		}
@@ -962,25 +968,25 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @param int $amount
 	 */
-	public function setMaxHealth(int $amount){
+	public function setMaxHealth(int $amount) : void{
 		$this->maxHealth = $amount;
 	}
 
 	/**
 	 * @param EntityDamageEvent $type
 	 */
-	public function setLastDamageCause(EntityDamageEvent $type){
+	public function setLastDamageCause(EntityDamageEvent $type) : void{
 		$this->lastDamageCause = $type;
 	}
 
 	/**
 	 * @return EntityDamageEvent|null
 	 */
-	public function getLastDamageCause(){
+	public function getLastDamageCause() : ?EntityDamageEvent{
 		return $this->lastDamageCause;
 	}
 
-	public function getAttributeMap(){
+	public function getAttributeMap() : AttributeMap{
 		return $this->attributeMap;
 	}
 
@@ -1030,7 +1036,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return $this->fireTicks > 0;
 	}
 
-	public function setOnFire(int $seconds){
+	public function setOnFire(int $seconds) : void{
 		$ticks = $seconds * 20;
 		if($ticks > $this->fireTicks){
 			$this->fireTicks = $ticks;
@@ -1053,7 +1059,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->fireTicks = $fireTicks;
 	}
 
-	public function extinguish(){
+	public function extinguish() : void{
 		$this->fireTicks = 0;
 		$this->setGenericFlag(self::DATA_FLAG_ONFIRE, false);
 	}
@@ -1085,7 +1091,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * Called to deal damage to entities when they are on fire.
 	 */
-	protected function dealFireDamage(){
+	protected function dealFireDamage() : void{
 		$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FIRE_TICK, 1);
 		$this->attack($ev);
 	}
@@ -1098,11 +1104,11 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return true;
 	}
 
-	protected function updateMovement(bool $teleport = false){
+	protected function updateMovement(bool $teleport = false) : void{
 		$diffPosition = ($this->x - $this->lastX) ** 2 + ($this->y - $this->lastY) ** 2 + ($this->z - $this->lastZ) ** 2;
 		$diffRotation = ($this->yaw - $this->lastYaw) ** 2 + ($this->pitch - $this->lastPitch) ** 2;
 
-		$diffMotion = ($this->motionX - $this->lastMotionX) ** 2 + ($this->motionY - $this->lastMotionY) ** 2 + ($this->motionZ - $this->lastMotionZ) ** 2;
+		$diffMotion = $this->motion->subtract($this->lastMotion)->lengthSquared();
 
 		if($teleport or $diffPosition > 0.0001 or $diffRotation > 1.0){
 			$this->lastX = $this->x;
@@ -1115,10 +1121,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$this->broadcastMovement($teleport);
 		}
 
-		if($diffMotion > 0.0025 or ($diffMotion > 0.0001 and $this->getMotion()->lengthSquared() <= 0.0001)){ //0.05 ** 2
-			$this->lastMotionX = $this->motionX;
-			$this->lastMotionY = $this->motionY;
-			$this->lastMotionZ = $this->motionZ;
+		if($diffMotion > 0.0025 or ($diffMotion > 0.0001 and $this->motion->lengthSquared() <= 0.0001)){ //0.05 ** 2
+			$this->lastMotion = clone $this->motion;
 
 			$this->broadcastMotion();
 		}
@@ -1128,7 +1132,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return new Vector3($vector3->x, $vector3->y + $this->baseOffset, $vector3->z);
 	}
 
-	protected function broadcastMovement(bool $teleport = false){
+	protected function broadcastMovement(bool $teleport = false) : void{
 		if($this->chunk !== null){
 			$pk = new MoveEntityPacket();
 			$pk->entityRuntimeId = $this->id;
@@ -1142,7 +1146,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
-	protected function broadcastMotion(){
+	protected function broadcastMotion() : void{
 		if($this->chunk !== null){
 			$pk = new SetEntityMotionPacket();
 			$pk->entityRuntimeId = $this->id;
@@ -1156,29 +1160,29 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return false;
 	}
 
-	protected function applyGravity(){
-		$this->motionY -= $this->gravity;
+	protected function applyGravity() : void{
+		$this->motion->y -= $this->gravity;
 	}
 
-	protected function tryChangeMovement(){
+	protected function tryChangeMovement() : void{
 		$friction = 1 - $this->drag;
 
 		if($this->applyDragBeforeGravity()){
-			$this->motionY *= $friction;
+			$this->motion->y *= $friction;
 		}
 
 		$this->applyGravity();
 
 		if(!$this->applyDragBeforeGravity()){
-			$this->motionY *= $friction;
+			$this->motion->y *= $friction;
 		}
 
 		if($this->onGround){
-			$friction *= $this->level->getBlockAt(Math::floorFloat($this->x), Math::floorFloat($this->y) - 1, Math::floorFloat($this->z))->getFrictionFactor();
+			$friction *= $this->level->getBlockAt((int) floor($this->x), (int) floor($this->y - 1), (int) floor($this->z))->getFrictionFactor();
 		}
 
-		$this->motionX *= $friction;
-		$this->motionZ *= $friction;
+		$this->motion->x *= $friction;
+		$this->motion->z *= $friction;
 	}
 
 	protected function checkObstruction(float $x, float $y, float $z) : bool{
@@ -1186,9 +1190,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			return false;
 		}
 
-		$floorX = Math::floorFloat($x);
-		$floorY = Math::floorFloat($y);
-		$floorZ = Math::floorFloat($z);
+		$floorX = (int) floor($x);
+		$floorY = (int) floor($y);
+		$floorZ = (int) floor($z);
 
 		$diffX = $x - $floorX;
 		$diffY = $y - $floorY;
@@ -1237,37 +1241,37 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$force = lcg_value() * 0.2 + 0.1;
 
 			if($direction === Vector3::SIDE_WEST){
-				$this->motionX = -$force;
+				$this->motion->x = -$force;
 
 				return true;
 			}
 
 			if($direction === Vector3::SIDE_EAST){
-				$this->motionX = $force;
+				$this->motion->x = $force;
 
 				return true;
 			}
 
 			if($direction === Vector3::SIDE_DOWN){
-				$this->motionY = -$force;
+				$this->motion->y = -$force;
 
 				return true;
 			}
 
 			if($direction === Vector3::SIDE_UP){
-				$this->motionY = $force;
+				$this->motion->y = $force;
 
 				return true;
 			}
 
 			if($direction === Vector3::SIDE_NORTH){
-				$this->motionZ = -$force;
+				$this->motion->z = -$force;
 
 				return true;
 			}
 
 			if($direction === Vector3::SIDE_SOUTH){
-				$this->motionZ = $force;
+				$this->motion->z = $force;
 
 				return true;
 			}
@@ -1279,7 +1283,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @return int|null
 	 */
-	public function getDirection(){
+	public function getDirection() : ?int{
 		$rotation = ($this->yaw - 90) % 360;
 		if($rotation < 0){
 			$rotation += 360.0;
@@ -1329,11 +1333,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		$this->lastUpdate = $currentTick;
 
-		if($this->needsDespawn){
-			$this->close();
-			return false;
-		}
-
 		if(!$this->isAlive()){
 			if($this->onDeathUpdate($tickDiff)){
 				$this->flagForDespawn();
@@ -1347,16 +1346,16 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		if($this->hasMovementUpdate()){
 			$this->tryChangeMovement();
-			$this->move($this->motionX, $this->motionY, $this->motionZ);
+			$this->move($this->motion->x, $this->motion->y, $this->motion->z);
 
-			if(abs($this->motionX) <= self::MOTION_THRESHOLD){
-				$this->motionX = 0;
+			if(abs($this->motion->x) <= self::MOTION_THRESHOLD){
+				$this->motion->x = 0;
 			}
-			if(abs($this->motionY) <= self::MOTION_THRESHOLD){
-				$this->motionY = 0;
+			if(abs($this->motion->y) <= self::MOTION_THRESHOLD){
+				$this->motion->y = 0;
 			}
-			if(abs($this->motionZ) <= self::MOTION_THRESHOLD){
-				$this->motionZ = 0;
+			if(abs($this->motion->z) <= self::MOTION_THRESHOLD){
+				$this->motion->z = 0;
 			}
 
 			$this->forceMovementUpdate = false;
@@ -1377,7 +1376,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		//return !($this instanceof Player);
 	}
 
-	final public function scheduleUpdate(){
+	final public function scheduleUpdate() : void{
+		if($this->closed){
+			throw new \InvalidStateException("Cannot schedule update on garbage entity " . get_class($this));
+		}
 		$this->level->updateEntities[$this->id] = $this;
 	}
 
@@ -1392,7 +1394,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @param bool $value
 	 */
-	final public function setForceMovementUpdate(bool $value = true){
+	final public function setForceMovementUpdate(bool $value = true) : void{
 		$this->forceMovementUpdate = $value;
 
 		$this->blocksAround = null;
@@ -1405,9 +1407,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public function hasMovementUpdate() : bool{
 		return (
 			$this->forceMovementUpdate or
-			$this->motionX != 0 or
-			$this->motionY != 0 or
-			$this->motionZ != 0 or
+			$this->motion->x != 0 or
+			$this->motion->y != 0 or
+			$this->motion->z != 0 or
 			!$this->onGround
 		);
 	}
@@ -1416,7 +1418,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return true;
 	}
 
-	public function resetFallDistance(){
+	public function resetFallDistance() : void{
 		$this->fallDistance = 0.0;
 	}
 
@@ -1424,7 +1426,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param float $distanceThisTick
 	 * @param bool  $onGround
 	 */
-	protected function updateFallState(float $distanceThisTick, bool $onGround){
+	protected function updateFallState(float $distanceThisTick, bool $onGround) : void{
 		if($onGround){
 			if($this->fallDistance > 0){
 				$this->fall($this->fallDistance);
@@ -1440,11 +1442,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @param float $fallDistance
 	 */
-	public function fall(float $fallDistance){
-
-	}
-
-	public function handleLavaMovement(){ //TODO
+	public function fall(float $fallDistance) : void{
 
 	}
 
@@ -1452,16 +1450,12 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return $this->eyeHeight;
 	}
 
-	public function moveFlying(){ //TODO
+	public function onCollideWithPlayer(Player $player) : void{
 
 	}
 
-	public function onCollideWithPlayer(Player $player){
-
-	}
-
-	public function isInsideOfWater() : bool{
-		$block = $this->level->getBlockAt(Math::floorFloat($this->x), Math::floorFloat($y = ($this->y + $this->getEyeHeight())), Math::floorFloat($this->z));
+	public function isUnderwater() : bool{
+		$block = $this->level->getBlockAt((int) floor($this->x), (int) floor($y = ($this->y + $this->getEyeHeight())), (int) floor($this->z));
 
 		if($block instanceof Water){
 			$f = ($block->y + 1) - ($block->getFluidHeightPercent() - 0.1111111);
@@ -1472,7 +1466,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	public function isInsideOfSolid() : bool{
-		$block = $this->level->getBlockAt(Math::floorFloat($this->x), Math::floorFloat($y = ($this->y + $this->getEyeHeight())), Math::floorFloat($this->z));
+		$block = $this->level->getBlockAt((int) floor($this->x), (int) floor($y = ($this->y + $this->getEyeHeight())), (int) floor($this->z));
 
 		return $block->isSolid() and !$block->isTransparent() and $block->collidesWithBB($this->getBoundingBox());
 	}
@@ -1486,7 +1480,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		Timings::$entityMoveTimer->startTiming();
 
-		$newBB = $this->boundingBox->getOffsetBoundingBox($dx, $dy, $dz);
+		$newBB = $this->boundingBox->offsetCopy($dx, $dy, $dz);
 
 		$list = $this->level->getCollisionCubes($this, $newBB, false);
 
@@ -1574,7 +1568,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 			assert(abs($dx) <= 20 and abs($dy) <= 20 and abs($dz) <= 20, "Movement distance is excessive: dx=$dx, dy=$dy, dz=$dz");
 
-			$list = $this->level->getCollisionCubes($this, $this->level->getTickRate() > 1 ? $this->boundingBox->getOffsetBoundingBox($dx, $dy, $dz) : $this->boundingBox->addCoord($dx, $dy, $dz), false);
+			$list = $this->level->getCollisionCubes($this, $this->level->getTickRate() > 1 ? $this->boundingBox->offsetCopy($dx, $dy, $dz) : $this->boundingBox->addCoord($dx, $dy, $dz), false);
 
 			foreach($list as $bb){
 				$dy = $bb->calculateYOffset($this->boundingBox, $dy);
@@ -1650,15 +1644,15 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->updateFallState($dy, $this->onGround);
 
 		if($movX != $dx){
-			$this->motionX = 0;
+			$this->motion->x = 0;
 		}
 
 		if($movY != $dy){
-			$this->motionY = 0;
+			$this->motion->y = 0;
 		}
 
 		if($movZ != $dz){
-			$this->motionZ = 0;
+			$this->motion->z = 0;
 		}
 
 		//TODO: vehicle collision events (first we need to spawn them!)
@@ -1666,7 +1660,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		Timings::$entityMoveTimer->stopTiming();
 	}
 
-	protected function checkGroundState(float $movX, float $movY, float $movZ, float $dx, float $dy, float $dz){
+	protected function checkGroundState(float $movX, float $movY, float $movZ, float $dx, float $dy, float $dz) : void{
 		$this->isCollidedVertically = $movY != $dy;
 		$this->isCollidedHorizontally = ($movX != $dx or $movZ != $dz);
 		$this->isCollided = ($this->isCollidedHorizontally or $this->isCollidedVertically);
@@ -1680,12 +1674,12 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($this->blocksAround === null){
 			$inset = 0.001; //Offset against floating-point errors
 
-			$minX = Math::floorFloat($this->boundingBox->minX + $inset);
-			$minY = Math::floorFloat($this->boundingBox->minY + $inset);
-			$minZ = Math::floorFloat($this->boundingBox->minZ + $inset);
-			$maxX = Math::floorFloat($this->boundingBox->maxX - $inset);
-			$maxY = Math::floorFloat($this->boundingBox->maxY - $inset);
-			$maxZ = Math::floorFloat($this->boundingBox->maxZ - $inset);
+			$minX = (int) floor($this->boundingBox->minX + $inset);
+			$minY = (int) floor($this->boundingBox->minY + $inset);
+			$minZ = (int) floor($this->boundingBox->minZ + $inset);
+			$maxX = (int) floor($this->boundingBox->maxX - $inset);
+			$maxY = (int) floor($this->boundingBox->maxY - $inset);
+			$maxZ = (int) floor($this->boundingBox->maxZ - $inset);
 
 			$this->blocksAround = [];
 
@@ -1713,7 +1707,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return true;
 	}
 
-	protected function checkBlockCollision(){
+	protected function checkBlockCollision() : void{
 		$vector = $this->temporalVector->setComponents(0, 0, 0);
 
 		foreach($this->getBlocksAround() as $block){
@@ -1724,9 +1718,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($vector->lengthSquared() > 0){
 			$vector = $vector->normalize();
 			$d = 0.014;
-			$this->motionX += $vector->x * $d;
-			$this->motionY += $vector->y * $d;
-			$this->motionZ += $vector->z * $d;
+			$this->motion->x += $vector->x * $d;
+			$this->motion->y += $vector->y * $d;
+			$this->motion->z += $vector->z * $d;
 		}
 	}
 
@@ -1762,7 +1756,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return true;
 	}
 
-	public function setRotation(float $yaw, float $pitch){
+	public function setRotation(float $yaw, float $pitch) : void{
 		$this->yaw = $yaw;
 		$this->pitch = $pitch;
 		$this->scheduleUpdate();
@@ -1778,7 +1772,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		return false;
 	}
 
-	protected function checkChunks(){
+	protected function checkChunks() : void{
 		$chunkX = $this->getFloorX() >> 4;
 		$chunkZ = $this->getFloorZ() >> 4;
 		if($this->chunk === null or ($this->chunk->getX() !== $chunkX or $this->chunk->getZ() !== $chunkZ)){
@@ -1809,17 +1803,17 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
-	protected function resetLastMovements(){
+	protected function resetLastMovements() : void{
 		list($this->lastX, $this->lastY, $this->lastZ) = [$this->x, $this->y, $this->z];
 		list($this->lastYaw, $this->lastPitch) = [$this->yaw, $this->pitch];
-		list($this->lastMotionX, $this->lastMotionY, $this->lastMotionZ) = [$this->motionX, $this->motionY, $this->motionZ];
+		$this->lastMotion = clone $this->motion;
 	}
 
 	public function getMotion() : Vector3{
-		return new Vector3($this->motionX, $this->motionY, $this->motionZ);
+		return clone $this->motion;
 	}
 
-	public function setMotion(Vector3 $motion){
+	public function setMotion(Vector3 $motion) : bool{
 		if(!$this->justCreated){
 			$this->server->getPluginManager()->callEvent($ev = new EntityMotionEvent($this, $motion));
 			if($ev->isCancelled()){
@@ -1827,9 +1821,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			}
 		}
 
-		$this->motionX = $motion->x;
-		$this->motionY = $motion->y;
-		$this->motionZ = $motion->z;
+		$this->motion = clone $motion;
 
 		if(!$this->justCreated){
 			$this->updateMovement();
@@ -1849,7 +1841,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @return bool
 	 */
-	public function teleport(Vector3 $pos, float $yaw = null, float $pitch = null) : bool{
+	public function teleport(Vector3 $pos, ?float $yaw = null, ?float $pitch = null) : bool{
 		if($pos instanceof Location){
 			$yaw = $yaw ?? $pos->yaw;
 			$pitch = $pitch ?? $pos->pitch;
@@ -1934,7 +1926,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/**
 	 * @param Player $player
 	 */
-	public function spawnTo(Player $player){
+	public function spawnTo(Player $player) : void{
 		if(!isset($this->hasSpawned[$player->getLoaderId()]) and $this->chunk !== null and isset($player->usedChunks[Level::chunkHash($this->chunk->getX(), $this->chunk->getZ())])){
 			$this->hasSpawned[$player->getLoaderId()] = $player;
 
@@ -1942,7 +1934,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
-	public function spawnToAll(){
+	public function spawnToAll() : void{
 		if($this->chunk === null or $this->closed){
 			return;
 		}
@@ -1953,7 +1945,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
-	public function respawnToAll(){
+	public function respawnToAll() : void{
 		foreach($this->hasSpawned as $key => $player){
 			unset($this->hasSpawned[$key]);
 			$this->spawnTo($player);
@@ -1964,7 +1956,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param Player $player
 	 * @param bool   $send
 	 */
-	public function despawnFrom(Player $player, bool $send = true){
+	public function despawnFrom(Player $player, bool $send = true) : void{
 		if(isset($this->hasSpawned[$player->getLoaderId()])){
 			if($send){
 				$pk = new RemoveEntityPacket();
@@ -1975,7 +1967,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
-	public function despawnFromAll(){
+	public function despawnFromAll() : void{
 		foreach($this->hasSpawned as $player){
 			$this->despawnFrom($player);
 		}
@@ -1986,6 +1978,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	public function flagForDespawn() : void{
 		$this->needsDespawn = true;
+		$this->scheduleUpdate();
 	}
 
 	public function isFlaggedForDespawn() : bool{
@@ -2005,7 +1998,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * WARNING: Entities are unusable after this has been executed!
 	 */
-	public function close(){
+	public function close() : void{
 		if(!$this->closed){
 			$this->server->getPluginManager()->callEvent(new EntityDespawnEvent($this));
 			$this->closed = true;
@@ -2034,7 +2027,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param bool $value
 	 * @param int  $propertyType
 	 */
-	public function setDataFlag(int $propertyId, int $flagId, bool $value = true, int $propertyType = self::DATA_TYPE_LONG){
+	public function setDataFlag(int $propertyId, int $flagId, bool $value = true, int $propertyType = self::DATA_TYPE_LONG) : void{
 		if($this->getDataFlag($propertyId, $flagId) !== $value){
 			$flags = (int) $this->propertyManager->getPropertyValue($propertyId, $propertyType);
 			$flags ^= 1 << $flagId;
@@ -2068,7 +2061,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param int  $flagId
 	 * @param bool $value
 	 */
-	public function setGenericFlag(int $flagId, bool $value = true){
+	public function setGenericFlag(int $flagId, bool $value = true) : void{
 		$this->setDataFlag(self::DATA_FLAGS, $flagId, $value, self::DATA_TYPE_LONG);
 	}
 
@@ -2076,7 +2069,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param Player[]|Player $player
 	 * @param array           $data Properly formatted entity data, defaults to everything
 	 */
-	public function sendData($player, array $data = null){
+	public function sendData($player, ?array $data = null) : void{
 		if(!is_array($player)){
 			$player = [$player];
 		}
@@ -2129,5 +2122,4 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public function __toString(){
 		return (new \ReflectionClass($this))->getShortName() . "(" . $this->getId() . ")";
 	}
-
 }

src/pocketmine/entity/EntityIds.php

@@ -46,7 +46,7 @@ interface EntityIds{
 	public const POLAR_BEAR = 28;
 	public const LLAMA = 29;
 	public const PARROT = 30;
-
+	public const DOLPHIN = 31;
 	public const ZOMBIE = 32;
 	public const CREEPER = 33;
 	public const SKELETON = 34;
@@ -86,6 +86,7 @@ interface EntityIds{
 	public const EYE_OF_ENDER_SIGNAL = 70;
 	public const ENDER_CRYSTAL = 71;
 	public const FIREWORKS_ROCKET = 72;
+	public const TRIDENT = 73;
 
 	public const SHULKER_BULLET = 76;
 	public const FISHING_HOOK = 77;
@@ -116,4 +117,11 @@ interface EntityIds{
 	public const EVOCATION_FANG = 103;
 	public const EVOCATION_ILLAGER = 104;
 	public const VEX = 105;
+	public const ICE_BOMB = 106;
+	public const BALLOON = 107;
+	public const PUFFERFISH = 108;
+	public const SALMON = 109;
+	public const DROWNED = 110;
+	public const TROPICAL_FISH = 111;
+	public const FISH = 112;
 }

src/pocketmine/entity/Human.php

@@ -30,11 +30,14 @@ use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\player\PlayerExhaustEvent;
 use pocketmine\event\player\PlayerExperienceChangeEvent;
 use pocketmine\inventory\EnderChestInventory;
+use pocketmine\inventory\EntityInventoryEventProcessor;
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Consumable;
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
+use pocketmine\item\Totem;
 use pocketmine\level\Level;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\ByteArrayTag;
@@ -43,6 +46,7 @@ use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
+use pocketmine\network\mcpe\protocol\EntityEventPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
@@ -111,7 +115,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	/**
 	 * @return UUID|null
 	 */
-	public function getUniqueId(){
+	public function getUniqueId() : ?UUID{
 		return $this->uuid;
 	}
 
@@ -151,14 +155,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 *
 	 * @param Player[]|null $targets
 	 */
-	public function sendSkin(array $targets = null) : void{
+	public function sendSkin(?array $targets = null) : void{
 		$pk = new PlayerSkinPacket();
 		$pk->uuid = $this->getUniqueId();
 		$pk->skin = $this->skin;
 		$this->server->broadcastPacket($targets ?? $this->hasSpawned, $pk);
 	}
 
-	public function jump(){
+	public function jump() : void{
 		parent::jump();
 		if($this->isSprinting()){
 			$this->exhaust(0.8, PlayerExhaustEvent::CAUSE_SPRINT_JUMPING);
@@ -179,7 +183,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	public function setFood(float $new){
+	public function setFood(float $new) : void{
 		$attr = $this->attributeMap->getAttribute(Attribute::HUNGER);
 		$old = $attr->getValue();
 		$attr->setValue($new);
@@ -202,7 +206,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return $this->attributeMap->getAttribute(Attribute::HUNGER)->getMaxValue();
 	}
 
-	public function addFood(float $amount){
+	public function addFood(float $amount) : void{
 		$attr = $this->attributeMap->getAttribute(Attribute::HUNGER);
 		$amount += $attr->getValue();
 		$amount = max(min($amount, $attr->getMaxValue()), $attr->getMinValue());
@@ -230,11 +234,11 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	public function setSaturation(float $saturation){
+	public function setSaturation(float $saturation) : void{
 		$this->attributeMap->getAttribute(Attribute::SATURATION)->setValue($saturation);
 	}
 
-	public function addSaturation(float $amount){
+	public function addSaturation(float $amount) : void{
 		$attr = $this->attributeMap->getAttribute(Attribute::SATURATION);
 		$attr->setValue($attr->getValue() + $amount, true);
 	}
@@ -249,7 +253,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 *
 	 * @param float $exhaustion
 	 */
-	public function setExhaustion(float $exhaustion){
+	public function setExhaustion(float $exhaustion) : void{
 		$this->attributeMap->getAttribute(Attribute::EXHAUSTION)->setValue($exhaustion);
 	}
 
@@ -529,14 +533,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return $this->inventory;
 	}
 
-	public function getEnderChestInventory(){
+	public function getEnderChestInventory() : EnderChestInventory{
 		return $this->enderChestInventory;
 	}
 
 	/**
 	 * For Human entities which are not players, sets their properties such as nametag, skin and UUID from NBT.
 	 */
-	protected function initHumanData(){
+	protected function initHumanData() : void{
 		if($this->namedtag->hasTag("NameTag", StringTag::class)){
 			$this->setNameTag($this->namedtag->getString("NameTag"));
 		}
@@ -555,18 +559,21 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		$this->uuid = UUID::fromData((string) $this->getId(), $this->skin->getSkinData(), $this->getNameTag());
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->setPlayerFlag(self::DATA_PLAYER_FLAG_SLEEP, false);
 		$this->propertyManager->setBlockPos(self::DATA_PLAYER_BED_POSITION, null);
 
 		$this->inventory = new PlayerInventory($this);
-		$this->enderChestInventory = new EnderChestInventory($this);
+		$this->enderChestInventory = new EnderChestInventory();
 		$this->initHumanData();
 
 		$inventoryTag = $this->namedtag->getListTag("Inventory");
 		if($inventoryTag !== null){
+			$armorListener = $this->armorInventory->getEventProcessor();
+			$this->armorInventory->setEventProcessor(null);
+
 			/** @var CompoundTag $item */
 			foreach($inventoryTag as $i => $item){
 				$slot = $item->getByte("Slot");
@@ -578,6 +585,8 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 					$this->inventory->setItem($slot - 9, Item::nbtDeserialize($item));
 				}
 			}
+
+			$this->armorInventory->setEventProcessor($armorListener);
 		}
 
 		$enderChestInventoryTag = $this->namedtag->getListTag("EnderChestInventory");
@@ -590,6 +599,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 
 		$this->inventory->setHeldItemIndex($this->namedtag->getInt("SelectedInventorySlot", 0), false);
 
+		$this->inventory->setEventProcessor(new EntityInventoryEventProcessor($this));
 
 		$this->setFood((float) $this->namedtag->getInt("foodLevel", (int) $this->getFood(), true));
 		$this->setExhaustion($this->namedtag->getFloat("foodExhaustionLevel", $this->getExhaustion(), true));
@@ -607,7 +617,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		}
 	}
 
-	protected function addAttributes(){
+	protected function addAttributes() : void{
 		parent::addAttributes();
 
 		$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::SATURATION));
@@ -629,7 +639,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return $hasUpdate;
 	}
 
-	public function doFoodTick(int $tickDiff = 1){
+	protected function doFoodTick(int $tickDiff = 1) : void{
 		if($this->isAlive()){
 			$food = $this->getFood();
 			$health = $this->getHealth();
@@ -641,8 +651,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			}
 
 			if($difficulty === Level::DIFFICULTY_PEACEFUL and $this->foodTickTimer % 10 === 0){
-				if($food < 20){
+				if($food < $this->getMaxFood()){
 					$this->addFood(1.0);
+					$food = $this->getFood();
 				}
 				if($this->foodTickTimer % 20 === 0 and $health < $this->getMaxHealth()){
 					$this->heal(new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
@@ -656,16 +667,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 						$this->exhaust(3.0, PlayerExhaustEvent::CAUSE_HEALTH_REGEN);
 					}
 				}elseif($food <= 0){
-					if(($difficulty === 1 and $health > 10) or ($difficulty === 2 and $health > 1) or $difficulty === 3){
+					if(($difficulty === Level::DIFFICULTY_EASY and $health > 10) or ($difficulty === Level::DIFFICULTY_NORMAL and $health > 1) or $difficulty === Level::DIFFICULTY_HARD){
 						$this->attack(new EntityDamageEvent($this, EntityDamageEvent::CAUSE_STARVATION, 1));
 					}
 				}
 			}
 
 			if($food <= 6){
-				if($this->isSprinting()){
-					$this->setSprinting(false);
-				}
+				$this->setSprinting(false);
 			}
 		}
 	}
@@ -674,14 +683,49 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return $this->getNameTag();
 	}
 
-	public function getDrops() : array{
-		return array_merge(
-			$this->inventory !== null ? array_values($this->inventory->getContents()) : [],
-			$this->armorInventory !== null ? array_values($this->armorInventory->getContents()) : []
-		);
+	public function applyDamageModifiers(EntityDamageEvent $source) : void{
+		parent::applyDamageModifiers($source);
+
+		$type = $source->getCause();
+		if($type !== EntityDamageEvent::CAUSE_SUICIDE and $type !== EntityDamageEvent::CAUSE_VOID
+			and $this->inventory->getItemInHand() instanceof Totem){ //TODO: check offhand as well (when it's implemented)
+
+			$compensation = $this->getHealth() - $source->getFinalDamage() - 1;
+			if($compensation < 0){
+				$source->setModifier($compensation, EntityDamageEvent::MODIFIER_TOTEM);
+			}
+		}
 	}
 
-	public function saveNBT(){
+	protected function applyPostDamageEffects(EntityDamageEvent $source) : void{
+		parent::applyPostDamageEffects($source);
+		$totemModifier = $source->getModifier(EntityDamageEvent::MODIFIER_TOTEM);
+		if($totemModifier < 0){ //Totem prevented death
+			$this->removeAllEffects();
+
+			$this->addEffect(new EffectInstance(Effect::getEffect(Effect::REGENERATION), 40 * 20, 1));
+			$this->addEffect(new EffectInstance(Effect::getEffect(Effect::FIRE_RESISTANCE), 40 * 20, 1));
+			$this->addEffect(new EffectInstance(Effect::getEffect(Effect::ABSORPTION), 5 * 20, 1));
+
+			$this->broadcastEntityEvent(EntityEventPacket::CONSUME_TOTEM);
+			$this->level->broadcastLevelEvent($this->add(0, $this->eyeHeight, 0), LevelEventPacket::EVENT_SOUND_TOTEM);
+
+			$hand = $this->inventory->getItemInHand();
+			if($hand instanceof Totem){
+				$hand->pop(); //Plugins could alter max stack size
+				$this->inventory->setItemInHand($hand);
+			}
+		}
+	}
+
+	public function getDrops() : array{
+		return array_filter(array_merge(
+			$this->inventory !== null ? array_values($this->inventory->getContents()) : [],
+			$this->armorInventory !== null ? array_values($this->armorInventory->getContents()) : []
+		), function(Item $item) : bool{ return !$item->hasEnchantment(Enchantment::VANISHING); });
+	}
+
+	public function saveNBT() : void{
 		parent::saveNBT();
 
 		$this->namedtag->setInt("foodLevel", (int) $this->getFood(), true);
@@ -743,7 +787,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		}
 	}
 
-	public function spawnTo(Player $player){
+	public function spawnTo(Player $player) : void{
 		if($player !== $this){
 			parent::spawnTo($player);
 		}
@@ -776,7 +820,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		}
 	}
 
-	public function close(){
+	public function close() : void{
 		if(!$this->closed){
 			if($this->inventory !== null){
 				$this->inventory->removeAllViewers(true);
@@ -806,7 +850,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 * @param int  $flagId
 	 * @param bool $value
 	 */
-	public function setPlayerFlag(int $flagId, bool $value = true){
+	public function setPlayerFlag(int $flagId, bool $value = true) : void{
 		$this->setDataFlag(self::DATA_PLAYER_FLAGS, $flagId, $value, self::DATA_TYPE_BYTE);
 	}
 }

src/pocketmine/entity/Living.php

@@ -31,6 +31,7 @@ use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\event\entity\EntityEffectAddEvent;
 use pocketmine\event\entity\EntityEffectRemoveEvent;
 use pocketmine\inventory\ArmorInventory;
+use pocketmine\inventory\ArmorInventoryEventProcessor;
 use pocketmine\item\Armor;
 use pocketmine\item\Consumable;
 use pocketmine\item\enchantment\Enchantment;
@@ -72,10 +73,12 @@ abstract class Living extends Entity implements Damageable{
 
 	abstract public function getName() : string;
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->armorInventory = new ArmorInventory($this);
+		//TODO: load/save armor inventory contents
+		$this->armorInventory->setEventProcessor(new ArmorInventoryEventProcessor($this));
 
 		$health = $this->getMaxHealth();
 
@@ -112,7 +115,7 @@ abstract class Living extends Entity implements Damageable{
 		}
 	}
 
-	protected function addAttributes(){
+	protected function addAttributes() : void{
 		$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::HEALTH));
 		$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::FOLLOW_RANGE));
 		$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::KNOCKBACK_RESISTANCE));
@@ -121,7 +124,7 @@ abstract class Living extends Entity implements Damageable{
 		$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::ABSORPTION));
 	}
 
-	public function setHealth(float $amount){
+	public function setHealth(float $amount) : void{
 		$wasAlive = $this->isAlive();
 		parent::setHealth($amount);
 		$this->attributeMap->getAttribute(Attribute::HEALTH)->setValue(ceil($this->getHealth()), true);
@@ -134,7 +137,7 @@ abstract class Living extends Entity implements Damageable{
 		return (int) $this->attributeMap->getAttribute(Attribute::HEALTH)->getMaxValue();
 	}
 
-	public function setMaxHealth(int $amount){
+	public function setMaxHealth(int $amount) : void{
 		$this->attributeMap->getAttribute(Attribute::HEALTH)->setMaxValue($amount);
 	}
 
@@ -142,11 +145,11 @@ abstract class Living extends Entity implements Damageable{
 		return $this->attributeMap->getAttribute(Attribute::ABSORPTION)->getValue();
 	}
 
-	public function setAbsorption(float $absorption){
+	public function setAbsorption(float $absorption) : void{
 		$this->attributeMap->getAttribute(Attribute::ABSORPTION)->setValue($absorption);
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setFloat("Health", $this->getHealth(), true);
 
@@ -186,7 +189,7 @@ abstract class Living extends Entity implements Damageable{
 	/**
 	 * Removes all effects from the mob.
 	 */
-	public function removeAllEffects(){
+	public function removeAllEffects() : void{
 		foreach($this->effects as $effect){
 			$this->removeEffect($effect->getId());
 		}
@@ -197,11 +200,15 @@ abstract class Living extends Entity implements Damageable{
 	 *
 	 * @param int $effectId
 	 */
-	public function removeEffect(int $effectId){
+	public function removeEffect(int $effectId) : void{
 		if(isset($this->effects[$effectId])){
 			$effect = $this->effects[$effectId];
+			$hasExpired = $effect->hasExpired();
 			$this->server->getPluginManager()->callEvent($ev = new EntityEffectRemoveEvent($this, $effect));
 			if($ev->isCancelled()){
+				if($hasExpired and !$ev->getEffect()->hasExpired()){ //altered duration of an expired effect to make it not get removed
+					$this->sendEffectAdd($ev->getEffect(), true);
+				}
 				return;
 			}
 
@@ -221,7 +228,7 @@ abstract class Living extends Entity implements Damageable{
 	 *
 	 * @return EffectInstance|null
 	 */
-	public function getEffect(int $effectId){
+	public function getEffect(int $effectId) : ?EffectInstance{
 		return $this->effects[$effectId] ?? null;
 	}
 
@@ -292,7 +299,7 @@ abstract class Living extends Entity implements Damageable{
 	/**
 	 * Recalculates the mob's potion bubbles colour based on the active effects.
 	 */
-	protected function recalculateEffectColor(){
+	protected function recalculateEffectColor() : void{
 		/** @var Color[] $colors */
 		$colors = [];
 		$ambient = true;
@@ -323,7 +330,7 @@ abstract class Living extends Entity implements Damageable{
 	 * Sends the mob's potion effects to the specified player.
 	 * @param Player $player
 	 */
-	public function sendPotionEffects(Player $player){
+	public function sendPotionEffects(Player $player) : void{
 		foreach($this->effects as $effect){
 			$pk = new MobEffectPacket();
 			$pk->entityRuntimeId = $this->id;
@@ -374,13 +381,13 @@ abstract class Living extends Entity implements Damageable{
 	/**
 	 * Called when the entity jumps from the ground. This method adds upwards velocity to the entity.
 	 */
-	public function jump(){
+	public function jump() : void{
 		if($this->onGround){
-			$this->motionY = $this->getJumpVelocity(); //Y motion should already be 0 if we're jumping from the ground.
+			$this->motion->y = $this->getJumpVelocity(); //Y motion should already be 0 if we're jumping from the ground.
 		}
 	}
 
-	public function fall(float $fallDistance){
+	public function fall(float $fallDistance) : void{
 		$damage = ceil($fallDistance - 3 - ($this->hasEffect(Effect::JUMP) ? $this->getEffect(Effect::JUMP)->getEffectLevel() : 0));
 		if($damage > 0){
 			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage);
@@ -427,7 +434,7 @@ abstract class Living extends Entity implements Damageable{
 		return $this->armorInventory;
 	}
 
-	public function setOnFire(int $seconds){
+	public function setOnFire(int $seconds) : void{
 		parent::setOnFire($seconds - (int) min($seconds, $seconds * $this->getHighestArmorEnchantmentLevel(Enchantment::FIRE_PROTECTION) * 0.15));
 	}
 
@@ -440,12 +447,12 @@ abstract class Living extends Entity implements Damageable{
 	public function applyDamageModifiers(EntityDamageEvent $source) : void{
 		if($source->canBeReducedByArmor()){
 			//MCPE uses the same system as PC did pre-1.9
-			$source->setDamage(-$source->getFinalDamage() * $this->getArmorPoints() * 0.04, EntityDamageEvent::MODIFIER_ARMOR);
+			$source->setModifier(-$source->getFinalDamage() * $this->getArmorPoints() * 0.04, EntityDamageEvent::MODIFIER_ARMOR);
 		}
 
 		$cause = $source->getCause();
 		if($this->hasEffect(Effect::DAMAGE_RESISTANCE) and $cause !== EntityDamageEvent::CAUSE_VOID and $cause !== EntityDamageEvent::CAUSE_SUICIDE){
-			$source->setDamage(-$source->getFinalDamage() * min(1, 0.2 * $this->getEffect(Effect::DAMAGE_RESISTANCE)->getEffectLevel()), EntityDamageEvent::MODIFIER_RESISTANCE);
+			$source->setModifier(-$source->getFinalDamage() * min(1, 0.2 * $this->getEffect(Effect::DAMAGE_RESISTANCE)->getEffectLevel()), EntityDamageEvent::MODIFIER_RESISTANCE);
 		}
 
 		$totalEpf = 0;
@@ -454,9 +461,9 @@ abstract class Living extends Entity implements Damageable{
 				$totalEpf += $item->getEnchantmentProtectionFactor($source);
 			}
 		}
-		$source->setDamage(-$source->getFinalDamage() * min(ceil(min($totalEpf, 25) * (mt_rand(50, 100) / 100)), 20) * 0.04, EntityDamageEvent::MODIFIER_ARMOR_ENCHANTMENTS);
+		$source->setModifier(-$source->getFinalDamage() * min(ceil(min($totalEpf, 25) * (mt_rand(50, 100) / 100)), 20) * 0.04, EntityDamageEvent::MODIFIER_ARMOR_ENCHANTMENTS);
 
-		$source->setDamage(-min($this->getAbsorption(), $source->getFinalDamage()), EntityDamageEvent::MODIFIER_ABSORPTION);
+		$source->setModifier(-min($this->getAbsorption(), $source->getFinalDamage()), EntityDamageEvent::MODIFIER_ABSORPTION);
 	}
 
 	/**
@@ -466,8 +473,8 @@ abstract class Living extends Entity implements Damageable{
 	 * @param EntityDamageEvent $source
 	 */
 	protected function applyPostDamageEffects(EntityDamageEvent $source) : void{
-		$this->setAbsorption(max(0, $this->getAbsorption() + $source->getDamage(EntityDamageEvent::MODIFIER_ABSORPTION)));
-		$this->damageArmor($source->getDamage(EntityDamageEvent::MODIFIER_BASE));
+		$this->setAbsorption(max(0, $this->getAbsorption() + $source->getModifier(EntityDamageEvent::MODIFIER_ABSORPTION)));
+		$this->damageArmor($source->getBaseDamage());
 	}
 
 	/**
@@ -492,10 +499,10 @@ abstract class Living extends Entity implements Damageable{
 		$this->armorInventory->setContents($armor);
 	}
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		if($this->attackTime > 0 or $this->noDamageTicks > 0){
 			$lastCause = $this->getLastDamageCause();
-			if($lastCause !== null and $lastCause->getDamage() >= $source->getDamage()){
+			if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){
 				$source->setCancelled();
 			}
 		}
@@ -540,7 +547,7 @@ abstract class Living extends Entity implements Damageable{
 
 				$deltaX = $this->x - $e->x;
 				$deltaZ = $this->z - $e->z;
-				$this->knockBack($e, $source->getDamage(), $deltaX, $deltaZ, $source->getKnockBack());
+				$this->knockBack($e, $source->getBaseDamage(), $deltaX, $deltaZ, $source->getKnockBack());
 			}
 		}
 
@@ -559,36 +566,37 @@ abstract class Living extends Entity implements Damageable{
 		$this->broadcastEntityEvent(EntityEventPacket::HURT_ANIMATION);
 	}
 
-	public function knockBack(Entity $attacker, float $damage, float $x, float $z, float $base = 0.4){
+	public function knockBack(Entity $attacker, float $damage, float $x, float $z, float $base = 0.4) : void{
 		$f = sqrt($x * $x + $z * $z);
 		if($f <= 0){
 			return;
 		}
+		if(mt_rand() / mt_getrandmax() > $this->getAttributeMap()->getAttribute(Attribute::KNOCKBACK_RESISTANCE)->getValue()){
+			$f = 1 / $f;
 
-		$f = 1 / $f;
+			$motion = clone $this->motion;
 
-		$motion = new Vector3($this->motionX, $this->motionY, $this->motionZ);
+			$motion->x /= 2;
+			$motion->y /= 2;
+			$motion->z /= 2;
+			$motion->x += $x * $f * $base;
+			$motion->y += $base;
+			$motion->z += $z * $f * $base;
 
-		$motion->x /= 2;
-		$motion->y /= 2;
-		$motion->z /= 2;
-		$motion->x += $x * $f * $base;
-		$motion->y += $base;
-		$motion->z += $z * $f * $base;
+			if($motion->y > $base){
+				$motion->y = $base;
+			}
 
-		if($motion->y > $base){
-			$motion->y = $base;
+			$this->setMotion($motion);
 		}
-
-		$this->setMotion($motion);
 	}
 
-	public function kill(){
+	public function kill() : void{
 		parent::kill();
 		$this->onDeath();
 	}
 
-	protected function onDeath(){
+	protected function onDeath() : void{
 		$this->server->getPluginManager()->callEvent($ev = new EntityDeathEvent($this, $this->getDrops()));
 		foreach($ev->getDrops() as $item){
 			$this->getLevel()->dropItem($this, $item);
@@ -649,7 +657,7 @@ abstract class Living extends Entity implements Damageable{
 		return $hasUpdate;
 	}
 
-	protected function doEffectsTick(int $tickDiff = 1){
+	protected function doEffectsTick(int $tickDiff = 1) : void{
 		foreach($this->effects as $instance){
 			$type = $instance->getType();
 			if($type->canTick($instance)){
@@ -666,7 +674,7 @@ abstract class Living extends Entity implements Damageable{
 	 * Ticks the entity's air supply when it cannot breathe.
 	 * @param int $tickDiff
 	 */
-	protected function doAirSupplyTick(int $tickDiff){
+	protected function doAirSupplyTick(int $tickDiff) : void{
 		if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(Enchantment::RESPIRATION)) <= 0 or
 			lcg_value() <= (1 / ($respirationLevel + 1))
 		){
@@ -686,7 +694,7 @@ abstract class Living extends Entity implements Damageable{
 	 * @return bool
 	 */
 	public function canBreathe() : bool{
-		return $this->hasEffect(Effect::WATER_BREATHING) or !$this->isInsideOfWater();
+		return $this->hasEffect(Effect::WATER_BREATHING) or !$this->isUnderwater();
 	}
 
 	/**
@@ -703,7 +711,7 @@ abstract class Living extends Entity implements Damageable{
 	 *
 	 * @param bool $value
 	 */
-	public function setBreathing(bool $value = true){
+	public function setBreathing(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_BREATHING, $value);
 	}
 
@@ -721,7 +729,7 @@ abstract class Living extends Entity implements Damageable{
 	 * Sets the number of air ticks left in the entity's air supply.
 	 * @param int $ticks
 	 */
-	public function setAirSupplyTicks(int $ticks){
+	public function setAirSupplyTicks(int $ticks) : void{
 		$this->propertyManager->setShort(self::DATA_AIR, $ticks);
 	}
 
@@ -737,7 +745,7 @@ abstract class Living extends Entity implements Damageable{
 	 * Sets the maximum amount of air ticks the air supply can hold.
 	 * @param int $ticks
 	 */
-	public function setMaxAirSupplyTicks(int $ticks){
+	public function setMaxAirSupplyTicks(int $ticks) : void{
 		$this->propertyManager->setShort(self::DATA_MAX_AIR, $ticks);
 	}
 
@@ -745,7 +753,7 @@ abstract class Living extends Entity implements Damageable{
 	 * Called when the entity's air supply ticks reaches -20 or lower. The entity will usually take damage at this point
 	 * and then the supply is reset to 0, so this method will be called roughly every second.
 	 */
-	public function onAirExpired(){
+	public function onAirExpired() : void{
 		$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_DROWNING, 2);
 		$this->attack($ev);
 	}
@@ -815,13 +823,10 @@ abstract class Living extends Entity implements Damageable{
 	 *
 	 * @return Block|null
 	 */
-	public function getTargetBlock(int $maxDistance, array $transparent = []){
-		try{
-			$block = $this->getLineOfSight($maxDistance, 1, $transparent)[0];
-			if($block instanceof Block){
-				return $block;
-			}
-		}catch(\ArrayOutOfBoundsException $e){
+	public function getTargetBlock(int $maxDistance, array $transparent = []) : ?Block{
+		$line = $this->getLineOfSight($maxDistance, 1, $transparent);
+		if(!empty($line)){
+			return array_shift($line);
 		}
 
 		return null;
@@ -852,7 +857,7 @@ abstract class Living extends Entity implements Damageable{
 		$this->armorInventory->sendContents($player);
 	}
 
-	public function close(){
+	public function close() : void{
 		if(!$this->closed){
 			if($this->armorInventory !== null){
 				$this->armorInventory->removeAllViewers(true);

src/pocketmine/entity/Skin.php

@@ -99,5 +99,4 @@ class Skin{
 			$this->geometryData = (string) json_encode(json_decode($this->geometryData));
 		}
 	}
-
 }

src/pocketmine/entity/Squid.php

@@ -42,7 +42,7 @@ class Squid extends WaterAnimal{
 
 	private $switchDirectionTicker = 0;
 
-	public function initEntity(){
+	public function initEntity() : void{
 		$this->setMaxHealth(10);
 		parent::initEntity();
 	}
@@ -51,7 +51,7 @@ class Squid extends WaterAnimal{
 		return "Squid";
 	}
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		parent::attack($source);
 		if($source->isCancelled()){
 			return;
@@ -93,30 +93,28 @@ class Squid extends WaterAnimal{
 				$this->swimDirection->y = -0.5;
 			}
 
-			$inWater = $this->isInsideOfWater();
+			$inWater = $this->isUnderwater();
 			if(!$inWater){
 				$this->swimDirection = null;
 			}elseif($this->swimDirection !== null){
-				if($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2 <= $this->swimDirection->lengthSquared()){
-					$this->motionX = $this->swimDirection->x * $this->swimSpeed;
-					$this->motionY = $this->swimDirection->y * $this->swimSpeed;
-					$this->motionZ = $this->swimDirection->z * $this->swimSpeed;
+				if($this->motion->lengthSquared() <= $this->swimDirection->lengthSquared()){
+					$this->motion = $this->swimDirection->multiply($this->swimSpeed);
 				}
 			}else{
 				$this->swimDirection = $this->generateRandomDirection();
 				$this->swimSpeed = mt_rand(50, 100) / 2000;
 			}
 
-			$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
-			$this->yaw = (-atan2($this->motionX, $this->motionZ) * 180 / M_PI);
-			$this->pitch = (-atan2($f, $this->motionY) * 180 / M_PI);
+			$f = sqrt(($this->motion->x ** 2) + ($this->motion->z ** 2));
+			$this->yaw = (-atan2($this->motion->x, $this->motion->z) * 180 / M_PI);
+			$this->pitch = (-atan2($f, $this->motion->y) * 180 / M_PI);
 		}
 
 		return $hasUpdate;
 	}
 
-	protected function applyGravity(){
-		if(!$this->isInsideOfWater()){
+	protected function applyGravity() : void{
+		if(!$this->isUnderwater()){
 			parent::applyGravity();
 		}
 	}

src/pocketmine/entity/Villager.php

@@ -39,7 +39,7 @@ class Villager extends Creature implements NPC, Ageable{
 		return "Villager";
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		/** @var int $profession */
@@ -52,7 +52,7 @@ class Villager extends Creature implements NPC, Ageable{
 		$this->setProfession($profession);
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setInt("Profession", $this->getProfession());
 	}
@@ -62,7 +62,7 @@ class Villager extends Creature implements NPC, Ageable{
 	 *
 	 * @param int $profession
 	 */
-	public function setProfession(int $profession){
+	public function setProfession(int $profession) : void{
 		$this->propertyManager->setInt(self::DATA_VARIANT, $profession);
 	}
 

src/pocketmine/entity/WaterAnimal.php

@@ -32,10 +32,10 @@ abstract class WaterAnimal extends Creature implements Ageable{
 	}
 
 	public function canBreathe() : bool{
-		return $this->isInsideOfWater();
+		return $this->isUnderwater();
 	}
 
-	public function onAirExpired(){
+	public function onAirExpired() : void{
 		$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 2);
 		$this->attack($ev);
 	}

src/pocketmine/entity/object/ExperienceOrb.php

@@ -100,7 +100,7 @@ class ExperienceOrb extends Entity{
 	 */
 	protected $targetPlayerRuntimeId = null;
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->age = $this->namedtag->getShort("Age", 0);
@@ -115,7 +115,7 @@ class ExperienceOrb extends Entity{
 		$this->setXpValue($value);
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 
 		$this->namedtag->setShort("Age", $this->age);
@@ -192,9 +192,9 @@ class ExperienceOrb extends Entity{
 			$oneMinusDistance = (1 - $distance) ** 2;
 
 			if($oneMinusDistance > 0){
-				$this->motionX += $vector->x / $distance * $oneMinusDistance * 0.2;
-				$this->motionY += $vector->y / $distance * $oneMinusDistance * 0.2;
-				$this->motionZ += $vector->z / $distance * $oneMinusDistance * 0.2;
+				$this->motion->x += $vector->x / $distance * $oneMinusDistance * 0.2;
+				$this->motion->y += $vector->y / $distance * $oneMinusDistance * 0.2;
+				$this->motion->z += $vector->z / $distance * $oneMinusDistance * 0.2;
 			}
 
 			if($currentTarget->canPickupXp() and $this->boundingBox->intersectsWith($currentTarget->getBoundingBox())){
@@ -210,7 +210,7 @@ class ExperienceOrb extends Entity{
 		return $hasUpdate;
 	}
 
-	protected function tryChangeMovement(){
+	protected function tryChangeMovement() : void{
 		$this->checkObstruction($this->x, $this->y, $this->z);
 		parent::tryChangeMovement();
 	}

src/pocketmine/entity/object/FallingBlock.php

@@ -50,7 +50,7 @@ class FallingBlock extends Entity{
 
 	public $canCollide = false;
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$blockId = 0;
@@ -64,8 +64,7 @@ class FallingBlock extends Entity{
 		}
 
 		if($blockId === 0){
-			$this->close();
-			return;
+			throw new \UnexpectedValueException("Invalid " . get_class($this) . " entity: block ID is 0 or missing");
 		}
 
 		$damage = $this->namedtag->getByte("Data", 0);
@@ -83,7 +82,7 @@ class FallingBlock extends Entity{
 		return false;
 	}
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
 			parent::attack($source);
 		}
@@ -126,15 +125,15 @@ class FallingBlock extends Entity{
 		return $hasUpdate;
 	}
 
-	public function getBlock(){
+	public function getBlock() : int{
 		return $this->block->getId();
 	}
 
-	public function getDamage(){
+	public function getDamage() : int{
 		return $this->block->getDamage();
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		$this->namedtag->setInt("TileID", $this->block->getId(), true);
 		$this->namedtag->setByte("Data", $this->block->getDamage());
 	}

src/pocketmine/entity/object/ItemEntity.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\entity\object;
 
 use pocketmine\entity\Entity;
-use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\ItemDespawnEvent;
 use pocketmine\event\entity\ItemSpawnEvent;
 use pocketmine\event\inventory\InventoryPickupItemEvent;
@@ -54,7 +53,7 @@ class ItemEntity extends Entity{
 
 	public $canCollide = false;
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->setMaxHealth(5);
@@ -67,8 +66,7 @@ class ItemEntity extends Entity{
 
 		$itemTag = $this->namedtag->getCompoundTag("Item");
 		if($itemTag === null){
-			$this->close();
-			return;
+			throw new \UnexpectedValueException("Invalid " . get_class($this) . " entity: expected \"Item\" NBT tag not found");
 		}
 
 		$this->item = Item::nbtDeserialize($itemTag);
@@ -77,18 +75,6 @@ class ItemEntity extends Entity{
 		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
 	}
 
-	public function attack(EntityDamageEvent $source){
-		if(
-			$source->getCause() === EntityDamageEvent::CAUSE_VOID or
-			$source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK or
-			$source->getCause() === EntityDamageEvent::CAUSE_LAVA or
-			$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_EXPLOSION or
-			$source->getCause() === EntityDamageEvent::CAUSE_BLOCK_EXPLOSION
-		){
-			parent::attack($source);
-		}
-	}
-
 	public function entityBaseTick(int $tickDiff = 1) : bool{
 		if($this->closed){
 			return false;
@@ -119,7 +105,7 @@ class ItemEntity extends Entity{
 		return $hasUpdate;
 	}
 
-	protected function tryChangeMovement(){
+	protected function tryChangeMovement() : void{
 		$this->checkObstruction($this->x, $this->y, $this->z);
 		parent::tryChangeMovement();
 	}
@@ -128,7 +114,7 @@ class ItemEntity extends Entity{
 		return true;
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setTag($this->item->nbtSerialize(-1, "Item"));
 		$this->namedtag->setShort("Health", (int) $this->getHealth());
@@ -167,7 +153,7 @@ class ItemEntity extends Entity{
 	/**
 	 * @param int $delay
 	 */
-	public function setPickupDelay(int $delay){
+	public function setPickupDelay(int $delay) : void{
 		$this->pickupDelay = $delay;
 	}
 
@@ -181,7 +167,7 @@ class ItemEntity extends Entity{
 	/**
 	 * @param string $owner
 	 */
-	public function setOwner(string $owner){
+	public function setOwner(string $owner) : void{
 		$this->owner = $owner;
 	}
 
@@ -195,7 +181,7 @@ class ItemEntity extends Entity{
 	/**
 	 * @param string $thrower
 	 */
-	public function setThrower(string $thrower){
+	public function setThrower(string $thrower) : void{
 		$this->thrower = $thrower;
 	}
 
@@ -210,7 +196,7 @@ class ItemEntity extends Entity{
 		$player->dataPacket($pk);
 	}
 
-	public function onCollideWithPlayer(Player $player){
+	public function onCollideWithPlayer(Player $player) : void{
 		if($this->getPickupDelay() > 0){
 			return;
 		}

src/pocketmine/entity/object/Painting.php

@@ -70,13 +70,13 @@ class Painting extends Entity{
 		parent::__construct($level, $nbt);
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		$this->setMaxHealth(1);
 		$this->setHealth(1);
 		parent::initEntity();
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setInt("TileX", (int) $this->blockIn->x);
 		$this->namedtag->setInt("TileY", (int) $this->blockIn->y);
@@ -86,7 +86,7 @@ class Painting extends Entity{
 		$this->namedtag->setByte("Direction", (int) $this->direction); //Save both for full compatibility
 	}
 
-	public function kill(){
+	public function kill() : void{
 		parent::kill();
 
 		$drops = true;
@@ -138,7 +138,7 @@ class Painting extends Entity{
 		return false;
 	}
 
-	protected function updateMovement(bool $teleport = false){
+	protected function updateMovement(bool $teleport = false) : void{
 
 	}
 
@@ -166,7 +166,7 @@ class Painting extends Entity{
 		return PaintingMotive::getMotiveByName($this->motive);
 	}
 
-	public function getDirection() : int{
+	public function getDirection() : ?int{
 		return $this->direction;
 	}
 

src/pocketmine/entity/object/PrimedTNT.php

@@ -47,13 +47,13 @@ class PrimedTNT extends Entity implements Explosive{
 	public $canCollide = false;
 
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
 			parent::attack($source);
 		}
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		if($this->namedtag->hasTag("Fuse", ShortTag::class)){
@@ -73,7 +73,7 @@ class PrimedTNT extends Entity implements Explosive{
 		return false;
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setShort("Fuse", $this->fuse, true); //older versions incorrectly saved this as a byte
 	}
@@ -101,7 +101,7 @@ class PrimedTNT extends Entity implements Explosive{
 		return $hasUpdate or $this->fuse >= 0;
 	}
 
-	public function explode(){
+	public function explode() : void{
 		$this->server->getPluginManager()->callEvent($ev = new ExplosionPrimeEvent($this, 4));
 
 		if(!$ev->isCancelled()){

src/pocketmine/entity/projectile/Arrow.php

@@ -48,7 +48,7 @@ class Arrow extends Projectile{
 
 	protected $damage = 2;
 
-	public function __construct(Level $level, CompoundTag $nbt, Entity $shootingEntity = null, bool $critical = false){
+	public function __construct(Level $level, CompoundTag $nbt, ?Entity $shootingEntity = null, bool $critical = false){
 		parent::__construct($level, $nbt, $shootingEntity);
 		$this->setCritical($critical);
 	}
@@ -57,7 +57,7 @@ class Arrow extends Projectile{
 		return $this->getGenericFlag(self::DATA_FLAG_CRITICAL);
 	}
 
-	public function setCritical(bool $value = true){
+	public function setCritical(bool $value = true) : void{
 		$this->setGenericFlag(self::DATA_FLAG_CRITICAL, $value);
 	}
 
@@ -95,7 +95,7 @@ class Arrow extends Projectile{
 		$this->broadcastEntityEvent(EntityEventPacket::ARROW_SHAKE, 7); //7 ticks
 	}
 
-	public function onCollideWithPlayer(Player $player){
+	public function onCollideWithPlayer(Player $player) : void{
 		if($this->blockHit === null){
 			return;
 		}

src/pocketmine/entity/projectile/Projectile.php

@@ -55,20 +55,20 @@ abstract class Projectile extends Entity{
 	/** @var int|null */
 	protected $blockHitData;
 
-	public function __construct(Level $level, CompoundTag $nbt, Entity $shootingEntity = null){
+	public function __construct(Level $level, CompoundTag $nbt, ?Entity $shootingEntity = null){
 		parent::__construct($level, $nbt);
 		if($shootingEntity !== null){
 			$this->setOwningEntity($shootingEntity);
 		}
 	}
 
-	public function attack(EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source) : void{
 		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
 			parent::attack($source);
 		}
 	}
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->setMaxHealth(1);
@@ -117,10 +117,10 @@ abstract class Projectile extends Entity{
 	 * @return int
 	 */
 	public function getResultDamage() : int{
-		return (int) ceil(sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2) * $this->damage);
+		return (int) ceil($this->motion->length() * $this->damage);
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 
 		$this->namedtag->setShort("Age", $this->age);
@@ -159,7 +159,7 @@ abstract class Projectile extends Entity{
 		Timings::$entityMoveTimer->startTiming();
 
 		$start = $this->asVector3();
-		$end = $start->add($this->motionX, $this->motionY, $this->motionZ);
+		$end = $start->add($this->motion);
 
 		$blockHit = null;
 		$entityHit = null;
@@ -185,7 +185,7 @@ abstract class Projectile extends Entity{
 				continue;
 			}
 
-			$entityBB = $entity->boundingBox->grow(0.3, 0.3, 0.3);
+			$entityBB = $entity->boundingBox->expandedCopy(0.3, 0.3, 0.3);
 			$entityHitResult = $entityBB->calculateIntercept($start, $end);
 
 			if($entityHitResult === null){
@@ -215,7 +215,7 @@ abstract class Projectile extends Entity{
 			}elseif($blockHit !== null){
 				$ev = new ProjectileHitBlockEvent($this, $hitResult, $blockHit);
 			}else{
-				\assert(false, "unknown hit type");
+				assert(false, "unknown hit type");
 			}
 
 			if($ev !== null){
@@ -230,15 +230,15 @@ abstract class Projectile extends Entity{
 			}
 
 			$this->isCollided = $this->onGround = true;
-			$this->motionX = $this->motionY = $this->motionZ = 0;
+			$this->motion->x = $this->motion->y = $this->motion->z = 0;
 		}else{
 			$this->isCollided = $this->onGround = false;
 			$this->blockHit = $this->blockHitId = $this->blockHitData = null;
 
 			//recompute angles...
-			$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
-			$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
-			$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
+			$f = sqrt(($this->motion->x ** 2) + ($this->motion->z ** 2));
+			$this->yaw = (atan2($this->motion->x, $this->motion->z) * 180 / M_PI);
+			$this->pitch = (atan2($this->motion->y, $f) * 180 / M_PI);
 		}
 
 		$this->checkChunks();

src/pocketmine/entity/projectile/SplashPotion.php

@@ -42,13 +42,13 @@ class SplashPotion extends Throwable{
 	protected $gravity = 0.05;
 	protected $drag = 0.01;
 
-	protected function initEntity(){
+	protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->setPotionId($this->namedtag->getShort("PotionId", 0));
 	}
 
-	public function saveNBT(){
+	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setShort("PotionId", $this->getPotionId());
 	}
@@ -81,7 +81,7 @@ class SplashPotion extends Throwable{
 
 		if($hasEffects){
 			if(!$this->willLinger()){
-				foreach($this->level->getNearbyEntities($this->boundingBox->grow(4.125, 2.125, 4.125), $this) as $entity){
+				foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
 					if($entity instanceof Living){
 						$distanceSquared = $entity->distanceSquared($this);
 						if($distanceSquared > 16){ //4 blocks

src/pocketmine/event/Event.php

@@ -59,7 +59,7 @@ abstract class Event{
 	 *
 	 * @throws \BadMethodCallException
 	 */
-	public function setCancelled(bool $value = true){
+	public function setCancelled(bool $value = true) : void{
 		if(!($this instanceof Cancellable)){
 			throw new \BadMethodCallException("Event is not Cancellable");
 		}

src/pocketmine/event/EventPriority.php

@@ -82,8 +82,8 @@ abstract class EventPriority{
 	public static function fromString(string $name) : int{
 		$name = strtoupper($name);
 		$const = self::class . "::" . $name;
-		if($name !== "ALL" and \defined($const)){
-			return \constant($const);
+		if($name !== "ALL" and defined($const)){
+			return constant($const);
 		}
 
 		throw new \InvalidArgumentException("Unable to resolve priority \"$name\"");

src/pocketmine/event/HandlerList.php

@@ -24,8 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\event;
 
 use pocketmine\plugin\Plugin;
-use pocketmine\plugin\PluginManager;
 use pocketmine\plugin\RegisteredListener;
+use pocketmine\utils\Utils;
 
 class HandlerList{
 	/**
@@ -69,7 +69,7 @@ class HandlerList{
 		}
 
 		$class = new \ReflectionClass($event);
-		$tags = PluginManager::parseDocComment((string) $class->getDocComment());
+		$tags = Utils::parseDocComment((string) $class->getDocComment());
 
 		if($class->isAbstract() && !isset($tags["allowHandle"])){
 			return null;

src/pocketmine/event/block/BlockBreakEvent.php

@@ -42,6 +42,8 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	protected $instaBreak = false;
 	/** @var Item[] */
 	protected $blockDrops = [];
+	/** @var int */
+	protected $xpDrops;
 
 	/**
 	 * @param Player $player
@@ -49,14 +51,16 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	 * @param Item   $item
 	 * @param bool   $instaBreak
 	 * @param Item[] $drops
+	 * @param int    $xpDrops
 	 */
-	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops){
+	public function __construct(Player $player, Block $block, Item $item, bool $instaBreak = false, array $drops, int $xpDrops = 0){
 		parent::__construct($block);
 		$this->item = $item;
 		$this->player = $player;
 
 		$this->instaBreak = $instaBreak;
 		$this->setDrops($drops);
+		$this->xpDrops = $xpDrops;
 	}
 
 	/**
@@ -88,7 +92,7 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	/**
 	 * @param bool $instaBreak
 	 */
-	public function setInstaBreak(bool $instaBreak){
+	public function setInstaBreak(bool $instaBreak) : void{
 		$this->instaBreak = $instaBreak;
 	}
 
@@ -103,7 +107,7 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	/**
 	 * @param Item[] $drops
 	 */
-	public function setDrops(array $drops){
+	public function setDrops(array $drops) : void{
 		$this->setDropsVariadic(...$drops);
 	}
 
@@ -112,7 +116,28 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{
 	 *
 	 * @param Item ...$drops
 	 */
-	public function setDropsVariadic(Item ...$drops){
+	public function setDropsVariadic(Item ...$drops) : void{
 		$this->blockDrops = $drops;
 	}
+
+	/**
+	 * Returns how much XP will be dropped by breaking this block.
+	 *
+	 * @return int
+	 */
+	public function getXpDropAmount() : int{
+		return $this->xpDrops;
+	}
+
+	/**
+	 * Sets how much XP will be dropped by breaking this block.
+	 *
+	 * @param int $amount
+	 */
+	public function setXpDropAmount(int $amount) : void{
+		if($amount < 0){
+			throw new \InvalidArgumentException("Amount must be at least zero");
+		}
+		$this->xpDrops = $amount;
+	}
 }

src/pocketmine/event/block/BlockGrowEvent.php

@@ -44,5 +44,4 @@ class BlockGrowEvent extends BlockEvent implements Cancellable{
 	public function getNewState() : Block{
 		return $this->newState;
 	}
-
 }

src/pocketmine/event/block/BlockSpreadEvent.php

@@ -43,5 +43,4 @@ class BlockSpreadEvent extends BlockFormEvent{
 	public function getSource() : Block{
 		return $this->source;
 	}
-
 }

src/pocketmine/event/block/SignChangeEvent.php

@@ -81,7 +81,7 @@ class SignChangeEvent extends BlockEvent implements Cancellable{
 	 *
 	 * @throws \InvalidArgumentException if there are more or less than 4 lines in the passed array
 	 */
-	public function setLines(array $lines){
+	public function setLines(array $lines) : void{
 		if(count($lines) !== 4){
 			throw new \InvalidArgumentException("Array size must be 4!");
 		}
@@ -94,7 +94,7 @@ class SignChangeEvent extends BlockEvent implements Cancellable{
 	 *
 	 * @throws \InvalidArgumentException if the index is out of bounds
 	 */
-	public function setLine(int $index, string $line){
+	public function setLine(int $index, string $line) : void{
 		if($index < 0 or $index > 3){
 			throw new \InvalidArgumentException("Index must be in the range 0-3!");
 		}

src/pocketmine/event/entity/EntityBlockChangeEvent.php

@@ -55,5 +55,4 @@ class EntityBlockChangeEvent extends EntityEvent implements Cancellable{
 	public function getTo() : Block{
 		return $this->to;
 	}
-
 }

src/pocketmine/event/entity/EntityCombustByBlockEvent.php

@@ -46,5 +46,4 @@ class EntityCombustByBlockEvent extends EntityCombustEvent{
 	public function getCombuster() : Block{
 		return $this->combuster;
 	}
-
 }

src/pocketmine/event/entity/EntityCombustByEntityEvent.php

@@ -45,5 +45,4 @@ class EntityCombustByEntityEvent extends EntityCombustEvent{
 	public function getCombuster() : Entity{
 		return $this->combuster;
 	}
-
 }

src/pocketmine/event/entity/EntityCombustEvent.php

@@ -46,8 +46,7 @@ class EntityCombustEvent extends EntityEvent implements Cancellable{
 		return $this->duration;
 	}
 
-	public function setDuration(int $duration){
+	public function setDuration(int $duration) : void{
 		$this->duration = $duration;
 	}
-
 }