Release 3.4.3

this should just default to 2 instead of shitting its pants.

composer.json

@@ -29,7 +29,8 @@
       "pocketmine/binaryutils": "^0.1.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"
    },
    "autoload": {
       "psr-4": {

composer.lock

@@ -4,20 +4,60 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3536995c56bfc3dbd6ccc0994e88a636",
+    "content-hash": "2d120a3dd7d68958809c3662d1cb7c99",
     "packages": [
         {
-            "name": "pocketmine/binaryutils",
-            "version": "0.1.1",
+            "name": "daverandom/callback-validator",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
+                "url": "https://github.com/DaveRandom/CallbackValidator.git",
+                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
-                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be",
+                "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.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/BinaryUtils.git",
+                "reference": "2c1628f08a9cdeca4d3c682e13f24420944ca845"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/2c1628f08a9cdeca4d3c682e13f24420944ca845",
+                "reference": "2c1628f08a9cdeca4d3c682e13f24420944ca845",
                 "shasum": ""
             },
             "require": {
@@ -35,10 +75,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.2",
                 "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2018-08-26T18:11:05+00:00"
+            "time": "2018-12-22T12:29:30+00:00"
         },
         {
             "name": "pocketmine/math",
@@ -76,19 +116,20 @@
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.2",
+            "version": "0.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "474f0cf0a47656d0122b4f3f71302e694ed6977b"
+                "reference": "291bf5cc2a94500eada1edbda51d15bed25a1e1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/474f0cf0a47656d0122b4f3f71302e694ed6977b",
-                "reference": "474f0cf0a47656d0122b4f3f71302e694ed6977b",
+                "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 +150,10 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.2",
+                "source": "https://github.com/pmmp/NBT/tree/0.2.3",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2018-10-12T08:26:44+00:00"
+            "time": "2018-12-03T16:08:28+00:00"
         },
         {
             "name": "pocketmine/raklib",
@@ -226,7 +267,8 @@
     "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",
@@ -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

@@ -173,6 +173,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 +276,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 +285,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 */
@@ -546,9 +543,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 +621,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * @param Plugin $plugin
 	 * @param string $name
-	 * @param bool $value
+	 * @param bool   $value
 	 *
 	 * @return PermissionAttachment
 	 */
@@ -800,7 +794,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 +962,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 +972,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 +1012,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 +1025,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());
 		}
@@ -1220,7 +1215,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 +1243,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 +1283,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 +1323,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 +1348,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 +1543,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 +1561,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 +1591,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 +1608,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 +1631,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 +1639,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 +1692,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 +1706,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;
-					}
-				}
 			}
 		}
 
@@ -1898,7 +1863,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 +2043,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());
 
@@ -2179,8 +2146,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 +2157,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 +2201,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 +2231,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{
@@ -2447,8 +2413,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 +2558,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);
@@ -2696,7 +2661,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());
 		}
@@ -2726,7 +2691,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 					$ev->setCancelled();
 				}
 
-				$this->getServer()->getPluginManager()->callEvent($ev);
+				$ev->call();
 				if($ev->isCancelled()){
 					$this->inventory->sendHeldItem($this);
 					break;
@@ -2805,7 +2770,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 +2780,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 +2793,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 +2811,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 +2839,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 +2858,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 +2931,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 +3004,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 +3040,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 +3072,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 +3115,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 +3139,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 +3243,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();
@@ -3423,7 +3395,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->stopSleep();
 
 				if($this->spawned){
-					$this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message, $reason));
+					$ev = new PlayerQuitEvent($this, $message, $reason);
+					$ev->call();
 					if($ev->getQuitMessage() != ""){
 						$this->server->broadcastMessage($ev->getQuitMessage());
 					}
@@ -3511,11 +3484,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");
 		}
@@ -3552,7 +3523,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);
 		}
 	}
 
@@ -3571,7 +3542,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){
@@ -3606,7 +3578,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);
@@ -3804,6 +3777,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){
@@ -3811,10 +3787,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)){

src/pocketmine/PocketMine.php

@@ -37,7 +37,7 @@ namespace pocketmine {
 	use pocketmine\wizard\SetupWizard;
 
 	const NAME = "PocketMine-MP";
-	const BASE_VERSION = "3.3.0";
+	const BASE_VERSION = "3.4.3";
 	const IS_DEVELOPMENT_BUILD = false;
 	const BUILD_NUMBER = 0;
 

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);
 	}
@@ -2388,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);
 				}
@@ -2525,7 +2544,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/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/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/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/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,6 +24,8 @@ 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\math\AxisAlignedBB;
@@ -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->broadcastLevelSoundEvent($this->add(0.5, 0.5, 0.5), LevelSoundEventPacket::SOUND_FIZZ, (int) ((2.6 + (lcg_value() - lcg_value()) * 0.8) * 1000));
+		}
 		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/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/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/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

@@ -95,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);
@@ -171,7 +171,7 @@ class Attribute{
 	}
 
 	public function resetToDefault() : void{
-		$this->setValue($this->getDefaultValue());
+		$this->setValue($this->getDefaultValue(), true);
 	}
 
 	public function getValue() : float{

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

@@ -264,8 +264,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);
 
@@ -346,7 +346,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),
@@ -516,7 +516,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");
 		}
@@ -563,7 +563,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();
 
@@ -637,6 +637,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;
@@ -905,7 +908,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;
 		}
@@ -919,7 +922,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;
 		}
@@ -936,6 +939,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{
@@ -1149,34 +1153,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{
@@ -1394,7 +1394,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		Timings::$timerEntityBaseTick->stopTiming();
 
 
-
 		$this->timings->stopTiming();
 
 		//if($this->isStatic())
@@ -1808,7 +1807,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);
@@ -1841,7 +1840,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;
 			}
@@ -1874,7 +1874,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;
 		}
@@ -1900,7 +1901,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;
 			}
@@ -1953,7 +1955,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);
@@ -1964,7 +1966,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);
 			}
@@ -2026,7 +2028,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();
@@ -2075,6 +2077,7 @@ 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{

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;
 		}
@@ -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;
@@ -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/FallingBlock.php

@@ -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

@@ -78,7 +78,7 @@ class ItemEntity extends Entity{
 		}
 
 
-		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
+		(new ItemSpawnEvent($this))->call();
 	}
 
 	public function entityBaseTick(int $tickDiff = 1) : bool{
@@ -96,7 +96,8 @@ class ItemEntity extends Entity{
 
 			$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{
@@ -208,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

@@ -186,7 +186,7 @@ class Arrow extends Projectile{
 			$ev->setCancelled();
 		}
 
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 		if($ev->isCancelled()){
 			return;
 		}

src/pocketmine/entity/projectile/Projectile.php

@@ -241,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){
@@ -315,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;
@@ -151,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/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;
@@ -67,4 +70,37 @@ abstract class Event{
 		/** @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/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/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/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

@@ -87,6 +87,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/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

@@ -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

@@ -59,7 +59,8 @@ class Bucket extends Item implements Consumable{
 
 				$stack->pop();
 				$resultItem = ItemFactory::get(Item::BUCKET, $blockClicked->getFlowingForm()->getId());
-				$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem));
+				$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,7 +81,8 @@ class Bucket extends Item implements Consumable{
 				}
 			}
 		}elseif($resultBlock instanceof Liquid and $blockReplace->canBeReplaced()){
-			$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, ItemFactory::get(Item::BUCKET)));
+			$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/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{

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,6 +71,7 @@ class Potion extends Item implements Consumable{
 	 * Returns a list of effects applied by potions with the specified ID.
 	 *
 	 * @param int $id
+	 *
 	 * @return EffectInstance[]
 	 */
 	public static function getPotionEffectsById(int $id) : array{

src/pocketmine/item/ProjectileItem.php

@@ -27,8 +27,8 @@ use pocketmine\entity\Entity;
 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,7 +58,8 @@ 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{

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

src/pocketmine/level/Explosion.php

@@ -153,7 +153,8 @@ class Explosion{
 		$yield = (1 / $this->size) * 100;
 
 		if($this->what instanceof Entity){
-			$this->level->getServer()->getPluginManager()->callEvent($ev = new EntityExplodeEvent($this->what, $this->source, $this->affectedBlocks, $yield));
+			$ev = new EntityExplodeEvent($this->what, $this->source, $this->affectedBlocks, $yield);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}else{
@@ -234,7 +235,8 @@ class Explosion{
 					continue;
 				}
 				if(!isset($this->affectedBlocks[$index = Level::blockHash($sideBlock->x, $sideBlock->y, $sideBlock->z)]) and !isset($updateBlocks[$index])){
-					$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockUpdateEvent($this->level->getBlockAt($sideBlock->x, $sideBlock->y, $sideBlock->z)));
+					$ev = new BlockUpdateEvent($this->level->getBlockAt($sideBlock->x, $sideBlock->y, $sideBlock->z));
+					$ev->call();
 					if(!$ev->isCancelled()){
 						foreach($this->level->getNearbyEntities(new AxisAlignedBB($sideBlock->x - 1, $sideBlock->y - 1, $sideBlock->z - 1, $sideBlock->x + 2, $sideBlock->y + 2, $sideBlock->z + 2)) as $entity){
 							$entity->onNearbyBlockChange();
@@ -251,7 +253,7 @@ class Explosion{
 		$pk->position = $this->source->asVector3();
 		$pk->radius = $this->size;
 		$pk->records = $send;
-		$this->level->addChunkPacket($source->getFloorX() >> 4, $source->getFloorZ() >> 4, $pk);
+		$this->level->broadcastPacketToViewers($source, $pk);
 
 		$this->level->addParticle(new HugeExplodeSeedParticle($source));
 		$this->level->broadcastLevelSoundEvent($source, LevelSoundEventPacket::SOUND_EXPLODE);

src/pocketmine/level/Level.php

@@ -241,12 +241,20 @@ class Level implements ChunkManager, Metadatable{
 	/** @var int */
 	public $tickRateCounter = 0;
 
+	/** @var bool */
+	private $doingTick = false;
+
 	/** @var string|Generator */
 	private $generator;
 
 	/** @var bool */
 	private $closed = false;
 
+	/** @var BlockLightUpdate|null */
+	private $blockLightUpdate = null;
+	/** @var SkyLightUpdate|null */
+	private $skyLightUpdate = null;
+
 	public static function chunkHash(int $x, int $z) : int{
 		return (($x & 0xFFFFFFFF) << 32) | ($z & 0xFFFFFFFF);
 	}
@@ -284,6 +292,7 @@ class Level implements ChunkManager, Metadatable{
 
 	/**
 	 * @param string $str
+	 *
 	 * @return int
 	 */
 	public static function getDifficultyFromString(string $str) : int{
@@ -441,13 +450,14 @@ class Level implements ChunkManager, Metadatable{
 		if(!is_array($pk)){
 			$pk = [$pk];
 		}
-
-		if($players === null){
-			foreach($pk as $e){
-				$this->addChunkPacket($sound->getFloorX() >> 4, $sound->getFloorZ() >> 4, $e);
+		if(!empty($pk)){
+			if($players === null){
+				foreach($pk as $e){
+					$this->broadcastPacketToViewers($sound, $e);
+				}
+			}else{
+				$this->server->batchPackets($players, $pk, false);
 			}
-		}else{
-			$this->server->batchPackets($players, $pk, false);
 		}
 	}
 
@@ -456,13 +466,14 @@ class Level implements ChunkManager, Metadatable{
 		if(!is_array($pk)){
 			$pk = [$pk];
 		}
-
-		if($players === null){
-			foreach($pk as $e){
-				$this->addChunkPacket($particle->getFloorX() >> 4, $particle->getFloorZ() >> 4, $e);
+		if(!empty($pk)){
+			if($players === null){
+				foreach($pk as $e){
+					$this->broadcastPacketToViewers($particle, $e);
+				}
+			}else{
+				$this->server->batchPackets($players, $pk, false);
 			}
-		}else{
-			$this->server->batchPackets($players, $pk, false);
 		}
 	}
 
@@ -479,10 +490,10 @@ class Level implements ChunkManager, Metadatable{
 		$pk->data = $data;
 		if($pos !== null){
 			$pk->position = $pos->asVector3();
-			$this->addChunkPacket($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4, $pk);
+			$this->broadcastPacketToViewers($pos, $pk);
 		}else{
 			$pk->position = null;
-			$this->addGlobalPacket($pk);
+			$this->broadcastGlobalPacket($pk);
 		}
 	}
 
@@ -504,7 +515,7 @@ class Level implements ChunkManager, Metadatable{
 		$pk->isBabyMob = $isBabyMob;
 		$pk->disableRelativeVolume = $disableRelativeVolume;
 		$pk->position = $pos->asVector3();
-		$this->addChunkPacket($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4, $pk);
+		$this->broadcastPacketToViewers($pos, $pk);
 	}
 
 	public function getAutoSave() : bool{
@@ -523,8 +534,12 @@ class Level implements ChunkManager, Metadatable{
 	 * @param bool $force default false, force unload of default level
 	 *
 	 * @return bool
+	 * @throws \InvalidStateException if trying to unload a level during level tick
 	 */
 	public function unload(bool $force = false) : bool{
+		if($this->doingTick and !$force){
+			throw new \InvalidStateException("Cannot unload a level during level tick");
+		}
 
 		$ev = new LevelUnloadEvent($this);
 
@@ -532,7 +547,7 @@ class Level implements ChunkManager, Metadatable{
 			$ev->setCancelled(true);
 		}
 
-		$this->server->getPluginManager()->callEvent($ev);
+		$ev->call();
 
 		if(!$force and $ev->isCancelled()){
 			return false;
@@ -583,6 +598,16 @@ class Level implements ChunkManager, Metadatable{
 		return $this->chunkLoaders[Level::chunkHash($chunkX, $chunkZ)] ?? [];
 	}
 
+	/**
+	 * Returns an array of players who have the target position within their view distance.
+	 * @param Vector3 $pos
+	 *
+	 * @return Player[]
+	 */
+	public function getViewersForPosition(Vector3 $pos) : array{
+		return $this->getChunkPlayers($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4);
+	}
+
 	/**
 	 * Queues a DataPacket to be sent to all players using the chunk at the specified X/Z coordinates at the end of the
 	 * current tick.
@@ -600,7 +625,27 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * Queues a DataPacket to be sent to everyone in the Level at the end of the current tick.
+	 * Broadcasts a packet to every player who has the target position within their view distance.
+	 *
+	 * @param Vector3    $pos
+	 * @param DataPacket $packet
+	 */
+	public function broadcastPacketToViewers(Vector3 $pos, DataPacket $packet) : void{
+		$this->addChunkPacket($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4, $packet);
+	}
+
+	/**
+	 * Broadcasts a packet to every player in the level.
+	 *
+	 * @param DataPacket $packet
+	 */
+	public function broadcastGlobalPacket(DataPacket $packet) : void{
+		$this->globalPackets[] = $packet;
+	}
+
+	/**
+	 * @deprecated
+	 * @see Level::broadcastGlobalPacket()
 	 *
 	 * @param DataPacket $packet
 	 */
@@ -692,7 +737,16 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		$this->timings->doTick->startTiming();
+		$this->doingTick = true;
+		try{
+			$this->actuallyDoTick($currentTick);
+		}finally{
+			$this->doingTick = false;
+			$this->timings->doTick->stopTiming();
+		}
+	}
 
+	protected function actuallyDoTick(int $currentTick) : void{
 		$this->checkTime();
 
 		$this->sunAnglePercentage = $this->computeSunAnglePercentage(); //Sun angle depends on the current time
@@ -727,7 +781,8 @@ class Level implements ChunkManager, Metadatable{
 			$block = $this->getBlockAt($x, $y, $z);
 			$block->clearCaches(); //for blocks like fences, force recalculation of connected AABBs
 
-			$this->server->getPluginManager()->callEvent($ev = new BlockUpdateEvent($block));
+			$ev = new BlockUpdateEvent($block);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				$block->onNearbyBlockChange();
 			}
@@ -764,6 +819,8 @@ class Level implements ChunkManager, Metadatable{
 		$this->tickChunks();
 		$this->timings->doTickTiles->stopTiming();
 
+		$this->executeQueuedLightUpdates();
+
 		if(count($this->changedBlocks) > 0){
 			if(count($this->players) > 0){
 				foreach($this->changedBlocks as $index => $blocks){
@@ -811,8 +868,6 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		$this->chunkPackets = [];
-
-		$this->timings->doTick->stopTiming();
 	}
 
 	public function checkSleep(){
@@ -875,7 +930,7 @@ class Level implements ChunkManager, Metadatable{
 					$pk->blockRuntimeId = $b->getRuntimeId();
 				}else{
 					$fullBlock = $this->getFullBlock($b->x, $b->y, $b->z);
-					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4,  $fullBlock & 0xf);
+					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4, $fullBlock & 0xf);
 				}
 
 				$pk->flags = $first ? $flags : UpdateBlockPacket::FLAG_NONE;
@@ -897,7 +952,7 @@ class Level implements ChunkManager, Metadatable{
 					$pk->blockRuntimeId = $b->getRuntimeId();
 				}else{
 					$fullBlock = $this->getFullBlock($b->x, $b->y, $b->z);
-					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4,  $fullBlock & 0xf);
+					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4, $fullBlock & 0xf);
 				}
 
 				$pk->flags = $flags;
@@ -971,13 +1026,20 @@ class Level implements ChunkManager, Metadatable{
 		foreach($this->chunkTickList as $index => $loaders){
 			Level::getXZ($index, $chunkX, $chunkZ);
 
-			if(($chunk = $this->chunks[$index] ?? null) === null){
-				unset($this->chunkTickList[$index]);
-				continue;
-			}elseif($loaders <= 0){
+			for($cx = -1; $cx <= 1; ++$cx){
+				for($cz = -1; $cz <= 1; ++$cz){
+					if(!isset($this->chunks[Level::chunkHash($chunkX + $cx, $chunkZ + $cz)])){
+						unset($this->chunkTickList[$index]);
+						goto skip_to_next; //no "continue 3" thanks!
+					}
+				}
+			}
+
+			if($loaders <= 0){
 				unset($this->chunkTickList[$index]);
 			}
 
+			$chunk = $this->chunks[$index];
 			foreach($chunk->getEntities() as $entity){
 				$entity->scheduleUpdate();
 			}
@@ -1006,6 +1068,8 @@ class Level implements ChunkManager, Metadatable{
 					}
 				}
 			}
+
+			skip_to_next: //dummy label to break out of nested loops
 		}
 
 		if($this->clearChunksOnTick){
@@ -1028,7 +1092,7 @@ class Level implements ChunkManager, Metadatable{
 			return false;
 		}
 
-		$this->server->getPluginManager()->callEvent(new LevelSaveEvent($this));
+		(new LevelSaveEvent($this))->call();
 
 		$this->provider->setTime($this->time);
 		$this->saveChunks();
@@ -1409,22 +1473,21 @@ class Level implements ChunkManager, Metadatable{
 			$newHeightMap = $oldHeightMap;
 		}
 
-		$update = new SkyLightUpdate($this);
-
+		if($this->skyLightUpdate === null){
+			$this->skyLightUpdate = new SkyLightUpdate($this);
+		}
 		if($newHeightMap > $oldHeightMap){ //Heightmap increase, block placed, remove sky light
 			for($i = $y; $i >= $oldHeightMap; --$i){
-				$update->setAndUpdateLight($x, $i, $z, 0); //Remove all light beneath, adjacent recalculation will handle the rest.
+				$this->skyLightUpdate->setAndUpdateLight($x, $i, $z, 0); //Remove all light beneath, adjacent recalculation will handle the rest.
 			}
 		}elseif($newHeightMap < $oldHeightMap){ //Heightmap decrease, block changed or removed, add sky light
 			for($i = $y; $i >= $newHeightMap; --$i){
-				$update->setAndUpdateLight($x, $i, $z, 15);
+				$this->skyLightUpdate->setAndUpdateLight($x, $i, $z, 15);
 			}
 		}else{ //No heightmap change, block changed "underground"
-			$update->setAndUpdateLight($x, $y, $z, max(0, $this->getHighestAdjacentBlockSkyLight($x, $y, $z) - BlockFactory::$lightFilter[$sourceId]));
+			$this->skyLightUpdate->setAndUpdateLight($x, $y, $z, max(0, $this->getHighestAdjacentBlockSkyLight($x, $y, $z) - BlockFactory::$lightFilter[$sourceId]));
 		}
 
-		$update->execute();
-
 		$this->timings->doBlockSkyLightUpdates->stopTiming();
 	}
 
@@ -1454,13 +1517,30 @@ class Level implements ChunkManager, Metadatable{
 		$id = $this->getBlockIdAt($x, $y, $z);
 		$newLevel = max(BlockFactory::$light[$id], $this->getHighestAdjacentBlockLight($x, $y, $z) - BlockFactory::$lightFilter[$id]);
 
-		$update = new BlockLightUpdate($this);
-		$update->setAndUpdateLight($x, $y, $z, $newLevel);
-		$update->execute();
+		if($this->blockLightUpdate === null){
+			$this->blockLightUpdate = new BlockLightUpdate($this);
+		}
+		$this->blockLightUpdate->setAndUpdateLight($x, $y, $z, $newLevel);
 
 		$this->timings->doBlockLightUpdates->stopTiming();
 	}
 
+	public function executeQueuedLightUpdates() : void{
+		if($this->blockLightUpdate !== null){
+			$this->timings->doBlockLightUpdates->startTiming();
+			$this->blockLightUpdate->execute();
+			$this->blockLightUpdate = null;
+			$this->timings->doBlockLightUpdates->stopTiming();
+		}
+
+		if($this->skyLightUpdate !== null){
+			$this->timings->doBlockSkyLightUpdates->startTiming();
+			$this->skyLightUpdate->execute();
+			$this->skyLightUpdate = null;
+			$this->timings->doBlockSkyLightUpdates->stopTiming();
+		}
+	}
+
 	/**
 	 * Sets on Vector3 the data from a Block object,
 	 * does block updates and puts the changes to the send queue.
@@ -1487,7 +1567,7 @@ class Level implements ChunkManager, Metadatable{
 
 		$this->timings->setBlock->startTiming();
 
-		if($this->getChunk($pos->x >> 4, $pos->z >> 4, true)->setBlock($pos->x & 0x0f, $pos->y, $pos->z & 0x0f, $block->getId(), $block->getDamage())){
+		if($this->getChunkAtPosition($pos, true)->setBlock($pos->x & 0x0f, $pos->y, $pos->z & 0x0f, $block->getId(), $block->getDamage())){
 			if(!($pos instanceof Position)){
 				$pos = $this->temporalPosition->setComponents($pos->x, $pos->y, $pos->z);
 			}
@@ -1520,7 +1600,8 @@ class Level implements ChunkManager, Metadatable{
 			if($update){
 				$this->updateAllLight($block);
 
-				$this->server->getPluginManager()->callEvent($ev = new BlockUpdateEvent($block));
+				$ev = new BlockUpdateEvent($block);
+				$ev->call();
 				if(!$ev->isCancelled()){
 					foreach($this->getNearbyEntities(new AxisAlignedBB($block->x - 1, $block->y - 1, $block->z - 1, $block->x + 2, $block->y + 2, $block->z + 2)) as $entity){
 						$entity->onNearbyBlockChange();
@@ -1683,7 +1764,7 @@ class Level implements ChunkManager, Metadatable{
 				$ev->setCancelled(!$canBreak);
 			}
 
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -1773,7 +1854,7 @@ class Level implements ChunkManager, Metadatable{
 				$ev->setCancelled(); //set it to cancelled so plugins can bypass this
 			}
 
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 			if(!$ev->isCancelled()){
 				if(!$player->isSneaking() and $blockClicked->onActivate($item, $player)){
 					return true;
@@ -1845,7 +1926,7 @@ class Level implements ChunkManager, Metadatable{
 				$ev->setCancelled(!$canPlace);
 			}
 
-			$this->server->getPluginManager()->callEvent($ev);
+			$ev->call();
 			if($ev->isCancelled()){
 				return false;
 			}
@@ -2098,6 +2179,9 @@ class Level implements ChunkManager, Metadatable{
 	 * @param int $id 0-255
 	 */
 	public function setBlockIdAt(int $x, int $y, int $z, int $id){
+		if(!$this->isInWorld($x, $y, $z)){ //TODO: bad hack but fixing this requires BC breaks to do properly :(
+			return;
+		}
 		unset($this->blockCache[$chunkHash = Level::chunkHash($x >> 4, $z >> 4)][$blockHash = Level::blockHash($x, $y, $z)]);
 		$this->getChunk($x >> 4, $z >> 4, true)->setBlockId($x & 0x0f, $y, $z & 0x0f, $id & 0xff);
 
@@ -2132,6 +2216,9 @@ class Level implements ChunkManager, Metadatable{
 	 * @param int $data 0-15
 	 */
 	public function setBlockDataAt(int $x, int $y, int $z, int $data){
+		if(!$this->isInWorld($x, $y, $z)){ //TODO: bad hack but fixing this requires BC breaks to do properly :(
+			return;
+		}
 		unset($this->blockCache[$chunkHash = Level::chunkHash($x >> 4, $z >> 4)][$blockHash = Level::blockHash($x, $y, $z)]);
 
 		$this->getChunk($x >> 4, $z >> 4, true)->setBlockData($x & 0x0f, $y, $z & 0x0f, $data & 0x0f);
@@ -2270,6 +2357,18 @@ class Level implements ChunkManager, Metadatable{
 		return null;
 	}
 
+	/**
+	 * Returns the chunk containing the given Vector3 position.
+	 *
+	 * @param Vector3 $pos
+	 * @param bool    $create
+	 *
+	 * @return null|Chunk
+	 */
+	public function getChunkAtPosition(Vector3 $pos, bool $create = false) : ?Chunk{
+		return $this->getChunk($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4, $create);
+	}
+
 	/**
 	 * Returns the chunks adjacent to the specified chunk.
 	 *
@@ -2307,7 +2406,7 @@ class Level implements ChunkManager, Metadatable{
 				$oldChunk = $this->getChunk($x, $z, false);
 				$this->setChunk($x, $z, $chunk, false);
 				if(($oldChunk === null or !$oldChunk->isPopulated()) and $chunk->isPopulated()){
-					$this->server->getPluginManager()->callEvent(new ChunkPopulateEvent($this, $chunk));
+					(new ChunkPopulateEvent($this, $chunk))->call();
 
 					foreach($this->getChunkLoaders($x, $z) as $loader){
 						$loader->onChunkPopulated($chunk);
@@ -2341,7 +2440,7 @@ class Level implements ChunkManager, Metadatable{
 
 		$chunkHash = Level::chunkHash($chunkX, $chunkZ);
 		$oldChunk = $this->getChunk($chunkX, $chunkZ, false);
-		if($oldChunk !== null){
+		if($oldChunk !== null and $oldChunk !== $chunk){
 			if($unload){
 				$this->unloadChunk($chunkX, $chunkZ, false, false);
 			}else{
@@ -2363,6 +2462,10 @@ class Level implements ChunkManager, Metadatable{
 		unset($this->blockCache[$chunkHash]);
 		unset($this->chunkCache[$chunkHash]);
 		unset($this->changedBlocks[$chunkHash]);
+		if(isset($this->chunkSendTasks[$chunkHash])){ //invalidate pending caches
+			$this->chunkSendTasks[$chunkHash]->cancelRun();
+			unset($this->chunkSendTasks[$chunkHash]);
+		}
 		$chunk->setChanged();
 
 		if(!$this->isChunkInUse($chunkX, $chunkZ)){
@@ -2386,6 +2489,17 @@ class Level implements ChunkManager, Metadatable{
 		return $this->getChunk($x >> 4, $z >> 4, true)->getHighestBlockAt($x & 0x0f, $z & 0x0f);
 	}
 
+	/**
+	 * Returns whether the given position is in a loaded area of terrain.
+	 *
+	 * @param Vector3 $pos
+	 *
+	 * @return bool
+	 */
+	public function isInLoadedTerrain(Vector3 $pos) : bool{
+		return $this->isChunkLoaded($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4);
+	}
+
 	/**
 	 * @param int $x
 	 * @param int $z
@@ -2435,7 +2549,7 @@ class Level implements ChunkManager, Metadatable{
 	public function setSpawnLocation(Vector3 $pos){
 		$previousSpawn = $this->getSpawnLocation();
 		$this->provider->setSpawn($pos);
-		$this->server->getPluginManager()->callEvent(new SpawnChangeEvent($this, $previousSpawn));
+		(new SpawnChangeEvent($this, $previousSpawn))->call();
 	}
 
 	public function requestChunk(int $x, int $z, Player $player){
@@ -2657,7 +2771,7 @@ class Level implements ChunkManager, Metadatable{
 
 		$chunk->initChunk($this);
 
-		$this->server->getPluginManager()->callEvent(new ChunkLoadEvent($this, $chunk, !$chunk->isGenerated()));
+		(new ChunkLoadEvent($this, $chunk, !$chunk->isGenerated()))->call();
 
 		if(!$chunk->isLightPopulated() and $chunk->isPopulated() and $this->getServer()->getProperty("chunk-ticking.light-updates", false)){
 			$this->getServer()->getAsyncPool()->submitTask(new LightPopulationTask($this, $chunk));
@@ -2711,7 +2825,8 @@ class Level implements ChunkManager, Metadatable{
 		$chunk = $this->chunks[$chunkHash] ?? null;
 
 		if($chunk !== null){
-			$this->server->getPluginManager()->callEvent($ev = new ChunkUnloadEvent($this, $chunk));
+			$ev = new ChunkUnloadEvent($this, $chunk);
+			$ev->call();
 			if($ev->isCancelled()){
 				$this->timings->doChunkUnload->stopTiming();
 
@@ -2778,7 +2893,7 @@ class Level implements ChunkManager, Metadatable{
 
 		$max = $this->worldHeight;
 		$v = $spawn->floor();
-		$chunk = $this->getChunk($v->x >> 4, $v->z >> 4, false);
+		$chunk = $this->getChunkAtPosition($v, false);
 		$x = (int) $v->x;
 		$z = (int) $v->z;
 		if($chunk !== null and $chunk->isGenerated()){
@@ -2969,6 +3084,7 @@ class Level implements ChunkManager, Metadatable{
 					$this->unloadChunkRequest($X, $Z, true);
 				}
 			}
+			$chunk->collectGarbage();
 		}
 
 		$this->provider->doGarbageCollection();

src/pocketmine/level/format/Chunk.php

@@ -51,7 +51,7 @@ class Chunk{
 	/** @var bool */
 	protected $isInit = false;
 
-	/** @var bool*/
+	/** @var bool */
 	protected $lightPopulated = false;
 	/** @var bool */
 	protected $terrainGenerated = false;
@@ -327,8 +327,8 @@ class Chunk{
 	/**
 	 * Returns the Y coordinate of the highest non-air block at the specified X/Z chunk block coordinates
 	 *
-	 * @param int  $x 0-15
-	 * @param int  $z 0-15
+	 * @param int $x 0-15
+	 * @param int $z 0-15
 	 *
 	 * @return int 0-255, or -1 if there are no blocks in the column
 	 */
@@ -366,6 +366,7 @@ class Chunk{
 
 	/**
 	 * Returns the heightmap value at the specified X/Z chunk block coordinates
+	 *
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 * @param int $value
@@ -465,6 +466,7 @@ class Chunk{
 
 	/**
 	 * Returns a column of block IDs from bottom to top at the specified X/Z chunk block coordinates.
+	 *
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 *
@@ -475,11 +477,13 @@ class Chunk{
 		foreach($this->subChunks as $subChunk){
 			$result .= $subChunk->getBlockIdColumn($x, $z);
 		}
+
 		return $result;
 	}
 
 	/**
 	 * Returns a column of block meta values from bottom to top at the specified X/Z chunk block coordinates.
+	 *
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 *
@@ -495,6 +499,7 @@ class Chunk{
 
 	/**
 	 * Returns a column of sky light values from bottom to top at the specified X/Z chunk block coordinates.
+	 *
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 *
@@ -510,6 +515,7 @@ class Chunk{
 
 	/**
 	 * Returns a column of block light values from bottom to top at the specified X/Z chunk block coordinates.
+	 *
 	 * @param int $x 0-15
 	 * @param int $z 0-15
 	 *
@@ -830,18 +836,17 @@ class Chunk{
 	}
 
 	/**
-	 * Disposes of empty subchunks
+	 * Disposes of empty subchunks and frees data where possible
 	 */
-	public function pruneEmptySubChunks(){
+	public function collectGarbage() : void{
 		foreach($this->subChunks as $y => $subChunk){
-			if($subChunk instanceof EmptySubChunk){
-				continue;
-			}elseif($subChunk->isEmpty()){ //normal subchunk full of air, remove it and replace it with an empty stub
-				$this->subChunks[$y] = $this->emptySubChunk;
-			}else{
-				continue; //do not set changed
+			if($subChunk instanceof SubChunk){
+				if($subChunk->isEmpty()){
+					$this->subChunks[$y] = $this->emptySubChunk;
+				}else{
+					$subChunk->collectGarbage();
+				}
 			}
-			$this->hasChanged = true;
 		}
 	}
 
@@ -858,8 +863,8 @@ class Chunk{
 			$result .= $this->subChunks[$y]->networkSerialize();
 		}
 		$result .= pack("v*", ...$this->heightMap)
-		        .  $this->biomeIds
-		        .  chr(0); //border block array count
+			. $this->biomeIds
+			. chr(0); //border block array count
 		//Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client.
 
 		foreach($this->tiles as $tile){
@@ -881,20 +886,31 @@ class Chunk{
 		$stream = new BinaryStream();
 		$stream->putInt($this->x);
 		$stream->putInt($this->z);
-		$count = 0;
-		$subChunks = "";
-		foreach($this->subChunks as $y => $subChunk){
-			if($subChunk instanceof EmptySubChunk){
-				continue;
+		$stream->putByte(($this->lightPopulated ? 4 : 0) | ($this->terrainPopulated ? 2 : 0) | ($this->terrainGenerated ? 1 : 0));
+		if($this->terrainGenerated){
+			//subchunks
+			$count = 0;
+			$subChunks = "";
+			foreach($this->subChunks as $y => $subChunk){
+				if($subChunk instanceof EmptySubChunk){
+					continue;
+				}
+				++$count;
+				$subChunks .= chr($y) . $subChunk->getBlockIdArray() . $subChunk->getBlockDataArray();
+				if($this->lightPopulated){
+					$subChunks .= $subChunk->getBlockSkyLightArray() . $subChunk->getBlockLightArray();
+				}
+			}
+			$stream->putByte($count);
+			$stream->put($subChunks);
+
+			//biomes
+			$stream->put($this->biomeIds);
+			if($this->lightPopulated){
+				$stream->put(pack("v*", ...$this->heightMap));
 			}
-			++$count;
-			$subChunks .= chr($y) . $subChunk->fastSerialize();
 		}
-		$stream->putByte($count);
-		$stream->put($subChunks);
-		$stream->put(pack("v*", ...$this->heightMap) .
-			$this->biomeIds .
-			chr(($this->lightPopulated ? 4 : 0) | ($this->terrainPopulated ? 2 : 0) | ($this->terrainGenerated ? 1 : 0)));
+
 		return $stream->getBuffer();
 	}
 
@@ -910,19 +926,36 @@ class Chunk{
 
 		$x = $stream->getInt();
 		$z = $stream->getInt();
+		$flags = $stream->getByte();
+		$lightPopulated = (bool) ($flags & 4);
+		$terrainPopulated = (bool) ($flags & 2);
+		$terrainGenerated = (bool) ($flags & 1);
+
 		$subChunks = [];
-		$count = $stream->getByte();
-		for($y = 0; $y < $count; ++$y){
-			$subChunks[$stream->getByte()] = SubChunk::fastDeserialize($stream->get(10240));
+		$biomeIds = "";
+		$heightMap = [];
+		if($terrainGenerated){
+			$count = $stream->getByte();
+			for($y = 0; $y < $count; ++$y){
+				$subChunks[$stream->getByte()] = new SubChunk(
+					$stream->get(4096), //blockids
+					$stream->get(2048), //blockdata
+					$lightPopulated ? $stream->get(2048) : "", //skylight
+					$lightPopulated ? $stream->get(2048) : "" //blocklight
+				);
+			}
+
+			$biomeIds = $stream->get(256);
+			if($lightPopulated){
+				$heightMap = array_values(unpack("v*", $stream->get(512)));
+			}
 		}
-		$heightMap = array_values(unpack("v*", $stream->get(512)));
-		$biomeIds = $stream->get(256);
 
 		$chunk = new Chunk($x, $z, $subChunks, [], [], $biomeIds, $heightMap);
-		$flags = $stream->getByte();
-		$chunk->lightPopulated = (bool) ($flags & 4);
-		$chunk->terrainPopulated = (bool) ($flags & 2);
-		$chunk->terrainGenerated = (bool) ($flags & 1);
+		$chunk->setGenerated($terrainGenerated);
+		$chunk->setPopulated($terrainPopulated);
+		$chunk->setLightPopulated($lightPopulated);
+
 		return $chunk;
 	}
 }

src/pocketmine/level/format/EmptySubChunk.php

@@ -126,8 +126,4 @@ class EmptySubChunk implements SubChunkInterface{
 	public function networkSerialize() : string{
 		return "\x00" . str_repeat("\x00", 6144);
 	}
-
-	public function fastSerialize() : string{
-		throw new \BadMethodCallException("Should not try to serialize empty subchunks");
-	}
 }

src/pocketmine/level/format/SubChunk.php

@@ -23,8 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\level\format;
 
-class SubChunk implements SubChunkInterface{
+if(!defined(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY')){
+	define(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY', str_repeat("\x00", 2048));
+}
 
+class SubChunk implements SubChunkInterface{
 	protected $ids;
 	protected $data;
 	protected $blockLight;
@@ -44,6 +47,7 @@ class SubChunk implements SubChunkInterface{
 		self::assignData($this->data, $data, 2048);
 		self::assignData($this->skyLight, $skyLight, 2048, "\xff");
 		self::assignData($this->blockLight, $blockLight, 2048);
+		$this->collectGarbage();
 	}
 
 	public function isEmpty(bool $checkLight = true) : bool{
@@ -51,7 +55,7 @@ class SubChunk implements SubChunkInterface{
 			substr_count($this->ids, "\x00") === 4096 and
 			(!$checkLight or (
 				substr_count($this->skyLight, "\xff") === 2048 and
-				substr_count($this->blockLight, "\x00") === 2048
+				$this->blockLight === ZERO_NIBBLE_ARRAY
 			))
 		);
 	}
@@ -66,31 +70,22 @@ class SubChunk implements SubChunkInterface{
 	}
 
 	public function getBlockData(int $x, int $y, int $z) : int{
-		$m = ord($this->data{($x << 7) + ($z << 3) + ($y >> 1)});
-		if(($y & 1) === 0){
-			return $m & 0x0f;
-		}else{
-			return $m >> 4;
-		}
+		return (ord($this->data{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockData(int $x, int $y, int $z, int $data) : bool{
 		$i = ($x << 7) | ($z << 3) | ($y >> 1);
-		if(($y & 1) === 0){
-			$this->data{$i} = chr((ord($this->data{$i}) & 0xf0) | ($data & 0x0f));
-		}else{
-			$this->data{$i} = chr((($data & 0x0f) << 4) | (ord($this->data{$i}) & 0x0f));
-		}
+
+		$shift = ($y & 1) << 2;
+		$byte = ord($this->data{$i});
+		$this->data{$i} = chr(($byte & ~(0xf << $shift)) | (($data & 0xf) << $shift));
+
 		return true;
 	}
 
 	public function getFullBlock(int $x, int $y, int $z) : int{
 		$i = ($x << 8) | ($z << 4) | $y;
-		if(($y & 1) === 0){
-			return (ord($this->ids{$i}) << 4) | (ord($this->data{$i >> 1}) & 0x0f);
-		}else{
-			return (ord($this->ids{$i}) << 4) | (ord($this->data{$i >> 1}) >> 4);
-		}
+		return (ord($this->ids{$i}) << 4) | ((ord($this->data{$i >> 1}) >> (($y & 1) << 2)) & 0xf);
 	}
 
 	public function setBlock(int $x, int $y, int $z, ?int $id = null, ?int $data = null) : bool{
@@ -106,13 +101,12 @@ class SubChunk implements SubChunkInterface{
 
 		if($data !== null){
 			$i >>= 1;
-			$byte = ord($this->data{$i});
-			if(($y & 1) === 0){
-				$this->data{$i} = chr(($byte & 0xf0) | ($data & 0x0f));
-			}else{
-				$this->data{$i} = chr((($data & 0x0f) << 4) | ($byte & 0x0f));
-			}
-			if($this->data{$i} !== $byte){
+
+			$shift = ($y & 1) << 2;
+			$oldPair = ord($this->data{$i});
+			$newPair = ($oldPair & ~(0xf << $shift)) | (($data & 0xf) << $shift);
+			if($newPair !== $oldPair){
+				$this->data{$i} = chr($newPair);
 				$changed = true;
 			}
 		}
@@ -121,42 +115,30 @@ class SubChunk implements SubChunkInterface{
 	}
 
 	public function getBlockLight(int $x, int $y, int $z) : int{
-		$byte = ord($this->blockLight{($x << 7) + ($z << 3) + ($y >> 1)});
-		if(($y & 1) === 0){
-			return $byte & 0x0f;
-		}else{
-			return $byte >> 4;
-		}
+		return (ord($this->blockLight{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockLight(int $x, int $y, int $z, int $level) : bool{
-		$i = ($x << 7) + ($z << 3) + ($y >> 1);
+		$i = ($x << 7) | ($z << 3) | ($y >> 1);
+
+		$shift = ($y & 1) << 2;
 		$byte = ord($this->blockLight{$i});
-		if(($y & 1) === 0){
-			$this->blockLight{$i} = chr(($byte & 0xf0) | ($level & 0x0f));
-		}else{
-			$this->blockLight{$i} = chr((($level & 0x0f) << 4) | ($byte & 0x0f));
-		}
+		$this->blockLight{$i} = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
+
 		return true;
 	}
 
 	public function getBlockSkyLight(int $x, int $y, int $z) : int{
-		$byte = ord($this->skyLight{($x << 7) + ($z << 3) + ($y >> 1)});
-		if(($y & 1) === 0){
-			return $byte & 0x0f;
-		}else{
-			return $byte >> 4;
-		}
+		return (ord($this->skyLight{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockSkyLight(int $x, int $y, int $z, int $level) : bool{
-		$i = ($x << 7) + ($z << 3) + ($y >> 1);
+		$i = ($x << 7) | ($z << 3) | ($y >> 1);
+
+		$shift = ($y & 1) << 2;
 		$byte = ord($this->skyLight{$i});
-		if(($y & 1) === 0){
-			$this->skyLight{$i} = chr(($byte & 0xf0) | ($level & 0x0f));
-		}else{
-			$this->skyLight{$i} = chr((($level & 0x0f) << 4) | ($byte & 0x0f));
-		}
+		$this->skyLight{$i} = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
+
 		return true;
 	}
 
@@ -222,24 +204,24 @@ class SubChunk implements SubChunkInterface{
 		return "\x00" . $this->ids . $this->data;
 	}
 
-	public function fastSerialize() : string{
-		return
-			$this->ids .
-			$this->data .
-			$this->skyLight .
-			$this->blockLight;
-	}
-
-	public static function fastDeserialize(string $data) : SubChunk{
-		return new SubChunk(
-			substr($data,    0, 4096), //ids
-			substr($data, 4096, 2048), //data
-			substr($data, 6144, 2048), //sky light
-			substr($data, 8192, 2048)  //block light
-		);
-	}
-
 	public function __debugInfo(){
 		return [];
 	}
+
+	public function collectGarbage() : void{
+		/*
+		 * This strange looking code is designed to exploit PHP's copy-on-write behaviour. Assigning will copy a
+		 * reference to the const instead of duplicating the whole string. The string will only be duplicated when
+		 * modified, which is perfect for this purpose.
+		 */
+		if($this->data === ZERO_NIBBLE_ARRAY){
+			$this->data = ZERO_NIBBLE_ARRAY;
+		}
+		if($this->skyLight === ZERO_NIBBLE_ARRAY){
+			$this->skyLight = ZERO_NIBBLE_ARRAY;
+		}
+		if($this->blockLight === ZERO_NIBBLE_ARRAY){
+			$this->blockLight = ZERO_NIBBLE_ARRAY;
+		}
+	}
 }

src/pocketmine/level/format/SubChunkInterface.php

@@ -27,6 +27,7 @@ interface SubChunkInterface{
 
 	/**
 	 * @param bool $checkLight
+	 *
 	 * @return bool
 	 */
 	public function isEmpty(bool $checkLight = true) : bool;
@@ -201,9 +202,4 @@ interface SubChunkInterface{
 	 * @return string
 	 */
 	public function networkSerialize() : string;
-
-	/**
-	 * @return string
-	 */
-	public function fastSerialize() : string;
 }

src/pocketmine/level/format/io/ChunkRequestTask.php

@@ -29,7 +29,6 @@ use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\Server;
-use pocketmine\tile\Spawnable;
 
 class ChunkRequestTask extends AsyncTask{
 
@@ -39,43 +38,29 @@ class ChunkRequestTask extends AsyncTask{
 	protected $chunkX;
 	protected $chunkZ;
 
-	protected $tiles;
-
 	protected $compressionLevel;
 
 	public function __construct(Level $level, int $chunkX, int $chunkZ, Chunk $chunk){
 		$this->levelId = $level->getId();
 		$this->compressionLevel = $level->getServer()->networkCompressionLevel;
 
-		$this->chunk = $chunk->fastSerialize();
+		$this->chunk = $chunk->networkSerialize();
 		$this->chunkX = $chunkX;
 		$this->chunkZ = $chunkZ;
-
-		//TODO: serialize tiles with chunks
-		$tiles = "";
-		foreach($chunk->getTiles() as $tile){
-			if($tile instanceof Spawnable){
-				$tiles .= $tile->getSerializedSpawnCompound();
-			}
-		}
-
-		$this->tiles = $tiles;
 	}
 
 	public function onRun(){
-		$chunk = Chunk::fastDeserialize($this->chunk);
-
 		$pk = new FullChunkDataPacket();
 		$pk->chunkX = $this->chunkX;
 		$pk->chunkZ = $this->chunkZ;
-		$pk->data = $chunk->networkSerialize() . $this->tiles;
+		$pk->data = $this->chunk;
 
 		$batch = new BatchPacket();
 		$batch->addPacket($pk);
 		$batch->setCompressionLevel($this->compressionLevel);
 		$batch->encode();
 
-		$this->setResult($batch->buffer, false);
+		$this->setResult($batch->buffer);
 	}
 
 	public function onCompletion(Server $server){

src/pocketmine/level/format/io/LevelProvider.php

@@ -148,6 +148,7 @@ interface LevelProvider{
 
 	/**
 	 * Sets the world difficulty.
+	 *
 	 * @param int $difficulty
 	 */
 	public function setDifficulty(int $difficulty);

src/pocketmine/level/format/io/leveldb/LevelDB.php

@@ -283,6 +283,11 @@ class LevelDB extends BaseLevelProvider{
 		/** @var SubChunk[] $subChunks */
 		$subChunks = [];
 
+		/** @var int[] $heightMap */
+		$heightMap = [];
+		/** @var string $biomeIds */
+		$biomeIds = "";
+
 		/** @var bool $lightPopulated */
 		$lightPopulated = true;
 
@@ -325,10 +330,12 @@ class LevelDB extends BaseLevelProvider{
 					}
 				}
 
-				$binaryStream->setBuffer($this->db->get($index . self::TAG_DATA_2D), 0);
+				if(($maps2d = $this->db->get($index . self::TAG_DATA_2D)) !== false){
+					$binaryStream->setBuffer($maps2d, 0);
 
-				$heightMap = array_values(unpack("v*", $binaryStream->get(512)));
-				$biomeIds = $binaryStream->get(256);
+					$heightMap = array_values(unpack("v*", $binaryStream->get(512)));
+					$biomeIds = $binaryStream->get(256);
+				}
 				break;
 			case 2: // < MCPE 1.0
 				$binaryStream->setBuffer($this->db->get($index . self::TAG_LEGACY_TERRAIN));

src/pocketmine/level/generator/object/Tree.php

@@ -33,10 +33,8 @@ abstract class Tree{
 	public $overridable = [
 		Block::AIR => true,
 		Block::SAPLING => true,
-		Block::LOG => true,
 		Block::LEAVES => true,
 		Block::SNOW_LAYER => true,
-		Block::LOG2 => true,
 		Block::LEAVES2 => true
 	];
 

src/pocketmine/level/generator/populator/Populator.php

@@ -33,9 +33,9 @@ abstract class Populator{
 
 	/**
 	 * @param ChunkManager $level
-	 * @param int $chunkX
-	 * @param int $chunkZ
-	 * @param Random $random
+	 * @param int          $chunkX
+	 * @param int          $chunkZ
+	 * @param Random       $random
 	 *
 	 * @return mixed
 	 */

src/pocketmine/level/light/LightPopulationTask.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\level\light;
 
+use pocketmine\block\BlockFactory;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\Level;
 use pocketmine\scheduler\AsyncTask;
@@ -39,6 +40,9 @@ class LightPopulationTask extends AsyncTask{
 	}
 
 	public function onRun(){
+		if(!BlockFactory::isInit()){
+			BlockFactory::init();
+		}
 		/** @var Chunk $chunk */
 		$chunk = Chunk::fastDeserialize($this->chunk);
 

src/pocketmine/level/light/LightUpdate.php

@@ -34,6 +34,9 @@ abstract class LightUpdate{
 	/** @var ChunkManager */
 	protected $level;
 
+	/** @var int[] blockhash => new light level */
+	protected $updateNodes = [];
+
 	/** @var \SplQueue */
 	protected $spreadQueue;
 	/** @var bool[] */
@@ -59,31 +62,31 @@ abstract class LightUpdate{
 	abstract protected function setLight(int $x, int $y, int $z, int $level);
 
 	public function setAndUpdateLight(int $x, int $y, int $z, int $newLevel){
-		if(!$this->level->isInWorld($x, $y, $z)){
-			throw new \InvalidArgumentException("Coordinates x=$x, y=$y, z=$z are out of range");
-		}
+		$this->updateNodes[Level::blockHash($x, $y, $z)] = [$x, $y, $z, $newLevel];
+	}
 
-		if(isset($this->spreadVisited[$index = Level::blockHash($x, $y, $z)]) or isset($this->removalVisited[$index])){
-			throw new \InvalidArgumentException("Already have a visit ready for this block");
-		}
+	private function prepareNodes() : void{
+		foreach($this->updateNodes as $blockHash => [$x, $y, $z, $newLevel]){
+			if($this->subChunkHandler->moveTo($x, $y, $z)){
+				$oldLevel = $this->getLight($x, $y, $z);
 
-		if($this->subChunkHandler->moveTo($x, $y, $z)){
-			$oldLevel = $this->getLight($x, $y, $z);
-
-			if($oldLevel !== $newLevel){
-				$this->setLight($x, $y, $z, $newLevel);
-				if($oldLevel < $newLevel){ //light increased
-					$this->spreadVisited[$index] = true;
-					$this->spreadQueue->enqueue([$x, $y, $z]);
-				}else{ //light removed
-					$this->removalVisited[$index] = true;
-					$this->removalQueue->enqueue([$x, $y, $z, $oldLevel]);
+				if($oldLevel !== $newLevel){
+					$this->setLight($x, $y, $z, $newLevel);
+					if($oldLevel < $newLevel){ //light increased
+						$this->spreadVisited[$blockHash] = true;
+						$this->spreadQueue->enqueue([$x, $y, $z]);
+					}else{ //light removed
+						$this->removalVisited[$blockHash] = true;
+						$this->removalQueue->enqueue([$x, $y, $z, $oldLevel]);
+					}
 				}
 			}
 		}
 	}
 
 	public function execute(){
+		$this->prepareNodes();
+
 		while(!$this->removalQueue->isEmpty()){
 			list($x, $y, $z, $oldAdjacentLight) = $this->removalQueue->dequeue();
 
@@ -106,6 +109,8 @@ abstract class LightUpdate{
 		while(!$this->spreadQueue->isEmpty()){
 			list($x, $y, $z) = $this->spreadQueue->dequeue();
 
+			unset($this->spreadVisited[Level::blockHash($x, $y, $z)]);
+
 			if(!$this->subChunkHandler->moveTo($x, $y, $z)){
 				continue;
 			}

src/pocketmine/level/particle/FloatingTextParticle.php

@@ -109,8 +109,8 @@ class FloatingTextParticle extends Particle{
 				1 << Entity::DATA_FLAG_IMMOBILE
 			);
 			$pk->metadata = [
-				Entity::DATA_FLAGS =>   [Entity::DATA_TYPE_LONG,   $flags],
-				Entity::DATA_SCALE =>   [Entity::DATA_TYPE_FLOAT,  0.01] //zero causes problems on debug builds
+				Entity::DATA_FLAGS => [Entity::DATA_TYPE_LONG, $flags],
+				Entity::DATA_SCALE => [Entity::DATA_TYPE_FLOAT, 0.01] //zero causes problems on debug builds
 			];
 
 			$p[] = $pk;

src/pocketmine/metadata/BlockMetadataStore.php

@@ -35,55 +35,26 @@ class BlockMetadataStore extends MetadataStore{
 		$this->owningLevel = $owningLevel;
 	}
 
-	public function disambiguate(Metadatable $block, string $metadataKey) : string{
-		if(!($block instanceof Block)){
-			throw new \InvalidArgumentException("Argument must be a Block instance");
+	private function disambiguate(Block $block, string $metadataKey) : string{
+		if($block->getLevel() !== $this->owningLevel){
+			throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName());
 		}
-
 		return $block->x . ":" . $block->y . ":" . $block->z . ":" . $metadataKey;
 	}
 
-	public function getMetadata(Metadatable $subject, string $metadataKey){
-		if(!($subject instanceof Block)){
-			throw new \InvalidArgumentException("Object must be a Block");
-		}
-		if($subject->getLevel() === $this->owningLevel){
-			return parent::getMetadata($subject, $metadataKey);
-		}else{
-			throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName());
-		}
+	public function getMetadata(Block $subject, string $metadataKey){
+		return $this->getMetadataInternal($this->disambiguate($subject, $metadataKey));
 	}
 
-	public function hasMetadata(Metadatable $subject, string $metadataKey) : bool{
-		if(!($subject instanceof Block)){
-			throw new \InvalidArgumentException("Object must be a Block");
-		}
-		if($subject->getLevel() === $this->owningLevel){
-			return parent::hasMetadata($subject, $metadataKey);
-		}else{
-			throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName());
-		}
+	public function hasMetadata(Block $subject, string $metadataKey) : bool{
+		return $this->hasMetadataInternal($this->disambiguate($subject, $metadataKey));
 	}
 
-	public function removeMetadata(Metadatable $subject, string $metadataKey, Plugin $owningPlugin){
-		if(!($subject instanceof Block)){
-			throw new \InvalidArgumentException("Object must be a Block");
-		}
-		if($subject->getLevel() === $this->owningLevel){
-			parent::removeMetadata($subject, $metadataKey, $owningPlugin);
-		}else{
-			throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName());
-		}
+	public function removeMetadata(Block $subject, string $metadataKey, Plugin $owningPlugin){
+		$this->removeMetadataInternal($this->disambiguate($subject, $metadataKey), $owningPlugin);
 	}
 
-	public function setMetadata(Metadatable $subject, string $metadataKey, MetadataValue $newMetadataValue){
-		if(!($subject instanceof Block)){
-			throw new \InvalidArgumentException("Object must be a Block");
-		}
-		if($subject->getLevel() === $this->owningLevel){
-			parent::setMetadata($subject, $metadataKey, $newMetadataValue);
-		}else{
-			throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName());
-		}
+	public function setMetadata(Block $subject, string $metadataKey, MetadataValue $newMetadataValue){
+		$this->setMetadataInternal($this->disambiguate($subject, $metadataKey), $newMetadataValue);
 	}
 }

src/pocketmine/metadata/EntityMetadataStore.php

@@ -24,14 +24,27 @@ declare(strict_types=1);
 namespace pocketmine\metadata;
 
 use pocketmine\entity\Entity;
+use pocketmine\plugin\Plugin;
 
 class EntityMetadataStore extends MetadataStore{
 
-	public function disambiguate(Metadatable $entity, string $metadataKey) : string{
-		if(!($entity instanceof Entity)){
-			throw new \InvalidArgumentException("Argument must be an Entity instance");
-		}
-
+	private function disambiguate(Entity $entity, string $metadataKey) : string{
 		return $entity->getId() . ":" . $metadataKey;
 	}
+
+	public function getMetadata(Entity $subject, string $metadataKey){
+		return $this->getMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function hasMetadata(Entity $subject, string $metadataKey) : bool{
+		return $this->hasMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function removeMetadata(Entity $subject, string $metadataKey, Plugin $owningPlugin){
+		$this->removeMetadataInternal($this->disambiguate($subject, $metadataKey), $owningPlugin);
+	}
+
+	public function setMetadata(Entity $subject, string $metadataKey, MetadataValue $newMetadataValue){
+		$this->setMetadataInternal($this->disambiguate($subject, $metadataKey), $newMetadataValue);
+	}
 }

src/pocketmine/metadata/LevelMetadataStore.php

@@ -24,14 +24,27 @@ declare(strict_types=1);
 namespace pocketmine\metadata;
 
 use pocketmine\level\Level;
+use pocketmine\plugin\Plugin;
 
 class LevelMetadataStore extends MetadataStore{
 
-	public function disambiguate(Metadatable $level, string $metadataKey) : string{
-		if(!($level instanceof Level)){
-			throw new \InvalidArgumentException("Argument must be a Level instance");
-		}
-
+	private function disambiguate(Level $level, string $metadataKey) : string{
 		return strtolower($level->getName()) . ":" . $metadataKey;
 	}
+
+	public function getMetadata(Level $subject, string $metadataKey){
+		return $this->getMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function hasMetadata(Level $subject, string $metadataKey) : bool{
+		return $this->hasMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function removeMetadata(Level $subject, string $metadataKey, Plugin $owningPlugin){
+		$this->removeMetadataInternal($this->disambiguate($subject, $metadataKey), $owningPlugin);
+	}
+
+	public function setMetadata(Level $subject, string $metadataKey, MetadataValue $newMetadataValue){
+		$this->setMetadataInternal($this->disambiguate($subject, $metadataKey), $newMetadataValue);
+	}
 }

src/pocketmine/metadata/MetadataStore.php

@@ -27,7 +27,6 @@ declare(strict_types=1);
 namespace pocketmine\metadata;
 
 use pocketmine\plugin\Plugin;
-use pocketmine\plugin\PluginException;
 
 abstract class MetadataStore{
 	/** @var \SplObjectStorage[] */
@@ -36,17 +35,12 @@ abstract class MetadataStore{
 	/**
 	 * Adds a metadata value to an object.
 	 *
-	 * @param Metadatable   $subject
-	 * @param string        $metadataKey
+	 * @param string        $key
 	 * @param MetadataValue $newMetadataValue
 	 */
-	public function setMetadata(Metadatable $subject, string $metadataKey, MetadataValue $newMetadataValue){
+	protected function setMetadataInternal(string $key, MetadataValue $newMetadataValue){
 		$owningPlugin = $newMetadataValue->getOwningPlugin();
-		if($owningPlugin === null){
-			throw new PluginException("Plugin cannot be null");
-		}
 
-		$key = $this->disambiguate($subject, $metadataKey);
 		if(!isset($this->metadataMap[$key])){
 			$entry = new \SplObjectStorage();
 			$this->metadataMap[$key] = $entry;
@@ -60,13 +54,11 @@ abstract class MetadataStore{
 	 * Returns all metadata values attached to an object. If multiple
 	 * have attached metadata, each will value will be included.
 	 *
-	 * @param Metadatable $subject
-	 * @param string      $metadataKey
+	 * @param string $key
 	 *
 	 * @return MetadataValue[]
 	 */
-	public function getMetadata(Metadatable $subject, string $metadataKey){
-		$key = $this->disambiguate($subject, $metadataKey);
+	protected function getMetadataInternal(string $key){
 		if(isset($this->metadataMap[$key])){
 			return $this->metadataMap[$key];
 		}else{
@@ -77,24 +69,21 @@ abstract class MetadataStore{
 	/**
 	 * Tests to see if a metadata attribute has been set on an object.
 	 *
-	 * @param Metadatable $subject
-	 * @param string      $metadataKey
+	 * @param string $key
 	 *
 	 * @return bool
 	 */
-	public function hasMetadata(Metadatable $subject, string $metadataKey) : bool{
-		return isset($this->metadataMap[$this->disambiguate($subject, $metadataKey)]);
+	protected function hasMetadataInternal(string $key) : bool{
+		return isset($this->metadataMap[$key]);
 	}
 
 	/**
 	 * Removes a metadata item owned by a plugin from a subject.
 	 *
-	 * @param Metadatable $subject
-	 * @param string      $metadataKey
-	 * @param Plugin      $owningPlugin
+	 * @param string $key
+	 * @param Plugin $owningPlugin
 	 */
-	public function removeMetadata(Metadatable $subject, string $metadataKey, Plugin $owningPlugin){
-		$key = $this->disambiguate($subject, $metadataKey);
+	protected function removeMetadataInternal(string $key, Plugin $owningPlugin){
 		if(isset($this->metadataMap[$key])){
 			unset($this->metadataMap[$key][$owningPlugin]);
 			if($this->metadataMap[$key]->count() === 0){
@@ -118,17 +107,4 @@ abstract class MetadataStore{
 			}
 		}
 	}
-
-	/**
-	 * Creates a unique name for the object receiving metadata by combining
-	 * unique data from the subject with a metadataKey.
-	 *
-	 * @param Metadatable $subject
-	 * @param string      $metadataKey
-	 *
-	 * @return string
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	abstract public function disambiguate(Metadatable $subject, string $metadataKey) : string;
 }

src/pocketmine/metadata/PlayerMetadataStore.php

@@ -24,14 +24,27 @@ declare(strict_types=1);
 namespace pocketmine\metadata;
 
 use pocketmine\IPlayer;
+use pocketmine\plugin\Plugin;
 
 class PlayerMetadataStore extends MetadataStore{
 
-	public function disambiguate(Metadatable $player, string $metadataKey) : string{
-		if(!($player instanceof IPlayer)){
-			throw new \InvalidArgumentException("Argument must be an IPlayer instance");
-		}
-
+	private function disambiguate(IPlayer $player, string $metadataKey) : string{
 		return strtolower($player->getName()) . ":" . $metadataKey;
 	}
+
+	public function getMetadata(IPlayer $subject, string $metadataKey){
+		return $this->getMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function hasMetadata(IPlayer $subject, string $metadataKey) : bool{
+		return $this->hasMetadataInternal($this->disambiguate($subject, $metadataKey));
+	}
+
+	public function removeMetadata(IPlayer $subject, string $metadataKey, Plugin $owningPlugin){
+		$this->removeMetadataInternal($this->disambiguate($subject, $metadataKey), $owningPlugin);
+	}
+
+	public function setMetadata(IPlayer $subject, string $metadataKey, MetadataValue $newMetadataValue){
+		$this->setMetadataInternal($this->disambiguate($subject, $metadataKey), $newMetadataValue);
+	}
 }

src/pocketmine/network/CompressBatchedTask.php

@@ -51,7 +51,7 @@ class CompressBatchedTask extends AsyncTask{
 		$batch->setCompressionLevel($this->level);
 		$batch->encode();
 
-		$this->setResult($batch->buffer, false);
+		$this->setResult($batch->buffer);
 	}
 
 	public function onCompletion(Server $server){

src/pocketmine/network/Network.php

@@ -98,7 +98,7 @@ class Network{
 				$logger->logException($e);
 			}
 
-			$this->server->getPluginManager()->callEvent(new NetworkInterfaceCrashEvent($interface, $e));
+			(new NetworkInterfaceCrashEvent($interface, $e))->call();
 
 			$interface->emergencyShutdown();
 			$this->unregisterInterface($interface);
@@ -110,7 +110,8 @@ class Network{
 	 * @param SourceInterface $interface
 	 */
 	public function registerInterface(SourceInterface $interface){
-		$this->server->getPluginManager()->callEvent($ev = new NetworkInterfaceRegisterEvent($interface));
+		$ev = new NetworkInterfaceRegisterEvent($interface);
+		$ev->call();
 		if(!$ev->isCancelled()){
 			$interface->start();
 			$this->interfaces[$hash = spl_object_hash($interface)] = $interface;
@@ -126,7 +127,7 @@ class Network{
 	 * @param SourceInterface $interface
 	 */
 	public function unregisterInterface(SourceInterface $interface){
-		$this->server->getPluginManager()->callEvent(new NetworkInterfaceUnregisterEvent($interface));
+		(new NetworkInterfaceUnregisterEvent($interface))->call();
 		unset($this->interfaces[$hash = spl_object_hash($interface)], $this->advancedInterfaces[$hash]);
 	}
 

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -109,7 +109,12 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putVarInt($auxValue);
 
 		$nbt = $item->getCompoundTag();
-		$this->putLShort(strlen($nbt));
+		$nbtLen = strlen($nbt);
+		if($nbtLen > 32767){
+			throw new \InvalidArgumentException("NBT encoded length must be < 32768, got $nbtLen bytes");
+		}
+
+		$this->putLShort($nbtLen);
 		$this->put($nbt);
 
 		$this->putVarInt(0); //CanPlaceOn entry count (TODO)