Release 3.5.4

Deprecations on a patch version breaks release protocol, but I don't care at this point. Nobody should have been using this shit anyway.

composer.json

@@ -27,9 +27,11 @@
       "pocketmine/raklib": "^0.12.0",
       "pocketmine/spl": "^0.3.0",
       "pocketmine/binaryutils": "^0.1.0",
-      "pocketmine/nbt": "^0.2.0",
+      "pocketmine/nbt": "^0.2.1",
       "pocketmine/math": "^0.2.0",
-      "pocketmine/snooze": "^0.1.0"
+      "pocketmine/snooze": "^0.1.0",
+      "daverandom/callback-validator": "dev-master",
+      "adhocore/json-comment": "^0.0.7"
    },
    "autoload": {
       "psr-4": {

composer.lock

@@ -4,20 +4,104 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2670b9e2a730ff758909be8b9e9d609a",
+    "content-hash": "d3fb809caf4d5a5c99054f47f28ff271",
     "packages": [
         {
-            "name": "pocketmine/binaryutils",
-            "version": "0.1.1",
+            "name": "adhocore/json-comment",
+            "version": "v0.0.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
+                "url": "https://github.com/adhocore/php-json-comment.git",
+                "reference": "135356c7e7336ef59924f1d921c770045f937a76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
-                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be",
+                "url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/135356c7e7336ef59924f1d921c770045f937a76",
+                "reference": "135356c7e7336ef59924f1d921c770045f937a76",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Ahc\\Json\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jitendra Adhikari",
+                    "email": "jiten.adhikary@gmail.com"
+                }
+            ],
+            "description": "Lightweight JSON comment stripper library for PHP",
+            "keywords": [
+                "comment",
+                "json",
+                "strip-comment"
+            ],
+            "time": "2018-08-01T12:27:26+00:00"
+        },
+        {
+            "name": "daverandom/callback-validator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DaveRandom/CallbackValidator.git",
+                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DaveRandom/CallbackValidator/zipball/d87a08cddbc6099816ed01e50ce25cdfc43b542f",
+                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-reflection": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DaveRandom\\CallbackValidator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Wright",
+                    "email": "cw@daverandom.com"
+                }
+            ],
+            "description": "Tools for validating callback signatures",
+            "time": "2017-04-03T15:22:41+00:00"
+        },
+        {
+            "name": "pocketmine/binaryutils",
+            "version": "0.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/BinaryUtils.git",
+                "reference": "925001c8eff97a36519b16bbd095964b0fc52772"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/925001c8eff97a36519b16bbd095964b0fc52772",
+                "reference": "925001c8eff97a36519b16bbd095964b0fc52772",
                 "shasum": ""
             },
             "require": {
@@ -35,10 +119,10 @@
             ],
             "description": "Classes and methods for conveniently handling binary data",
             "support": {
-                "source": "https://github.com/pmmp/BinaryUtils/tree/master",
+                "source": "https://github.com/pmmp/BinaryUtils/tree/0.1.3",
                 "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2018-08-26T18:11:05+00:00"
+            "time": "2018-12-30T12:17:51+00:00"
         },
         {
             "name": "pocketmine/math",
@@ -76,19 +160,20 @@
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.0",
+            "version": "0.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c"
+                "reference": "291bf5cc2a94500eada1edbda51d15bed25a1e1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
-                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/291bf5cc2a94500eada1edbda51d15bed25a1e1c",
+                "reference": "291bf5cc2a94500eada1edbda51d15bed25a1e1c",
                 "shasum": ""
             },
             "require": {
+                "ext-zlib": "*",
                 "php": ">=7.2.0",
                 "php-64bit": "*",
                 "pocketmine/binaryutils": "^0.1.0"
@@ -109,10 +194,10 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.0",
+                "source": "https://github.com/pmmp/NBT/tree/0.2.3",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2018-06-13T09:56:00+00:00"
+            "time": "2018-12-03T16:08:28+00:00"
         },
         {
             "name": "pocketmine/raklib",
@@ -191,16 +276,16 @@
         },
         {
             "name": "pocketmine/spl",
-            "version": "0.3.1",
+            "version": "0.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/SPL.git",
-                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5"
+                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ca3912099543ddc4b4b14f40e258d84ca547dfa5",
-                "reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/7fd53857cd000491ba69e8db865792a024dd2c49",
+                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49",
                 "shasum": ""
             },
             "type": "library",
@@ -219,14 +304,15 @@
             "support": {
                 "source": "https://github.com/pmmp/SPL/tree/master"
             },
-            "time": "2018-06-09T17:30:36+00:00"
+            "time": "2018-08-12T15:17:39+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "ext-pthreads": 20
+        "ext-pthreads": 20,
+        "daverandom/callback-validator": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

src/pocketmine/CrashDump.php

@@ -33,6 +33,14 @@ use raklib\RakLib;
 
 class CrashDump{
 
+	/**
+	 * Crashdump data format version, used by the crash archive to decide how to decode the crashdump
+	 * This should be incremented when backwards incompatible changes are introduced, such as fields being removed or
+	 * having their content changed, version format changing, etc.
+	 * It is not necessary to increase this when adding new fields.
+	 */
+	private const FORMAT_VERSION = 1;
+
 	/** @var Server */
 	private $server;
 	private $fp;
@@ -54,6 +62,7 @@ class CrashDump{
 		if(!is_resource($this->fp)){
 			throw new \RuntimeException("Could not create Crash Dump");
 		}
+		$this->data["format_version"] = self::FORMAT_VERSION;
 		$this->data["time"] = $this->time;
 		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
 		$this->addLine();
@@ -150,7 +159,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
+			$error["trace"] = Utils::printableCurrentTrace(3); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",
@@ -212,11 +221,11 @@ class CrashDump{
 		$this->addLine("Code:");
 		$this->data["code"] = [];
 
-		if($this->server->getProperty("auto-report.send-code", true) !== false){
+		if($this->server->getProperty("auto-report.send-code", true) !== false and file_exists($error["fullFile"])){
 			$file = @file($error["fullFile"], FILE_IGNORE_NEW_LINES);
-			for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10; ++$l){
-				$this->addLine("[" . ($l + 1) . "] " . @$file[$l]);
-				$this->data["code"][$l + 1] = @$file[$l];
+			for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10 and isset($file[$l]); ++$l){
+				$this->addLine("[" . ($l + 1) . "] " . $file[$l]);
+				$this->data["code"][$l + 1] = $file[$l];
 			}
 		}
 
@@ -232,10 +241,10 @@ class CrashDump{
 		$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->getFullVersion(false);
-		$this->data["general"]["build"] = $version->getBuild();
+		$this->data["general"]["base_version"] = \pocketmine\BASE_VERSION;
+		$this->data["general"]["build"] = \pocketmine\BUILD_NUMBER;
+		$this->data["general"]["is_dev"] = \pocketmine\IS_DEVELOPMENT_BUILD;
 		$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
-		$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");

src/pocketmine/MemoryManager.php

@@ -185,7 +185,7 @@ class MemoryManager{
 		}
 
 		$ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount);
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 
 		$cycles = 0;
 		if($this->garbageCollectionTrigger){
@@ -473,7 +473,7 @@ class MemoryManager{
 				self::continueDump($value, $data[$key], $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
 			}
 		}elseif(is_string($from)){
-			$data = "(string) len(". strlen($from) .") " . substr(Utils::printable($from), 0, $maxStringSize);
+			$data = "(string) len(" . strlen($from) . ") " . substr(Utils::printable($from), 0, $maxStringSize);
 		}elseif(is_resource($from)){
 			$data = "(resource) " . print_r($from, true);
 		}else{

src/pocketmine/OfflinePlayer.php

@@ -35,7 +35,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	/** @var Server */
 	private $server;
 	/** @var CompoundTag|null */
-	private $namedtag;
+	private $namedtag = null;
 
 	/**
 	 * @param Server $server
@@ -44,10 +44,8 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	public function __construct(Server $server, string $name){
 		$this->server = $server;
 		$this->name = $name;
-		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){
+		if($this->server->hasOfflinePlayerData($this->name)){
 			$this->namedtag = $this->server->getOfflinePlayerData($this->name);
-		}else{
-			$this->namedtag = null;
 		}
 	}
 

src/pocketmine/Player.php

@@ -101,6 +101,7 @@ use pocketmine\network\mcpe\PlayerNetworkSessionAdapter;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
 use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
+use pocketmine\network\mcpe\protocol\AvailableEntityIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
 use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
@@ -120,6 +121,7 @@ use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
 use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
+use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
 use pocketmine\network\mcpe\protocol\PlayerActionPacket;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
@@ -173,6 +175,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	/**
 	 * Checks a supplied username and checks it is valid.
+	 *
 	 * @param string $name
 	 *
 	 * @return bool
@@ -275,7 +278,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/** @var int */
 	protected $spawnThreshold;
 	/** @var int */
-	protected $chunkLoadCount = 0;
+	protected $spawnChunkLoadCount = 0;
 	/** @var int */
 	protected $chunksPerTick;
 
@@ -284,14 +287,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	/** @var Vector3|null */
 	protected $newPosition;
-	/** @var Vector3|null */
-	public $speed = null;
 	/** @var bool */
 	protected $isTeleporting = false;
 	/** @var int */
 	protected $inAirTicks = 0;
-	/** @var int */
-	protected $startAirTicks = 5;
 	/** @var float */
 	protected $stepHeight = 0.6;
 	/** @var bool */
@@ -328,6 +327,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/** @var Form[] */
 	protected $forms = [];
 
+	/** @var float */
+	protected $lastRightClickTime = 0.0;
+	/** @var Vector3|null */
+	protected $lastRightClickPos = null;
+
 	/**
 	 * @return TranslationContainer|string
 	 */
@@ -546,9 +550,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	public function resetFallDistance() : void{
 		parent::resetFallDistance();
-		if($this->inAirTicks !== 0){
-			$this->startAirTicks = 5;
-		}
 		$this->inAirTicks = 0;
 	}
 
@@ -627,7 +628,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * @param Plugin $plugin
 	 * @param string $name
-	 * @param bool $value
+	 * @param bool   $value
 	 *
 	 * @return PermissionAttachment
 	 */
@@ -675,7 +676,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	public function sendCommandData(){
 		$pk = new AvailableCommandsPacket();
 		foreach($this->server->getCommandMap()->getCommands() as $name => $command){
-			if(isset($pk->commandData[$command->getName()]) or $command->getName() === "help"){
+			if(isset($pk->commandData[$command->getName()]) or $command->getName() === "help" or !$command->testPermissionSilent($this)){
 				continue;
 			}
 
@@ -800,7 +801,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		$ev = new PlayerChangeSkinEvent($this, $this->getSkin(), $skin);
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 
 		if($ev->isCancelled()){
 			$this->sendSkin([$this]);
@@ -968,8 +969,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		$this->usedChunks[Level::chunkHash($x, $z)] = true;
-		$this->chunkLoadCount++;
-
 		$this->dataPacket($payload);
 
 		if($this->spawned){
@@ -980,8 +979,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			}
 		}
 
-		if($this->chunkLoadCount >= $this->spawnThreshold and !$this->spawned){
-			$this->doFirstSpawn();
+		if($this->spawnChunkLoadCount !== -1 and ++$this->spawnChunkLoadCount >= $this->spawnThreshold){
+			$this->sendPlayStatus(PlayStatusPacket::PLAYER_SPAWN);
+			$this->spawnChunkLoadCount = -1;
 		}
 	}
 
@@ -1019,11 +1019,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		Timings::$playerChunkSendTimer->stopTiming();
 	}
 
-	protected function doFirstSpawn(){
+	public function doFirstSpawn(){
+		if($this->spawned){
+			return; //avoid player spawning twice (this can only happen on 3.x with a custom malicious client)
+		}
 		$this->spawned = true;
 
-		$this->sendPlayStatus(PlayStatusPacket::PLAYER_SPAWN);
-
 		if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
 		}
@@ -1031,11 +1032,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this,
+		$ev = new PlayerJoinEvent($this,
 			new TranslationContainer(TextFormat::YELLOW . "%multiplayer.player.joined", [
 				$this->getDisplayName()
 			])
-		));
+		);
+		$ev->call();
 		if(strlen(trim((string) $ev->getJoinMessage())) > 0){
 			$this->server->broadcastMessage($ev->getJoinMessage());
 		}
@@ -1076,8 +1078,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		Timings::$playerChunkOrderTimer->startTiming();
 
-		$this->nextChunkOrderRun = 200;
-
 		$radius = $this->server->getAllowedViewDistance($this->viewDistance);
 		$radiusSquared = $radius ** 2;
 
@@ -1154,6 +1154,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		$this->loadQueue = $newOrder;
+		if(!empty($this->loadQueue) or !empty($unloadChunks)){
+			$pk = new NetworkChunkPublisherUpdatePacket();
+			$pk->x = $this->getFloorX();
+			$pk->y = $this->getFloorY();
+			$pk->z = $this->getFloorZ();
+			$pk->radius = $this->viewDistance * 16; //blocks, not chunks >.>
+			$this->dataPacket($pk);
+		}
 
 		Timings::$playerChunkOrderTimer->stopTiming();
 	}
@@ -1220,7 +1228,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pos = $pos->floor();
 		$b = $this->level->getBlock($pos);
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerBedEnterEvent($this, $b));
+		$ev = new PlayerBedEnterEvent($this, $b);
+		$ev->call();
 		if($ev->isCancelled()){
 			return false;
 		}
@@ -1247,7 +1256,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			if($b instanceof Bed){
 				$b->setOccupied(false);
 			}
-			$this->server->getPluginManager()->callEvent($ev = new PlayerBedLeaveEvent($this, $b));
+			(new PlayerBedLeaveEvent($this, $b))->call();
 
 			$this->sleeping = null;
 			$this->propertyManager->setBlockPos(self::DATA_PLAYER_BED_POSITION, null);
@@ -1287,7 +1296,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					return false;
 				}
 			}
-			$this->server->getPluginManager()->callEvent($ev = new PlayerAchievementAwardedEvent($this, $achievementId));
+			$ev = new PlayerAchievementAwardedEvent($this, $achievementId);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$this->achievements[$achievementId] = true;
 				Achievement::broadcast($this, $achievementId);
@@ -1326,6 +1336,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * TODO: remove this when Spectator Mode gets added properly to MCPE
 	 *
 	 * @param int $gamemode
+	 *
 	 * @return int
 	 */
 	public static function getClientFriendlyGamemode(int $gamemode) : int{
@@ -1350,7 +1361,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return false;
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerGameModeChangeEvent($this, $gm));
+		$ev = new PlayerGameModeChangeEvent($this, $gm);
+		$ev->call();
 		if($ev->isCancelled()){
 			if($client){ //gamemode change by client in the GUI
 				$this->sendGamemode();
@@ -1544,14 +1556,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$this->server->getLogger()->warning($this->getName() . " moved too fast, reverting movement");
 			$this->server->getLogger()->debug("Old position: " . $this->asVector3() . ", new position: " . $this->newPosition);
 			$revert = true;
-		}else{
-			$chunkX = $newPos->getFloorX() >> 4;
-			$chunkZ = $newPos->getFloorZ() >> 4;
-
-			if(!$this->level->isChunkLoaded($chunkX, $chunkZ) or !$this->level->isChunkGenerated($chunkX, $chunkZ)){
-				$revert = true;
-				$this->nextChunkOrderRun = 0;
-			}
+		}elseif(!$this->level->isInLoadedTerrain($newPos) or !$this->level->isChunkGenerated($newPos->getFloorX() >> 4, $newPos->getFloorZ() >> 4)){
+			$revert = true;
+			$this->nextChunkOrderRun = 0;
 		}
 
 		if(!$revert and $distanceSquared != 0){
@@ -1567,7 +1574,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$ev = new PlayerIllegalMoveEvent($this, $newPos, new Vector3($this->lastX, $this->lastY, $this->lastZ));
 				$ev->setCancelled($this->allowMovementCheats);
 
-				$this->server->getPluginManager()->callEvent($ev);
+				$ev->call();
 
 				if(!$ev->isCancelled()){
 					$revert = true;
@@ -1597,7 +1604,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 			$ev = new PlayerMoveEvent($this, $from, $to);
 
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 
 			if(!($revert = $ev->isCancelled())){ //Yes, this is intended
 				if($to->distanceSquared($ev->getTo()) > 0.01){ //If plugins modify the destination
@@ -1614,10 +1621,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					}
 				}
 			}
-
-			$this->speed = $to->subtract($from)->divide($tickDiff);
-		}elseif($distanceSquared == 0){
-			$this->speed = new Vector3(0, 0, 0);
 		}
 
 		if($revert){
@@ -1641,7 +1644,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function jump() : void{
-		$this->server->getPluginManager()->callEvent(new PlayerJumpEvent($this));
+		(new PlayerJumpEvent($this))->call();
 		parent::jump();
 	}
 
@@ -1649,10 +1652,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(parent::setMotion($motion)){
 			$this->broadcastMotion();
 
-			if($this->motion->y > 0){
-				$this->startAirTicks = (-log($this->gravity / ($this->gravity + $this->drag * $this->motion->y)) / $this->drag) * 2 + 5;
-			}
-
 			return true;
 		}
 		return false;
@@ -1706,6 +1705,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if($this->spawned){
 			$this->processMovement($tickDiff);
 			$this->motion->x = $this->motion->y = $this->motion->z = 0; //TODO: HACK! (Fixes player knockback being messed up)
+			if($this->onGround){
+				$this->inAirTicks = 0;
+			}else{
+				$this->inAirTicks += $tickDiff;
+			}
 
 			Timings::$timerEntityBaseTick->startTiming();
 			$this->entityBaseTick($tickDiff);
@@ -1715,32 +1719,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				Timings::$playerCheckNearEntitiesTimer->startTiming();
 				$this->checkNearEntities();
 				Timings::$playerCheckNearEntitiesTimer->stopTiming();
-
-				if($this->speed !== null){
-					if($this->onGround){
-						if($this->inAirTicks !== 0){
-							$this->startAirTicks = 5;
-						}
-						$this->inAirTicks = 0;
-					}else{
-						if(!$this->allowFlight and $this->inAirTicks > 10 and !$this->isSleeping() and !$this->isImmobile()){
-							$expectedVelocity = (-$this->gravity) / $this->drag - ((-$this->gravity) / $this->drag) * exp(-$this->drag * ($this->inAirTicks - $this->startAirTicks));
-							$diff = ($this->speed->y - $expectedVelocity) ** 2;
-
-							if(!$this->hasEffect(Effect::JUMP) and !$this->hasEffect(Effect::LEVITATION) and $diff > 0.6 and $expectedVelocity < $this->speed->y and !$this->server->getAllowFlight()){
-								if($this->inAirTicks < 100){
-									$this->setMotion(new Vector3(0, $expectedVelocity, 0));
-								}elseif($this->kick($this->server->getLanguage()->translateString("kick.reason.cheat", ["%ability.flight"]))){
-									$this->timings->stopTiming();
-
-									return false;
-								}
-							}
-						}
-
-						$this->inAirTicks += $tickDiff;
-					}
-				}
 			}
 		}
 
@@ -1797,7 +1775,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return;
 		}
 
-		if($this->nextChunkOrderRun-- <= 0){
+		if($this->nextChunkOrderRun !== PHP_INT_MAX and $this->nextChunkOrderRun-- <= 0){
+			$this->nextChunkOrderRun = PHP_INT_MAX;
 			$this->orderChunks();
 		}
 
@@ -1898,7 +1877,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		$this->setSkin($skin);
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
+		$ev = new PlayerPreLoginEvent($this, "Plugin reason");
+		$ev->call();
 		if($ev->isCancelled()){
 			$this->close("", $ev->getKickMessage());
 
@@ -2077,7 +2057,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->level->registerChunkLoader($this, ((int) floor($pos[0])) >> 4, ((int) floor($pos[2])) >> 4, true);
 
 		parent::__construct($this->level, $this->namedtag);
-		$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
+		$ev = new PlayerLoginEvent($this, "Plugin reason");
+		$ev->call();
 		if($ev->isCancelled()){
 			$this->close($this->getLeaveMessage(), $ev->getKickMessage());
 
@@ -2120,6 +2101,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk->worldName = $this->server->getMotd();
 		$this->dataPacket($pk);
 
+		$this->sendDataPacket(new AvailableEntityIdentifiersPacket());
+
 		$this->level->sendTime($this);
 
 		$this->sendAttributes(true);
@@ -2179,8 +2162,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				}
 
 				$ev = new PlayerCommandPreprocessEvent($this, $messagePart);
-
-				$this->server->getPluginManager()->callEvent($ev);
+				$ev->call();
 
 				if($ev->isCancelled()){
 					break;
@@ -2191,7 +2173,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					$this->server->dispatchCommand($ev->getPlayer(), substr($ev->getMessage(), 1));
 					Timings::$playerCommandTimer->stopTiming();
 				}else{
-					$this->server->getPluginManager()->callEvent($ev = new PlayerChatEvent($this, $ev->getMessage()));
+					$ev = new PlayerChatEvent($this, $ev->getMessage());
+					$ev->call();
 					if(!$ev->isCancelled()){
 						$this->server->broadcastMessage($this->getServer()->getLanguage()->translateString($ev->getFormat(), [$ev->getPlayer()->getDisplayName(), $ev->getMessage()]), $ev->getRecipients());
 					}
@@ -2234,9 +2217,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	public function handleLevelSoundEvent(LevelSoundEventPacket $packet) : bool{
 		//TODO: add events so plugins can change this
-		if($this->chunk !== null){
-			$this->getLevel()->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $packet);
-		}
+		$this->getLevel()->broadcastPacketToViewers($this, $packet);
 		return true;
 	}
 
@@ -2266,6 +2247,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * Don't expect much from this handler. Most of it is roughly hacked and duct-taped together.
 	 *
 	 * @param InventoryTransactionPacket $packet
+	 *
 	 * @return bool
 	 */
 	public function handleInventoryTransaction(InventoryTransactionPacket $packet) : bool{
@@ -2356,6 +2338,19 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$type = $packet->trData->actionType;
 				switch($type){
 					case InventoryTransactionPacket::USE_ITEM_ACTION_CLICK_BLOCK:
+						//TODO: start hack for client spam bug
+						$spamBug = ($this->lastRightClickPos !== null and
+							microtime(true) - $this->lastRightClickTime < 0.1 and //100ms
+							$this->lastRightClickPos->distanceSquared($packet->trData->clickPos) < 0.00001 //signature spam bug has 0 distance, but allow some error
+						);
+						//get rid of continued spam if the player clicks and holds right-click
+						$this->lastRightClickPos = clone $packet->trData->clickPos;
+						$this->lastRightClickTime = microtime(true);
+						if($spamBug){
+							return true;
+						}
+						//TODO: end hack for client spam bug
+
 						$this->setUsingItem(false);
 
 						if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13) or $this->isSpectator()){
@@ -2447,8 +2442,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							$ev->setCancelled();
 						}
 
-						$this->server->getPluginManager()->callEvent($ev);
-
+						$ev->call();
 						if($ev->isCancelled()){
 							$this->inventory->sendHeldItem($this);
 							return true;
@@ -2593,7 +2587,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 								if($this->hasItemCooldown($slot)){
 									$ev->setCancelled();
 								}
-								$this->server->getPluginManager()->callEvent($ev);
+								$ev->call();
 
 								if($ev->isCancelled() or !$this->consumeObject($slot)){
 									$this->inventory->sendContents($this);
@@ -2654,6 +2648,13 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
+		if($packet->action === InteractPacket::ACTION_MOUSEOVER and $packet->target === 0){
+			//TODO HACK: silence useless spam (MCPE 1.8)
+			//this packet is EXPECTED to only be sent when interacting with an entity, but due to some messy Mojang
+			//hacks, it also sends it when changing the held item now, which causes us to think the inventory was closed
+			//when it wasn't.
+			return true;
+		}
 
 		$this->doCloseInventory();
 
@@ -2696,7 +2697,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$ev->setCancelled();
 		}
 
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$this->inventory->setItemInHand($ev->getResultItem());
 		}
@@ -2721,12 +2722,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 				$target = $this->level->getBlock($pos);
 
-				$ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $packet->face, $target->getId() === 0 ? PlayerInteractEvent::LEFT_CLICK_AIR : PlayerInteractEvent::LEFT_CLICK_BLOCK);
+				$ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $packet->face, PlayerInteractEvent::LEFT_CLICK_BLOCK);
 				if($this->level->checkSpawnProtection($this, $target)){
 					$ev->setCancelled();
 				}
 
-				$this->getServer()->getPluginManager()->callEvent($ev);
+				$ev->call();
 				if($ev->isCancelled()){
 					$this->inventory->sendHeldItem($this);
 					break;
@@ -2785,7 +2786,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				break; //TODO
 			case PlayerActionPacket::ACTION_CONTINUE_BREAK:
 				$block = $this->level->getBlock($pos);
-				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, BlockFactory::toStaticRuntimeId($block->getId(), $block->getDamage()) | ($packet->face << 24));
+				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, $block->getRuntimeId() | ($packet->face << 24));
 				//TODO: destroy-progress level event
 				break;
 			case PlayerActionPacket::ACTION_START_SWIMMING:
@@ -2805,7 +2806,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	public function toggleSprint(bool $sprint) : void{
 		$ev = new PlayerToggleSprintEvent($this, $sprint);
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if($ev->isCancelled()){
 			$this->sendData($this);
 		}else{
@@ -2815,7 +2816,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	public function toggleSneak(bool $sneak) : void{
 		$ev = new PlayerToggleSneakEvent($this, $sneak);
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if($ev->isCancelled()){
 			$this->sendData($this);
 		}else{
@@ -2828,7 +2829,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return true;
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerAnimationEvent($this, $packet->action));
+		$ev = new PlayerAnimationEvent($this, $packet->action);
+		$ev->call();
 		if($ev->isCancelled()){
 			return true;
 		}
@@ -2845,6 +2847,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * Drops an item on the ground in front of the player. Returns if the item drop was successful.
 	 *
 	 * @param Item $item
+	 *
 	 * @return bool if the item was dropped or if the item was null
 	 */
 	public function dropItem(Item $item) : bool{
@@ -2872,7 +2875,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->doCloseInventory();
 
 		if(isset($this->windowIndex[$packet->windowId])){
-			$this->server->getPluginManager()->callEvent(new InventoryCloseEvent($this->windowIndex[$packet->windowId], $this));
+			(new InventoryCloseEvent($this->windowIndex[$packet->windowId], $this))->call();
 			$this->removeWindow($this->windowIndex[$packet->windowId]);
 			return true;
 		}elseif($packet->windowId === 255){
@@ -2891,11 +2894,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$handled = false;
 
 		$isFlying = $packet->getFlag(AdventureSettingsPacket::FLYING);
-		if($isFlying and !$this->allowFlight and !$this->server->getAllowFlight()){
+		if($isFlying and !$this->allowFlight){
 			$this->kick($this->server->getLanguage()->translateString("kick.reason.cheat", ["%ability.flight"]));
 			return true;
 		}elseif($isFlying !== $this->isFlying()){
-			$this->server->getPluginManager()->callEvent($ev = new PlayerToggleFlightEvent($this, $isFlying));
+			$ev = new PlayerToggleFlightEvent($this, $isFlying);
+			$ev->call();
 			if($ev->isCancelled()){
 				$this->sendSettings();
 			}else{
@@ -2963,7 +2967,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$ev->setCancelled();
 			}
 
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 			if($ev->isCancelled()){
 				$tile->spawnTo($this);
 				return true;
@@ -3036,7 +3040,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				return false;
 		}
 
-		$this->getServer()->getPluginManager()->callEvent($event = new PlayerEditBookEvent($this, $oldBook, $newBook, $packet->type, $modifiedPages));
+		$event = new PlayerEditBookEvent($this, $oldBook, $newBook, $packet->type, $modifiedPages);
+		$event->call();
 		if($event->isCancelled()){
 			return true;
 		}
@@ -3071,7 +3076,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 		$timings = Timings::getSendDataPacketTimings($packet);
 		$timings->startTiming();
-		$this->server->getPluginManager()->callEvent($ev = new DataPacketSendEvent($this, $packet));
+		$ev = new DataPacketSendEvent($this, $packet);
+		$ev->call();
 		if($ev->isCancelled()){
 			$timings->stopTiming();
 			return false;
@@ -3102,7 +3108,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$timings = Timings::getSendDataPacketTimings($packet);
 		$timings->startTiming();
 		try{
-			$this->server->getPluginManager()->callEvent($ev = new DataPacketSendEvent($this, $packet));
+			$ev = new DataPacketSendEvent($this, $packet);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -3144,14 +3151,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * Transfers a player to another server.
 	 *
 	 * @param string $address The IP address or hostname of the destination server
-	 * @param int    $port    The destination port, defaults to 19132
+	 * @param int    $port The destination port, defaults to 19132
 	 * @param string $message Message to show in the console when closing the player
 	 *
 	 * @return bool if transfer was successful.
 	 */
 	public function transfer(string $address, int $port = 19132, string $message = "transfer") : bool{
-		$this->server->getPluginManager()->callEvent($ev = new PlayerTransferEvent($this, $address, $port, $message));
-
+		$ev = new PlayerTransferEvent($this, $address, $port, $message);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$pk = new TransferPacket();
 			$pk->address = $ev->getAddress();
@@ -3168,14 +3175,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * Kicks a player from the server
 	 *
-	 * @param string $reason
-	 * @param bool   $isAdmin
+	 * @param string               $reason
+	 * @param bool                 $isAdmin
 	 * @param TextContainer|string $quitMessage
 	 *
 	 * @return bool
 	 */
 	public function kick(string $reason = "", bool $isAdmin = true, $quitMessage = null) : bool{
-		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage()));
+		$ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage());
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$reason = $ev->getReason();
 			$message = $reason;
@@ -3271,7 +3279,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * Internal function used for sending titles.
 	 *
 	 * @param string $title
-	 * @param int $type
+	 * @param int    $type
 	 */
 	protected function sendTitleText(string $title, int $type){
 		$pk = new SetTitlePacket();
@@ -3365,6 +3373,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk = new ModalFormRequestPacket();
 		$pk->formId = $id;
 		$pk->formData = json_encode($form);
+		if($pk->formData === false){
+			throw new \InvalidArgumentException("Failed to encode form JSON: " . json_last_error_msg());
+		}
 		if($this->dataPacket($pk)){
 			$this->forms[$id] = $form;
 		}
@@ -3404,91 +3415,82 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 */
 	final public function close($message = "", string $reason = "generic reason", bool $notify = true) : void{
 		if($this->isConnected() and !$this->closed){
+			if($notify and strlen($reason) > 0){
+				$pk = new DisconnectPacket();
+				$pk->message = $reason;
+				$this->directDataPacket($pk);
+			}
+			$this->interface->close($this, $notify ? $reason : "");
+			$this->sessionAdapter = null;
 
-			try{
-				if($notify and strlen($reason) > 0){
-					$pk = new DisconnectPacket();
-					$pk->message = $reason;
-					$this->directDataPacket($pk);
+			PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+			PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+
+			$this->stopSleep();
+
+			if($this->spawned){
+				$ev = new PlayerQuitEvent($this, $message, $reason);
+				$ev->call();
+				if($ev->getQuitMessage() != ""){
+					$this->server->broadcastMessage($ev->getQuitMessage());
 				}
-				$this->interface->close($this, $notify ? $reason : "");
-				$this->sessionAdapter = null;
 
-				PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
-				PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+				$this->save();
+			}
 
-				$this->stopSleep();
-
-				if($this->spawned){
-					$this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message, $reason));
-					if($ev->getQuitMessage() != ""){
-						$this->server->broadcastMessage($ev->getQuitMessage());
+			if($this->isValid()){
+				foreach($this->usedChunks as $index => $d){
+					Level::getXZ($index, $chunkX, $chunkZ);
+					$this->level->unregisterChunkLoader($this, $chunkX, $chunkZ);
+					foreach($this->level->getChunkEntities($chunkX, $chunkZ) as $entity){
+						$entity->despawnFrom($this);
 					}
+					unset($this->usedChunks[$index]);
+				}
+			}
+			$this->usedChunks = [];
+			$this->loadQueue = [];
 
-					try{
-						$this->save();
-					}catch(\Throwable $e){
-						$this->server->getLogger()->critical("Failed to save player data for " . $this->getName());
-						$this->server->getLogger()->logException($e);
+			if($this->loggedIn){
+				$this->server->onPlayerLogout($this);
+				foreach($this->server->getOnlinePlayers() as $player){
+					if(!$player->canSee($this)){
+						$player->showPlayer($this);
 					}
 				}
+				$this->hiddenPlayers = [];
+			}
 
-				if($this->isValid()){
-					foreach($this->usedChunks as $index => $d){
-						Level::getXZ($index, $chunkX, $chunkZ);
-						$this->level->unregisterChunkLoader($this, $chunkX, $chunkZ);
-						foreach($this->level->getChunkEntities($chunkX, $chunkZ) as $entity){
-							$entity->despawnFrom($this);
-						}
-						unset($this->usedChunks[$index]);
-					}
-				}
-				$this->usedChunks = [];
-				$this->loadQueue = [];
+			$this->removeAllWindows(true);
+			$this->windows = [];
+			$this->windowIndex = [];
+			$this->cursorInventory = null;
+			$this->craftingGrid = null;
 
-				if($this->loggedIn){
-					$this->server->onPlayerLogout($this);
-					foreach($this->server->getOnlinePlayers() as $player){
-						if(!$player->canSee($this)){
-							$player->showPlayer($this);
-						}
-					}
-					$this->hiddenPlayers = [];
-				}
+			if($this->constructed){
+				parent::close();
+			}
+			$this->spawned = false;
 
-				$this->removeAllWindows(true);
-				$this->windows = [];
-				$this->windowIndex = [];
-				$this->cursorInventory = null;
-				$this->craftingGrid = null;
+			if($this->loggedIn){
+				$this->loggedIn = false;
+				$this->server->removeOnlinePlayer($this);
+			}
 
-				if($this->constructed){
-					parent::close();
-				}
-				$this->spawned = false;
+			$this->server->removePlayer($this);
 
-				if($this->loggedIn){
-					$this->loggedIn = false;
-					$this->server->removeOnlinePlayer($this);
-				}
+			$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logOut", [
+				TextFormat::AQUA . $this->getName() . TextFormat::WHITE,
+				$this->ip,
+				$this->port,
+				$this->getServer()->getLanguage()->translateString($reason)
+			]));
 
-				$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logOut", [
-					TextFormat::AQUA . $this->getName() . TextFormat::WHITE,
-					$this->ip,
-					$this->port,
-					$this->getServer()->getLanguage()->translateString($reason)
-				]));
+			$this->spawnPosition = null;
 
-				$this->spawnPosition = null;
-
-				if($this->perm !== null){
-					$this->perm->clearPermissions();
-					$this->perm = null;
-				}
-			}catch(\Throwable $e){
-				$this->server->getLogger()->logException($e);
-			}finally{
-				$this->server->removePlayer($this);
+			if($this->perm !== null){
+				$this->perm->clearPermissions();
+				$this->perm = null;
 			}
 		}
 	}
@@ -3508,11 +3510,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * Handles player data saving
 	 *
-	 * @param bool $async
-	 *
 	 * @throws \InvalidStateException if the player is closed
 	 */
-	public function save(bool $async = false){
+	public function save(){
 		if($this->closed){
 			throw new \InvalidStateException("Tried to save closed player");
 		}
@@ -3549,7 +3549,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->namedtag->setLong("lastPlayed", (int) floor(microtime(true) * 1000));
 
 		if($this->username != "" and $this->namedtag instanceof CompoundTag){
-			$this->server->saveOfflinePlayerData($this->username, $this->namedtag, $async);
+			$this->server->saveOfflinePlayerData($this->username, $this->namedtag);
 		}
 	}
 
@@ -3568,7 +3568,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		//main inventory and drops the rest on the ground.
 		$this->doCloseInventory();
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerDeathEvent($this, $this->getDrops()));
+		$ev = new PlayerDeathEvent($this, $this->getDrops());
+		$ev->call();
 
 		if(!$ev->getKeepInventory()){
 			foreach($ev->getDrops() as $item){
@@ -3603,7 +3604,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return;
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerRespawnEvent($this, $this->getSpawn()));
+		$ev = new PlayerRespawnEvent($this, $this->getSpawn());
+		$ev->call();
 
 		$realSpawn = Position::fromObject($ev->getRespawnPosition()->add(0.5, 0, 0.5), $ev->getRespawnPosition()->getLevel());
 		$this->teleport($realSpawn);
@@ -3801,6 +3803,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 * @param bool      $isPermanent Prevents the window being removed if true.
 	 *
 	 * @return int
+	 *
+	 * @throws \InvalidArgumentException if a forceID which is already in use is specified
+	 * @throws \InvalidStateException if trying to add a window without forceID when no slots are free
 	 */
 	public function addWindow(Inventory $inventory, int $forceId = null, bool $isPermanent = false) : int{
 		if(($id = $this->getWindowId($inventory)) !== ContainerIds::NONE){
@@ -3808,10 +3813,21 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 
 		if($forceId === null){
-			$this->windowCnt = $cnt = max(ContainerIds::FIRST, ++$this->windowCnt % ContainerIds::LAST);
+			$cnt = $this->windowCnt;
+			do{
+				$cnt = max(ContainerIds::FIRST, ($cnt + 1) % ContainerIds::LAST);
+				if($cnt === $this->windowCnt){ //wraparound, no free slots
+					throw new \InvalidStateException("No free window IDs found");
+				}
+			}while(isset($this->windowIndex[$cnt]));
+			$this->windowCnt = $cnt;
 		}else{
 			$cnt = $forceId;
+			if(isset($this->windowIndex[$cnt])){
+				throw new \InvalidArgumentException("Requested force ID $forceId already in use");
+			}
 		}
+
 		$this->windowIndex[$cnt] = $inventory;
 		$this->windows[spl_object_hash($inventory)] = $cnt;
 		if($inventory->open($this)){
@@ -3887,9 +3903,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	public function onChunkChanged(Chunk $chunk){
 		if(isset($this->usedChunks[$hash = Level::chunkHash($chunk->getX(), $chunk->getZ())])){
 			$this->usedChunks[$hash] = false;
-			if(!$this->spawned){
-				$this->nextChunkOrderRun = 0;
-			}
+			$this->nextChunkOrderRun = 0;
 		}
 	}
 

src/pocketmine/PocketMine.php

@@ -37,7 +37,7 @@ namespace pocketmine {
 	use pocketmine\wizard\SetupWizard;
 
 	const NAME = "PocketMine-MP";
-	const BASE_VERSION = "3.2.1";
+	const BASE_VERSION = "3.5.4";
 	const IS_DEVELOPMENT_BUILD = false;
 	const BUILD_NUMBER = 0;
 
@@ -145,12 +145,18 @@ namespace pocketmine {
 		define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
 	}
 
-	define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
+	$opts = getopt("", ["bootstrap:"]);
+	if(isset($opts["bootstrap"])){
+		$bootstrap = realpath($opts["bootstrap"]) ?: $opts["bootstrap"];
+	}else{
+		$bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
+	}
+	define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
 
-	if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
+	if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
 		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
 	}else{
-		critical_error("Composer autoloader not found.");
+		critical_error("Composer autoloader not found at " . $bootstrap);
 		critical_error("Please install/update Composer dependencies or use provided builds.");
 		exit(1);
 	}

src/pocketmine/Server.php

@@ -91,7 +91,6 @@ 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\snooze\SleeperHandler;
 use pocketmine\snooze\SleeperNotifier;
@@ -198,9 +197,6 @@ class Server{
 	/** @var ResourcePackManager */
 	private $resourceManager;
 
-	/** @var ConsoleCommandSender */
-	private $consoleSender;
-
 	/** @var int */
 	private $maxPlayers;
 
@@ -556,10 +552,11 @@ class Server{
 	}
 
 	/**
+	 * @deprecated
 	 * @return bool
 	 */
 	public function getAllowFlight() : bool{
-		return $this->getConfigBool("allow-flight", false);
+		return true;
 	}
 
 	/**
@@ -734,6 +731,17 @@ class Server{
 		return $result;
 	}
 
+	/**
+	 * Returns whether the server has stored any saved data for this player.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function hasOfflinePlayerData(string $name) : bool{
+		return file_exists($this->getDataPath() . "players/$name.dat");
+	}
+
 	/**
 	 * @param string $name
 	 *
@@ -805,22 +813,17 @@ class Server{
 	/**
 	 * @param string      $name
 	 * @param CompoundTag $nbtTag
-	 * @param bool        $async
 	 */
-	public function saveOfflinePlayerData(string $name, CompoundTag $nbtTag, bool $async = false){
+	public function saveOfflinePlayerData(string $name, CompoundTag $nbtTag){
 		$ev = new PlayerDataSaveEvent($nbtTag, $name);
 		$ev->setCancelled(!$this->shouldSavePlayerData());
 
-		$this->pluginManager->callEvent($ev);
+		$ev->call();
 
 		if(!$ev->isCancelled()){
 			$nbt = new BigEndianNBTStream();
 			try{
-				if($async){
-					$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()));
-				}
+				file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
 			}catch(\Throwable $e){
 				$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
 				$this->logger->logException($e);
@@ -991,6 +994,7 @@ class Server{
 
 	/**
 	 * @internal
+	 *
 	 * @param Level $level
 	 */
 	public function removeLevel(Level $level) : void{
@@ -1033,7 +1037,7 @@ class Server{
 
 		$this->levels[$level->getId()] = $level;
 
-		$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
+		(new LevelLoadEvent($level))->call();
 
 		$level->setTickRate($this->baseTickRate);
 
@@ -1082,9 +1086,9 @@ class Server{
 
 		$level->setTickRate($this->baseTickRate);
 
-		$this->getPluginManager()->callEvent(new LevelInitEvent($level));
+		(new LevelInitEvent($level))->call();
 
-		$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
+		(new LevelLoadEvent($level))->call();
 
 		$this->getLogger()->notice($this->getLanguage()->translateString("pocketmine.level.backgroundGeneration", [$name]));
 
@@ -1437,31 +1441,6 @@ class Server{
 			}
 			$this->config = new Config($this->dataPath . "pocketmine.yml", Config::YAML, []);
 
-			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.");
-			}
-
-			ini_set('assert.exception', '1');
-
-			if($this->logger instanceof MainLogger){
-				$this->logger->setLogDebug(\pocketmine\DEBUG > 1);
-			}
-
 			$this->logger->info("Loading server properties...");
 			$this->properties = new Config($this->dataPath . "server.properties", Config::PROPERTIES, [
 				"motd" => \pocketmine\NAME . " Server",
@@ -1470,7 +1449,6 @@ class Server{
 				"announce-player-achievements" => true,
 				"spawn-protection" => 16,
 				"max-players" => 20,
-				"allow-flight" => false,
 				"spawn-animals" => true,
 				"spawn-mobs" => true,
 				"gamemode" => 0,
@@ -1487,9 +1465,36 @@ class Server{
 				"rcon.password" => substr(base64_encode(random_bytes(20)), 3, 10),
 				"auto-save" => true,
 				"view-distance" => 8,
-				"xbox-auth" => true
+				"xbox-auth" => true,
+				"language" => "eng"
 			]);
 
+			define('pocketmine\DEBUG', (int) $this->getProperty("debug.level", 1));
+
+			$this->forceLanguage = (bool) $this->getProperty("settings.force-language", false);
+			$this->baseLang = new BaseLang($this->getConfigString("language", $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->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error5", ["https://github.com/pmmp/PocketMine-MP/releases"]));
+				$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.");
+			}
+
+			ini_set('assert.exception', '1');
+
+			if($this->logger instanceof MainLogger){
+				$this->logger->setLogDebug(\pocketmine\DEBUG > 1);
+			}
+
 			$this->memoryManager = new MemoryManager($this);
 
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.start", [TextFormat::AQUA . $this->getVersion() . TextFormat::RESET]));
@@ -1527,10 +1532,22 @@ class Server{
 
 			$this->doTitleTick = ((bool) $this->getProperty("console.title-tick", true)) && Terminal::hasFormattingCodes();
 
+
+			$consoleSender = new ConsoleCommandSender();
+			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $consoleSender);
+
 			$consoleNotifier = new SleeperNotifier();
 			$this->console = new CommandReader($consoleNotifier);
-			$this->tickSleeper->addNotifier($consoleNotifier, function() : void{
-				$this->checkConsole();
+			$this->tickSleeper->addNotifier($consoleNotifier, function() use ($consoleSender) : void{
+				Timings::$serverCommandTimer->startTiming();
+				while(($line = $this->console->getLine()) !== null){
+					$ev = new ServerCommandEvent($consoleSender, $line);
+					$ev->call();
+					if(!$ev->isCancelled()){
+						$this->dispatchCommand($ev->getSender(), $ev->getCommand());
+					}
+				}
+				Timings::$serverCommandTimer->stopTiming();
 			});
 			$this->console->start(PTHREADS_INHERIT_NONE);
 
@@ -1606,7 +1623,6 @@ class Server{
 			Timings::init();
 			TimingsHandler::setEnabled((bool) $this->getProperty("settings.enable-profiling", false));
 
-			$this->consoleSender = new ConsoleCommandSender();
 			$this->commandMap = new SimpleCommandMap($this);
 
 			Entity::init();
@@ -1623,7 +1639,6 @@ class Server{
 			$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR, $this->logger);
 
 			$this->pluginManager = new PluginManager($this, $this->commandMap, ((bool) $this->getProperty("plugins.legacy-data-dir", true)) ? null : $this->getDataPath() . "plugin_data" . DIRECTORY_SEPARATOR);
-			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);
 			$this->profilingTickRate = (float) $this->getProperty("settings.profile-report-trigger", 20);
 			$this->pluginManager->registerInterface(new PharPluginLoader($this->autoloader));
 			$this->pluginManager->registerInterface(new ScriptPluginLoader());
@@ -1922,17 +1937,6 @@ class Server{
 		$this->pluginManager->disablePlugins();
 	}
 
-	public function checkConsole(){
-		Timings::$serverCommandTimer->startTiming();
-		while(($line = $this->console->getLine()) !== null){
-			$this->pluginManager->callEvent($ev = new ServerCommandEvent($this->consoleSender, $line));
-			if(!$ev->isCancelled()){
-				$this->dispatchCommand($ev->getSender(), $ev->getCommand());
-			}
-		}
-		Timings::$serverCommandTimer->stopTiming();
-	}
-
 	/**
 	 * Executes a command from a CommandSender
 	 *
@@ -1944,7 +1948,8 @@ class Server{
 	 */
 	public function dispatchCommand(CommandSender $sender, string $commandLine, bool $internal = false) : bool{
 		if(!$internal){
-			$this->pluginManager->callEvent($ev = new CommandEvent($sender, $commandLine));
+			$ev = new CommandEvent($sender, $commandLine);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -2168,7 +2173,7 @@ class Server{
 			"fullFile" => $e->getFile(),
 			"file" => $errfile,
 			"line" => $errline,
-			"trace" => Utils::getTrace(0, $trace)
+			"trace" => Utils::printableTrace($trace)
 		];
 
 		global $lastExceptionError, $lastError;
@@ -2195,6 +2200,14 @@ class Server{
 
 			if($this->getProperty("auto-report.enabled", true) !== false){
 				$report = true;
+
+				$stamp = $this->getDataPath() . "crashdumps/.last_crash";
+				$crashInterval = 120; //2 minutes
+				if(file_exists($stamp) and !($report = (filemtime($stamp) + $crashInterval < time()))){
+					$this->logger->debug("Not sending crashdump due to last crash less than $crashInterval seconds ago");
+				}
+				@touch($stamp); //update file timestamp
+
 				$plugin = $dump->getData()["plugin"];
 				if(is_string($plugin)){
 					$p = $this->pluginManager->getPlugin($plugin);
@@ -2237,6 +2250,12 @@ class Server{
 
 		$this->forceShutdown();
 		$this->isRunning = false;
+
+		//Force minimum uptime to be >= 120 seconds, to reduce the impact of spammy crash loops
+		$spacing = ((int) \pocketmine\START_TIME) - time() + 120;
+		if($spacing > 0){
+			sleep($spacing);
+		}
 		@Utils::kill(getmypid());
 		exit(1);
 	}
@@ -2309,7 +2328,7 @@ class Server{
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 
-		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, "", 0, $skin, $xboxUserId);
+		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, $skin, $xboxUserId);
 
 		$this->broadcastPacket($players ?? $this->playerList, $pk);
 	}
@@ -2332,7 +2351,7 @@ class Server{
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 		foreach($this->playerList as $player){
-			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), "", 0, $player->getSkin(), $player->getXuid());
+			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin(), $player->getXuid());
 		}
 
 		$p->dataPacket($pk);
@@ -2348,41 +2367,37 @@ class Server{
 		}
 
 		//Do level ticks
-		foreach($this->getLevels() as $level){
+		foreach($this->levels as $k => $level){
+			if(!isset($this->levels[$k])){
+				// Level unloaded during the tick of a level earlier in this loop, perhaps by plugin
+				continue;
+			}
 			if($level->getTickRate() > $this->baseTickRate and --$level->tickRateCounter > 0){
 				continue;
 			}
-			try{
-				$levelTime = microtime(true);
-				$level->doTick($currentTick);
-				$tickMs = (microtime(true) - $levelTime) * 1000;
-				$level->tickRateTime = $tickMs;
 
-				if($this->autoTickRate){
-					if($tickMs < 50 and $level->getTickRate() > $this->baseTickRate){
-						$level->setTickRate($r = $level->getTickRate() - 1);
-						if($r > $this->baseTickRate){
-							$level->tickRateCounter = $level->getTickRate();
-						}
-						$this->getLogger()->debug("Raising level \"{$level->getName()}\" tick rate to {$level->getTickRate()} ticks");
-					}elseif($tickMs >= 50){
-						if($level->getTickRate() === $this->baseTickRate){
-							$level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50))));
-							$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
-						}elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){
-							$level->setTickRate($level->getTickRate() + 1);
-							$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
-						}
+			$levelTime = microtime(true);
+			$level->doTick($currentTick);
+			$tickMs = (microtime(true) - $levelTime) * 1000;
+			$level->tickRateTime = $tickMs;
+
+			if($this->autoTickRate){
+				if($tickMs < 50 and $level->getTickRate() > $this->baseTickRate){
+					$level->setTickRate($r = $level->getTickRate() - 1);
+					if($r > $this->baseTickRate){
 						$level->tickRateCounter = $level->getTickRate();
 					}
+					$this->getLogger()->debug("Raising level \"{$level->getName()}\" tick rate to {$level->getTickRate()} ticks");
+				}elseif($tickMs >= 50){
+					if($level->getTickRate() === $this->baseTickRate){
+						$level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50))));
+						$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
+					}elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){
+						$level->setTickRate($level->getTickRate() + 1);
+						$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
+					}
+					$level->tickRateCounter = $level->getTickRate();
 				}
-			}catch(\Throwable $e){
-				if(!$level->isClosed()){
-					$this->logger->critical($this->getLanguage()->translateString("pocketmine.level.tickError", [$level->getName(), $e->getMessage()]));
-				}else{
-					$this->logger->critical($this->getLanguage()->translateString("pocketmine.level.tickUnloadError", [$level->getName()]));
-				}
-				$this->logger->logException($e);
 			}
 		}
 	}
@@ -2392,7 +2407,7 @@ class Server{
 			Timings::$worldSaveTimer->startTiming();
 			foreach($this->players as $index => $player){
 				if($player->spawned){
-					$player->save(true);
+					$player->save();
 				}elseif(!$player->isConnected()){
 					$this->removePlayer($player);
 				}
@@ -2476,9 +2491,7 @@ class Server{
 				$this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload));
 			}
 		}catch(\Throwable $e){
-			if(\pocketmine\DEBUG > 1){
-				$this->logger->logException($e);
-			}
+			$this->logger->logException($e);
 
 			$this->getNetwork()->blockAddress($address, 600);
 		}
@@ -2529,7 +2542,7 @@ class Server{
 		}
 
 		if(($this->tickCounter & 0b111111111) === 0){
-			$this->getPluginManager()->callEvent($this->queryRegenerateTask = new QueryRegenerateEvent($this, 5));
+			($this->queryRegenerateTask = new QueryRegenerateEvent($this, 5))->call();
 			if($this->queryHandler !== null){
 				$this->queryHandler->regenerateInfo();
 			}

src/pocketmine/block/ActivatorRail.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class ActivatorRail extends Rail{
+class ActivatorRail extends RedstoneRail{
 
 	protected $id = self::ACTIVATOR_RAIL;
 

src/pocketmine/block/BaseRail.php

@@ -0,0 +1,266 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+
+abstract class BaseRail extends Flowable{
+
+	public const STRAIGHT_NORTH_SOUTH = 0;
+	public const STRAIGHT_EAST_WEST = 1;
+	public const ASCENDING_EAST = 2;
+	public const ASCENDING_WEST = 3;
+	public const ASCENDING_NORTH = 4;
+	public const ASCENDING_SOUTH = 5;
+
+	private const ASCENDING_SIDES = [
+		self::ASCENDING_NORTH => Vector3::SIDE_NORTH,
+		self::ASCENDING_EAST => Vector3::SIDE_EAST,
+		self::ASCENDING_SOUTH => Vector3::SIDE_SOUTH,
+		self::ASCENDING_WEST => Vector3::SIDE_WEST
+	];
+
+	protected const FLAG_ASCEND = 1 << 24; //used to indicate direction-up
+
+	protected const CONNECTIONS = [
+		//straights
+		self::STRAIGHT_NORTH_SOUTH => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_SOUTH
+		],
+		self::STRAIGHT_EAST_WEST => [
+			Vector3::SIDE_EAST,
+			Vector3::SIDE_WEST
+		],
+
+		//ascending
+		self::ASCENDING_EAST => [
+			Vector3::SIDE_WEST,
+			Vector3::SIDE_EAST | self::FLAG_ASCEND
+		],
+		self::ASCENDING_WEST => [
+			Vector3::SIDE_EAST,
+			Vector3::SIDE_WEST | self::FLAG_ASCEND
+		],
+		self::ASCENDING_NORTH => [
+			Vector3::SIDE_SOUTH,
+			Vector3::SIDE_NORTH | self::FLAG_ASCEND
+		],
+		self::ASCENDING_SOUTH => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_SOUTH | self::FLAG_ASCEND
+		]
+	];
+
+	public function __construct(int $meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getHardness() : float{
+		return 0.7;
+	}
+
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if(!$blockReplace->getSide(Vector3::SIDE_DOWN)->isTransparent() and $this->getLevel()->setBlock($blockReplace, $this, true, true)){
+			$this->tryReconnect();
+			return true;
+		}
+
+		return false;
+	}
+
+	protected static function searchState(array $connections, array $lookup) : int{
+		$meta = array_search($connections, $lookup, true);
+		if($meta === false){
+			$meta = array_search(array_reverse($connections), $lookup, true);
+		}
+		if($meta === false){
+			throw new \InvalidArgumentException("No meta value matches connections " . implode(", ", array_map('dechex', $connections)));
+		}
+
+		return $meta;
+	}
+
+	/**
+	 * Returns a meta value for the rail with the given connections.
+	 *
+	 * @param array $connections
+	 *
+	 * @return int
+	 *
+	 * @throws \InvalidArgumentException if no state matches the given connections
+	 */
+	protected function getMetaForState(array $connections) : int{
+		return self::searchState($connections, self::CONNECTIONS);
+	}
+
+	/**
+	 * Returns the connection directions of this rail (depending on the current block state)
+	 *
+	 * @return int[]
+	 */
+	abstract protected function getConnectionsForState() : array;
+
+	/**
+	 * Returns all the directions this rail is already connected in.
+	 *
+	 * @return int[]
+	 */
+	private function getConnectedDirections() : array{
+		/** @var int[] $connections */
+		$connections = [];
+
+		/** @var int $connection */
+		foreach($this->getConnectionsForState() as $connection){
+			$other = $this->getSide($connection & ~self::FLAG_ASCEND);
+			$otherConnection = Vector3::getOppositeSide($connection & ~self::FLAG_ASCEND);
+
+			if(($connection & self::FLAG_ASCEND) !== 0){
+				$other = $other->getSide(Vector3::SIDE_UP);
+
+			}elseif(!($other instanceof BaseRail)){ //check for rail sloping up to meet this one
+				$other = $other->getSide(Vector3::SIDE_DOWN);
+				$otherConnection |= self::FLAG_ASCEND;
+			}
+
+			if(
+				$other instanceof BaseRail and
+				in_array($otherConnection, $other->getConnectionsForState(), true)
+			){
+				$connections[] = $connection;
+			}
+		}
+
+		return $connections;
+	}
+
+	private function getPossibleConnectionDirections(array $constraints) : array{
+		switch(count($constraints)){
+			case 0:
+				//No constraints, can connect in any direction
+				$possible = [
+					Vector3::SIDE_NORTH => true,
+					Vector3::SIDE_SOUTH => true,
+					Vector3::SIDE_WEST => true,
+					Vector3::SIDE_EAST => true
+				];
+				foreach($possible as $p => $_){
+					$possible[$p | self::FLAG_ASCEND] = true;
+				}
+
+				return $possible;
+			case 1:
+				return $this->getPossibleConnectionDirectionsOneConstraint(array_shift($constraints));
+			case 2:
+				return [];
+			default:
+				throw new \InvalidArgumentException("Expected at most 2 constraints, got " . count($constraints));
+		}
+	}
+
+	protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
+		$opposite = Vector3::getOppositeSide($constraint & ~self::FLAG_ASCEND);
+
+		$possible = [$opposite => true];
+
+		if(($constraint & self::FLAG_ASCEND) === 0){
+			//We can slope the other way if this connection isn't already a slope
+			$possible[$opposite | self::FLAG_ASCEND] = true;
+		}
+
+		return $possible;
+	}
+
+	private function tryReconnect() : void{
+		$thisConnections = $this->getConnectedDirections();
+		$changed = false;
+
+		do{
+			$possible = $this->getPossibleConnectionDirections($thisConnections);
+			$continue = false;
+
+			foreach($possible as $thisSide => $_){
+				$otherSide = Vector3::getOppositeSide($thisSide & ~self::FLAG_ASCEND);
+
+				$other = $this->getSide($thisSide & ~self::FLAG_ASCEND);
+
+				if(($thisSide & self::FLAG_ASCEND) !== 0){
+					$other = $other->getSide(Vector3::SIDE_UP);
+
+				}elseif(!($other instanceof BaseRail)){ //check if other rails can slope up to meet this one
+					$other = $other->getSide(Vector3::SIDE_DOWN);
+					$otherSide |= self::FLAG_ASCEND;
+				}
+
+				if(!($other instanceof BaseRail) or count($otherConnections = $other->getConnectedDirections()) >= 2){
+					//we can only connect to a rail that has less than 2 connections
+					continue;
+				}
+
+				$otherPossible = $other->getPossibleConnectionDirections($otherConnections);
+
+				if(isset($otherPossible[$otherSide])){
+					$otherConnections[] = $otherSide;
+					$other->updateState($otherConnections);
+
+					$changed = true;
+					$thisConnections[] = $thisSide;
+					$continue = count($thisConnections) < 2;
+
+					break; //force recomputing possible directions, since this connection could invalidate others
+				}
+			}
+		}while($continue);
+
+		if($changed){
+			$this->updateState($thisConnections);
+		}
+	}
+
+	private function updateState(array $connections) : void{
+		if(count($connections) === 1){
+			$connections[] = Vector3::getOppositeSide($connections[0] & ~self::FLAG_ASCEND);
+		}elseif(count($connections) !== 2){
+			throw new \InvalidArgumentException("Expected exactly 2 connections, got " . count($connections));
+		}
+
+		$this->meta = $this->getMetaForState($connections);
+		$this->level->setBlock($this, $this, false, false); //avoid recursion
+	}
+
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() or (
+			isset(self::ASCENDING_SIDES[$this->meta & 0x07]) and
+			$this->getSide(self::ASCENDING_SIDES[$this->meta & 0x07])->isTransparent()
+		)){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function getVariantBitmask() : int{
+		return 0;
+	}
+}

src/pocketmine/block/Bed.php

@@ -192,21 +192,25 @@ class Bed extends Transparent{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		if($this->isHeadPart()){
-			$tile = $this->getLevel()->getTile($this);
-			if($tile instanceof TileBed){
-				return [
-					ItemFactory::get($this->getItemId(), $tile->getColor())
-				];
-			}else{
-				return [
-					ItemFactory::get($this->getItemId(), 14) //Red
-				];
-			}
+			return [$this->getItem()];
 		}
 
 		return [];
 	}
 
+	public function getPickedItem() : Item{
+		return $this->getItem();
+	}
+
+	private function getItem() : Item{
+		$tile = $this->getLevel()->getTile($this);
+		if($tile instanceof TileBed){
+			return ItemFactory::get($this->getItemId(), $tile->getColor());
+		}
+
+		return ItemFactory::get($this->getItemId(), 14); //Red
+	}
+
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}

src/pocketmine/block/Block.php

@@ -109,6 +109,14 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $this->itemId ?? $this->getId();
 	}
 
+	/**
+	 * @internal
+	 * @return int
+	 */
+	public function getRuntimeId() : int{
+		return BlockFactory::toStaticRuntimeId($this->getId(), $this->getDamage());
+	}
+
 	/**
 	 * @return int
 	 */

src/pocketmine/block/BlockFactory.php

@@ -330,6 +330,10 @@ class BlockFactory{
 		}
 	}
 
+	public static function isInit() : bool{
+		return self::$fullList !== null;
+	}
+
 	/**
 	 * Registers a block type into the index. Plugins may use this method to register new block types or override
 	 * existing ones.
@@ -411,6 +415,7 @@ class BlockFactory{
 	 * Returns whether a specified block ID is already registered in the block factory.
 	 *
 	 * @param int $id
+	 *
 	 * @return bool
 	 */
 	public static function isRegistered(int $id) : bool{

src/pocketmine/block/BrewingStand.php

@@ -23,12 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
 use pocketmine\item\TieredTool;
 
 class BrewingStand extends Transparent{
 
 	protected $id = self::BREWING_STAND_BLOCK;
 
+	protected $itemId = Item::BREWING_STAND;
+
 	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}

src/pocketmine/block/Cactus.php

@@ -31,7 +31,6 @@ use pocketmine\item\Item;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Cactus extends Transparent{
 
@@ -95,7 +94,8 @@ class Cactus extends Transparent{
 				for($y = 1; $y < 3; ++$y){
 					$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
 					if($b->getId() === self::AIR){
-						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
+						$ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS));
+						$ev->call();
 						if(!$ev->isCancelled()){
 							$this->getLevel()->setBlock($b, $ev->getNewState(), true);
 						}

src/pocketmine/block/Cake.php

@@ -35,6 +35,8 @@ class Cake extends Transparent implements FoodSource{
 
 	protected $id = self::CAKE_BLOCK;
 
+	protected $itemId = Item::CAKE;
+
 	public function __construct(int $meta = 0){
 		$this->meta = $meta;
 	}

src/pocketmine/block/Crops.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 abstract class Crops extends Flowable{
 
@@ -50,8 +49,8 @@ abstract class Crops extends Flowable{
 				$block->meta = 7;
 			}
 
-			Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-
+			$ev = new BlockGrowEvent($this, $block);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 			}
@@ -79,8 +78,8 @@ abstract class Crops extends Flowable{
 			if($this->meta < 0x07){
 				$block = clone $this;
 				++$block->meta;
-				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-
+				$ev = new BlockGrowEvent($this, $block);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 				}

src/pocketmine/block/DetectorRail.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class DetectorRail extends Rail{
+class DetectorRail extends RedstoneRail{
 
 	protected $id = self::DETECTOR_RAIL;
 

src/pocketmine/block/DoubleSlab.php

@@ -47,4 +47,8 @@ abstract class DoubleSlab extends Solid{
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
+
+	public function getPickedItem() : Item{
+		return ItemFactory::get($this->getSlabId(), $this->getVariant());
+	}
 }

src/pocketmine/block/Farmland.php

@@ -111,4 +111,8 @@ class Farmland extends Transparent{
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
+
+	public function getPickedItem() : Item{
+		return ItemFactory::get(Item::DIRT);
+	}
 }

src/pocketmine/block/Fire.php

@@ -31,7 +31,6 @@ use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
-use pocketmine\Server;
 
 class Fire extends Flowable{
 
@@ -69,7 +68,7 @@ class Fire extends Flowable{
 		if($entity instanceof Arrow){
 			$ev->setCancelled();
 		}
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$entity->setOnFire($ev->getDuration());
 		}
@@ -153,7 +152,8 @@ class Fire extends Flowable{
 
 	private function burnBlock(Block $block, int $chanceBound) : void{
 		if(mt_rand(0, $chanceBound) < $block->getFlammability()){
-			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockBurnEvent($block, $this));
+			$ev = new BlockBurnEvent($block, $this);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$block->onIncinerate();
 

src/pocketmine/block/Grass.php

@@ -67,7 +67,8 @@ class Grass extends Solid{
 		$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
 		if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
 			//grass dies
-			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
+			$ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT));
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$this->level->setBlock($this, $ev->getNewState(), false, false);
 			}
@@ -86,7 +87,8 @@ class Grass extends Solid{
 					continue;
 				}
 
-				$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
+				$ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS));
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$this->level->setBlock($b, $ev->getNewState(), false, false);
 				}

src/pocketmine/block/Lava.php

@@ -31,7 +31,6 @@ use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Lava extends Liquid{
 
@@ -107,7 +106,7 @@ class Lava extends Liquid{
 		$entity->attack($ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 15);
-		Server::getInstance()->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$entity->setOnFire($ev->getDuration());
 		}

src/pocketmine/block/Leaves.php

@@ -147,8 +147,8 @@ class Leaves extends Transparent{
 			$this->meta &= 0x03;
 			$visited = [];
 
-			$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
-
+			$ev = new LeavesDecayEvent($this);
+			$ev->call();
 			if($ev->isCancelled() or $this->findLog($this, $visited, 0)){
 				$this->getLevel()->setBlock($this, $this, false, false);
 			}else{

src/pocketmine/block/Liquid.php

@@ -24,11 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\event\block\BlockFormEvent;
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\level\sound\FizzSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 
 abstract class Liquid extends Transparent{
 
@@ -294,12 +296,16 @@ abstract class Liquid extends Transparent{
 
 	protected function flowIntoBlock(Block $block, int $newFlowDecay) : void{
 		if($this->canFlowInto($block) and !($block instanceof Liquid)){
-			if($block->getId() > 0){
-				$this->level->useBreakOn($block);
-			}
+			$ev = new BlockSpreadEvent($block, $this, BlockFactory::get($this->getId(), $newFlowDecay));
+			$ev->call();
+			if(!$ev->isCancelled()){
+				if($block->getId() > 0){
+					$this->level->useBreakOn($block);
+				}
 
-			$this->level->setBlock($block, BlockFactory::get($this->getId(), $newFlowDecay), true, true);
-			$this->level->scheduleDelayedBlockUpdate($block, $this->tickRate());
+				$this->level->setBlock($block, $ev->getNewState(), true, true);
+				$this->level->scheduleDelayedBlockUpdate($block, $this->tickRate());
+			}
 		}
 	}
 
@@ -425,10 +431,12 @@ abstract class Liquid extends Transparent{
 	}
 
 	protected function liquidCollide(Block $cause, Block $result) : bool{
-		//TODO: add events
-
-		$this->level->setBlock($this, $result, true, true);
-		$this->level->broadcastLevelSoundEvent($this->add(0.5, 0.5, 0.5), LevelSoundEventPacket::SOUND_FIZZ, (int) ((2.6 + (lcg_value() - lcg_value()) * 0.8) * 1000));
+		$ev = new BlockFormEvent($this, $result);
+		$ev->call();
+		if(!$ev->isCancelled()){
+			$this->level->setBlock($this, $ev->getNewState(), true, true);
+			$this->level->addSound(new FizzSound($this->add(0.5, 0.5, 0.5), 2.6 + (lcg_value() - lcg_value()) * 0.8));
+		}
 		return true;
 	}
 

src/pocketmine/block/MelonStem.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
-use pocketmine\Server;
 
 class MelonStem extends Crops{
 
@@ -46,7 +45,8 @@ class MelonStem extends Crops{
 			if($this->meta < 0x07){
 				$block = clone $this;
 				++$block->meta;
-				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+				$ev = new BlockGrowEvent($this, $block);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
 				}
@@ -60,7 +60,8 @@ class MelonStem extends Crops{
 				$side = $this->getSide(mt_rand(2, 5));
 				$d = $side->getSide(Vector3::SIDE_DOWN);
 				if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::MELON_BLOCK)));
+					$ev = new BlockGrowEvent($side, BlockFactory::get(Block::MELON_BLOCK));
+					$ev->call();
 					if(!$ev->isCancelled()){
 						$this->getLevel()->setBlock($side, $ev->getNewState(), true);
 					}

src/pocketmine/block/Mycelium.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
-use pocketmine\Server;
 
 class Mycelium extends Solid{
 
@@ -67,7 +66,8 @@ class Mycelium extends Solid{
 		$block = $this->getLevel()->getBlockAt($x, $y, $z);
 		if($block->getId() === Block::DIRT){
 			if($block->getSide(Vector3::SIDE_UP) instanceof Transparent){
-				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, BlockFactory::get(Block::MYCELIUM)));
+				$ev = new BlockSpreadEvent($block, $this, BlockFactory::get(Block::MYCELIUM));
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($block, $ev->getNewState());
 				}

src/pocketmine/block/NetherWartPlant.php

@@ -68,8 +68,8 @@ class NetherWartPlant extends Flowable{
 		if($this->meta < 3 and mt_rand(0, 10) === 0){ //Still growing
 			$block = clone $this;
 			$block->meta++;
-			$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-
+			$ev = new BlockGrowEvent($this, $block);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$this->getLevel()->setBlock($this, $ev->getNewState(), false, true);
 			}

src/pocketmine/block/PoweredRail.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-class PoweredRail extends Rail{
+class PoweredRail extends RedstoneRail{
 	protected $id = self::POWERED_RAIL;
 
 	public function getName() : string{

src/pocketmine/block/PumpkinStem.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
-use pocketmine\Server;
 
 class PumpkinStem extends Crops{
 
@@ -46,7 +45,8 @@ class PumpkinStem extends Crops{
 			if($this->meta < 0x07){
 				$block = clone $this;
 				++$block->meta;
-				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+				$ev = new BlockGrowEvent($this, $block);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
 				}
@@ -60,7 +60,8 @@ class PumpkinStem extends Crops{
 				$side = $this->getSide(mt_rand(2, 5));
 				$d = $side->getSide(Vector3::SIDE_DOWN);
 				if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::PUMPKIN)));
+					$ev = new BlockGrowEvent($side, BlockFactory::get(Block::PUMPKIN));
+					$ev->call();
 					if(!$ev->isCancelled()){
 						$this->getLevel()->setBlock($side, $ev->getNewState(), true);
 					}

src/pocketmine/block/Rail.php

@@ -23,54 +23,71 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
 use pocketmine\math\Vector3;
-use pocketmine\Player;
 
-class Rail extends Flowable{
+class Rail extends BaseRail{
 
-	public const STRAIGHT_NORTH_SOUTH = 0;
-	public const STRAIGHT_EAST_WEST = 1;
-	public const ASCENDING_EAST = 2;
-	public const ASCENDING_WEST = 3;
-	public const ASCENDING_NORTH = 4;
-	public const ASCENDING_SOUTH = 5;
+	/* extended meta values for regular rails, to allow curving */
 	public const CURVE_SOUTHEAST = 6;
 	public const CURVE_SOUTHWEST = 7;
 	public const CURVE_NORTHWEST = 8;
 	public const CURVE_NORTHEAST = 9;
 
-	protected $id = self::RAIL;
+	private const CURVE_CONNECTIONS = [
+		self::CURVE_SOUTHEAST => [
+			Vector3::SIDE_SOUTH,
+			Vector3::SIDE_EAST
+		],
+		self::CURVE_SOUTHWEST => [
+			Vector3::SIDE_SOUTH,
+			Vector3::SIDE_WEST
+		],
+		self::CURVE_NORTHWEST => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_WEST
+		],
+		self::CURVE_NORTHEAST => [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_EAST
+		]
+	];
 
-	public function __construct(int $meta = 0){
-		$this->meta = $meta;
-	}
+	protected $id = self::RAIL;
 
 	public function getName() : string{
 		return "Rail";
 	}
 
-	public function getHardness() : float{
-		return 0.7;
-	}
-
-	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
-		if(!$blockReplace->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			return $this->getLevel()->setBlock($blockReplace, $this, true, true);
-		}
-
-		return false;
-	}
-
-	public function onNearbyBlockChange() : void{
-		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-			$this->getLevel()->useBreakOn($this);
-		}else{
-			//TODO: Update rail connectivity
+	protected function getMetaForState(array $connections) : int{
+		try{
+			return self::searchState($connections, self::CURVE_CONNECTIONS);
+		}catch(\InvalidArgumentException $e){
+			return parent::getMetaForState($connections);
 		}
 	}
 
-	public function getVariantBitmask() : int{
-		return 0;
+	protected function getConnectionsForState() : array{
+		return self::CURVE_CONNECTIONS[$this->meta] ?? self::CONNECTIONS[$this->meta];
+	}
+
+	protected function getPossibleConnectionDirectionsOneConstraint(int $constraint) : array{
+		static $horizontal = [
+			Vector3::SIDE_NORTH,
+			Vector3::SIDE_SOUTH,
+			Vector3::SIDE_WEST,
+			Vector3::SIDE_EAST
+		];
+
+		$possible = parent::getPossibleConnectionDirectionsOneConstraint($constraint);
+
+		if(($constraint & self::FLAG_ASCEND) === 0){
+			foreach($horizontal as $d){
+				if($constraint !== $d){
+					$possible[$d] = true;
+				}
+			}
+		}
+
+		return $possible;
 	}
 }

src/pocketmine/block/RedstoneOre.php

@@ -50,7 +50,8 @@ class RedstoneOre extends Solid{
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
-		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
+		return false; //this shouldn't prevent block placement
 	}
 
 	public function onNearbyBlockChange() : void{

src/pocketmine/block/RedstoneRail.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+class RedstoneRail extends BaseRail{
+	protected const FLAG_POWERED = 0x08;
+
+	protected function getConnectionsForState() : array{
+		return self::CONNECTIONS[$this->meta & ~self::FLAG_POWERED];
+	}
+}

src/pocketmine/block/Skull.php

@@ -71,18 +71,20 @@ class Skull extends Flowable{
 		return true;
 	}
 
-	public function getDropsForCompatibleTool(Item $item) : array{
+	private function getItem() : Item{
 		$tile = $this->level->getTile($this);
-		if($tile instanceof TileSkull){
-			return [
-				ItemFactory::get(Item::SKULL, $tile->getType())
-			];
-		}
+		return ItemFactory::get(Item::SKULL, $tile instanceof TileSkull ? $tile->getType() : 0);
+	}
 
-		return [];
+	public function getDropsForCompatibleTool(Item $item) : array{
+		return [$this->getItem()];
 	}
 
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}
+
+	public function getPickedItem() : Item{
+		return $this->getItem();
+	}
 }

src/pocketmine/block/Sugarcane.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Sugarcane extends Flowable{
 
@@ -49,7 +48,8 @@ class Sugarcane extends Flowable{
 				for($y = 1; $y < 3; ++$y){
 					$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
 					if($b->getId() === self::AIR){
-						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK)));
+						$ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK));
+						$ev->call();
 						if(!$ev->isCancelled()){
 							$this->getLevel()->setBlock($b, $ev->getNewState(), true);
 						}

src/pocketmine/block/Thin.php

@@ -100,11 +100,7 @@ abstract class Thin extends Transparent{
 		}
 
 		//FIXME: currently there's no proper way to tell if a block is a full-block, so we check the bounding box size
-		$bbs = $block->getCollisionBoxes();
-		if(count($bbs) === 1){
-			return $bbs[0]->getAverageEdgeLength() >= 1;
-		}
-
-		return false;
+		$bb = $block->getBoundingBox();
+		return $bb !== null and $bb->getAverageEdgeLength() >= 1;
 	}
 }

src/pocketmine/block/Torch.php

@@ -45,8 +45,8 @@ class Torch extends Flowable{
 
 	public function onNearbyBlockChange() : void{
 		$below = $this->getSide(Vector3::SIDE_DOWN);
-		$side = $this->getDamage();
-		$faces = [
+		$meta = $this->getDamage();
+		static $faces = [
 			0 => Vector3::SIDE_DOWN,
 			1 => Vector3::SIDE_WEST,
 			2 => Vector3::SIDE_EAST,
@@ -54,8 +54,9 @@ class Torch extends Flowable{
 			4 => Vector3::SIDE_SOUTH,
 			5 => Vector3::SIDE_DOWN
 		];
+		$face = $faces[$meta] ?? Vector3::SIDE_DOWN;
 
-		if($this->getSide($faces[$side])->isTransparent() and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
+		if($this->getSide($face)->isTransparent() and !($face === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
 			$this->getLevel()->useBreakOn($this);
 		}
 	}

src/pocketmine/block/UnknownBlock.php

@@ -31,6 +31,10 @@ class UnknownBlock extends Transparent{
 		return 0;
 	}
 
+	public function canBePlaced() : bool{
+		return false;
+	}
+
 	public function getDrops(Item $item) : array{
 		return [];
 	}

src/pocketmine/command/CommandMap.php

@@ -27,7 +27,7 @@ namespace pocketmine\command;
 interface CommandMap{
 
 	/**
-	 * @param string $fallbackPrefix
+	 * @param string    $fallbackPrefix
 	 * @param Command[] $commands
 	 */
 	public function registerAll(string $fallbackPrefix, array $commands);

src/pocketmine/command/CommandReader.php

@@ -25,6 +25,7 @@ namespace pocketmine\command;
 
 use pocketmine\snooze\SleeperNotifier;
 use pocketmine\Thread;
+use pocketmine\utils\Utils;
 
 class CommandReader extends Thread{
 
@@ -47,9 +48,9 @@ class CommandReader extends Thread{
 		$this->buffer = new \Threaded;
 		$this->notifier = $notifier;
 
-		$opts = getopt("", ["disable-readline"]);
+		$opts = getopt("", ["disable-readline", "enable-readline"]);
 
-		if(extension_loaded("readline") and !isset($opts["disable-readline"]) and !$this->isPipe(STDIN)){
+		if(extension_loaded("readline") and (Utils::getOS() === "win" ? isset($opts["enable-readline"]) : !isset($opts["disable-readline"])) and !$this->isPipe(STDIN)){
 			$this->type = self::TYPE_READLINE;
 		}
 	}
@@ -94,6 +95,7 @@ class CommandReader extends Thread{
 	 * Checks if the specified stream is a FIFO pipe.
 	 *
 	 * @param resource $stream
+	 *
 	 * @return bool
 	 */
 	private function isPipe($stream) : bool{

src/pocketmine/command/CommandSender.php

@@ -54,6 +54,7 @@ interface CommandSender extends Permissible{
 
 	/**
 	 * Sets the line height used for command output pagination for this command sender. `null` will reset it to default.
+	 *
 	 * @param int|null $height
 	 */
 	public function setScreenLineHeight(int $height = null);

src/pocketmine/command/ConsoleCommandSender.php

@@ -64,7 +64,7 @@ class ConsoleCommandSender implements CommandSender{
 	/**
 	 * @param Plugin $plugin
 	 * @param string $name
-	 * @param bool $value
+	 * @param bool   $value
 	 *
 	 * @return PermissionAttachment
 	 */

src/pocketmine/command/FormattedCommandAlias.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;
 
@@ -49,11 +48,6 @@ class FormattedCommandAlias extends Command{
 				$commands[] = $this->buildCommand($formatString, $args);
 			}catch(\InvalidArgumentException $e){
 				$sender->sendMessage(TextFormat::RED . $e->getMessage());
-				return false;
-			}catch(\Throwable $e){
-				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.exception"));
-				$sender->getServer()->getLogger()->logException($e);
-
 				return false;
 			}
 		}

src/pocketmine/command/SimpleCommandMap.php

@@ -65,9 +65,7 @@ use pocketmine\command\defaults\VanillaCommand;
 use pocketmine\command\defaults\VersionCommand;
 use pocketmine\command\defaults\WhitelistCommand;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
-use pocketmine\utils\TextFormat;
 
 class SimpleCommandMap implements CommandMap{
 
@@ -193,9 +191,9 @@ class SimpleCommandMap implements CommandMap{
 
 	/**
 	 * @param Command $command
-	 * @param bool $isAlias
-	 * @param string $fallbackPrefix
-	 * @param string $label
+	 * @param bool    $isAlias
+	 * @param string  $fallbackPrefix
+	 * @param string  $label
 	 *
 	 * @return bool
 	 */
@@ -258,14 +256,10 @@ class SimpleCommandMap implements CommandMap{
 			$target->execute($sender, $sentCommandLabel, $args);
 		}catch(InvalidCommandSyntaxException $e){
 			$sender->sendMessage($this->server->getLanguage()->translateString("commands.generic.usage", [$target->getUsage()]));
-		}catch(\Throwable $e){
-			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.exception"));
-			$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.command.exception", [$commandLine, (string) $target, $e->getMessage()]));
-			$sender->getServer()->getLogger()->logException($e);
+		}finally{
+			$target->timings->stopTiming();
 		}
 
-		$target->timings->stopTiming();
-
 		return true;
 	}
 

src/pocketmine/command/defaults/PardonCommand.php

@@ -34,7 +34,8 @@ class PardonCommand extends VanillaCommand{
 		parent::__construct(
 			$name,
 			"%pocketmine.command.unban.player.description",
-			"%commands.unban.usage"
+			"%commands.unban.usage",
+			["unban"]
 		);
 		$this->setPermission("pocketmine.command.unban.player");
 	}

src/pocketmine/command/defaults/PardonIpCommand.php

@@ -34,7 +34,8 @@ class PardonIpCommand extends VanillaCommand{
 		parent::__construct(
 			$name,
 			"%pocketmine.command.unban.ip.description",
-			"%commands.unbanip.usage"
+			"%commands.unbanip.usage",
+			["unban-ip"]
 		);
 		$this->setPermission("pocketmine.command.unban.ip");
 	}

src/pocketmine/command/defaults/ParticleCommand.php

@@ -29,6 +29,7 @@ use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\lang\TranslationContainer;
+use pocketmine\level\Level;
 use pocketmine\level\particle\AngryVillagerParticle;
 use pocketmine\level\particle\BlockForceFieldParticle;
 use pocketmine\level\particle\BubbleParticle;
@@ -84,14 +85,18 @@ class ParticleCommand extends VanillaCommand{
 
 		if($sender instanceof Player){
 			$level = $sender->getLevel();
+			$pos = new Vector3(
+				$this->getRelativeDouble($sender->getX(), $sender, $args[1]),
+				$this->getRelativeDouble($sender->getY(), $sender, $args[2], 0, Level::Y_MAX),
+				$this->getRelativeDouble($sender->getZ(), $sender, $args[3])
+			);
 		}else{
 			$level = $sender->getServer()->getDefaultLevel();
+			$pos = new Vector3((float) $args[1], (float) $args[2], (float) $args[3]);
 		}
 
 		$name = strtolower($args[0]);
 
-		$pos = new Vector3((float) $args[1], (float) $args[2], (float) $args[3]);
-
 		$xd = (float) $args[4];
 		$yd = (float) $args[5];
 		$zd = (float) $args[6];

src/pocketmine/entity/Attribute.php

@@ -54,7 +54,7 @@ class Attribute{
 	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);
+		self::addAttribute(self::EXHAUSTION, "minecraft:player.exhaustion", 0.00, 5.00, 0.0, false);
 		self::addAttribute(self::KNOCKBACK_RESISTANCE, "minecraft:knockback_resistance", 0.00, 1.00, 0.00);
 		self::addAttribute(self::HEALTH, "minecraft:health", 0.00, 20.00, 20.00);
 		self::addAttribute(self::MOVEMENT_SPEED, "minecraft:movement", 0.00, 340282346638528859811704183484516925440.00, 0.10);
@@ -127,8 +127,8 @@ class Attribute{
 	}
 
 	public function setMinValue(float $minValue){
-		if($minValue > $this->getMaxValue()){
-			throw new \InvalidArgumentException("Value $minValue is bigger than the maxValue!");
+		if($minValue > ($max = $this->getMaxValue())){
+			throw new \InvalidArgumentException("Minimum $minValue is greater than the maximum $max");
 		}
 
 		if($this->minValue != $minValue){
@@ -143,8 +143,8 @@ class Attribute{
 	}
 
 	public function setMaxValue(float $maxValue){
-		if($maxValue < $this->getMinValue()){
-			throw new \InvalidArgumentException("Value $maxValue is bigger than the minValue!");
+		if($maxValue < ($min = $this->getMinValue())){
+			throw new \InvalidArgumentException("Maximum $maxValue is less than the minimum $min");
 		}
 
 		if($this->maxValue != $maxValue){
@@ -160,7 +160,7 @@ class Attribute{
 
 	public function setDefaultValue(float $defaultValue){
 		if($defaultValue > $this->getMaxValue() or $defaultValue < $this->getMinValue()){
-			throw new \InvalidArgumentException("Value $defaultValue exceeds the range!");
+			throw new \InvalidArgumentException("Default $defaultValue is outside the range " . $this->getMinValue() . " - " . $this->getMaxValue());
 		}
 
 		if($this->defaultValue !== $defaultValue){
@@ -171,7 +171,7 @@ class Attribute{
 	}
 
 	public function resetToDefault() : void{
-		$this->setValue($this->getDefaultValue());
+		$this->setValue($this->getDefaultValue(), true);
 	}
 
 	public function getValue() : float{
@@ -188,7 +188,7 @@ class Attribute{
 	public function setValue(float $value, bool $fit = false, bool $forceSend = false){
 		if($value > $this->getMaxValue() or $value < $this->getMinValue()){
 			if(!$fit){
-				throw new \InvalidArgumentException("Value $value exceeds the range!");
+				throw new \InvalidArgumentException("Value $value is outside the range " . $this->getMinValue() . " - " . $this->getMaxValue());
 			}
 			$value = min(max($value, $this->getMinValue()), $this->getMaxValue());
 		}

src/pocketmine/entity/DataPropertyManager.php

@@ -143,7 +143,8 @@ class DataPropertyManager{
 	 */
 	public function getItem(int $key) : ?Item{
 		$value = $this->getPropertyValue($key, Entity::DATA_TYPE_SLOT);
-		assert($value instanceof Item  or $value === null);
+		assert($value instanceof Item or $value === null);
+
 		return $value;
 	}
 

src/pocketmine/entity/EffectInstance.php

@@ -81,6 +81,7 @@ class EffectInstance{
 
 	/**
 	 * @param int $duration
+	 *
 	 * @throws \InvalidArgumentException
 	 *
 	 * @return $this

src/pocketmine/entity/Entity.php

@@ -175,6 +175,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_SCORE_TAG = 83; //string
 	public const DATA_BALLOON_ATTACHED_ENTITY = 84; //int64, entity unique ID of owner
 	public const DATA_PUFFERFISH_SIZE = 85; //byte
+	public const DATA_BOAT_BUBBLE_TIME = 86; //int (time in bubble column)
+	public const DATA_PLAYER_AGENT_EID = 87; //long
+	/* 88 (float) related to panda sitting
+	 * 89 (float) related to panda sitting
+	 * 90 (unknown) */
+	public const DATA_FLAGS2 = 91; //long (extended data flags)
+	/* 92 (float) related to panda lying down
+	 * 93 (float) related to panda lying down */
 
 
 	public const DATA_FLAG_ONFIRE = 0;
@@ -206,34 +214,48 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_FLAG_INTERESTED = 26;
 	public const DATA_FLAG_CHARGED = 27;
 	public const DATA_FLAG_TAMED = 28;
-	public const DATA_FLAG_LEASHED = 29;
-	public const DATA_FLAG_SHEARED = 30;
-	public const DATA_FLAG_GLIDING = 31;
-	public const DATA_FLAG_ELDER = 32;
-	public const DATA_FLAG_MOVING = 33;
-	public const DATA_FLAG_BREATHING = 34;
-	public const DATA_FLAG_CHESTED = 35;
-	public const DATA_FLAG_STACKABLE = 36;
-	public const DATA_FLAG_SHOWBASE = 37;
-	public const DATA_FLAG_REARING = 38;
-	public const DATA_FLAG_VIBRATING = 39;
-	public const DATA_FLAG_IDLING = 40;
-	public const DATA_FLAG_EVOKER_SPELL = 41;
-	public const DATA_FLAG_CHARGE_ATTACK = 42;
-	public const DATA_FLAG_WASD_CONTROLLED = 43;
-	public const DATA_FLAG_CAN_POWER_JUMP = 44;
-	public const DATA_FLAG_LINGER = 45;
-	public const DATA_FLAG_HAS_COLLISION = 46;
-	public const DATA_FLAG_AFFECTED_BY_GRAVITY = 47;
-	public const DATA_FLAG_FIRE_IMMUNE = 48;
-	public const DATA_FLAG_DANCING = 49;
-	public const DATA_FLAG_ENCHANTED = 50;
-	public const DATA_FLAG_SHOW_TRIDENT_ROPE = 51; // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
-	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 const DATA_FLAG_ORPHANED = 29;
+	public const DATA_FLAG_LEASHED = 30;
+	public const DATA_FLAG_SHEARED = 31;
+	public const DATA_FLAG_GLIDING = 32;
+	public const DATA_FLAG_ELDER = 33;
+	public const DATA_FLAG_MOVING = 34;
+	public const DATA_FLAG_BREATHING = 35;
+	public const DATA_FLAG_CHESTED = 36;
+	public const DATA_FLAG_STACKABLE = 37;
+	public const DATA_FLAG_SHOWBASE = 38;
+	public const DATA_FLAG_REARING = 39;
+	public const DATA_FLAG_VIBRATING = 40;
+	public const DATA_FLAG_IDLING = 41;
+	public const DATA_FLAG_EVOKER_SPELL = 42;
+	public const DATA_FLAG_CHARGE_ATTACK = 43;
+	public const DATA_FLAG_WASD_CONTROLLED = 44;
+	public const DATA_FLAG_CAN_POWER_JUMP = 45;
+	public const DATA_FLAG_LINGER = 46;
+	public const DATA_FLAG_HAS_COLLISION = 47;
+	public const DATA_FLAG_AFFECTED_BY_GRAVITY = 48;
+	public const DATA_FLAG_FIRE_IMMUNE = 49;
+	public const DATA_FLAG_DANCING = 50;
+	public const DATA_FLAG_ENCHANTED = 51;
+	public const DATA_FLAG_SHOW_TRIDENT_ROPE = 52; // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
+	public const DATA_FLAG_CONTAINER_PRIVATE = 53; //inventory is private, doesn't drop contents when killed if true
+	public const DATA_FLAG_TRANSFORMING = 54;
+	public const DATA_FLAG_SPIN_ATTACK = 55;
+	public const DATA_FLAG_SWIMMING = 56;
+	public const DATA_FLAG_BRIBED = 57; //dolphins have this set when they go to find treasure for the player
+	public const DATA_FLAG_PREGNANT = 58;
+	public const DATA_FLAG_LAYING_EGG = 59;
+	public const DATA_FLAG_RIDER_CAN_PICK = 60; //???
+	public const DATA_FLAG_TRANSITION_SITTING = 61;
+	public const DATA_FLAG_EATING = 62;
+	public const DATA_FLAG_LAYING_DOWN = 63;
+	public const DATA_FLAG_SNEEZING = 64;
+	public const DATA_FLAG_TRUSTING = 65;
+	public const DATA_FLAG_ROLLING = 66;
+	public const DATA_FLAG_SCARED = 67;
+	public const DATA_FLAG_IN_SCAFFOLDING = 68;
+	public const DATA_FLAG_OVER_SCAFFOLDING = 69;
+	public const DATA_FLAG_FALL_THROUGH_SCAFFOLDING = 70;
 
 	public static $entityCount = 1;
 	/** @var Entity[] */
@@ -260,8 +282,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		Entity::registerEntity(Snowball::class, false, ['Snowball', 'minecraft:snowball']);
 		Entity::registerEntity(SplashPotion::class, false, ['ThrownPotion', 'minecraft:potion', 'thrownpotion']);
 		Entity::registerEntity(Squid::class, false, ['Squid', 'minecraft:squid']);
-		Entity::registerEntity(Villager::class, false, ['Villager',	'minecraft:villager']);
-		Entity::registerEntity(Zombie::class, false, ['Zombie',	'minecraft:zombie']);
+		Entity::registerEntity(Villager::class, false, ['Villager', 'minecraft:villager']);
+		Entity::registerEntity(Zombie::class, false, ['Zombie', 'minecraft:zombie']);
 
 		Entity::registerEntity(Human::class, true);
 
@@ -342,7 +364,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 *
 	 * @return CompoundTag
 	 */
-	public static function createBaseNBT(Vector3 $pos, ?Vector3 $motion = null , float $yaw = 0.0, float $pitch = 0.0) : CompoundTag{
+	public static function createBaseNBT(Vector3 $pos, ?Vector3 $motion = null, float $yaw = 0.0, float $pitch = 0.0) : CompoundTag{
 		return new CompoundTag("", [
 			new ListTag("Pos", [
 				new DoubleTag("", $pos->x),
@@ -408,8 +430,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public $boundingBox;
 	/** @var bool */
 	public $onGround;
-	/** @var int */
-	protected $age = 0;
 
 	/** @var float */
 	public $eyeHeight = null;
@@ -514,7 +534,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
 		$this->recalculateBoundingBox();
 
-		$this->chunk = $this->level->getChunk($this->getFloorX() >> 4, $this->getFloorZ() >> 4, false);
+		$this->chunk = $this->level->getChunkAtPosition($this, false);
 		if($this->chunk === null){
 			throw new \InvalidStateException("Cannot create entities in unloaded chunks");
 		}
@@ -561,7 +581,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$this->level->addEntity($this);
 
 		$this->lastUpdate = $this->server->getTick();
-		$this->server->getPluginManager()->callEvent(new EntitySpawnEvent($this));
+		(new EntitySpawnEvent($this))->call();
 
 		$this->scheduleUpdate();
 
@@ -635,6 +655,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param float $value
 	 */
 	public function setScale(float $value) : void{
+		if($value <= 0){
+			throw new \InvalidArgumentException("Scale must be greater than 0");
+		}
 		$multiplier = $value / $this->getScale();
 
 		$this->width *= $multiplier;
@@ -903,7 +926,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param EntityDamageEvent $source
 	 */
 	public function attack(EntityDamageEvent $source) : void{
-		$this->server->getPluginManager()->callEvent($source);
+		$source->call();
 		if($source->isCancelled()){
 			return;
 		}
@@ -917,7 +940,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param EntityRegainHealthEvent $source
 	 */
 	public function heal(EntityRegainHealthEvent $source) : void{
-		$this->server->getPluginManager()->callEvent($source);
+		$source->call();
 		if($source->isCancelled()){
 			return;
 		}
@@ -934,6 +957,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * Called to tick entities while dead. Returns whether the entity should be flagged for despawn yet.
 	 *
 	 * @param int $tickDiff
+	 *
 	 * @return bool
 	 */
 	protected function onDeathUpdate(int $tickDiff) : bool{
@@ -1041,7 +1065,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			}
 		}
 
-		$this->age += $tickDiff;
 		$this->ticksLived += $tickDiff;
 
 		return $hasUpdate;
@@ -1148,34 +1171,30 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	protected function broadcastMovement(bool $teleport = false) : void{
-		if($this->chunk !== null){
-			$pk = new MoveEntityAbsolutePacket();
-			$pk->entityRuntimeId = $this->id;
-			$pk->position = $this->getOffsetPosition($this);
+		$pk = new MoveEntityAbsolutePacket();
+		$pk->entityRuntimeId = $this->id;
+		$pk->position = $this->getOffsetPosition($this);
 
-			//this looks very odd but is correct as of 1.5.0.7
-			//for arrows this is actually x/y/z rotation
-			//for mobs x and z are used for pitch and yaw, and y is used for headyaw
-			$pk->xRot = $this->pitch;
-			$pk->yRot = $this->yaw; //TODO: head yaw
-			$pk->zRot = $this->yaw;
+		//this looks very odd but is correct as of 1.5.0.7
+		//for arrows this is actually x/y/z rotation
+		//for mobs x and z are used for pitch and yaw, and y is used for headyaw
+		$pk->xRot = $this->pitch;
+		$pk->yRot = $this->yaw; //TODO: head yaw
+		$pk->zRot = $this->yaw;
 
-			if($teleport){
-				$pk->flags |= MoveEntityAbsolutePacket::FLAG_TELEPORT;
-			}
-
-			$this->level->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $pk);
+		if($teleport){
+			$pk->flags |= MoveEntityAbsolutePacket::FLAG_TELEPORT;
 		}
+
+		$this->level->broadcastPacketToViewers($this, $pk);
 	}
 
 	protected function broadcastMotion() : void{
-		if($this->chunk !== null){
-			$pk = new SetEntityMotionPacket();
-			$pk->entityRuntimeId = $this->id;
-			$pk->motion = $this->getMotion();
+		$pk = new SetEntityMotionPacket();
+		$pk->entityRuntimeId = $this->id;
+		$pk->motion = $this->getMotion();
 
-			$this->level->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $pk);
-		}
+		$this->level->broadcastPacketToViewers($this, $pk);
 	}
 
 	protected function applyDragBeforeGravity() : bool{
@@ -1393,7 +1412,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		Timings::$timerEntityBaseTick->stopTiming();
 
 
-
 		$this->timings->stopTiming();
 
 		//if($this->isStatic())
@@ -1807,7 +1825,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$this->chunk = $this->level->getChunk($chunkX, $chunkZ, true);
 
 			if(!$this->justCreated){
-				$newChunk = $this->level->getChunkPlayers($chunkX, $chunkZ);
+				$newChunk = $this->level->getViewersForPosition($this);
 				foreach($this->hasSpawned as $player){
 					if(!isset($newChunk[$player->getLoaderId()])){
 						$this->despawnFrom($player);
@@ -1840,7 +1858,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 	public function setMotion(Vector3 $motion) : bool{
 		if(!$this->justCreated){
-			$this->server->getPluginManager()->callEvent($ev = new EntityMotionEvent($this, $motion));
+			$ev = new EntityMotionEvent($this, $motion);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -1873,7 +1892,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 		$from = Position::fromObject($this, $this->level);
 		$to = Position::fromObject($pos, $pos instanceof Position ? $pos->getLevel() : $this->level);
-		$this->server->getPluginManager()->callEvent($ev = new EntityTeleportEvent($this, $from, $to));
+		$ev = new EntityTeleportEvent($this, $from, $to);
+		$ev->call();
 		if($ev->isCancelled()){
 			return false;
 		}
@@ -1899,7 +1919,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 
 		if($this->isValid()){
-			$this->server->getPluginManager()->callEvent($ev = new EntityLevelChangeEvent($this, $this->level, $targetLevel));
+			$ev = new EntityLevelChangeEvent($this, $this->level, $targetLevel);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -1952,7 +1973,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param 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())])){
+		if(!isset($this->hasSpawned[$player->getLoaderId()])){
 			$this->hasSpawned[$player->getLoaderId()] = $player;
 
 			$this->sendSpawnPacket($player);
@@ -1963,7 +1984,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($this->chunk === null or $this->closed){
 			return;
 		}
-		foreach($this->level->getChunkPlayers($this->chunk->getX(), $this->chunk->getZ()) as $player){
+		foreach($this->level->getViewersForPosition($this) as $player){
 			if($player->isOnline()){
 				$this->spawnTo($player);
 			}
@@ -2025,7 +2046,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 */
 	public function close() : void{
 		if(!$this->closed){
-			$this->server->getPluginManager()->callEvent(new EntityDespawnEvent($this));
+			(new EntityDespawnEvent($this))->call();
 			$this->closed = true;
 
 			$this->despawnFromAll();
@@ -2074,10 +2095,11 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * Wrapper around {@link Entity#getDataFlag} for generic data flag reading.
 	 *
 	 * @param int $flagId
+	 *
 	 * @return bool
 	 */
 	public function getGenericFlag(int $flagId) : bool{
-		return $this->getDataFlag(self::DATA_FLAGS, $flagId);
+		return $this->getDataFlag($flagId >= 64 ? self::DATA_FLAGS2 : self::DATA_FLAGS, $flagId % 64);
 	}
 
 	/**
@@ -2087,7 +2109,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param bool $value
 	 */
 	public function setGenericFlag(int $flagId, bool $value = true) : void{
-		$this->setDataFlag(self::DATA_FLAGS, $flagId, $value, self::DATA_TYPE_LONG);
+		$this->setDataFlag($flagId >= 64 ? self::DATA_FLAGS2 : self::DATA_FLAGS, $flagId % 64, $value, self::DATA_TYPE_LONG);
 	}
 
 	/**

src/pocketmine/entity/EntityIds.php

@@ -71,8 +71,9 @@ interface EntityIds{
 	public const ENDER_DRAGON = 53;
 	public const SHULKER = 54;
 	public const ENDERMITE = 55;
-	public const LEARN_TO_CODE_MASCOT = 56;
+	public const AGENT = 56, LEARN_TO_CODE_MASCOT = 56;
 	public const VINDICATOR = 57;
+	public const PHANTOM = 58;
 
 	public const ARMOR_STAND = 61;
 	public const TRIPOD_CAMERA = 62;
@@ -86,8 +87,9 @@ 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 THROWN_TRIDENT = 73, TRIDENT = 73;
+	public const TURTLE = 74;
+	public const CAT = 75;
 	public const SHULKER_BULLET = 76;
 	public const FISHING_HOOK = 77;
 	public const CHALKBOARD = 78;
@@ -97,7 +99,7 @@ interface EntityIds{
 	public const EGG = 82;
 	public const PAINTING = 83;
 	public const MINECART = 84;
-	public const LARGE_FIREBALL = 85;
+	public const FIREBALL = 85, LARGE_FIREBALL = 85;
 	public const SPLASH_POTION = 86;
 	public const ENDER_PEARL = 87;
 	public const LEASH_KNOT = 88;
@@ -122,6 +124,7 @@ interface EntityIds{
 	public const PUFFERFISH = 108;
 	public const SALMON = 109;
 	public const DROWNED = 110;
-	public const TROPICAL_FISH = 111;
-	public const FISH = 112;
+	public const TROPICALFISH = 111, TROPICAL_FISH = 111;
+	public const COD = 112, FISH = 112;
+	public const PANDA = 113;
 }

src/pocketmine/entity/Human.php

@@ -269,7 +269,8 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 * @return float the amount of exhaustion level increased
 	 */
 	public function exhaust(float $amount, int $cause = PlayerExhaustEvent::CAUSE_CUSTOM) : float{
-		$this->server->getPluginManager()->callEvent($ev = new PlayerExhaustEvent($this, $amount, $cause));
+		$ev = new PlayerExhaustEvent($this, $amount, $cause);
+		$ev->call();
 		if($ev->isCancelled()){
 			return 0.0;
 		}
@@ -449,7 +450,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 
 	private function playLevelUpSound(int $newLevel) : void{
 		$volume = 0x10000000 * (min(30, $newLevel) / 5); //No idea why such odd numbers, but this works...
-		$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_LEVELUP, 1, (int) $volume);
+		$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_LEVELUP, (int) $volume);
 	}
 
 	/**
@@ -466,7 +467,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	protected function setXpAndProgress(?int $level, ?float $progress) : bool{
 		if(!$this->justCreated){
 			$ev = new PlayerExperienceChangeEvent($this, $this->getXpLevel(), $this->getXpProgress(), $level, $progress);
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 
 			if($ev->isCancelled()){
 				return false;
@@ -841,7 +842,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			/* we don't use Server->updatePlayerListData() because that uses batches, which could cause race conditions in async compression mode */
 			$pk = new PlayerListPacket();
 			$pk->type = PlayerListPacket::TYPE_ADD;
-			$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->getName(), 0, $this->skin)];
+			$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->skin)];
 			$player->dataPacket($pk);
 		}
 
@@ -888,6 +889,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	 * Wrapper around {@link Entity#getDataFlag} for player-specific data flag reading.
 	 *
 	 * @param int $flagId
+	 *
 	 * @return bool
 	 */
 	public function getPlayerFlag(int $flagId) : bool{

src/pocketmine/entity/Living.php

@@ -205,7 +205,8 @@ abstract class Living extends Entity implements Damageable{
 		if(isset($this->effects[$effectId])){
 			$effect = $this->effects[$effectId];
 			$hasExpired = $effect->hasExpired();
-			$this->server->getPluginManager()->callEvent($ev = new EntityEffectRemoveEvent($this, $effect));
+			$ev = new EntityEffectRemoveEvent($this, $effect);
+			$ev->call();
 			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);
@@ -278,7 +279,7 @@ abstract class Living extends Entity implements Damageable{
 		$ev = new EntityEffectAddEvent($this, $effect, $oldEffect);
 		$ev->setCancelled($cancelled);
 
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if($ev->isCancelled()){
 			return false;
 		}
@@ -329,6 +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) : void{
@@ -569,7 +571,10 @@ abstract class Living extends Entity implements Damageable{
 			}
 
 			if($e !== null){
-				if($e->isOnFire()){
+				if((
+					$source->getCause() === EntityDamageEvent::CAUSE_PROJECTILE or
+					$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_ATTACK
+				) and $e->isOnFire()){
 					$this->setOnFire(2 * $this->level->getDifficulty());
 				}
 
@@ -621,7 +626,8 @@ abstract class Living extends Entity implements Damageable{
 	}
 
 	protected function onDeath() : void{
-		$this->server->getPluginManager()->callEvent($ev = new EntityDeathEvent($this, $this->getDrops()));
+		$ev = new EntityDeathEvent($this, $this->getDrops());
+		$ev->call();
 		foreach($ev->getDrops() as $item){
 			$this->getLevel()->dropItem($this, $item);
 		}
@@ -654,11 +660,11 @@ abstract class Living extends Entity implements Damageable{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if($this->doEffectsTick($tickDiff)){
-			$hasUpdate = true;
-		}
-
 		if($this->isAlive()){
+			if($this->doEffectsTick($tickDiff)){
+				$hasUpdate = true;
+			}
+
 			if($this->isInsideOfSolid()){
 				$hasUpdate = true;
 				$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 1);
@@ -771,6 +777,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) : void{
@@ -787,6 +794,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) : void{

src/pocketmine/entity/object/ExperienceOrb.php

@@ -88,6 +88,9 @@ class ExperienceOrb extends Entity{
 	public $gravity = 0.04;
 	public $drag = 0.02;
 
+	/** @var int */
+	protected $age = 0;
+
 	/**
 	 * @var int
 	 * Ticker used for determining interval in which to look for new target players.
@@ -159,6 +162,7 @@ class ExperienceOrb extends Entity{
 	public function entityBaseTick(int $tickDiff = 1) : bool{
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
+		$this->age += $tickDiff;
 		if($this->age > 6000){
 			$this->flagForDespawn();
 			return true;

src/pocketmine/entity/object/FallingBlock.php

@@ -71,7 +71,7 @@ class FallingBlock extends Entity{
 
 		$this->block = BlockFactory::get($blockId, $damage);
 
-		$this->propertyManager->setInt(self::DATA_VARIANT, BlockFactory::toStaticRuntimeId($this->block->getId(), $this->block->getDamage()));
+		$this->propertyManager->setInt(self::DATA_VARIANT, $this->block->getRuntimeId());
 	}
 
 	public function canCollideWith(Entity $entity) : bool{
@@ -113,7 +113,8 @@ class FallingBlock extends Entity{
 					//FIXME: anvils are supposed to destroy torches
 					$this->getLevel()->dropItem($this, ItemFactory::get($this->getBlock(), $this->getDamage()));
 				}else{
-					$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, $blockTarget ?? $this->block));
+					$ev = new EntityBlockChangeEvent($this, $block, $blockTarget ?? $this->block);
+					$ev->call();
 					if(!$ev->isCancelled()){
 						$this->getLevel()->setBlock($pos, $ev->getTo(), true);
 					}

src/pocketmine/entity/object/ItemEntity.php

@@ -53,6 +53,9 @@ class ItemEntity extends Entity{
 
 	public $canCollide = false;
 
+	/** @var int */
+	protected $age = 0;
+
 	protected function initEntity() : void{
 		parent::initEntity();
 
@@ -70,9 +73,12 @@ class ItemEntity extends Entity{
 		}
 
 		$this->item = Item::nbtDeserialize($itemTag);
+		if($this->item->isNull()){
+			throw new \UnexpectedValueException("Item for " . get_class($this) . " is invalid");
+		}
 
 
-		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
+		(new ItemSpawnEvent($this))->call();
 	}
 
 	public function entityBaseTick(int $tickDiff = 1) : bool{
@@ -82,16 +88,16 @@ class ItemEntity extends Entity{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if(!$this->isFlaggedForDespawn()){
-			if($this->pickupDelay > 0 and $this->pickupDelay < 32767){ //Infinite delay
-				$this->pickupDelay -= $tickDiff;
-				if($this->pickupDelay < 0){
-					$this->pickupDelay = 0;
-				}
+		if(!$this->isFlaggedForDespawn() and $this->pickupDelay > -1 and $this->pickupDelay < 32767){ //Infinite delay
+			$this->pickupDelay -= $tickDiff;
+			if($this->pickupDelay < 0){
+				$this->pickupDelay = 0;
 			}
 
+			$this->age += $tickDiff;
 			if($this->age > 6000){
-				$this->server->getPluginManager()->callEvent($ev = new ItemDespawnEvent($this));
+				$ev = new ItemDespawnEvent($this);
+				$ev->call();
 				if($ev->isCancelled()){
 					$this->age = 0;
 				}else{
@@ -99,7 +105,6 @@ class ItemEntity extends Entity{
 					$hasUpdate = true;
 				}
 			}
-
 		}
 
 		return $hasUpdate;
@@ -204,11 +209,12 @@ class ItemEntity extends Entity{
 		$item = $this->getItem();
 		$playerInventory = $player->getInventory();
 
-		if(!($item instanceof Item) or ($player->isSurvival() and !$playerInventory->canAddItem($item))){
+		if($player->isSurvival() and !$playerInventory->canAddItem($item)){
 			return;
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new InventoryPickupItemEvent($playerInventory, $this));
+		$ev = new InventoryPickupItemEvent($playerInventory, $this);
+		$ev->call();
 		if($ev->isCancelled()){
 			return;
 		}

src/pocketmine/entity/object/PaintingMotive.php

@@ -73,6 +73,7 @@ class PaintingMotive{
 
 	/**
 	 * @param string $name
+	 *
 	 * @return PaintingMotive|null
 	 */
 	public static function getMotiveByName(string $name) : ?PaintingMotive{

src/pocketmine/entity/object/PrimedTNT.php

@@ -102,8 +102,8 @@ class PrimedTNT extends Entity implements Explosive{
 	}
 
 	public function explode() : void{
-		$this->server->getPluginManager()->callEvent($ev = new ExplosionPrimeEvent($this, 4));
-
+		$ev = new ExplosionPrimeEvent($this, 4);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$explosion = new Explosion($this, $ev->getForce(), $this);
 			if($ev->isBlockBreaking()){

src/pocketmine/entity/projectile/Arrow.php

@@ -61,6 +61,9 @@ class Arrow extends Projectile{
 	/** @var float */
 	protected $punchKnockback = 0.0;
 
+	/** @var int */
+	protected $collideTicks = 0;
+
 	public function __construct(Level $level, CompoundTag $nbt, ?Entity $shootingEntity = null, bool $critical = false){
 		parent::__construct($level, $nbt, $shootingEntity);
 		$this->setCritical($critical);
@@ -70,12 +73,14 @@ class Arrow extends Projectile{
 		parent::initEntity();
 
 		$this->pickupMode = $this->namedtag->getByte(self::TAG_PICKUP, self::PICKUP_ANY, true);
+		$this->collideTicks = $this->namedtag->getShort("life", $this->collideTicks);
 	}
 
 	public function saveNBT() : void{
 		parent::saveNBT();
 
 		$this->namedtag->setByte(self::TAG_PICKUP, $this->pickupMode, true);
+		$this->namedtag->setShort("life", $this->collideTicks);
 	}
 
 	public function isCritical() : bool{
@@ -116,9 +121,14 @@ class Arrow extends Projectile{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if($this->age > 1200){
-			$this->flagForDespawn();
-			$hasUpdate = true;
+		if($this->isCollided){
+			$this->collideTicks += $tickDiff;
+			if($this->collideTicks > 1200){
+				$this->flagForDespawn();
+				$hasUpdate = true;
+			}
+		}else{
+			$this->collideTicks = 0;
 		}
 
 		return $hasUpdate;
@@ -176,7 +186,7 @@ class Arrow extends Projectile{
 			$ev->setCancelled();
 		}
 
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if($ev->isCancelled()){
 			return;
 		}

src/pocketmine/entity/projectile/EnderPearl.php

@@ -66,7 +66,5 @@ class EnderPearl extends Throwable{
 
 			$owner->attack(new EntityDamageEvent($owner, EntityDamageEvent::CAUSE_FALL, 5));
 		}
-
-		$this->flagForDespawn();
 	}
 }

src/pocketmine/entity/projectile/ExperienceBottle.php

@@ -42,7 +42,5 @@ class ExperienceBottle extends Throwable{
 		$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_GLASS);
 
 		$this->level->dropExperience($this, mt_rand(3, 11));
-
-		$this->flagForDespawn();
 	}
 }

src/pocketmine/entity/projectile/Projectile.php

@@ -74,7 +74,6 @@ abstract class Projectile extends Entity{
 
 		$this->setMaxHealth(1);
 		$this->setHealth(1);
-		$this->age = $this->namedtag->getShort("Age", $this->age);
 		$this->damage = $this->namedtag->getDouble("damage", $this->damage);
 
 		do{
@@ -144,7 +143,6 @@ abstract class Projectile extends Entity{
 	public function saveNBT() : void{
 		parent::saveNBT();
 
-		$this->namedtag->setShort("Age", $this->age);
 		$this->namedtag->setDouble("damage", $this->damage);
 
 		if($this->blockHit !== null){
@@ -243,7 +241,7 @@ abstract class Projectile extends Entity{
 			}
 
 			if($ev !== null){
-				$this->server->getPluginManager()->callEvent($ev);
+				$ev->call();
 				$this->onHit($ev);
 
 				if($ev instanceof ProjectileHitEntityEvent){
@@ -317,7 +315,7 @@ abstract class Projectile extends Entity{
 
 			if($this->fireTicks > 0){
 				$ev = new EntityCombustByEntityEvent($this, $entityHit, 5);
-				$this->server->getPluginManager()->callEvent($ev);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$entityHit->setOnFire($ev->getDuration());
 				}

src/pocketmine/entity/projectile/SplashPotion.php

@@ -27,8 +27,8 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
-use pocketmine\event\entity\ProjectileHitEntityEvent;
 use pocketmine\event\entity\ProjectileHitBlockEvent;
+use pocketmine\event\entity\ProjectileHitEntityEvent;
 use pocketmine\event\entity\ProjectileHitEvent;
 use pocketmine\item\Potion;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
@@ -124,8 +124,6 @@ class SplashPotion extends Throwable{
 				}
 			}
 		}
-
-		$this->flagForDespawn();
 	}
 
 	/**
@@ -153,6 +151,7 @@ class SplashPotion extends Throwable{
 
 	/**
 	 * Sets whether this splash potion will create an area-effect-cloud when it lands.
+	 *
 	 * @param bool $value
 	 */
 	public function setLinger(bool $value = true) : void{

src/pocketmine/entity/projectile/Throwable.php

@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\projectile;
 
+use pocketmine\block\Block;
+use pocketmine\math\RayTraceResult;
+
 abstract class Throwable extends Projectile{
 
 	public $width = 0.25;
@@ -31,18 +34,8 @@ abstract class Throwable extends Projectile{
 	protected $gravity = 0.03;
 	protected $drag = 0.01;
 
-	public function entityBaseTick(int $tickDiff = 1) : bool{
-		if($this->closed){
-			return false;
-		}
-
-		$hasUpdate = parent::entityBaseTick($tickDiff);
-
-		if($this->age > 1200 or $this->isCollided){
-			$this->flagForDespawn();
-			$hasUpdate = true;
-		}
-
-		return $hasUpdate;
+	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
+		parent::onHitBlock($blockHit, $hitResult);
+		$this->flagForDespawn();
 	}
 }

src/pocketmine/entity/utils/ExperienceUtils.php

@@ -31,6 +31,7 @@ abstract class ExperienceUtils{
 	 * Calculates and returns the amount of XP needed to get from level 0 to level $level
 	 *
 	 * @param int $level
+	 *
 	 * @return int
 	 */
 	public static function getXpToReachLevel(int $level) : int{

src/pocketmine/event/Event.php

@@ -27,6 +27,9 @@ declare(strict_types=1);
 namespace pocketmine\event;
 
 abstract class Event{
+	private const MAX_EVENT_CALL_DEPTH = 50;
+	/** @var int */
+	private static $eventCallDepth = 1;
 
 	/** @var string|null */
 	protected $eventName = null;
@@ -47,7 +50,7 @@ abstract class Event{
 	 */
 	public function isCancelled() : bool{
 		if(!($this instanceof Cancellable)){
-			throw new \BadMethodCallException("Event is not Cancellable");
+			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
 		}
 
 		/** @var Event $this */
@@ -61,10 +64,43 @@ abstract class Event{
 	 */
 	public function setCancelled(bool $value = true) : void{
 		if(!($this instanceof Cancellable)){
-			throw new \BadMethodCallException("Event is not Cancellable");
+			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
 		}
 
 		/** @var Event $this */
 		$this->isCancelled = $value;
 	}
+
+	/**
+	 * Calls event handlers registered for this event.
+	 *
+	 * @throws \RuntimeException if event call recursion reaches the max depth limit
+	 *
+	 * @throws \ReflectionException
+	 */
+	public function call() : void{
+		if(self::$eventCallDepth >= self::MAX_EVENT_CALL_DEPTH){
+			//this exception will be caught by the parent event call if all else fails
+			throw new \RuntimeException("Recursive event call detected (reached max depth of " . self::MAX_EVENT_CALL_DEPTH . " calls)");
+		}
+
+		$handlerList = HandlerList::getHandlerListFor(get_class($this));
+		assert($handlerList !== null, "Called event should have a valid HandlerList");
+
+		++self::$eventCallDepth;
+		try{
+			foreach(EventPriority::ALL as $priority){
+				$currentList = $handlerList;
+				while($currentList !== null){
+					foreach($currentList->getListenersByPriority($priority) as $registration){
+						$registration->callEvent($this);
+					}
+
+					$currentList = $currentList->getParent();
+				}
+			}
+		}finally{
+			--self::$eventCallDepth;
+		}
+	}
 }

src/pocketmine/event/inventory/FurnaceBurnEvent.php

@@ -40,8 +40,8 @@ class FurnaceBurnEvent extends BlockEvent implements Cancellable{
 
 	/**
 	 * @param Furnace $furnace
-	 * @param Item $fuel
-	 * @param int $burnTime
+	 * @param Item    $fuel
+	 * @param int     $burnTime
 	 */
 	public function __construct(Furnace $furnace, Item $fuel, int $burnTime){
 		parent::__construct($furnace->getBlock());

src/pocketmine/event/inventory/FurnaceSmeltEvent.php

@@ -38,8 +38,8 @@ class FurnaceSmeltEvent extends BlockEvent implements Cancellable{
 
 	/**
 	 * @param Furnace $furnace
-	 * @param Item $source
-	 * @param Item $result
+	 * @param Item    $source
+	 * @param Item    $result
 	 */
 	public function __construct(Furnace $furnace, Item $source, Item $result){
 		parent::__construct($furnace->getBlock());

src/pocketmine/event/player/PlayerChangeSkinEvent.php

@@ -63,6 +63,7 @@ class PlayerChangeSkinEvent extends PlayerEvent implements Cancellable{
 
 	/**
 	 * @param Skin $skin
+	 *
 	 * @throws \InvalidArgumentException if the specified skin is not valid
 	 */
 	public function setNewSkin(Skin $skin) : void{

src/pocketmine/event/player/PlayerJoinEvent.php

@@ -27,7 +27,11 @@ use pocketmine\lang\TextContainer;
 use pocketmine\Player;
 
 /**
- * Called when a player joins the server, after sending all the spawn packets
+ * Called when the player spawns in the world after logging in, when they first see the terrain.
+ *
+ * Note: A lot of data is sent to the player between login and this event. Disconnecting the player during this event
+ * will cause this data to be wasted. Prefer disconnecting at login-time if possible to minimize bandwidth wastage.
+ * @see PlayerLoginEvent
  */
 class PlayerJoinEvent extends PlayerEvent{
 	/** @var string|TextContainer */

src/pocketmine/event/player/PlayerLoginEvent.php

@@ -27,7 +27,9 @@ use pocketmine\event\Cancellable;
 use pocketmine\Player;
 
 /**
- * Called when a player joins, after things have been correctly set up (you can change anything now)
+ * Called after the player has successfully authenticated, before it spawns. The player is on the loading screen when
+ * this is called.
+ * Cancelling this event will cause the player to be disconnected with the kick message set.
  */
 class PlayerLoginEvent extends PlayerEvent implements Cancellable{
 	/** @var string */

src/pocketmine/event/player/PlayerMoveEvent.php

@@ -34,7 +34,7 @@ class PlayerMoveEvent extends PlayerEvent implements Cancellable{
 	private $to;
 
 	/**
-	 * @param Player $player
+	 * @param Player   $player
 	 * @param Location $from
 	 * @param Location $to
 	 */

src/pocketmine/event/player/PlayerPreLoginEvent.php

@@ -27,7 +27,17 @@ use pocketmine\event\Cancellable;
 use pocketmine\Player;
 
 /**
- * Called when the player logs in, before things have been set up
+ * Called when a player connects to the server, prior to authentication taking place.
+ * Cancelling this event will cause the player to be disconnected with the kick message set.
+ *
+ * This event should be used to decide if the player may continue to login to the server. Do things like checking
+ * bans, whitelisting, server-full etc here.
+ *
+ * WARNING: Any information about the player CANNOT be trusted at this stage, because they are not authenticated and
+ * could be a hacker posing as another player.
+ *
+ * WARNING: Due to internal bad architecture, the player is not fully constructed at this stage, and errors might occur
+ * when calling API methods on the player. Tread with caution.
  */
 class PlayerPreLoginEvent extends PlayerEvent implements Cancellable{
 	/** @var string */

src/pocketmine/event/server/DataPacketSendEvent.php

@@ -34,7 +34,7 @@ class DataPacketSendEvent extends ServerEvent implements Cancellable{
 	private $player;
 
 	/**
-	 * @param Player $player
+	 * @param Player     $player
 	 * @param DataPacket $packet
 	 */
 	public function __construct(Player $player, DataPacket $packet){

src/pocketmine/event/server/NetworkInterfaceCrashEvent.php

@@ -26,7 +26,8 @@ namespace pocketmine\event\server;
 use pocketmine\network\SourceInterface;
 
 /**
- * Called when a network interface crashes, with relevant crash information.
+ * Never called. Should never have come into this world. Nothing to see here.
+ * @deprecated
  */
 class NetworkInterfaceCrashEvent extends NetworkInterfaceEvent{
 	/**

src/pocketmine/inventory/ArmorInventoryEventProcessor.php

@@ -26,7 +26,6 @@ namespace pocketmine\inventory;
 use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityArmorChangeEvent;
 use pocketmine\item\Item;
-use pocketmine\Server;
 
 class ArmorInventoryEventProcessor implements InventoryEventProcessor{
 	/** @var Entity */
@@ -37,7 +36,8 @@ class ArmorInventoryEventProcessor implements InventoryEventProcessor{
 	}
 
 	public function onSlotChange(Inventory $inventory, int $slot, Item $oldItem, Item $newItem) : ?Item{
-		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityArmorChangeEvent($this->entity, $oldItem, $newItem, $slot));
+		$ev = new EntityArmorChangeEvent($this->entity, $oldItem, $newItem, $slot);
+		$ev->call();
 		if($ev->isCancelled()){
 			return null;
 		}

src/pocketmine/inventory/BaseInventory.php

@@ -384,6 +384,7 @@ abstract class BaseInventory implements Inventory{
 
 	/**
 	 * Removes the inventory window from all players currently viewing it.
+	 *
 	 * @param bool $force Force removal of permanent windows such as the player's own inventory. Used internally.
 	 */
 	public function removeAllViewers(bool $force = false) : void{
@@ -398,7 +399,8 @@ abstract class BaseInventory implements Inventory{
 	}
 
 	public function open(Player $who) : bool{
-		$who->getServer()->getPluginManager()->callEvent($ev = new InventoryOpenEvent($this, $who));
+		$ev = new InventoryOpenEvent($this, $who);
+		$ev->call();
 		if($ev->isCancelled()){
 			return false;
 		}

src/pocketmine/inventory/ChestInventory.php

@@ -61,19 +61,29 @@ class ChestInventory extends ContainerInventory{
 		return $this->holder;
 	}
 
+	protected function getOpenSound() : int{
+		return LevelSoundEventPacket::SOUND_CHEST_OPEN;
+	}
+
+	protected function getCloseSound() : int{
+		return LevelSoundEventPacket::SOUND_CHEST_CLOSED;
+	}
+
 	public function onOpen(Player $who) : void{
 		parent::onOpen($who);
 
 		if(count($this->getViewers()) === 1 and $this->getHolder()->isValid()){
+			//TODO: this crap really shouldn't be managed by the inventory
 			$this->broadcastBlockEventPacket(true);
-			$this->getHolder()->getLevel()->broadcastLevelSoundEvent($this->getHolder()->add(0.5, 0.5, 0.5), LevelSoundEventPacket::SOUND_CHEST_OPEN);
+			$this->getHolder()->getLevel()->broadcastLevelSoundEvent($this->getHolder()->add(0.5, 0.5, 0.5), $this->getOpenSound());
 		}
 	}
 
 	public function onClose(Player $who) : void{
 		if(count($this->getViewers()) === 1 and $this->getHolder()->isValid()){
+			//TODO: this crap really shouldn't be managed by the inventory
 			$this->broadcastBlockEventPacket(false);
-			$this->getHolder()->getLevel()->broadcastLevelSoundEvent($this->getHolder()->add(0.5, 0.5, 0.5), LevelSoundEventPacket::SOUND_CHEST_CLOSED);
+			$this->getHolder()->getLevel()->broadcastLevelSoundEvent($this->getHolder()->add(0.5, 0.5, 0.5), $this->getCloseSound());
 		}
 		parent::onClose($who);
 	}
@@ -87,6 +97,6 @@ class ChestInventory extends ContainerInventory{
 		$pk->z = (int) $holder->z;
 		$pk->eventType = 1; //it's always 1 for a chest
 		$pk->eventData = $isOpen ? 1 : 0;
-		$holder->getLevel()->addChunkPacket($holder->getFloorX() >> 4, $holder->getFloorZ() >> 4, $pk);
+		$holder->getLevel()->broadcastPacketToViewers($holder, $pk);
 	}
 }

src/pocketmine/inventory/EnderChestInventory.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\inventory;
 
 use pocketmine\level\Position;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\types\WindowTypes;
 use pocketmine\tile\EnderChest;
 
@@ -58,6 +59,14 @@ class EnderChestInventory extends ChestInventory{
 		$this->holder->setLevel($enderChest->getLevel());
 	}
 
+	protected function getOpenSound() : int{
+		return LevelSoundEventPacket::SOUND_ENDERCHEST_OPEN;
+	}
+
+	protected function getCloseSound() : int{
+		return LevelSoundEventPacket::SOUND_ENDERCHEST_CLOSED;
+	}
+
 	/**
 	 * This override is here for documentation and code completion purposes only.
 	 * @return Position

src/pocketmine/inventory/EntityInventoryEventProcessor.php

@@ -26,7 +26,6 @@ namespace pocketmine\inventory;
 use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityInventoryChangeEvent;
 use pocketmine\item\Item;
-use pocketmine\Server;
 
 class EntityInventoryEventProcessor implements InventoryEventProcessor{
 	/** @var Entity */
@@ -37,7 +36,8 @@ class EntityInventoryEventProcessor implements InventoryEventProcessor{
 	}
 
 	public function onSlotChange(Inventory $inventory, int $slot, Item $oldItem, Item $newItem) : ?Item{
-		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityInventoryChangeEvent($this->entity, $oldItem, $newItem, $slot));
+		$ev = new EntityInventoryChangeEvent($this->entity, $oldItem, $newItem, $slot);
+		$ev->call();
 		if($ev->isCancelled()){
 			return null;
 		}

src/pocketmine/inventory/Inventory.php

@@ -244,6 +244,7 @@ interface Inventory{
 	 * Returns whether the specified slot exists in the inventory.
 	 *
 	 * @param int $slot
+	 *
 	 * @return bool
 	 */
 	public function slotExists(int $slot) : bool;

src/pocketmine/inventory/PlayerInventory.php

@@ -69,7 +69,8 @@ class PlayerInventory extends BaseInventory{
 			return false;
 		}
 
-		$this->getHolder()->getLevel()->getServer()->getPluginManager()->callEvent($ev = new PlayerItemHeldEvent($this->getHolder(), $this->getItem($hotbarSlot), $hotbarSlot));
+		$ev = new PlayerItemHeldEvent($this->getHolder(), $this->getItem($hotbarSlot), $hotbarSlot);
+		$ev->call();
 
 		if($ev->isCancelled()){
 			$this->sendHeldItem($this->getHolder());
@@ -87,6 +88,7 @@ class PlayerInventory extends BaseInventory{
 
 	/**
 	 * @param int $slot
+	 *
 	 * @throws \InvalidArgumentException
 	 */
 	private function throwIfNotHotbarSlot(int $slot){
@@ -99,6 +101,7 @@ class PlayerInventory extends BaseInventory{
 	 * Returns the item in the specified hotbar slot.
 	 *
 	 * @param int $hotbarSlot
+	 *
 	 * @return Item
 	 *
 	 * @throws \InvalidArgumentException if the hotbar slot index is out of range
@@ -159,6 +162,7 @@ class PlayerInventory extends BaseInventory{
 
 	/**
 	 * Sends the currently-held item to specified targets.
+	 *
 	 * @param Player|Player[] $target
 	 */
 	public function sendHeldItem($target){

src/pocketmine/inventory/ShapedRecipe.php

@@ -46,11 +46,11 @@ class ShapedRecipe implements CraftingRecipe{
 	 *     Array of 1, 2, or 3 strings representing the rows of the recipe.
 	 *     This accepts an array of 1, 2 or 3 strings. Each string should be of the same length and must be at most 3
 	 *     characters long. Each character represents a unique type of ingredient. Spaces are interpreted as air.
-	 * @param Item[] $ingredients <br>
+	 * @param Item[]   $ingredients <br>
 	 *     Char => Item map of items to be set into the shape.
 	 *     This accepts an array of Items, indexed by character. Every unique character (except space) in the shape
 	 *     array MUST have a corresponding item in this list. Space character is automatically treated as air.
-	 * @param Item[] $results List of items that this recipe produces when crafted.
+	 * @param Item[]   $results List of items that this recipe produces when crafted.
 	 *
 	 * Note: Recipes **do not** need to be square. Do NOT add padding for empty rows/columns.
 	 */

src/pocketmine/inventory/transaction/CraftingTransaction.php

@@ -134,7 +134,8 @@ class CraftingTransaction extends InventoryTransaction{
 	}
 
 	protected function callExecuteEvent() : bool{
-		$this->source->getServer()->getPluginManager()->callEvent($ev = new CraftItemEvent($this, $this->recipe, $this->repetitions, $this->inputs, $this->outputs));
+		$ev = new CraftItemEvent($this, $this->recipe, $this->repetitions, $this->inputs, $this->outputs);
+		$ev->call();
 		return !$ev->isCancelled();
 	}
 

src/pocketmine/inventory/transaction/InventoryTransaction.php

@@ -29,7 +29,6 @@ use pocketmine\inventory\transaction\action\InventoryAction;
 use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\item\Item;
 use pocketmine\Player;
-use pocketmine\Server;
 
 /**
  * This InventoryTransaction only allows doing Transaction between one / two inventories
@@ -250,7 +249,8 @@ class InventoryTransaction{
 	}
 
 	protected function callExecuteEvent() : bool{
-		Server::getInstance()->getPluginManager()->callEvent($ev = new InventoryTransactionEvent($this));
+		$ev = new InventoryTransactionEvent($this);
+		$ev->call();
 		return !$ev->isCancelled();
 	}
 

src/pocketmine/inventory/transaction/action/DropItemAction.php

@@ -42,7 +42,8 @@ class DropItemAction extends InventoryAction{
 	}
 
 	public function onPreExecute(Player $source) : bool{
-		$source->getServer()->getPluginManager()->callEvent($ev = new PlayerDropItemEvent($source, $this->targetItem));
+		$ev = new PlayerDropItemEvent($source, $this->targetItem);
+		$ev->call();
 		if($ev->isCancelled()){
 			return false;
 		}
@@ -54,6 +55,7 @@ class DropItemAction extends InventoryAction{
 	 * Drops the target item in front of the player.
 	 *
 	 * @param Player $source
+	 *
 	 * @return bool
 	 */
 	public function execute(Player $source) : bool{

src/pocketmine/item/Armor.php

@@ -53,6 +53,7 @@ abstract class Armor extends Durable{
 
 	/**
 	 * Sets the dyed colour of this armour piece. This generally only applies to leather armour.
+	 *
 	 * @param Color $color
 	 */
 	public function setCustomColor(Color $color) : void{

src/pocketmine/item/Bow.php

@@ -79,7 +79,7 @@ class Bow extends Tool{
 				$entity->setBaseDamage($entity->getBaseDamage() + (($powerLevel + 1) / 2));
 			}
 			if($this->hasEnchantment(Enchantment::FLAME)){
-				$entity->setOnFire($entity->getFireTicks() * 20 + 100);
+				$entity->setOnFire(intdiv($entity->getFireTicks(), 20) + 100);
 			}
 			$ev = new EntityShootBowEvent($player, $this, $entity, $force);
 
@@ -87,7 +87,7 @@ class Bow extends Tool{
 				$ev->setCancelled();
 			}
 
-			$player->getServer()->getPluginManager()->callEvent($ev);
+			$ev->call();
 
 			$entity = $ev->getProjectile(); //This might have been changed by plugins
 
@@ -104,7 +104,8 @@ class Bow extends Tool{
 				}
 
 				if($entity instanceof Projectile){
-					$player->getServer()->getPluginManager()->callEvent($projectileEv = new ProjectileLaunchEvent($entity));
+					$projectileEv = new ProjectileLaunchEvent($entity);
+					$projectileEv->call();
 					if($projectileEv->isCancelled()){
 						$ev->getProjectile()->flagForDespawn();
 					}else{

src/pocketmine/item/Bucket.php

@@ -57,9 +57,10 @@ class Bucket extends Item implements Consumable{
 			if($blockClicked instanceof Liquid and $blockClicked->getDamage() === 0){
 				$stack = clone $this;
 
-				$resultItem = $stack->pop();
-				$resultItem->setDamage($blockClicked->getFlowingForm()->getId());
-				$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem));
+				$stack->pop();
+				$resultItem = ItemFactory::get(Item::BUCKET, $blockClicked->getFlowingForm()->getId());
+				$ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					$player->getLevel()->setBlock($blockClicked, BlockFactory::get(Block::AIR), true, true);
 					$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $blockClicked->getBucketFillSound());
@@ -80,9 +81,8 @@ class Bucket extends Item implements Consumable{
 				}
 			}
 		}elseif($resultBlock instanceof Liquid and $blockReplace->canBeReplaced()){
-			$resultItem = clone $this;
-			$resultItem->setDamage(0);
-			$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, $resultItem));
+			$ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, ItemFactory::get(Item::BUCKET));
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$player->getLevel()->setBlock($blockReplace, $resultBlock->getFlowingForm(), true, true);
 				$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());

src/pocketmine/item/ChorusFruit.php

@@ -47,17 +47,17 @@ class ChorusFruit extends Food{
 	}
 
 	public function onConsume(Living $consumer){
+		$level = $consumer->getLevel();
+		assert($level !== null);
+
 		$minX = $consumer->getFloorX() - 8;
-		$minY = $consumer->getFloorY() - 8;
+		$minY = min($consumer->getFloorY(), $consumer->getLevel()->getWorldHeight()) - 8;
 		$minZ = $consumer->getFloorZ() - 8;
 
 		$maxX = $minX + 16;
 		$maxY = $minY + 16;
 		$maxZ = $minZ + 16;
 
-		$level = $consumer->getLevel();
-		assert($level !== null);
-
 		for($attempts = 0; $attempts < 16; ++$attempts){
 			$x = mt_rand($minX, $maxX);
 			$y = mt_rand($minY, $maxY);

src/pocketmine/item/Durable.php

@@ -38,6 +38,7 @@ abstract class Durable extends Item{
 
 	/**
 	 * Sets whether the item will take damage when used.
+	 *
 	 * @param bool $value
 	 */
 	public function setUnbreakable(bool $value = true){
@@ -46,6 +47,7 @@ abstract class Durable extends Item{
 
 	/**
 	 * Applies damage to the item.
+	 *
 	 * @param int $amount
 	 *
 	 * @return bool if any damage was applied to the item

src/pocketmine/item/Item.php

@@ -523,6 +523,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * @param string $name
+	 *
 	 * @return NamedTag|null
 	 */
 	public function getNamedTagEntry(string $name) : ?NamedTag{
@@ -557,6 +558,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * Sets the Item's NBT from the supplied CompoundTag object.
+	 *
 	 * @param CompoundTag $tag
 	 *
 	 * @return Item
@@ -589,6 +591,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * @param int $count
+	 *
 	 * @return Item
 	 */
 	public function setCount(int $count) : Item{
@@ -669,6 +672,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * @param int $meta
+	 *
 	 * @return Item
 	 */
 	public function setDamage(int $meta) : Item{
@@ -779,6 +783,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 * Returns whether the item was changed, for example count decrease or durability change.
 	 *
 	 * @param Player $player
+	 *
 	 * @return bool
 	 */
 	public function onReleaseUsing(Player $player) : bool{
@@ -844,6 +849,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * Returns whether the specified item stack has the same ID, damage, NBT and count as this item stack.
+	 *
 	 * @param Item $other
 	 *
 	 * @return bool
@@ -888,6 +894,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 * Returns an Item from properties created in an array by {@link Item#jsonSerialize}
 	 *
 	 * @param array $data
+	 *
 	 * @return Item
 	 */
 	final public static function jsonDeserialize(array $data) : Item{
@@ -956,7 +963,12 @@ class Item implements ItemIds, \JsonSerializable{
 		if($idTag instanceof ShortTag){
 			$item = ItemFactory::get($idTag->getValue(), $meta, $count);
 		}elseif($idTag instanceof StringTag){ //PC item save format
-			$item = ItemFactory::fromString($idTag->getValue());
+			try{
+				$item = ItemFactory::fromString($idTag->getValue());
+			}catch(\InvalidArgumentException $e){
+				//TODO: improve error handling
+				return ItemFactory::get(Item::AIR, 0, 0);
+			}
 			$item->setDamage($meta);
 			$item->setCount($count);
 		}else{

src/pocketmine/item/PaintingItem.php

@@ -37,67 +37,68 @@ class PaintingItem extends Item{
 	}
 
 	public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
-		if(!$blockClicked->isTransparent() and $face > 1 and !$blockReplace->isSolid()){
-			/** @var PaintingMotive[] $motives */
-			$motives = [];
+		if($face === Vector3::SIDE_DOWN or $face === Vector3::SIDE_UP){
+			return false;
+		}
 
-			$totalDimension = 0;
-			foreach(PaintingMotive::getAll() as $motive){
-				$currentTotalDimension = $motive->getHeight() + $motive->getWidth();
-				if($currentTotalDimension < $totalDimension){
-					continue;
+		$motives = [];
+
+		$totalDimension = 0;
+		foreach(PaintingMotive::getAll() as $motive){
+			$currentTotalDimension = $motive->getHeight() + $motive->getWidth();
+			if($currentTotalDimension < $totalDimension){
+				continue;
+			}
+
+			if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){
+				if($currentTotalDimension > $totalDimension){
+					$totalDimension = $currentTotalDimension;
+					/*
+					 * This drops all motive possibilities smaller than this
+					 * We use the total of height + width to allow equal chance of horizontal/vertical paintings
+					 * when there is an L-shape of space available.
+					 */
+					$motives = [];
 				}
 
-				if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){
-					if($currentTotalDimension > $totalDimension){
-						$totalDimension = $currentTotalDimension;
-						/*
-						 * This drops all motive possibilities smaller than this
-						 * We use the total of height + width to allow equal chance of horizontal/vertical paintings
-						 * when there is an L-shape of space available.
-						 */
-						$motives = [];
-					}
-
-					$motives[] = $motive;
-				}
+				$motives[] = $motive;
 			}
+		}
 
-			if(empty($motives)){ //No space available
-				return false;
-			}
+		if(empty($motives)){ //No space available
+			return false;
+		}
 
-			/** @var PaintingMotive $motive */
-			$motive = $motives[array_rand($motives)];
+		/** @var PaintingMotive $motive */
+		$motive = $motives[array_rand($motives)];
 
-			static $directions = [
-				Vector3::SIDE_SOUTH => 0,
-				Vector3::SIDE_WEST => 1,
-				Vector3::SIDE_NORTH => 2,
-				Vector3::SIDE_EAST => 3
-			];
+		static $directions = [
+			Vector3::SIDE_SOUTH => 0,
+			Vector3::SIDE_WEST => 1,
+			Vector3::SIDE_NORTH => 2,
+			Vector3::SIDE_EAST => 3
+		];
 
-			$direction = $directions[$face] ?? -1;
-			if($direction === -1){
-				return false;
-			}
+		$direction = $directions[$face] ?? -1;
+		if($direction === -1){
+			return false;
+		}
 
-			$nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0);
-			$nbt->setByte("Direction", $direction);
-			$nbt->setString("Motive", $motive->getName());
-			$nbt->setInt("TileX", $blockClicked->getFloorX());
-			$nbt->setInt("TileY", $blockClicked->getFloorY());
-			$nbt->setInt("TileZ", $blockClicked->getFloorZ());
+		$nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0);
+		$nbt->setByte("Direction", $direction);
+		$nbt->setString("Motive", $motive->getName());
+		$nbt->setInt("TileX", $blockClicked->getFloorX());
+		$nbt->setInt("TileY", $blockClicked->getFloorY());
+		$nbt->setInt("TileZ", $blockClicked->getFloorZ());
 
-			$entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt);
+		$entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt);
 
-			if($entity instanceof Entity){
-				--$this->count;
-				$entity->spawnToAll();
+		if($entity instanceof Entity){
+			--$this->count;
+			$entity->spawnToAll();
 
-				$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
-				return true;
-			}
+			$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
+			return true;
 		}
 
 		return false;

src/pocketmine/item/Potion.php

@@ -71,9 +71,8 @@ class Potion extends Item implements Consumable{
 	 * Returns a list of effects applied by potions with the specified ID.
 	 *
 	 * @param int $id
-	 * @return EffectInstance[]
 	 *
-	 * @throws \InvalidArgumentException if the potion type is unknown
+	 * @return EffectInstance[]
 	 */
 	public static function getPotionEffectsById(int $id) : array{
 		switch($id){
@@ -213,7 +212,7 @@ class Potion extends Item implements Consumable{
 				];
 		}
 
-		throw new \InvalidArgumentException("Unknown potion type $id");
+		return [];
 	}
 
 	public function __construct(int $meta = 0){

src/pocketmine/item/ProjectileItem.php

@@ -24,11 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\entity\Entity;
+use pocketmine\entity\EntityIds;
 use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\entity\ProjectileLaunchEvent;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\Player;
 
 abstract class ProjectileItem extends Item{
@@ -58,15 +59,14 @@ abstract class ProjectileItem extends Item{
 		$this->count--;
 
 		if($projectile instanceof Projectile){
-			$player->getServer()->getPluginManager()->callEvent($projectileEv = new ProjectileLaunchEvent($projectile));
+			$projectileEv = new ProjectileLaunchEvent($projectile);
+			$projectileEv->call();
 			if($projectileEv->isCancelled()){
 				$projectile->flagForDespawn();
 			}else{
 				$projectile->spawnToAll();
 
-				//319 is the Player's entity type ID in MCPE, with all its flags (which we don't know)
-				//without this, it doesn't work at all.
-				$player->getLevel()->broadcastLevelSoundEvent($player, LevelSoundEventPacket::SOUND_THROW, 319);
+				$player->getLevel()->broadcastLevelSoundEvent($player, LevelSoundEventPacket::SOUND_THROW, 0, EntityIds::PLAYER);
 			}
 		}elseif($projectile !== null){
 			$projectile->spawnToAll();

src/pocketmine/item/WritableBook.php

@@ -137,7 +137,7 @@ class WritableBook extends Item{
 	/**
 	 * Inserts a new page with the given text and moves other pages upwards.
 	 *
-	 * @param int $pageId
+	 * @param int    $pageId
 	 * @param string $pageText
 	 *
 	 * @return bool indicating success

src/pocketmine/item/enchantment/EnchantmentInstance.php

@@ -69,6 +69,7 @@ class EnchantmentInstance{
 
 	/**
 	 * Sets the level of the enchantment.
+	 *
 	 * @param int $level
 	 *
 	 * @return $this

src/pocketmine/item/enchantment/ProtectionEnchantment.php

@@ -62,6 +62,7 @@ class ProtectionEnchantment extends Enchantment{
 
 	/**
 	 * Returns the base EPF this enchantment type offers for the given enchantment level.
+	 *
 	 * @param int $level
 	 *
 	 * @return int
@@ -72,6 +73,7 @@ class ProtectionEnchantment extends Enchantment{
 
 	/**
 	 * Returns whether this enchantment type offers protection from the specified damage source's cause.
+	 *
 	 * @param EntityDamageEvent $event
 	 *
 	 * @return bool