Release 3.2.4

Use of this by plugins will produce a lot of undefined behaviour, such as event handlers not being unregistered, scheduled tasks not being removed, and registered permissions causing memory leaks.

.gitmodules

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

.travis.yml

@@ -6,9 +6,9 @@ php:
 before_script:
 # - pecl install channel://pecl.php.net/pthreads-3.1.6
  - echo | pecl install channel://pecl.php.net/yaml-2.0.2
- - git clone https://github.com/krakjoe/pthreads.git
+ - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout d32079fb4a88e6e008104d36dbbf0c2dd7deb403
+ - git checkout c8cfacda84f21032d6014b53e72bf345ac901dac
  - phpize
  - ./configure
  - make

composer.json

@@ -27,7 +27,7 @@
       "pocketmine/raklib": "^0.12.0",
       "pocketmine/spl": "^0.3.0",
       "pocketmine/binaryutils": "^0.1.0",
-      "pocketmine/nbt": "^0.2.0",
+      "pocketmine/nbt": "^0.2.1",
       "pocketmine/math": "^0.2.0",
       "pocketmine/snooze": "^0.1.0"
    },

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2670b9e2a730ff758909be8b9e9d609a",
+    "content-hash": "3536995c56bfc3dbd6ccc0994e88a636",
     "packages": [
         {
             "name": "pocketmine/binaryutils",
-            "version": "0.1.0",
+            "version": "0.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595"
+                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
-                "reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/54efeb978be0ff9335022729fe63c1e2077bf1be",
+                "reference": "54efeb978be0ff9335022729fe63c1e2077bf1be",
                 "shasum": ""
             },
             "require": {
@@ -38,20 +38,20 @@
                 "source": "https://github.com/pmmp/BinaryUtils/tree/master",
                 "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2018-04-16T09:05:08+00:00"
+            "time": "2018-08-26T18:11:05+00:00"
         },
         {
             "name": "pocketmine/math",
-            "version": "0.2.0",
+            "version": "0.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Math.git",
-                "reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef"
+                "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Math/zipball/95ae5600328ed2add44c0bc830a68d3660e9e0ef",
-                "reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/ee299f5c9c444ca526c9c691b920f321458cf0b6",
+                "reference": "ee299f5c9c444ca526c9c691b920f321458cf0b6",
                 "shasum": ""
             },
             "require": {
@@ -69,23 +69,23 @@
             ],
             "description": "PHP library containing math related code used in PocketMine-MP",
             "support": {
-                "source": "https://github.com/pmmp/Math/tree/master",
+                "source": "https://github.com/pmmp/Math/tree/0.2.1",
                 "issues": "https://github.com/pmmp/Math/issues"
             },
-            "time": "2018-06-09T09:26:30+00:00"
+            "time": "2018-08-15T15:43:27+00:00"
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.0",
+            "version": "0.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c"
+                "reference": "a4ee39f313c6870153fb7c7e513b211217f7daf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
-                "reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/a4ee39f313c6870153fb7c7e513b211217f7daf8",
+                "reference": "a4ee39f313c6870153fb7c7e513b211217f7daf8",
                 "shasum": ""
             },
             "require": {
@@ -109,10 +109,10 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.0",
+                "source": "https://github.com/pmmp/NBT/tree/0.2.1",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2018-06-13T09:56:00+00:00"
+            "time": "2018-09-04T10:36:02+00:00"
         },
         {
             "name": "pocketmine/raklib",

src/pocketmine/MemoryManager.php

@@ -243,6 +243,9 @@ class MemoryManager{
 
 		if($this->garbageCollectionAsync){
 			$pool = $this->server->getAsyncPool();
+			if(($w = $pool->shutdownUnusedWorkers()) > 0){
+				$this->server->getLogger()->debug("Shut down $w idle async pool workers");
+			}
 			foreach($pool->getRunningWorkers() as $i){
 				$pool->submitTaskToWorker(new GarbageCollectionTask(), $i);
 			}
@@ -394,15 +397,22 @@ class MemoryManager{
 					$info["implements"] = implode(", ", $reflection->getInterfaceNames());
 				}
 
-				foreach($reflection->getProperties() as $property){
-					if($property->isStatic()){
-						continue;
-					}
+				for($original = $reflection; $reflection !== false; $reflection = $reflection->getParentClass()){
+					foreach($reflection->getProperties() as $property){
+						if($property->isStatic()){
+							continue;
+						}
 
-					if(!$property->isPublic()){
-						$property->setAccessible(true);
+						$name = $property->getName();
+						if($reflection !== $original and !$property->isPublic()){
+							$name = $reflection->getName() . ":" . $name;
+						}
+						if(!$property->isPublic()){
+							$property->setAccessible(true);
+						}
+
+						self::continueDump($property->getValue($object), $info["properties"][$name], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 					}
-					self::continueDump($property->getValue($object), $info["properties"][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 				}
 
 				fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");

src/pocketmine/OfflinePlayer.php

@@ -44,7 +44,7 @@ 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->getName()) . ".dat")){
+		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){
 			$this->namedtag = $this->server->getOfflinePlayerData($this->name);
 		}else{
 			$this->namedtag = null;
@@ -64,7 +64,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	}
 
 	public function isOp() : bool{
-		return $this->server->isOp(strtolower($this->getName()));
+		return $this->server->isOp($this->name);
 	}
 
 	public function setOp(bool $value){
@@ -73,38 +73,38 @@ class OfflinePlayer implements IPlayer, Metadatable{
 		}
 
 		if($value){
-			$this->server->addOp(strtolower($this->getName()));
+			$this->server->addOp($this->name);
 		}else{
-			$this->server->removeOp(strtolower($this->getName()));
+			$this->server->removeOp($this->name);
 		}
 	}
 
 	public function isBanned() : bool{
-		return $this->server->getNameBans()->isBanned(strtolower($this->getName()));
+		return $this->server->getNameBans()->isBanned($this->name);
 	}
 
 	public function setBanned(bool $value){
 		if($value){
-			$this->server->getNameBans()->addBan($this->getName(), null, null, null);
+			$this->server->getNameBans()->addBan($this->name, null, null, null);
 		}else{
-			$this->server->getNameBans()->remove($this->getName());
+			$this->server->getNameBans()->remove($this->name);
 		}
 	}
 
 	public function isWhitelisted() : bool{
-		return $this->server->isWhitelisted(strtolower($this->getName()));
+		return $this->server->isWhitelisted($this->name);
 	}
 
 	public function setWhitelisted(bool $value){
 		if($value){
-			$this->server->addWhitelist(strtolower($this->getName()));
+			$this->server->addWhitelist($this->name);
 		}else{
-			$this->server->removeWhitelist(strtolower($this->getName()));
+			$this->server->removeWhitelist($this->name);
 		}
 	}
 
 	public function getPlayer(){
-		return $this->server->getPlayerExact($this->getName());
+		return $this->server->getPlayerExact($this->name);
 	}
 
 	public function getFirstPlayed(){

src/pocketmine/Player.php

@@ -32,11 +32,9 @@ use pocketmine\entity\Effect;
 use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Human;
-use pocketmine\entity\Living;
 use pocketmine\entity\object\ItemEntity;
 use pocketmine\entity\projectile\Arrow;
 use pocketmine\entity\Skin;
-use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\inventory\InventoryCloseEvent;
@@ -68,6 +66,8 @@ use pocketmine\event\player\PlayerToggleSneakEvent;
 use pocketmine\event\player\PlayerToggleSprintEvent;
 use pocketmine\event\player\PlayerTransferEvent;
 use pocketmine\event\server\DataPacketSendEvent;
+use pocketmine\form\Form;
+use pocketmine\form\FormValidationException;
 use pocketmine\inventory\CraftingGrid;
 use pocketmine\inventory\Inventory;
 use pocketmine\inventory\PlayerCursorInventory;
@@ -77,6 +77,8 @@ use pocketmine\inventory\transaction\InventoryTransaction;
 use pocketmine\inventory\transaction\TransactionValidationException;
 use pocketmine\item\Consumable;
 use pocketmine\item\Durable;
+use pocketmine\item\enchantment\EnchantmentInstance;
+use pocketmine\item\enchantment\MeleeWeaponEnchantment;
 use pocketmine\item\Item;
 use pocketmine\item\WritableBook;
 use pocketmine\item\WrittenBook;
@@ -116,6 +118,7 @@ use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\LoginPacket;
 use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
+use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerActionPacket;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
@@ -146,6 +149,7 @@ use pocketmine\network\SourceInterface;
 use pocketmine\permission\PermissibleBase;
 use pocketmine\permission\PermissionAttachment;
 use pocketmine\permission\PermissionAttachmentInfo;
+use pocketmine\permission\PermissionManager;
 use pocketmine\plugin\Plugin;
 use pocketmine\resourcepacks\ResourcePack;
 use pocketmine\tile\ItemFrame;
@@ -193,9 +197,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 */
 	protected $sessionAdapter;
 
-	/** @var int */
-	protected $protocol = -1;
-
 	/** @var string */
 	protected $ip;
 	/** @var int */
@@ -322,6 +323,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/** @var int[] ID => ticks map */
 	protected $usedItemsCooldown = [];
 
+	/** @var int */
+	protected $formIdCounter = 0;
+	/** @var Form[] */
+	protected $forms = [];
+
 	/**
 	 * @return TranslationContainer|string
 	 */
@@ -535,7 +541,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function canBeCollidedWith() : bool{
-		return !$this->isSpectator();
+		return !$this->isSpectator() and parent::canBeCollidedWith();
 	}
 
 	public function resetFallDistance() : void{
@@ -637,8 +643,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function recalculatePermissions(){
-		$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
-		$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+		$permManager = PermissionManager::getInstance();
+		$permManager->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+		$permManager->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 
 		if($this->perm === null){
 			return;
@@ -647,10 +654,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->perm->recalculatePermissions();
 
 		if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+			$permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
 		}
 		if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+			$permManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 		}
 
 		if($this->spawned){
@@ -1018,10 +1025,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->sendPlayStatus(PlayStatusPacket::PLAYER_SPAWN);
 
 		if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
 		}
 		if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 		}
 
 		$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this,
@@ -1487,14 +1494,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	protected function checkGroundState(float $movX, float $movY, float $movZ, float $dx, float $dy, float $dz) : void{
-		if(!$this->onGround or $movY != 0){
-			$bb = clone $this->boundingBox;
-			$bb->minY = $this->y - 0.2;
-			$bb->maxY = $this->y + 0.2;
+		$bb = clone $this->boundingBox;
+		$bb->minY = $this->y - 0.2;
+		$bb->maxY = $this->y + 0.2;
 
-			$this->onGround = count($this->level->getCollisionBlocks($bb, true)) > 0;
-		}
-		$this->isCollided = $this->onGround;
+		$this->onGround = $this->isCollided = count($this->level->getCollisionBlocks($bb, true)) > 0;
 	}
 
 	public function canBeMovedByCurrents() : bool{
@@ -1842,8 +1846,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return false;
 		}
 
-		$this->protocol = $packet->protocol;
-
 		if($packet->protocol !== ProtocolInfo::CURRENT_PROTOCOL){
 			if($packet->protocol < ProtocolInfo::CURRENT_PROTOCOL){
 				$this->sendPlayStatus(PlayStatusPacket::LOGIN_FAILED_CLIENT, true);
@@ -1926,7 +1928,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	public function sendPlayStatus(int $status, bool $immediate = false){
 		$pk = new PlayStatusPacket();
 		$pk->status = $status;
-		$pk->protocol = $this->protocol;
 		$this->sendDataPacket($pk, false, $immediate);
 	}
 
@@ -2034,7 +2035,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			case ResourcePackClientResponsePacket::STATUS_SEND_PACKS:
 				$manager = $this->server->getResourcePackManager();
 				foreach($packet->packIds as $uuid){
-					$pack = $manager->getPackById($uuid);
+					$pack = $manager->getPackById(substr($uuid, 0, strpos($uuid, "_"))); //dirty hack for mojang's dirty hack for versions
 					if(!($pack instanceof ResourcePack)){
 						//Client requested a resource pack but we don't have it available on the server
 						$this->close("", "disconnectionScreen.resourcePack", true);
@@ -2168,7 +2169,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return false;
 		}
 
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
 		$message = TextFormat::clean($message, $this->removeFormat);
 		foreach(explode("\n", $message) as $messagePart){
@@ -2243,7 +2244,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
 		switch($packet->event){
 			case EntityEventPacket::EATING_ITEM:
@@ -2394,7 +2395,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 						return true;
 					case InventoryTransactionPacket::USE_ITEM_ACTION_BREAK_BLOCK:
-						$this->resetCraftingGridType();
+						$this->doCloseInventory();
 
 						$item = $this->inventory->getItemInHand();
 						$oldItem = clone $item;
@@ -2502,6 +2503,19 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 						}
 
 						$ev = new EntityDamageByEntityEvent($this, $target, EntityDamageEvent::CAUSE_ENTITY_ATTACK, $heldItem->getAttackPoints());
+
+						$meleeEnchantmentDamage = 0;
+						/** @var EnchantmentInstance[] $meleeEnchantments */
+						$meleeEnchantments = [];
+						foreach($heldItem->getEnchantments() as $enchantment){
+							$type = $enchantment->getType();
+							if($type instanceof MeleeWeaponEnchantment and $type->isApplicableTo($target)){
+								$meleeEnchantmentDamage += $type->getDamageBonus($enchantment->getLevel());
+								$meleeEnchantments[] = $enchantment;
+							}
+						}
+						$ev->setModifier($meleeEnchantmentDamage, EntityDamageEvent::MODIFIER_WEAPON_ENCHANTMENTS);
+
 						if($cancelled){
 							$ev->setCancelled();
 						}
@@ -2529,11 +2543,21 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							}
 						}
 
-						if($heldItem->onAttackEntity($target) and $this->isSurvival()){ //always fire the hook, even if we are survival
-							$this->inventory->setItemInHand($heldItem);
+						foreach($meleeEnchantments as $enchantment){
+							$type = $enchantment->getType();
+							assert($type instanceof MeleeWeaponEnchantment);
+							$type->onPostAttack($this, $target, $enchantment->getLevel());
 						}
 
-						$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
+						if($this->isAlive()){
+							//reactive damage like thorns might cause us to be killed by attacking another mob, which
+							//would mean we'd already have dropped the inventory by the time we reached here
+							if($heldItem->onAttackEntity($target) and $this->isSurvival()){ //always fire the hook, even if we are survival
+								$this->inventory->setItemInHand($heldItem);
+							}
+
+							$this->exhaust(0.3, PlayerExhaustEvent::CAUSE_ATTACK);
+						}
 
 						return true;
 					default:
@@ -2631,7 +2655,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return true;
 		}
 
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
 		$target = $this->level->getEntity($packet->target);
 		if($target === null){
@@ -2697,7 +2721,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 				$target = $this->level->getBlock($pos);
 
-				$ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $packet->face, $target->getId() === 0 ? PlayerInteractEvent::LEFT_CLICK_AIR : PlayerInteractEvent::LEFT_CLICK_BLOCK);
+				$ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $packet->face, PlayerInteractEvent::LEFT_CLICK_BLOCK);
 				if($this->level->checkSpawnProtection($this, $target)){
 					$ev->setCancelled();
 				}
@@ -2761,7 +2785,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				break; //TODO
 			case PlayerActionPacket::ACTION_CONTINUE_BREAK:
 				$block = $this->level->getBlock($pos);
-				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, BlockFactory::toStaticRuntimeId($block->getId(), $block->getDamage()) | ($packet->face << 24));
+				$this->level->broadcastLevelEvent($pos, LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, $block->getRuntimeId() | ($packet->face << 24));
 				//TODO: destroy-progress level event
 				break;
 			case PlayerActionPacket::ACTION_START_SWIMMING:
@@ -2845,7 +2869,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			return true;
 		}
 
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
 		if(isset($this->windowIndex[$packet->windowId])){
 			$this->server->getPluginManager()->callEvent(new InventoryCloseEvent($this->windowIndex[$packet->windowId], $this));
@@ -2895,7 +2919,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
 		$pos = new Vector3($packet->x, $packet->y, $packet->z);
 		if($pos->distanceSquared($this) > 10000 or $this->level->checkSpawnProtection($this, $pos)){
@@ -3146,12 +3170,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	 *
 	 * @param string $reason
 	 * @param bool   $isAdmin
+	 * @param TextContainer|string $quitMessage
 	 *
 	 * @return bool
 	 */
-	public function kick(string $reason = "", bool $isAdmin = true) : bool{
-		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $this->getLeaveMessage()));
+	public function kick(string $reason = "", bool $isAdmin = true, $quitMessage = null) : bool{
+		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage()));
 		if(!$ev->isCancelled()){
+			$reason = $ev->getReason();
 			$message = $reason;
 			if($isAdmin){
 				if(!$this->isBanned()){
@@ -3329,6 +3355,45 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->dataPacket($pk);
 	}
 
+	/**
+	 * Sends a Form to the player, or queue to send it if a form is already open.
+	 *
+	 * @param Form $form
+	 */
+	public function sendForm(Form $form) : void{
+		$id = $this->formIdCounter++;
+		$pk = new ModalFormRequestPacket();
+		$pk->formId = $id;
+		$pk->formData = json_encode($form);
+		if($this->dataPacket($pk)){
+			$this->forms[$id] = $form;
+		}
+	}
+
+	/**
+	 * @param int   $formId
+	 * @param mixed $responseData
+	 *
+	 * @return bool
+	 */
+	public function onFormSubmit(int $formId, $responseData) : bool{
+		if(!isset($this->forms[$formId])){
+			$this->server->getLogger()->debug("Got unexpected response for form $formId");
+			return false;
+		}
+
+		try{
+			$this->forms[$formId]->handleResponse($this, $responseData);
+		}catch(FormValidationException $e){
+			$this->server->getLogger()->critical("Failed to validate form " . get_class($this->forms[$formId]) . ": " . $e->getMessage());
+			$this->server->getLogger()->logException($e);
+		}finally{
+			unset($this->forms[$formId]);
+		}
+
+		return true;
+	}
+
 	/**
 	 * Note for plugin developers: use kick() with the isAdmin
 	 * flag set to kick without the "Kicked by admin" part instead of this method.
@@ -3349,8 +3414,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->interface->close($this, $notify ? $reason : "");
 				$this->sessionAdapter = null;
 
-				$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
-				$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+				PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+				PermissionManager::getInstance()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
 
 				$this->stopSleep();
 
@@ -3499,123 +3564,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	protected function onDeath() : void{
-		$message = "death.attack.generic";
-
-		$params = [
-			$this->getDisplayName()
-		];
-
-		$cause = $this->getLastDamageCause();
-
-		switch($cause === null ? EntityDamageEvent::CAUSE_CUSTOM : $cause->getCause()){
-			case EntityDamageEvent::CAUSE_ENTITY_ATTACK:
-				if($cause instanceof EntityDamageByEntityEvent){
-					$e = $cause->getDamager();
-					if($e instanceof Player){
-						$message = "death.attack.player";
-						$params[] = $e->getDisplayName();
-						break;
-					}elseif($e instanceof Living){
-						$message = "death.attack.mob";
-						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
-						break;
-					}else{
-						$params[] = "Unknown";
-					}
-				}
-				break;
-			case EntityDamageEvent::CAUSE_PROJECTILE:
-				if($cause instanceof EntityDamageByEntityEvent){
-					$e = $cause->getDamager();
-					if($e instanceof Player){
-						$message = "death.attack.arrow";
-						$params[] = $e->getDisplayName();
-					}elseif($e instanceof Living){
-						$message = "death.attack.arrow";
-						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
-						break;
-					}else{
-						$params[] = "Unknown";
-					}
-				}
-				break;
-			case EntityDamageEvent::CAUSE_SUICIDE:
-				$message = "death.attack.generic";
-				break;
-			case EntityDamageEvent::CAUSE_VOID:
-				$message = "death.attack.outOfWorld";
-				break;
-			case EntityDamageEvent::CAUSE_FALL:
-				if($cause instanceof EntityDamageEvent){
-					if($cause->getFinalDamage() > 2){
-						$message = "death.fell.accident.generic";
-						break;
-					}
-				}
-				$message = "death.attack.fall";
-				break;
-
-			case EntityDamageEvent::CAUSE_SUFFOCATION:
-				$message = "death.attack.inWall";
-				break;
-
-			case EntityDamageEvent::CAUSE_LAVA:
-				$message = "death.attack.lava";
-				break;
-
-			case EntityDamageEvent::CAUSE_FIRE:
-				$message = "death.attack.onFire";
-				break;
-
-			case EntityDamageEvent::CAUSE_FIRE_TICK:
-				$message = "death.attack.inFire";
-				break;
-
-			case EntityDamageEvent::CAUSE_DROWNING:
-				$message = "death.attack.drown";
-				break;
-
-			case EntityDamageEvent::CAUSE_CONTACT:
-				if($cause instanceof EntityDamageByBlockEvent){
-					if($cause->getDamager()->getId() === Block::CACTUS){
-						$message = "death.attack.cactus";
-					}
-				}
-				break;
-
-			case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION:
-			case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
-				if($cause instanceof EntityDamageByEntityEvent){
-					$e = $cause->getDamager();
-					if($e instanceof Player){
-						$message = "death.attack.explosion.player";
-						$params[] = $e->getDisplayName();
-					}elseif($e instanceof Living){
-						$message = "death.attack.explosion.player";
-						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
-						break;
-					}
-				}else{
-					$message = "death.attack.explosion";
-				}
-				break;
-
-			case EntityDamageEvent::CAUSE_MAGIC:
-				$message = "death.attack.magic";
-				break;
-
-			case EntityDamageEvent::CAUSE_CUSTOM:
-				break;
-
-			default:
-				break;
-		}
-
 		//Crafting grid must always be evacuated even if keep-inventory is true. This dumps the contents into the
 		//main inventory and drops the rest on the ground.
-		$this->resetCraftingGridType();
+		$this->doCloseInventory();
 
-		$this->server->getPluginManager()->callEvent($ev = new PlayerDeathEvent($this, $this->getDrops(), new TranslationContainer($message, $params)));
+		$this->server->getPluginManager()->callEvent($ev = new PlayerDeathEvent($this, $this->getDrops()));
 
 		if(!$ev->getKeepInventory()){
 			foreach($ev->getDrops() as $item){
@@ -3796,15 +3749,19 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->craftingGrid = $grid;
 	}
 
-	public function resetCraftingGridType() : void{
-		$contents = $this->craftingGrid->getContents();
-		if(count($contents) > 0){
-			$drops = $this->inventory->addItem(...$contents);
-			foreach($drops as $drop){
-				$this->dropItem($drop);
-			}
+	public function doCloseInventory() : void{
+		/** @var Inventory[] $inventories */
+		$inventories = [$this->craftingGrid, $this->cursorInventory];
+		foreach($inventories as $inventory){
+			$contents = $inventory->getContents();
+			if(count($contents) > 0){
+				$drops = $this->inventory->addItem(...$contents);
+				foreach($drops as $drop){
+					$this->dropItem($drop);
+				}
 
-			$this->craftingGrid->clearAll();
+				$inventory->clearAll();
+			}
 		}
 
 		if($this->craftingGrid->getGridWidth() > CraftingGrid::SIZE_SMALL){

src/pocketmine/PocketMine.php

@@ -37,7 +37,7 @@ namespace pocketmine {
 	use pocketmine\wizard\SetupWizard;
 
 	const NAME = "PocketMine-MP";
-	const BASE_VERSION = "3.0.1";
+	const BASE_VERSION = "3.2.4";
 	const IS_DEVELOPMENT_BUILD = false;
 	const BUILD_NUMBER = 0;
 
@@ -53,83 +53,89 @@ namespace pocketmine {
 	 * Enjoy it as much as I did writing it. I don't want to do it again.
 	 */
 
-	if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
-		critical_error(\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . ".");
-		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
-		exit(1);
-	}
-
-	if(PHP_INT_SIZE < 8){
-		critical_error("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported.");
-		critical_error("Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.");
-		critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
-		exit(1);
-	}
-
-	/* Dependencies check */
-
-	$errors = 0;
-
-	if(php_sapi_name() !== "cli"){
-		critical_error("You must run " . \pocketmine\NAME . " using the CLI.");
-		++$errors;
-	}
-
-	$extensions = [
-		"bcmath" => "BC Math",
-		"curl" => "cURL",
-		"ctype" => "ctype",
-		"date" => "Date",
-		"hash" => "Hash",
-		"json" => "JSON",
-		"mbstring" => "Multibyte String",
-		"openssl" => "OpenSSL",
-		"pcre" => "PCRE",
-		"phar" => "Phar",
-		"pthreads" => "pthreads",
-		"reflection" => "Reflection",
-		"sockets" => "Sockets",
-		"spl" => "SPL",
-		"yaml" => "YAML",
-		"zip" => "Zip",
-		"zlib" => "Zlib"
-	];
-
-	foreach($extensions as $ext => $name){
-		if(!extension_loaded($ext)){
-			critical_error("Unable to find the $name ($ext) extension.");
-			++$errors;
+	/**
+	 * @return string[]
+	 */
+	function check_platform_dependencies(){
+		if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
+			//If PHP version isn't high enough, anything below might break, so don't bother checking it.
+			return [
+				\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "."
+			];
 		}
-	}
 
-	if(extension_loaded("pthreads")){
-		$pthreads_version = phpversion("pthreads");
-		if(substr_count($pthreads_version, ".") < 2){
-			$pthreads_version = "0.$pthreads_version";
+		$messages = [];
+
+		if(PHP_INT_SIZE < 8){
+			$messages[] = "Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
 		}
-		if(version_compare($pthreads_version, "3.1.7dev") < 0){
-			critical_error("pthreads >= 3.1.7dev is required, while you have $pthreads_version.");
-			++$errors;
+
+		if(php_sapi_name() !== "cli"){
+			$messages[] = "You must run " . \pocketmine\NAME . " using the CLI.";
 		}
-	}
 
-	if(extension_loaded("leveldb")){
-		$leveldb_version = phpversion("leveldb");
-		if(version_compare($leveldb_version, "0.2.1") < 0){
-			critical_error("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
-			++$errors;
+		$extensions = [
+			"bcmath" => "BC Math",
+			"curl" => "cURL",
+			"ctype" => "ctype",
+			"date" => "Date",
+			"hash" => "Hash",
+			"json" => "JSON",
+			"mbstring" => "Multibyte String",
+			"openssl" => "OpenSSL",
+			"pcre" => "PCRE",
+			"phar" => "Phar",
+			"pthreads" => "pthreads",
+			"reflection" => "Reflection",
+			"sockets" => "Sockets",
+			"spl" => "SPL",
+			"yaml" => "YAML",
+			"zip" => "Zip",
+			"zlib" => "Zlib"
+		];
+
+		foreach($extensions as $ext => $name){
+			if(!extension_loaded($ext)){
+				$messages[] = "Unable to find the $name ($ext) extension.";
+			}
 		}
+
+		if(extension_loaded("pthreads")){
+			$pthreads_version = phpversion("pthreads");
+			if(substr_count($pthreads_version, ".") < 2){
+				$pthreads_version = "0.$pthreads_version";
+			}
+			if(version_compare($pthreads_version, "3.1.7dev") < 0){
+				$messages[] = "pthreads >= 3.1.7dev is required, while you have $pthreads_version.";
+			}
+		}
+
+		if(extension_loaded("leveldb")){
+			$leveldb_version = phpversion("leveldb");
+			if(version_compare($leveldb_version, "0.2.1") < 0){
+				$messages[] = "php-leveldb >= 0.2.1 is required, while you have $leveldb_version.";
+			}
+		}
+
+		if(extension_loaded("pocketmine")){
+			$messages[] = "The native PocketMine extension is no longer supported.";
+		}
+
+		return $messages;
 	}
 
-	if(extension_loaded("pocketmine")){
-		critical_error("The native PocketMine extension is no longer supported.");
-		++$errors;
-	}
-
-	if($errors > 0){
+	if(!empty($messages = check_platform_dependencies())){
+		echo PHP_EOL;
+		$binary = version_compare(PHP_VERSION, "5.4") >= 0 ? PHP_BINARY : "unknown";
+		critical_error("Selected PHP binary ($binary) does not satisfy some requirements.");
+		foreach($messages as $m){
+			echo " - $m" . PHP_EOL;
+		}
 		critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
+		echo PHP_EOL;
 		exit(1);
 	}
+	unset($messages);
 
 	error_reporting(-1);
 
@@ -139,12 +145,18 @@ namespace pocketmine {
 		define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
 	}
 
-	define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
+	$opts = getopt("", ["bootstrap:"]);
+	if(isset($opts["bootstrap"])){
+		$bootstrap = realpath($opts["bootstrap"]) ?: $opts["bootstrap"];
+	}else{
+		$bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
+	}
+	define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
 
-	if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
+	if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
 		require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
 	}else{
-		critical_error("Composer autoloader not found.");
+		critical_error("Composer autoloader not found at " . $bootstrap);
 		critical_error("Please install/update Composer dependencies or use provided builds.");
 		exit(1);
 	}

src/pocketmine/Server.php

@@ -39,6 +39,7 @@ use pocketmine\event\HandlerList;
 use pocketmine\event\level\LevelInitEvent;
 use pocketmine\event\level\LevelLoadEvent;
 use pocketmine\event\player\PlayerDataSaveEvent;
+use pocketmine\event\server\CommandEvent;
 use pocketmine\event\server\QueryRegenerateEvent;
 use pocketmine\event\server\ServerCommandEvent;
 use pocketmine\inventory\CraftingManager;
@@ -82,6 +83,7 @@ use pocketmine\network\rcon\RCON;
 use pocketmine\network\upnp\UPnP;
 use pocketmine\permission\BanList;
 use pocketmine\permission\DefaultPermissions;
+use pocketmine\permission\PermissionManager;
 use pocketmine\plugin\PharPluginLoader;
 use pocketmine\plugin\Plugin;
 use pocketmine\plugin\PluginLoadOrder;
@@ -99,6 +101,7 @@ use pocketmine\timings\TimingsHandler;
 use pocketmine\updater\AutoUpdater;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Config;
+use pocketmine\utils\Internet;
 use pocketmine\utils\MainLogger;
 use pocketmine\utils\Terminal;
 use pocketmine\utils\TextFormat;
@@ -1025,14 +1028,8 @@ class Server{
 			return false;
 		}
 
-		try{
-			$level = new Level($this, $name, new $providerClass($path));
-		}catch(\Throwable $e){
-
-			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, $e->getMessage()]));
-			$this->logger->logException($e);
-			return false;
-		}
+		/** @see LevelProvider::__construct() */
+		$level = new Level($this, $name, new $providerClass($path));
 
 		$this->levels[$level->getId()] = $level;
 
@@ -1070,22 +1067,20 @@ class Server{
 
 		if(($providerClass = LevelProviderManager::getProviderByName($this->getProperty("level-settings.default-format", "pmanvil"))) === null){
 			$providerClass = LevelProviderManager::getProviderByName("pmanvil");
+			if($providerClass === null){
+				throw new \InvalidStateException("Default level provider has not been registered");
+			}
 		}
 
-		try{
-			$path = $this->getDataPath() . "worlds/" . $name . "/";
-			/** @var LevelProvider $providerClass */
-			$providerClass::generate($path, $name, $seed, $generator, $options);
+		$path = $this->getDataPath() . "worlds/" . $name . "/";
+		/** @var LevelProvider $providerClass */
+		$providerClass::generate($path, $name, $seed, $generator, $options);
 
-			$level = new Level($this, $name, new $providerClass($path));
-			$this->levels[$level->getId()] = $level;
+		/** @see LevelProvider::__construct() */
+		$level = new Level($this, $name, new $providerClass($path));
+		$this->levels[$level->getId()] = $level;
 
-			$level->setTickRate($this->baseTickRate);
-		}catch(\Throwable $e){
-			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.generationError", [$name, $e->getMessage()]));
-			$this->logger->logException($e);
-			return false;
-		}
+		$level->setTickRate($this->baseTickRate);
 
 		$this->getPluginManager()->callEvent(new LevelInitEvent($level));
 
@@ -1143,17 +1138,12 @@ class Server{
 	 * Useful for tracking entities across multiple worlds without needing strong references.
 	 *
 	 * @param int        $entityId
-	 * @param Level|null $expectedLevel Level to look in first for the target
+	 * @param Level|null $expectedLevel @deprecated Level to look in first for the target
 	 *
 	 * @return Entity|null
 	 */
 	public function findEntity(int $entityId, Level $expectedLevel = null){
-		$levels = $this->levels;
-		if($expectedLevel !== null){
-			array_unshift($levels, $expectedLevel);
-		}
-
-		foreach($levels as $level){
+		foreach($this->levels as $level){
 			assert(!$level->isClosed());
 			if(($entity = $level->getEntity($entityId)) instanceof Entity){
 				return $entity;
@@ -1300,7 +1290,7 @@ class Server{
 		if(($player = $this->getPlayerExact($name)) !== null){
 			$player->recalculatePermissions();
 		}
-		$this->operators->save(true);
+		$this->operators->save();
 	}
 
 	/**
@@ -1320,7 +1310,7 @@ class Server{
 	 */
 	public function addWhitelist(string $name){
 		$this->whitelist->set(strtolower($name), true);
-		$this->whitelist->save(true);
+		$this->whitelist->save();
 	}
 
 	/**
@@ -1633,7 +1623,7 @@ 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);
-			$this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);
+			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());
@@ -1691,7 +1681,7 @@ class Server{
 			}
 
 			if($this->properties->hasChanged()){
-				$this->properties->save(true);
+				$this->properties->save();
 			}
 
 			if(!($this->getDefaultLevel() instanceof Level)){
@@ -1742,7 +1732,7 @@ class Server{
 		if(!is_array($recipients)){
 			/** @var Player[] $recipients */
 			$recipients = [];
-			foreach($this->pluginManager->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
 				if($permissible instanceof Player and $permissible->hasPermission(self::BROADCAST_CHANNEL_USERS)){
 					$recipients[spl_object_hash($permissible)] = $permissible; // do not send messages directly, or some might be repeated
 				}
@@ -1768,7 +1758,7 @@ class Server{
 			/** @var Player[] $recipients */
 			$recipients = [];
 
-			foreach($this->pluginManager->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
 				if($permissible instanceof Player and $permissible->hasPermission(self::BROADCAST_CHANNEL_USERS)){
 					$recipients[spl_object_hash($permissible)] = $permissible; // do not send messages directly, or some might be repeated
 				}
@@ -1798,7 +1788,7 @@ class Server{
 			/** @var Player[] $recipients */
 			$recipients = [];
 
-			foreach($this->pluginManager->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
 				if($permissible instanceof Player and $permissible->hasPermission(self::BROADCAST_CHANNEL_USERS)){
 					$recipients[spl_object_hash($permissible)] = $permissible; // do not send messages directly, or some might be repeated
 				}
@@ -1823,7 +1813,7 @@ class Server{
 		/** @var CommandSender[] $recipients */
 		$recipients = [];
 		foreach(explode(";", $permissions) as $permission){
-			foreach($this->pluginManager->getPermissionSubscriptions($permission) as $permissible){
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions($permission) as $permissible){
 				if($permissible instanceof CommandSender and $permissible->hasPermission($permission)){
 					$recipients[spl_object_hash($permissible)] = $permissible; // do not send messages directly, or some might be repeated
 				}
@@ -1948,10 +1938,20 @@ class Server{
 	 *
 	 * @param CommandSender $sender
 	 * @param string        $commandLine
+	 * @param bool          $internal
 	 *
 	 * @return bool
 	 */
-	public function dispatchCommand(CommandSender $sender, string $commandLine) : bool{
+	public function dispatchCommand(CommandSender $sender, string $commandLine, bool $internal = false) : bool{
+		if(!$internal){
+			$this->pluginManager->callEvent($ev = new CommandEvent($sender, $commandLine));
+			if($ev->isCancelled()){
+				return false;
+			}
+
+			$commandLine = $ev->getCommand();
+		}
+
 		if($this->commandMap->dispatch($sender, $commandLine)){
 			return true;
 		}
@@ -1971,6 +1971,7 @@ class Server{
 
 		$this->pluginManager->disablePlugins();
 		$this->pluginManager->clearPlugins();
+		PermissionManager::getInstance()->clearPermissions();
 		$this->commandMap->clearCommands();
 
 		$this->logger->info("Reloading properties...");
@@ -2010,6 +2011,10 @@ class Server{
 			return;
 		}
 
+		if($this->doTitleTick){
+			echo "\x1b]0;\x07";
+		}
+
 		try{
 			if(!$this->isRunning()){
 				$this->sendUsage(SendUsageTask::TYPE_CLOSE);
@@ -2141,10 +2146,6 @@ class Server{
 	 * @param array|null $trace
 	 */
 	public function exceptionHandler(\Throwable $e, $trace = null){
-		if($e === null){
-			return;
-		}
-
 		global $lastError;
 
 		if($trace === null){
@@ -2202,7 +2203,7 @@ class Server{
 					}
 				}
 
-				if($dump->getData()["error"]["type"] === "E_PARSE" or $dump->getData()["error"]["type"] === "E_COMPILE_ERROR"){
+				if($dump->getData()["error"]["type"] === \ParseError::class){
 					$report = false;
 				}
 
@@ -2213,7 +2214,7 @@ class Server{
 
 				if($report){
 					$url = ($this->getProperty("auto-report.use-https", true) ? "https" : "http") . "://" . $this->getProperty("auto-report.host", "crash.pmmp.io") . "/submit/api";
-					$reply = Utils::postURL($url, [
+					$reply = Internet::postURL($url, [
 						"report" => "yes",
 						"name" => $this->getName() . " " . $this->getPocketMineVersion(),
 						"email" => "crash@pocketmine.net",
@@ -2347,41 +2348,37 @@ class Server{
 		}
 
 		//Do level ticks
-		foreach($this->getLevels() as $level){
+		foreach($this->levels as $k => $level){
+			if(!isset($this->levels[$k])){
+				// Level unloaded during the tick of a level earlier in this loop, perhaps by plugin
+				continue;
+			}
 			if($level->getTickRate() > $this->baseTickRate and --$level->tickRateCounter > 0){
 				continue;
 			}
-			try{
-				$levelTime = microtime(true);
-				$level->doTick($currentTick);
-				$tickMs = (microtime(true) - $levelTime) * 1000;
-				$level->tickRateTime = $tickMs;
 
-				if($this->autoTickRate){
-					if($tickMs < 50 and $level->getTickRate() > $this->baseTickRate){
-						$level->setTickRate($r = $level->getTickRate() - 1);
-						if($r > $this->baseTickRate){
-							$level->tickRateCounter = $level->getTickRate();
-						}
-						$this->getLogger()->debug("Raising level \"{$level->getName()}\" tick rate to {$level->getTickRate()} ticks");
-					}elseif($tickMs >= 50){
-						if($level->getTickRate() === $this->baseTickRate){
-							$level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50))));
-							$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
-						}elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){
-							$level->setTickRate($level->getTickRate() + 1);
-							$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
-						}
+			$levelTime = microtime(true);
+			$level->doTick($currentTick);
+			$tickMs = (microtime(true) - $levelTime) * 1000;
+			$level->tickRateTime = $tickMs;
+
+			if($this->autoTickRate){
+				if($tickMs < 50 and $level->getTickRate() > $this->baseTickRate){
+					$level->setTickRate($r = $level->getTickRate() - 1);
+					if($r > $this->baseTickRate){
 						$level->tickRateCounter = $level->getTickRate();
 					}
+					$this->getLogger()->debug("Raising level \"{$level->getName()}\" tick rate to {$level->getTickRate()} ticks");
+				}elseif($tickMs >= 50){
+					if($level->getTickRate() === $this->baseTickRate){
+						$level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50))));
+						$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
+					}elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){
+						$level->setTickRate($level->getTickRate() + 1);
+						$this->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate()));
+					}
+					$level->tickRateCounter = $level->getTickRate();
 				}
-			}catch(\Throwable $e){
-				if(!$level->isClosed()){
-					$this->logger->critical($this->getLanguage()->translateString("pocketmine.level.tickError", [$level->getName(), $e->getMessage()]));
-				}else{
-					$this->logger->critical($this->getLanguage()->translateString("pocketmine.level.tickUnloadError", [$level->getName()]));
-				}
-				$this->logger->logException($e);
 			}
 		}
 	}
@@ -2471,6 +2468,8 @@ class Server{
 		try{
 			if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){
 				$this->queryHandler->handle($interface, $address, $port, $payload);
+			}else{
+				$this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload));
 			}
 		}catch(\Throwable $e){
 			if(\pocketmine\DEBUG > 1){
@@ -2526,13 +2525,9 @@ class Server{
 		}
 
 		if(($this->tickCounter & 0b111111111) === 0){
-			try{
-				$this->getPluginManager()->callEvent($this->queryRegenerateTask = new QueryRegenerateEvent($this, 5));
-				if($this->queryHandler !== null){
-					$this->queryHandler->regenerateInfo();
-				}
-			}catch(\Throwable $e){
-				$this->logger->logException($e);
+			$this->getPluginManager()->callEvent($this->queryRegenerateTask = new QueryRegenerateEvent($this, 5));
+			if($this->queryHandler !== null){
+				$this->queryHandler->regenerateInfo();
 			}
 		}
 

src/pocketmine/Thread.php

@@ -67,14 +67,10 @@ abstract class Thread extends \Thread{
 	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
-			if($this->getClassLoader() === null){
-				$this->setClassLoader();
-			}
-			return parent::start($options);
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
 		}
-
-		return false;
+		return parent::start($options);
 	}
 
 	/**
@@ -83,12 +79,9 @@ abstract class Thread extends \Thread{
 	public function quit(){
 		$this->isKilled = true;
 
-		$this->notify();
-
 		if(!$this->isJoined()){
-			if(!$this->isTerminated()){
-				$this->join();
-			}
+			$this->notify();
+			$this->join();
 		}
 
 		ThreadManager::getInstance()->remove($this);

src/pocketmine/Worker.php

@@ -67,14 +67,10 @@ abstract class Worker extends \Worker{
 	public function start(?int $options = \PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
-			if($this->getClassLoader() === null){
-				$this->setClassLoader();
-			}
-			return parent::start($options);
+		if($this->getClassLoader() === null){
+			$this->setClassLoader();
 		}
-
-		return false;
+		return parent::start($options);
 	}
 
 	/**
@@ -83,16 +79,10 @@ abstract class Worker extends \Worker{
 	public function quit(){
 		$this->isKilled = true;
 
-		$this->notify();
-
 		if($this->isRunning()){
-			$this->shutdown();
+			while($this->unstack() !== null);
 			$this->notify();
-			$this->unstack();
-		}elseif(!$this->isJoined()){
-			if(!$this->isTerminated()){
-				$this->join();
-			}
+			$this->shutdown();
 		}
 
 		ThreadManager::getInstance()->remove($this);

src/pocketmine/block/Anvil.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\AnvilInventory;
 use pocketmine\item\Item;
-use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -55,13 +54,17 @@ class Anvil extends Fallable{
 		return 6000;
 	}
 
+	public function getVariantBitmask() : int{
+		return 0x0c;
+	}
+
 	public function getName() : string{
 		static $names = [
 			self::TYPE_NORMAL => "Anvil",
 			self::TYPE_SLIGHTLY_DAMAGED => "Slightly Damaged Anvil",
 			self::TYPE_VERY_DAMAGED => "Very Damaged Anvil"
 		];
-		return $names[$this->meta & 0x0c] ?? "Anvil";
+		return $names[$this->getVariant()] ?? "Anvil";
 	}
 
 	public function getToolType() : int{
@@ -106,13 +109,7 @@ class Anvil extends Fallable{
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
-		$this->meta = ($this->meta & 0x0c) | $direction;
+		$this->meta = $this->getVariant() | $direction;
 		return $this->getLevel()->setBlock($blockReplace, $this, true, true);
 	}
-
-	public function getDropsForCompatibleTool(Item $item) : array{
-		return [
-			ItemFactory::get($this->getItemId(), $this->getDamage() >> 2)
-		];
-	}
 }

src/pocketmine/block/Bed.php

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

src/pocketmine/block/Block.php

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

src/pocketmine/block/BlockFactory.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Position;
-use pocketmine\utils\MainLogger;
 
 /**
  * Manages block registration and instance creation
@@ -422,8 +421,8 @@ class BlockFactory{
 	public static function registerStaticRuntimeIdMappings() : void{
 		/** @var mixed[] $runtimeIdMap */
 		$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
-		foreach($runtimeIdMap as $obj){
-			self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
+		foreach($runtimeIdMap as $k => $obj){
+			self::registerMapping($k, $obj["id"], $obj["data"]);
 		}
 	}
 
@@ -436,19 +435,12 @@ class BlockFactory{
 	 * @return int
 	 */
 	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
-		if($id === Block::AIR){
-			//TODO: HACK! (weird air blocks with non-zero damage values shouldn't turn into update! blocks)
-			$meta = 0;
-		}
-
-		$index = ($id << 4) | $meta;
-		if(!isset(self::$staticRuntimeIdMap[$index])){
-			self::registerMapping($rtId = ++self::$lastRuntimeId, $id, $meta);
-			MainLogger::getLogger()->error("ID $id meta $meta does not have a corresponding block static runtime ID, added a new unknown runtime ID ($rtId)");
-			return $rtId;
-		}
-
-		return self::$staticRuntimeIdMap[$index];
+		/*
+		 * try id+meta first
+		 * if not found, try id+0 (strip meta)
+		 * if still not found, return update! block
+		 */
+		return self::$staticRuntimeIdMap[($id << 4) | $meta] ?? self::$staticRuntimeIdMap[$id << 4] ?? self::$staticRuntimeIdMap[BlockIds::INFO_UPDATE << 4];
 	}
 
 	/**

src/pocketmine/block/BrewingStand.php

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

src/pocketmine/block/Cactus.php

@@ -77,7 +77,7 @@ class Cactus extends Transparent{
 		}else{
 			for($side = 2; $side <= 5; ++$side){
 				$b = $this->getSide($side);
-				if(!$b->canBeFlowedInto()){
+				if($b->isSolid()){
 					$this->getLevel()->useBreakOn($this);
 					break;
 				}
@@ -117,7 +117,7 @@ class Cactus extends Transparent{
 			$block1 = $this->getSide(Vector3::SIDE_SOUTH);
 			$block2 = $this->getSide(Vector3::SIDE_WEST);
 			$block3 = $this->getSide(Vector3::SIDE_EAST);
-			if($block0->isTransparent() and $block1->isTransparent() and $block2->isTransparent() and $block3->isTransparent()){
+			if(!$block0->isSolid() and !$block1->isSolid() and !$block2->isSolid() and !$block3->isSolid()){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;

src/pocketmine/block/Cake.php

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

src/pocketmine/block/CoalOre.php

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

src/pocketmine/block/ConcretePowder.php

@@ -66,7 +66,7 @@ class ConcretePowder extends Fallable{
 	private function checkAdjacentWater() : ?Block{
 		for($i = 1; $i < 6; ++$i){ //Do not check underneath
 			if($this->getSide($i) instanceof Water){
-				return Block::get(Block::CONCRETE, $this->meta);
+				return BlockFactory::get(Block::CONCRETE, $this->meta);
 			}
 		}
 

src/pocketmine/block/DoubleSlab.php

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

src/pocketmine/block/EmeraldOre.php

@@ -53,7 +53,11 @@ class EmeraldOre extends Solid{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-				ItemFactory::get(Item::EMERALD)
+			ItemFactory::get(Item::EMERALD)
 		];
 	}
+
+	protected function getXpDropAmount() : int{
+		return mt_rand(3, 7);
+	}
 }

src/pocketmine/block/Farmland.php

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

src/pocketmine/block/RedstoneOre.php

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

src/pocketmine/block/SignPost.php

@@ -61,7 +61,7 @@ class SignPost extends Transparent{
 		if($face !== Vector3::SIDE_DOWN){
 
 			if($face === Vector3::SIDE_UP){
-				$this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0f;
+				$this->meta = $player !== null ? (floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0f) : 0;
 				$this->getLevel()->setBlock($blockReplace, $this, true);
 			}else{
 				$this->meta = $face;

src/pocketmine/block/Skull.php

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

src/pocketmine/block/TNT.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Arrow;
 use pocketmine\item\FlintSteel;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
@@ -56,6 +57,16 @@ class TNT extends Solid{
 		return false;
 	}
 
+	public function hasEntityCollision() : bool{
+		return true;
+	}
+
+	public function onEntityCollide(Entity $entity) : void{
+		if($entity instanceof Arrow and $entity->isOnFire()){
+			$this->ignite();
+		}
+	}
+
 	public function ignite(int $fuse = 80){
 		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
 

src/pocketmine/block/Thin.php

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

src/pocketmine/block/Torch.php

@@ -55,7 +55,7 @@ class Torch extends Flowable{
 			5 => Vector3::SIDE_DOWN
 		];
 
-		if($this->getSide($faces[$side])->isTransparent() and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
+		if($this->getSide($faces[$side])->isTransparent() and !($faces[$side] === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
 			$this->getLevel()->useBreakOn($this);
 		}
 	}

src/pocketmine/command/Command.php

@@ -28,6 +28,7 @@ namespace pocketmine\command;
 
 use pocketmine\lang\TextContainer;
 use pocketmine\lang\TranslationContainer;
+use pocketmine\permission\PermissionManager;
 use pocketmine\Server;
 use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\TextFormat;
@@ -127,7 +128,7 @@ abstract class Command{
 		if($this->permissionMessage === null){
 			$target->sendMessage($target->getServer()->getLanguage()->translateString(TextFormat::RED . "%commands.generic.permission"));
 		}elseif($this->permissionMessage !== ""){
-			$target->sendMessage(str_replace("<permission>", $this->getPermission(), $this->permissionMessage));
+			$target->sendMessage(str_replace("<permission>", $this->permission, $this->permissionMessage));
 		}
 
 		return false;
@@ -139,11 +140,11 @@ abstract class Command{
 	 * @return bool
 	 */
 	public function testPermissionSilent(CommandSender $target) : bool{
-		if(($perm = $this->getPermission()) === null or $perm === ""){
+		if($this->permission === null or $this->permission === ""){
 			return true;
 		}
 
-		foreach(explode(";", $perm) as $permission){
+		foreach(explode(";", $this->permission) as $permission){
 			if($target->hasPermission($permission)){
 				return true;
 			}
@@ -293,7 +294,7 @@ abstract class Command{
 			$m = clone $message;
 			$result = "[" . $source->getName() . ": " . ($source->getServer()->getLanguage()->get($m->getText()) !== $m->getText() ? "%" : "") . $m->getText() . "]";
 
-			$users = $source->getServer()->getPluginManager()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_ADMINISTRATIVE);
+			$users = PermissionManager::getInstance()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_ADMINISTRATIVE);
 			$colored = TextFormat::GRAY . TextFormat::ITALIC . $result;
 
 			$m->setText($result);
@@ -301,7 +302,7 @@ abstract class Command{
 			$m->setText($colored);
 			$colored = clone $m;
 		}else{
-			$users = $source->getServer()->getPluginManager()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_ADMINISTRATIVE);
+			$users = PermissionManager::getInstance()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_ADMINISTRATIVE);
 			$result = new TranslationContainer("chat.type.admin", [$source->getName(), $message]);
 			$colored = new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%chat.type.admin", [$source->getName(), $message]);
 		}

src/pocketmine/command/CommandReader.php

@@ -25,6 +25,7 @@ namespace pocketmine\command;
 
 use pocketmine\snooze\SleeperNotifier;
 use pocketmine\Thread;
+use pocketmine\utils\Utils;
 
 class CommandReader extends Thread{
 
@@ -47,9 +48,9 @@ class CommandReader extends Thread{
 		$this->buffer = new \Threaded;
 		$this->notifier = $notifier;
 
-		$opts = getopt("", ["disable-readline"]);
+		$opts = getopt("", ["disable-readline", "enable-readline"]);
 
-		if(extension_loaded("readline") and !isset($opts["disable-readline"]) and !$this->isPipe(STDIN)){
+		if(extension_loaded("readline") and (Utils::getOS() === "win" ? isset($opts["enable-readline"]) : !isset($opts["disable-readline"])) and !$this->isPipe(STDIN)){
 			$this->type = self::TYPE_READLINE;
 		}
 	}

src/pocketmine/command/FormattedCommandAlias.php

@@ -59,7 +59,7 @@ class FormattedCommandAlias extends Command{
 		}
 
 		foreach($commands as $command){
-			$result |= Server::getInstance()->dispatchCommand($sender, $command);
+			$result |= Server::getInstance()->dispatchCommand($sender, $command, true);
 		}
 
 		return (bool) $result;

src/pocketmine/command/SimpleCommandMap.php

@@ -302,9 +302,9 @@ class SimpleCommandMap implements CommandMap{
 			}
 
 			$targets = [];
+			$bad = [];
+			$recursive = [];
 
-			$bad = "";
-			$recursive = "";
 			foreach($commandStrings as $commandString){
 				$args = explode(" ", $commandString);
 				$commandName = "";
@@ -312,27 +312,21 @@ class SimpleCommandMap implements CommandMap{
 
 
 				if($command === null){
-					if(strlen($bad) > 0){
-						$bad .= ", ";
-					}
-					$bad .= $commandString;
+					$bad[] = $commandString;
 				}elseif($commandName === $alias){
-					if($recursive !== ""){
-						$recursive .= ", ";
-					}
-					$recursive .= $commandString;
+					$recursive[] = $commandString;
 				}else{
 					$targets[] = $commandString;
 				}
 			}
 
-			if($recursive !== ""){
-				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.recursive", [$alias, $recursive]));
+			if(!empty($recursive)){
+				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.recursive", [$alias, implode(", ", $recursive)]));
 				continue;
 			}
 
-			if(strlen($bad) > 0){
-				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.notFound", [$alias, $bad]));
+			if(!empty($bad)){
+				$this->server->getLogger()->warning($this->server->getLanguage()->translateString("pocketmine.command.alias.notFound", [$alias, implode(", ", $bad)]));
 				continue;
 			}
 

src/pocketmine/command/defaults/KillCommand.php

@@ -62,15 +62,7 @@ class KillCommand extends VanillaCommand{
 			$player = $sender->getServer()->getPlayer($args[0]);
 
 			if($player instanceof Player){
-				$sender->getServer()->getPluginManager()->callEvent($ev = new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000));
-
-				if($ev->isCancelled()){
-					return true;
-				}
-
-				$player->setLastDamageCause($ev);
-				$player->setHealth(0);
-
+				$player->attack(new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000));
 				Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kill.successful", [$player->getName()]));
 			}else{
 				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
@@ -86,14 +78,7 @@ class KillCommand extends VanillaCommand{
 				return true;
 			}
 
-			$sender->getServer()->getPluginManager()->callEvent($ev = new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000));
-
-			if($ev->isCancelled()){
-				return true;
-			}
-
-			$sender->setLastDamageCause($ev);
-			$sender->setHealth(0);
+			$sender->attack(new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000));
 			$sender->sendMessage(new TranslationContainer("commands.kill.successful", [$sender->getName()]));
 		}else{
 			throw new InvalidCommandSyntaxException();

src/pocketmine/command/defaults/PluginsCommand.php

@@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\lang\TranslationContainer;
+use pocketmine\plugin\Plugin;
 use pocketmine\utils\TextFormat;
 
 class PluginsCommand extends VanillaCommand{
@@ -43,20 +44,12 @@ class PluginsCommand extends VanillaCommand{
 		if(!$this->testPermission($sender)){
 			return true;
 		}
-		$this->sendPluginList($sender);
+
+		$list = array_map(function(Plugin $plugin) : string{
+			return ($plugin->isEnabled() ? TextFormat::GREEN : TextFormat::RED) . $plugin->getDescription()->getFullName();
+		}, $sender->getServer()->getPluginManager()->getPlugins());
+
+		$sender->sendMessage(new TranslationContainer("pocketmine.command.plugins.success", [count($list), implode(TextFormat::WHITE . ", ", $list)]));
 		return true;
 	}
-
-	private function sendPluginList(CommandSender $sender){
-		$list = "";
-		foreach(($plugins = $sender->getServer()->getPluginManager()->getPlugins()) as $plugin){
-			if(strlen($list) > 0){
-				$list .= TextFormat::WHITE . ", ";
-			}
-			$list .= $plugin->isEnabled() ? TextFormat::GREEN : TextFormat::RED;
-			$list .= $plugin->getDescription()->getFullName();
-		}
-
-		$sender->sendMessage(new TranslationContainer("pocketmine.command.plugins.success", [count($plugins), $list]));
-	}
 }

src/pocketmine/command/defaults/TeleportCommand.php

@@ -49,7 +49,7 @@ class TeleportCommand extends VanillaCommand{
 		}
 
 		$args = array_values(array_filter($args, function($arg){
-			return strlen($arg) > 0;
+			return $arg !== "";
 		}));
 		if(count($args) < 1 or count($args) > 6){
 			throw new InvalidCommandSyntaxException();

src/pocketmine/command/defaults/TellCommand.php

@@ -50,9 +50,7 @@ class TellCommand extends VanillaCommand{
 			throw new InvalidCommandSyntaxException();
 		}
 
-		$name = strtolower(array_shift($args));
-
-		$player = $sender->getServer()->getPlayer($name);
+		$player = $sender->getServer()->getPlayer(array_shift($args));
 
 		if($player === $sender){
 			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.message.sameTarget"));

src/pocketmine/command/defaults/TimingsCommand.php

@@ -30,6 +30,7 @@ use pocketmine\Player;
 use pocketmine\scheduler\BulkCurlTask;
 use pocketmine\Server;
 use pocketmine\timings\TimingsHandler;
+use pocketmine\utils\InternetException;
 
 class TimingsCommand extends VanillaCommand{
 
@@ -98,48 +99,51 @@ class TimingsCommand extends VanillaCommand{
 			if($paste){
 				fseek($fileTimings, 0);
 				$data = [
-					"syntax" => "text",
-					"poster" => $sender->getServer()->getName(),
-					"content" => stream_get_contents($fileTimings)
+					"browser" => $agent = $sender->getServer()->getName() . " " . $sender->getServer()->getPocketMineVersion(),
+					"data" => $content = stream_get_contents($fileTimings)
 				];
 				fclose($fileTimings);
 
-				$sender->getServer()->getAsyncPool()->submitTask(new class([
-					["page" => "http://paste.ubuntu.com", "extraOpts" => [
-						CURLOPT_HTTPHEADER => ["User-Agent: " . $sender->getServer()->getName() . " " . $sender->getServer()->getPocketMineVersion()],
-						CURLOPT_POST => 1,
-						CURLOPT_POSTFIELDS => $data,
-						CURLOPT_AUTOREFERER => false,
-						CURLOPT_FOLLOWLOCATION => false
-					]]
-				], $sender) extends BulkCurlTask{
+				$host = $sender->getServer()->getProperty("timings.host", "timings.pmmp.io");
+
+				$sender->getServer()->getAsyncPool()->submitTask(new class($sender, $host, $agent, $data) extends BulkCurlTask{
+					/** @var string */
+					private $host;
+
+					public function __construct(CommandSender $sender, string $host, string $agent, array $data){
+						parent::__construct([
+							["page" => "https://$host?upload=true", "extraOpts" => [
+								CURLOPT_HTTPHEADER => [
+									"User-Agent: $agent",
+									"Content-Type: application/x-www-form-urlencoded"
+								],
+								CURLOPT_POST => true,
+								CURLOPT_POSTFIELDS => http_build_query($data),
+								CURLOPT_AUTOREFERER => false,
+								CURLOPT_FOLLOWLOCATION => false
+							]]
+						], $sender);
+						$this->host = $host;
+					}
+
 					public function onCompletion(Server $server){
 						$sender = $this->fetchLocal();
 						if($sender instanceof Player and !$sender->isOnline()){ // TODO replace with a more generic API method for checking availability of CommandSender
 							return;
 						}
 						$result = $this->getResult()[0];
-						if($result instanceof \RuntimeException){
+						if($result instanceof InternetException){
 							$server->getLogger()->logException($result);
 							return;
 						}
-						list(, $headers) = $result;
-						foreach($headers as $headerGroup){
-							if(isset($headerGroup["location"]) and preg_match('#^http://paste\\.ubuntu\\.com/([A-Za-z0-9+\/=]+)/#', trim($headerGroup["location"]), $match)){
-								$pasteId = $match[1];
-								break;
-							}
-						}
-						if(isset($pasteId)){
-							$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsUpload", ["http://paste.ubuntu.com/" . $pasteId . "/"]));
+						if(isset($result[0]) && is_array($response = json_decode($result[0], true)) && isset($response["id"])){
 							$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsRead",
-								["http://" . $sender->getServer()->getProperty("timings.host", "timings.pmmp.io") . "/?url=" . urlencode($pasteId)]));
+								["https://" . $this->host . "/?id=" . $response["id"]]));
 						}else{
 							$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.pasteError"));
 						}
 					}
 				});
-
 			}else{
 				fclose($fileTimings);
 				$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsWrite", [$timings]));

src/pocketmine/entity/Effect.php

@@ -56,6 +56,7 @@ class Effect{
 	public const SATURATION = 23;
 	public const LEVITATION = 24; //TODO
 	public const FATAL_POISON = 25;
+	public const CONDUIT_POWER = 26;
 
 	/** @var Effect[] */
 	protected static $effects = [];
@@ -86,6 +87,7 @@ class Effect{
 		self::registerEffect(new Effect(Effect::SATURATION, "%potion.saturation", new Color(0xf8, 0x24, 0x23), false, 1));
 		self::registerEffect(new Effect(Effect::LEVITATION, "%potion.levitation", new Color(0xce, 0xff, 0xff)));
 		self::registerEffect(new Effect(Effect::FATAL_POISON, "%potion.poison", new Color(0x4e, 0x93, 0x31), true));
+		self::registerEffect(new Effect(Effect::CONDUIT_POWER, "%potion.conduitPower", new Color(0x1d, 0xc2, 0xd1)));
 	}
 
 	/**

src/pocketmine/entity/Entity.php

@@ -64,7 +64,7 @@ use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\protocol\AddEntityPacket;
 use pocketmine\network\mcpe\protocol\EntityEventPacket;
-use pocketmine\network\mcpe\protocol\MoveEntityPacket;
+use pocketmine\network\mcpe\protocol\MoveEntityAbsolutePacket;
 use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
 use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
 use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
@@ -169,7 +169,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_LIMITED_LIFE = 77;
 	public const DATA_ARMOR_STAND_POSE_INDEX = 78; //int
 	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; //int
-	/* 80 (byte) something to do with nametag visibility? */
+	public const DATA_ALWAYS_SHOW_NAMETAG = 80; //byte: -1 = default, 0 = only when looked at, 1 = always
 	public const DATA_COLOR_2 = 81; //byte
 	/* 82 (unknown) */
 	public const DATA_SCORE_TAG = 83; //string
@@ -228,7 +228,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_FLAG_FIRE_IMMUNE = 48;
 	public const DATA_FLAG_DANCING = 49;
 	public const DATA_FLAG_ENCHANTED = 50;
-	//51 is something to do with tridents
+	public const DATA_FLAG_SHOW_TRIDENT_ROPE = 51; // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
 	public const DATA_FLAG_CONTAINER_PRIVATE = 52; //inventory is private, doesn't drop contents when killed if true
 	//53 TransformationComponent
 	public const DATA_FLAG_SPIN_ATTACK = 54;
@@ -285,6 +285,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public static function createEntity($type, Level $level, CompoundTag $nbt, ...$args) : ?Entity{
 		if(isset(self::$knownEntities[$type])){
 			$class = self::$knownEntities[$type];
+			/** @see Entity::__construct() */
 			return new $class($level, $nbt, ...$args);
 		}
 
@@ -407,8 +408,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public $boundingBox;
 	/** @var bool */
 	public $onGround;
-	/** @var int */
-	protected $age = 0;
 
 	/** @var float */
 	public $eyeHeight = null;
@@ -606,7 +605,21 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param bool $value
 	 */
 	public function setNameTagAlwaysVisible(bool $value = true) : void{
-		$this->setGenericFlag(self::DATA_FLAG_ALWAYS_SHOW_NAMETAG, $value);
+		$this->propertyManager->setByte(self::DATA_ALWAYS_SHOW_NAMETAG, $value ? 1 : 0);
+	}
+
+	/**
+	 * @return string|null
+	 */
+	public function getScoreTag() : ?string{
+		return $this->propertyManager->getString(self::DATA_SCORE_TAG);
+	}
+
+	/**
+	 * @param string $score
+	 */
+	public function setScoreTag(string $score) : void{
+		$this->propertyManager->setString(self::DATA_SCORE_TAG, $score);
 	}
 
 	/**
@@ -734,7 +747,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public function getOwningEntity() : ?Entity{
 		$eid = $this->getOwningEntityId();
 		if($eid !== null){
-			return $this->server->findEntity($eid, $this->level);
+			return $this->server->findEntity($eid);
 		}
 
 		return null;
@@ -774,7 +787,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public function getTargetEntity() : ?Entity{
 		$eid = $this->getTargetEntityId();
 		if($eid !== null){
-			return $this->server->findEntity($eid, $this->level);
+			return $this->server->findEntity($eid);
 		}
 
 		return null;
@@ -1015,8 +1028,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$hasUpdate = true;
 		}
 
-		if($this->isOnFire()){
-			$hasUpdate = ($hasUpdate || $this->doOnFireTick($tickDiff));
+		if($this->isOnFire() and $this->doOnFireTick($tickDiff)){
+			$hasUpdate = true;
 		}
 
 		if($this->noDamageTicks > 0){
@@ -1026,7 +1039,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			}
 		}
 
-		$this->age += $tickDiff;
 		$this->ticksLived += $tickDiff;
 
 		return $hasUpdate;
@@ -1101,7 +1113,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	public function canBeCollidedWith() : bool{
-		return true;
+		return $this->isAlive();
 	}
 
 	protected function updateMovement(bool $teleport = false) : void{
@@ -1134,13 +1146,20 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 	protected function broadcastMovement(bool $teleport = false) : void{
 		if($this->chunk !== null){
-			$pk = new MoveEntityPacket();
+			$pk = new MoveEntityAbsolutePacket();
 			$pk->entityRuntimeId = $this->id;
 			$pk->position = $this->getOffsetPosition($this);
-			$pk->yaw = $this->yaw;
-			$pk->pitch = $this->pitch;
-			$pk->headYaw = $this->yaw; //TODO
-			$pk->teleported = $teleport;
+
+			//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);
 		}
@@ -1346,7 +1365,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 
 		if($this->hasMovementUpdate()){
 			$this->tryChangeMovement();
-			$this->move($this->motion->x, $this->motion->y, $this->motion->z);
 
 			if(abs($this->motion->x) <= self::MOTION_THRESHOLD){
 				$this->motion->x = 0;
@@ -1358,6 +1376,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 				$this->motion->z = 0;
 			}
 
+			if($this->motion->x != 0 or $this->motion->y != 0 or $this->motion->z != 0){
+				$this->move($this->motion->x, $this->motion->y, $this->motion->z);
+			}
+
 			$this->forceMovementUpdate = false;
 		}
 

src/pocketmine/entity/Human.php

@@ -34,6 +34,7 @@ use pocketmine\inventory\EntityInventoryEventProcessor;
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Consumable;
+use pocketmine\item\Durable;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
@@ -49,7 +50,9 @@ use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\EntityEventPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
+use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
+use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\Player;
 use pocketmine\utils\UUID;
 
@@ -516,6 +519,42 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return $this->xpCooldown === 0;
 	}
 
+	public function onPickupXp(int $xpValue) : void{
+		static $mainHandIndex = -1;
+
+		//TODO: replace this with a more generic equipment getting/setting interface
+		/** @var Durable[] $equipment */
+		$equipment = [];
+
+		if(($item = $this->inventory->getItemInHand()) instanceof Durable and $item->hasEnchantment(Enchantment::MENDING)){
+			$equipment[$mainHandIndex] = $item;
+		}
+		//TODO: check offhand
+		foreach($this->armorInventory->getContents() as $k => $item){
+			if($item instanceof Durable and $item->hasEnchantment(Enchantment::MENDING)){
+				$equipment[$k] = $item;
+			}
+		}
+
+		if(!empty($equipment)){
+			$repairItem = $equipment[$k = array_rand($equipment)];
+			if($repairItem->getDamage() > 0){
+				$repairAmount = min($repairItem->getDamage(), $xpValue * 2);
+				$repairItem->setDamage($repairItem->getDamage() - $repairAmount);
+				$xpValue -= (int) ceil($repairAmount / 2);
+
+				if($k === $mainHandIndex){
+					$this->inventory->setItemInHand($repairItem);
+				}else{
+					$this->armorInventory->setItem($k, $repairItem);
+				}
+			}
+		}
+
+		$this->addXp($xpValue); //this will still get fired even if the value is 0 due to mending, to play sounds
+		$this->resetXpCooldown();
+	}
+
 	/**
 	 * Sets the duration in ticks until the human can pick up another XP orb.
 	 *
@@ -798,6 +837,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			throw new \InvalidStateException((new \ReflectionClass($this))->getShortName() . " must have a valid skin set");
 		}
 
+		if(!($this instanceof Player)){
+			/* we don't use Server->updatePlayerListData() because that uses batches, which could cause race conditions in async compression mode */
+			$pk = new PlayerListPacket();
+			$pk->type = PlayerListPacket::TYPE_ADD;
+			$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->getName(), 0, $this->skin)];
+			$player->dataPacket($pk);
+		}
+
 		$pk = new AddPlayerPacket();
 		$pk->uuid = $this->getUniqueId();
 		$pk->username = $this->getName();
@@ -816,7 +863,10 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		$this->armorInventory->sendContents($player);
 
 		if(!($this instanceof Player)){
-			$this->sendSkin([$player]);
+			$pk = new PlayerListPacket();
+			$pk->type = PlayerListPacket::TYPE_REMOVE;
+			$pk->entries = [PlayerListEntry::createRemovalEntry($this->uuid)];
+			$player->dataPacket($pk);
 		}
 	}
 

src/pocketmine/entity/Living.php

@@ -34,6 +34,7 @@ use pocketmine\inventory\ArmorInventory;
 use pocketmine\inventory\ArmorInventoryEventProcessor;
 use pocketmine\item\Armor;
 use pocketmine\item\Consumable;
+use pocketmine\item\Durable;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
@@ -469,12 +470,33 @@ abstract class Living extends Entity implements Damageable{
 	/**
 	 * Called after EntityDamageEvent execution to apply post-hurt effects, such as reducing absorption or modifying
 	 * armour durability.
+	 * This will not be called by damage sources causing death.
 	 *
 	 * @param EntityDamageEvent $source
 	 */
 	protected function applyPostDamageEffects(EntityDamageEvent $source) : void{
 		$this->setAbsorption(max(0, $this->getAbsorption() + $source->getModifier(EntityDamageEvent::MODIFIER_ABSORPTION)));
 		$this->damageArmor($source->getBaseDamage());
+
+		if($source instanceof EntityDamageByEntityEvent){
+			$damage = 0;
+			foreach($this->armorInventory->getContents() as $k => $item){
+				if($item instanceof Armor and ($thornsLevel = $item->getEnchantmentLevel(Enchantment::THORNS)) > 0){
+					if(mt_rand(0, 99) < $thornsLevel * 15){
+						$this->damageItem($item, 3);
+						$damage += ($thornsLevel > 10 ? $thornsLevel - 10 : 1 + mt_rand(0, 3));
+					}else{
+						$this->damageItem($item, 1); //thorns causes an extra +1 durability loss even if it didn't activate
+					}
+
+					$this->armorInventory->setItem($k, $item);
+				}
+			}
+
+			if($damage > 0){
+				$source->getDamager()->attack(new EntityDamageByEntityEvent($this, $source->getDamager(), EntityDamageEvent::CAUSE_MAGIC, $damage));
+			}
+		}
 	}
 
 	/**
@@ -489,16 +511,20 @@ abstract class Living extends Entity implements Damageable{
 		$armor = $this->armorInventory->getContents(true);
 		foreach($armor as $item){
 			if($item instanceof Armor){
-				$item->applyDamage($durabilityRemoved);
-				if($item->isBroken()){
-					$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_BREAK);
-				}
+				$this->damageItem($item, $durabilityRemoved);
 			}
 		}
 
 		$this->armorInventory->setContents($armor);
 	}
 
+	private function damageItem(Durable $item, int $durabilityRemoved) : void{
+		$item->applyDamage($durabilityRemoved);
+		if($item->isBroken()){
+			$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_BREAK);
+		}
+	}
+
 	public function attack(EntityDamageEvent $source) : void{
 		if($this->attackTime > 0 or $this->noDamageTicks > 0){
 			$lastCause = $this->getLastDamageCause();
@@ -534,6 +560,8 @@ abstract class Living extends Entity implements Damageable{
 			return;
 		}
 
+		$this->attackTime = $source->getAttackCooldown();
+
 		if($source instanceof EntityDamageByEntityEvent){
 			$e = $source->getDamager();
 			if($source instanceof EntityDamageByChildEntityEvent){
@@ -551,15 +579,10 @@ abstract class Living extends Entity implements Damageable{
 			}
 		}
 
-		$this->applyPostDamageEffects($source);
-
 		if($this->isAlive()){
+			$this->applyPostDamageEffects($source);
 			$this->doHitAnimation();
-		}else{
-			$this->startDeathAnimation();
 		}
-
-		$this->attackTime = 10; //0.5 seconds cooldown
 	}
 
 	protected function doHitAnimation() : void{
@@ -594,6 +617,7 @@ abstract class Living extends Entity implements Damageable{
 	public function kill() : void{
 		parent::kill();
 		$this->onDeath();
+		$this->startDeathAnimation();
 	}
 
 	protected function onDeath() : void{
@@ -630,7 +654,9 @@ abstract class Living extends Entity implements Damageable{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		$this->doEffectsTick($tickDiff);
+		if($this->doEffectsTick($tickDiff)){
+			$hasUpdate = true;
+		}
 
 		if($this->isAlive()){
 			if($this->isInsideOfSolid()){
@@ -639,12 +665,8 @@ abstract class Living extends Entity implements Damageable{
 				$this->attack($ev);
 			}
 
-			if(!$this->canBreathe()){
-				$this->setBreathing(false);
-				$this->doAirSupplyTick($tickDiff);
-			}elseif(!$this->isBreathing()){
-				$this->setBreathing(true);
-				$this->setAirSupplyTicks($this->getMaxAirSupplyTicks());
+			if($this->doAirSupplyTick($tickDiff)){
+				$hasUpdate = true;
 			}
 		}
 
@@ -657,7 +679,7 @@ abstract class Living extends Entity implements Damageable{
 		return $hasUpdate;
 	}
 
-	protected function doEffectsTick(int $tickDiff = 1) : void{
+	protected function doEffectsTick(int $tickDiff = 1) : bool{
 		foreach($this->effects as $instance){
 			$type = $instance->getType();
 			if($type->canTick($instance)){
@@ -668,25 +690,47 @@ abstract class Living extends Entity implements Damageable{
 				$this->removeEffect($instance->getId());
 			}
 		}
+
+		return !empty($this->effects);
 	}
 
 	/**
-	 * Ticks the entity's air supply when it cannot breathe.
+	 * Ticks the entity's air supply, consuming it when underwater and regenerating it when out of water.
+	 *
 	 * @param int $tickDiff
+	 *
+	 * @return bool
 	 */
-	protected function doAirSupplyTick(int $tickDiff) : void{
-		if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(Enchantment::RESPIRATION)) <= 0 or
-			lcg_value() <= (1 / ($respirationLevel + 1))
-		){
-			$ticks = $this->getAirSupplyTicks() - $tickDiff;
+	protected function doAirSupplyTick(int $tickDiff) : bool{
+		$ticks = $this->getAirSupplyTicks();
+		$oldTicks = $ticks;
+		if(!$this->canBreathe()){
+			$this->setBreathing(false);
 
-			if($ticks <= -20){
-				$this->setAirSupplyTicks(0);
-				$this->onAirExpired();
-			}else{
-				$this->setAirSupplyTicks($ticks);
+			if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(Enchantment::RESPIRATION)) <= 0 or
+				lcg_value() <= (1 / ($respirationLevel + 1))
+			){
+				$ticks -= $tickDiff;
+				if($ticks <= -20){
+					$ticks = 0;
+					$this->onAirExpired();
+				}
+			}
+		}elseif(!$this->isBreathing()){
+			if($ticks < ($max = $this->getMaxAirSupplyTicks())){
+				$ticks += $tickDiff * 5;
+			}
+			if($ticks >= $max){
+				$ticks = $max;
+				$this->setBreathing(true);
 			}
 		}
+
+		if($ticks !== $oldTicks){
+			$this->setAirSupplyTicks($ticks);
+		}
+
+		return $ticks !== $oldTicks;
 	}
 
 	/**
@@ -694,7 +738,7 @@ abstract class Living extends Entity implements Damageable{
 	 * @return bool
 	 */
 	public function canBreathe() : bool{
-		return $this->hasEffect(Effect::WATER_BREATHING) or !$this->isUnderwater();
+		return $this->hasEffect(Effect::WATER_BREATHING) or $this->hasEffect(Effect::CONDUIT_POWER) or !$this->isUnderwater();
 	}
 
 	/**

src/pocketmine/entity/object/ExperienceOrb.php

@@ -88,6 +88,9 @@ class ExperienceOrb extends Entity{
 	public $gravity = 0.04;
 	public $drag = 0.02;
 
+	/** @var int */
+	protected $age = 0;
+
 	/**
 	 * @var int
 	 * Ticker used for determining interval in which to look for new target players.
@@ -144,7 +147,7 @@ class ExperienceOrb extends Entity{
 			return null;
 		}
 
-		$entity = $this->server->findEntity($this->targetPlayerRuntimeId, $this->level);
+		$entity = $this->server->findEntity($this->targetPlayerRuntimeId);
 		if($entity instanceof Human){
 			return $entity;
 		}
@@ -159,13 +162,14 @@ class ExperienceOrb extends Entity{
 	public function entityBaseTick(int $tickDiff = 1) : bool{
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
+		$this->age += $tickDiff;
 		if($this->age > 6000){
 			$this->flagForDespawn();
 			return true;
 		}
 
 		$currentTarget = $this->getTargetPlayer();
-		if($currentTarget !== null and $currentTarget->distanceSquared($this) > self::MAX_TARGET_DISTANCE ** 2){
+		if($currentTarget !== null and (!$currentTarget->isAlive() or $currentTarget->distanceSquared($this) > self::MAX_TARGET_DISTANCE ** 2)){
 			$currentTarget = null;
 		}
 
@@ -200,10 +204,7 @@ class ExperienceOrb extends Entity{
 			if($currentTarget->canPickupXp() and $this->boundingBox->intersectsWith($currentTarget->getBoundingBox())){
 				$this->flagForDespawn();
 
-				$currentTarget->addXp($this->getXpValue());
-				$currentTarget->resetXpCooldown();
-
-				//TODO: check Mending enchantment
+				$currentTarget->onPickupXp($this->getXpValue());
 			}
 		}
 

src/pocketmine/entity/object/FallingBlock.php

@@ -71,7 +71,7 @@ class FallingBlock extends Entity{
 
 		$this->block = BlockFactory::get($blockId, $damage);
 
-		$this->propertyManager->setInt(self::DATA_VARIANT, BlockFactory::toStaticRuntimeId($this->block->getId(), $this->block->getDamage()));
+		$this->propertyManager->setInt(self::DATA_VARIANT, $this->block->getRuntimeId());
 	}
 
 	public function canCollideWith(Entity $entity) : bool{
@@ -134,6 +134,7 @@ class FallingBlock extends Entity{
 	}
 
 	public function saveNBT() : void{
+		parent::saveNBT();
 		$this->namedtag->setInt("TileID", $this->block->getId(), true);
 		$this->namedtag->setByte("Data", $this->block->getDamage());
 	}

src/pocketmine/entity/object/ItemEntity.php

@@ -53,6 +53,9 @@ class ItemEntity extends Entity{
 
 	public $canCollide = false;
 
+	/** @var int */
+	protected $age = 0;
+
 	protected function initEntity() : void{
 		parent::initEntity();
 
@@ -70,6 +73,9 @@ class ItemEntity extends Entity{
 		}
 
 		$this->item = Item::nbtDeserialize($itemTag);
+		if($this->item->isNull()){
+			throw new \UnexpectedValueException("Item for " . get_class($this) . " is invalid");
+		}
 
 
 		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
@@ -82,14 +88,13 @@ class ItemEntity extends Entity{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if(!$this->isFlaggedForDespawn()){
-			if($this->pickupDelay > 0 and $this->pickupDelay < 32767){ //Infinite delay
-				$this->pickupDelay -= $tickDiff;
-				if($this->pickupDelay < 0){
-					$this->pickupDelay = 0;
-				}
+		if(!$this->isFlaggedForDespawn() and $this->pickupDelay > -1 and $this->pickupDelay < 32767){ //Infinite delay
+			$this->pickupDelay -= $tickDiff;
+			if($this->pickupDelay < 0){
+				$this->pickupDelay = 0;
 			}
 
+			$this->age += $tickDiff;
 			if($this->age > 6000){
 				$this->server->getPluginManager()->callEvent($ev = new ItemDespawnEvent($this));
 				if($ev->isCancelled()){
@@ -99,7 +104,6 @@ class ItemEntity extends Entity{
 					$hasUpdate = true;
 				}
 			}
-
 		}
 
 		return $hasUpdate;
@@ -197,7 +201,7 @@ class ItemEntity extends Entity{
 	}
 
 	public function onCollideWithPlayer(Player $player) : void{
-		if($this->getPickupDelay() > 0){
+		if($this->getPickupDelay() !== 0){
 			return;
 		}
 

src/pocketmine/entity/object/Painting.php

@@ -84,6 +84,8 @@ class Painting extends Entity{
 
 		$this->namedtag->setByte("Facing", (int) $this->direction);
 		$this->namedtag->setByte("Direction", (int) $this->direction); //Save both for full compatibility
+
+		$this->namedtag->setString("Motive", $this->motive);
 	}
 
 	public function kill() : void{

src/pocketmine/entity/projectile/Arrow.php

@@ -40,19 +40,49 @@ use pocketmine\Player;
 class Arrow extends Projectile{
 	public const NETWORK_ID = self::ARROW;
 
+	public const PICKUP_NONE = 0;
+	public const PICKUP_ANY = 1;
+	public const PICKUP_CREATIVE = 2;
+
+	private const TAG_PICKUP = "pickup"; //TAG_Byte
+
 	public $width = 0.25;
 	public $height = 0.25;
 
 	protected $gravity = 0.05;
 	protected $drag = 0.01;
 
-	protected $damage = 2;
+	/** @var float */
+	protected $damage = 2.0;
+
+	/** @var int */
+	protected $pickupMode = self::PICKUP_ANY;
+
+	/** @var float */
+	protected $punchKnockback = 0.0;
+
+	/** @var int */
+	protected $collideTicks = 0;
 
 	public function __construct(Level $level, CompoundTag $nbt, ?Entity $shootingEntity = null, bool $critical = false){
 		parent::__construct($level, $nbt, $shootingEntity);
 		$this->setCritical($critical);
 	}
 
+	protected function initEntity() : void{
+		parent::initEntity();
+
+		$this->pickupMode = $this->namedtag->getByte(self::TAG_PICKUP, self::PICKUP_ANY, true);
+		$this->collideTicks = $this->namedtag->getShort("life", $this->collideTicks);
+	}
+
+	public function saveNBT() : void{
+		parent::saveNBT();
+
+		$this->namedtag->setByte(self::TAG_PICKUP, $this->pickupMode, true);
+		$this->namedtag->setShort("life", $this->collideTicks);
+	}
+
 	public function isCritical() : bool{
 		return $this->getGenericFlag(self::DATA_FLAG_CRITICAL);
 	}
@@ -70,6 +100,20 @@ class Arrow extends Projectile{
 		}
 	}
 
+	/**
+	 * @return float
+	 */
+	public function getPunchKnockback() : float{
+		return $this->punchKnockback;
+	}
+
+	/**
+	 * @param float $punchKnockback
+	 */
+	public function setPunchKnockback(float $punchKnockback) : void{
+		$this->punchKnockback = $punchKnockback;
+	}
+
 	public function entityBaseTick(int $tickDiff = 1) : bool{
 		if($this->closed){
 			return false;
@@ -77,9 +121,14 @@ class Arrow extends Projectile{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if($this->age > 1200){
-			$this->flagForDespawn();
-			$hasUpdate = true;
+		if($this->isCollided){
+			$this->collideTicks += $tickDiff;
+			if($this->collideTicks > 1200){
+				$this->flagForDespawn();
+				$hasUpdate = true;
+			}
+		}else{
+			$this->collideTicks = 0;
 		}
 
 		return $hasUpdate;
@@ -95,6 +144,31 @@ class Arrow extends Projectile{
 		$this->broadcastEntityEvent(EntityEventPacket::ARROW_SHAKE, 7); //7 ticks
 	}
 
+	protected function onHitEntity(Entity $entityHit, RayTraceResult $hitResult) : void{
+		parent::onHitEntity($entityHit, $hitResult);
+		if($this->punchKnockback > 0){
+			$horizontalSpeed = sqrt($this->motion->x ** 2 + $this->motion->z ** 2);
+			if($horizontalSpeed > 0){
+				$multiplier = $this->punchKnockback * 0.6 / $horizontalSpeed;
+				$entityHit->setMotion($entityHit->getMotion()->add($this->motion->x * $multiplier, 0.1, $this->motion->z * $multiplier));
+			}
+		}
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getPickupMode() : int{
+		return $this->pickupMode;
+	}
+
+	/**
+	 * @param int $pickupMode
+	 */
+	public function setPickupMode(int $pickupMode) : void{
+		$this->pickupMode = $pickupMode;
+	}
+
 	public function onCollideWithPlayer(Player $player) : void{
 		if($this->blockHit === null){
 			return;
@@ -107,7 +181,12 @@ class Arrow extends Projectile{
 			return;
 		}
 
-		$this->server->getPluginManager()->callEvent($ev = new InventoryPickupArrowEvent($playerInventory, $this));
+		$ev = new InventoryPickupArrowEvent($playerInventory, $this);
+		if($this->pickupMode === self::PICKUP_NONE or ($this->pickupMode === self::PICKUP_CREATIVE and !$player->isCreative())){
+			$ev->setCancelled();
+		}
+
+		$this->server->getPluginManager()->callEvent($ev);
 		if($ev->isCancelled()){
 			return;
 		}

src/pocketmine/entity/projectile/EnderPearl.php

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

src/pocketmine/entity/projectile/ExperienceBottle.php

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

src/pocketmine/entity/projectile/Projectile.php

@@ -46,7 +46,8 @@ abstract class Projectile extends Entity{
 
 	public const DATA_SHOOTER_ID = 17;
 
-	protected $damage = 0;
+	/** @var float */
+	protected $damage = 0.0;
 
 	/** @var Vector3|null */
 	protected $blockHit;
@@ -73,7 +74,7 @@ abstract class Projectile extends Entity{
 
 		$this->setMaxHealth(1);
 		$this->setHealth(1);
-		$this->age = $this->namedtag->getShort("Age", $this->age);
+		$this->damage = $this->namedtag->getDouble("damage", $this->damage);
 
 		do{
 			$blockHit = null;
@@ -112,6 +113,25 @@ abstract class Projectile extends Entity{
 		return false;
 	}
 
+	/**
+	 * Returns the base damage applied on collision. This is multiplied by the projectile's speed to give a result
+	 * damage.
+	 *
+	 * @return float
+	 */
+	public function getBaseDamage() : float{
+		return $this->damage;
+	}
+
+	/**
+	 * Sets the base amount of damage applied by the projectile.
+	 *
+	 * @param float $damage
+	 */
+	public function setBaseDamage(float $damage) : void{
+		$this->damage = $damage;
+	}
+
 	/**
 	 * Returns the amount of damage this projectile will deal to the entity it hits.
 	 * @return int
@@ -123,7 +143,7 @@ abstract class Projectile extends Entity{
 	public function saveNBT() : void{
 		parent::saveNBT();
 
-		$this->namedtag->setShort("Age", $this->age);
+		$this->namedtag->setDouble("damage", $this->damage);
 
 		if($this->blockHit !== null){
 			$this->namedtag->setInt("tileX", $this->blockHit->x);
@@ -140,17 +160,19 @@ abstract class Projectile extends Entity{
 		return true;
 	}
 
-	public function hasMovementUpdate() : bool{
-		$parent = parent::hasMovementUpdate();
-		if($parent and $this->blockHit !== null){
+	public function onNearbyBlockChange() : void{
+		if($this->blockHit !== null){
 			$blockIn = $this->level->getBlockAt($this->blockHit->x, $this->blockHit->y, $this->blockHit->z);
-
-			if($blockIn->getId() === $this->blockHitId and $blockIn->getDamage() === $this->blockHitData){
-				return false;
+			if($blockIn->getId() !== $this->blockHitId or $blockIn->getDamage() !== $this->blockHitData){
+				$this->blockHit = $this->blockHitId = $this->blockHitData = null;
 			}
 		}
 
-		return $parent;
+		parent::onNearbyBlockChange();
+	}
+
+	public function hasMovementUpdate() : bool{
+		return $this->blockHit === null and parent::hasMovementUpdate();
 	}
 
 	public function move(float $dx, float $dy, float $dz) : void{

src/pocketmine/entity/projectile/SplashPotion.php

@@ -82,7 +82,7 @@ class SplashPotion extends Throwable{
 		if($hasEffects){
 			if(!$this->willLinger()){
 				foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
-					if($entity instanceof Living){
+					if($entity instanceof Living and $entity->isAlive()){
 						$distanceSquared = $entity->distanceSquared($this);
 						if($distanceSquared > 16){ //4 blocks
 							continue;
@@ -124,8 +124,6 @@ class SplashPotion extends Throwable{
 				}
 			}
 		}
-
-		$this->flagForDespawn();
 	}
 
 	/**

src/pocketmine/entity/projectile/Throwable.php

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

src/pocketmine/event/Listener.php

@@ -23,6 +23,37 @@ declare(strict_types=1);
 
 namespace pocketmine\event;
 
+use pocketmine\plugin\PluginManager;
+
+/**
+ * Classes implementing this interface can be registered to receive called Events.
+ * @see PluginManager::registerEvents()
+ *
+ * A function in a Listener class must meet the following criteria to be registered as an event handler:
+ *
+ * - MUST be public
+ * - MUST NOT be static
+ * - MUST accept EXACTLY ONE class parameter which:
+ *   - MUST be a VALID class extending Event
+ *   - MUST NOT be abstract, UNLESS it has an `@allowHandle` annotation
+ *
+ * Event handlers do not have to have any particular name - they are detected using reflection.
+ * They SHOULD NOT return any values (but this is not currently enforced).
+ *
+ * Functions which meet the criteria can have the following annotations in their doc comments:
+ *
+ * - `@notHandler`: Marks a function as NOT being an event handler. Only needed if the function meets the above criteria.
+ * - `@softDepend [PluginName]`: Handler WILL NOT be registered if its event doesn't exist. Useful for soft-depending
+ *     on plugin events. Plugin name is optional.
+ *     Example: `@softDepend SimpleAuth`
+ * - `@ignoreCancelled`: Cancelled events WILL NOT be passed to this handler.
+ * - `@priority <PRIORITY>`: Sets the priority at which this event handler will receive events.
+ *     Example: `@priority HIGHEST`
+ *     @see EventPriority for a list of possible options.
+ *
+ * Event handlers will receive any instanceof the Event class they have chosen to receive. For example, an
+ * EntityDamageEvent handler will also receive any subclass of EntityDamageEvent.
+ */
 interface Listener{
 
 }

src/pocketmine/event/entity/EntityDamageByChildEntityEvent.php

@@ -51,6 +51,6 @@ class EntityDamageByChildEntityEvent extends EntityDamageByEntityEvent{
 	 * @return Entity|null
 	 */
 	public function getChild() : ?Entity{
-		return $this->getEntity()->getLevel()->getServer()->findEntity($this->childEntityEid, $this->getEntity()->getLevel());
+		return $this->getEntity()->getLevel()->getServer()->findEntity($this->childEntityEid);
 	}
 }

src/pocketmine/event/entity/EntityDamageByEntityEvent.php

@@ -69,7 +69,7 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
 	 * @return Entity|null
 	 */
 	public function getDamager() : ?Entity{
-		return $this->getEntity()->getLevel()->getServer()->findEntity($this->damagerEntityId, $this->getEntity()->getLevel());
+		return $this->getEntity()->getLevel()->getServer()->findEntity($this->damagerEntityId);
 	}
 
 	/**

src/pocketmine/event/entity/EntityDamageEvent.php

@@ -38,6 +38,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 	public const MODIFIER_ARMOR_ENCHANTMENTS = 6;
 	public const MODIFIER_CRITICAL = 7;
 	public const MODIFIER_TOTEM = 8;
+	public const MODIFIER_WEAPON_ENCHANTMENTS = 9;
 
 	public const CAUSE_CONTACT = 0;
 	public const CAUSE_ENTITY_ATTACK = 1;
@@ -68,6 +69,9 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 	/** @var float[] */
 	private $originals;
 
+	/** @var int */
+	private $attackCooldown = 10;
+
 
 	/**
 	 * @param Entity        $entity
@@ -196,4 +200,24 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 
 		return true;
 	}
+
+	/**
+	 * Returns the cooldown in ticks before the target entity can be attacked again.
+	 *
+	 * @return int
+	 */
+	public function getAttackCooldown() : int{
+		return $this->attackCooldown;
+	}
+
+	/**
+	 * Sets the cooldown in ticks before the target entity can be attacked again.
+	 *
+	 * NOTE: This value is not used in non-Living entities
+	 *
+	 * @param int $attackCooldown
+	 */
+	public function setAttackCooldown(int $attackCooldown) : void{
+		$this->attackCooldown = $attackCooldown;
+	}
 }

src/pocketmine/event/player/PlayerChatEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
 
@@ -55,7 +56,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 		$this->format = $format;
 
 		if($recipients === null){
-			$this->recipients = Server::getInstance()->getPluginManager()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_USERS);
+			$this->recipients = PermissionManager::getInstance()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_USERS);
 		}else{
 			$this->recipients = $recipients;
 		}

src/pocketmine/event/player/PlayerDeathEvent.php

@@ -23,9 +23,15 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
+use pocketmine\block\Block;
+use pocketmine\entity\Living;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageByEntityEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\item\Item;
 use pocketmine\lang\TextContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 
 class PlayerDeathEvent extends EntityDeathEvent{
@@ -37,13 +43,13 @@ class PlayerDeathEvent extends EntityDeathEvent{
 	private $keepInventory = false;
 
 	/**
-	 * @param Player               $entity
-	 * @param Item[]               $drops
-	 * @param string|TextContainer $deathMessage
+	 * @param Player                    $entity
+	 * @param Item[]                    $drops
+	 * @param string|TextContainer|null $deathMessage Null will cause the default vanilla message to be used
 	 */
-	public function __construct(Player $entity, array $drops, $deathMessage){
+	public function __construct(Player $entity, array $drops, $deathMessage = null){
 		parent::__construct($entity, $drops);
-		$this->deathMessage = $deathMessage;
+		$this->deathMessage = $deathMessage ?? self::deriveMessage($entity->getDisplayName(), $entity->getLastDamageCause());
 	}
 
 	/**
@@ -81,4 +87,123 @@ class PlayerDeathEvent extends EntityDeathEvent{
 	public function setKeepInventory(bool $keepInventory) : void{
 		$this->keepInventory = $keepInventory;
 	}
+
+	/**
+	 * Returns the vanilla death message for the given death cause.
+	 *
+	 * @param string                 $name
+	 * @param null|EntityDamageEvent $deathCause
+	 *
+	 * @return TranslationContainer
+	 */
+	public static function deriveMessage(string $name, ?EntityDamageEvent $deathCause) : TranslationContainer{
+		$message = "death.attack.generic";
+		$params = [$name];
+
+		switch($deathCause === null ? EntityDamageEvent::CAUSE_CUSTOM : $deathCause->getCause()){
+			case EntityDamageEvent::CAUSE_ENTITY_ATTACK:
+				if($deathCause instanceof EntityDamageByEntityEvent){
+					$e = $deathCause->getDamager();
+					if($e instanceof Player){
+						$message = "death.attack.player";
+						$params[] = $e->getDisplayName();
+						break;
+					}elseif($e instanceof Living){
+						$message = "death.attack.mob";
+						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
+						break;
+					}else{
+						$params[] = "Unknown";
+					}
+				}
+				break;
+			case EntityDamageEvent::CAUSE_PROJECTILE:
+				if($deathCause instanceof EntityDamageByEntityEvent){
+					$e = $deathCause->getDamager();
+					if($e instanceof Player){
+						$message = "death.attack.arrow";
+						$params[] = $e->getDisplayName();
+					}elseif($e instanceof Living){
+						$message = "death.attack.arrow";
+						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
+						break;
+					}else{
+						$params[] = "Unknown";
+					}
+				}
+				break;
+			case EntityDamageEvent::CAUSE_SUICIDE:
+				$message = "death.attack.generic";
+				break;
+			case EntityDamageEvent::CAUSE_VOID:
+				$message = "death.attack.outOfWorld";
+				break;
+			case EntityDamageEvent::CAUSE_FALL:
+				if($deathCause instanceof EntityDamageEvent){
+					if($deathCause->getFinalDamage() > 2){
+						$message = "death.fell.accident.generic";
+						break;
+					}
+				}
+				$message = "death.attack.fall";
+				break;
+
+			case EntityDamageEvent::CAUSE_SUFFOCATION:
+				$message = "death.attack.inWall";
+				break;
+
+			case EntityDamageEvent::CAUSE_LAVA:
+				$message = "death.attack.lava";
+				break;
+
+			case EntityDamageEvent::CAUSE_FIRE:
+				$message = "death.attack.onFire";
+				break;
+
+			case EntityDamageEvent::CAUSE_FIRE_TICK:
+				$message = "death.attack.inFire";
+				break;
+
+			case EntityDamageEvent::CAUSE_DROWNING:
+				$message = "death.attack.drown";
+				break;
+
+			case EntityDamageEvent::CAUSE_CONTACT:
+				if($deathCause instanceof EntityDamageByBlockEvent){
+					if($deathCause->getDamager()->getId() === Block::CACTUS){
+						$message = "death.attack.cactus";
+					}
+				}
+				break;
+
+			case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION:
+			case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
+				if($deathCause instanceof EntityDamageByEntityEvent){
+					$e = $deathCause->getDamager();
+					if($e instanceof Player){
+						$message = "death.attack.explosion.player";
+						$params[] = $e->getDisplayName();
+					}elseif($e instanceof Living){
+						$message = "death.attack.explosion.player";
+						$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
+						break;
+					}
+				}else{
+					$message = "death.attack.explosion";
+				}
+				break;
+
+			case EntityDamageEvent::CAUSE_MAGIC:
+				$message = "death.attack.magic";
+				break;
+
+			case EntityDamageEvent::CAUSE_CUSTOM:
+				break;
+
+			default:
+				break;
+		}
+
+		return new TranslationContainer($message, $params);
+	}
 }

src/pocketmine/event/player/PlayerExperienceChangeEvent.php

@@ -31,7 +31,6 @@ use pocketmine\event\entity\EntityEvent;
  * Called when a player gains or loses XP levels and/or progress.
  */
 class PlayerExperienceChangeEvent extends EntityEvent implements Cancellable{
-	public static $handlerList = null;
 	/** @var Human */
 	protected $entity;
 	/** @var int */

src/pocketmine/event/player/PlayerKickEvent.php

@@ -50,6 +50,13 @@ class PlayerKickEvent extends PlayerEvent implements Cancellable{
 		$this->reason = $reason;
 	}
 
+	/**
+	 * @param string $reason
+	 */
+	public function setReason(string $reason) : void{
+		$this->reason = $reason;
+	}
+
 	public function getReason() : string{
 		return $this->reason;
 	}

src/pocketmine/event/server/CommandEvent.php

@@ -0,0 +1,73 @@
+<?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\event\server;
+
+use pocketmine\command\CommandSender;
+use pocketmine\event\Cancellable;
+
+/**
+ * Called when any CommandSender runs a command, early in the process
+ *
+ * You don't want to use this except for a few cases like logging commands,
+ * blocking commands on certain places, or applying modifiers.
+ *
+ * The message DOES NOT contain a slash at the start
+ */
+class CommandEvent extends ServerEvent implements Cancellable{
+	/** @var string */
+	protected $command;
+
+	/** @var CommandSender */
+	protected $sender;
+
+	/**
+	 * @param CommandSender $sender
+	 * @param string        $command
+	 */
+	public function __construct(CommandSender $sender, string $command){
+		$this->sender = $sender;
+		$this->command = $command;
+	}
+
+	/**
+	 * @return CommandSender
+	 */
+	public function getSender() : CommandSender{
+		return $this->sender;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCommand() : string{
+		return $this->command;
+	}
+
+	/**
+	 * @param string $command
+	 */
+	public function setCommand(string $command) : void{
+		$this->command = $command;
+	}
+}

src/pocketmine/event/server/RemoteServerCommandEvent.php

@@ -27,6 +27,8 @@ use pocketmine\command\CommandSender;
 
 /**
  * This event is called when a command is received over RCON.
+ *
+ * @deprecated Use CommandEvent instead.
  */
 class RemoteServerCommandEvent extends ServerCommandEvent{
 

src/pocketmine/event/server/ServerCommandEvent.php

@@ -33,6 +33,8 @@ use pocketmine\event\Cancellable;
  * blocking commands on certain places, or applying modifiers.
  *
  * The message DOES NOT contain a slash at the start
+ *
+ * @deprecated Use CommandEvent instead.
  */
 class ServerCommandEvent extends ServerEvent implements Cancellable{
 	/** @var string */

src/pocketmine/form/Form.php

@@ -0,0 +1,43 @@
+<?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\form;
+
+use pocketmine\Player;
+
+/**
+ * Form implementations must implement this interface to be able to utilize the Player form-sending mechanism.
+ * There is no restriction on custom implementations other than that they must implement this.
+ */
+interface Form extends \JsonSerializable{
+
+	/**
+	 * Handles a form response from a player.
+	 *
+	 * @param Player $player
+	 * @param mixed  $data
+	 *
+	 * @throws FormValidationException if the data could not be processed
+	 */
+	public function handleResponse(Player $player, $data) : void;
+}

src/pocketmine/form/FormValidationException.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\form;
+
+class FormValidationException extends \RuntimeException{
+
+}

src/pocketmine/inventory/DoubleChestInventory.php

@@ -60,15 +60,16 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
 	}
 
 	public function getItem(int $index) : Item{
-		return $index < $this->left->getSize() ? $this->left->getItem($index) : $this->right->getItem($index - $this->right->getSize());
+		return $index < $this->left->getSize() ? $this->left->getItem($index) : $this->right->getItem($index - $this->left->getSize());
 	}
 
 	public function setItem(int $index, Item $item, bool $send = true) : bool{
-		return $index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->right->getSize(), $item, $send);
-	}
-
-	public function clear(int $index, bool $send = true) : bool{
-		return $index < $this->left->getSize() ? $this->left->clear($index, $send) : $this->right->clear($index - $this->right->getSize(), $send);
+		$old = $this->getItem($index);
+		if($index < $this->left->getSize() ? $this->left->setItem($index, $item, $send) : $this->right->setItem($index - $this->left->getSize(), $item, $send)){
+			$this->onSlotChange($index, $old, $send);
+			return true;
+		}
+		return false;
 	}
 
 	public function getContents(bool $includeEmpty = false) : array{

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

@@ -38,7 +38,7 @@ class DropItemAction extends InventoryAction{
 	}
 
 	public function isValid(Player $source) : bool{
-		return true;
+		return !$this->targetItem->isNull();
 	}
 
 	public function onPreExecute(Player $source) : bool{

src/pocketmine/item/Bow.php

@@ -24,9 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\entity\Entity;
+use pocketmine\entity\projectile\Arrow as ArrowEntity;
 use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\entity\EntityShootBowEvent;
 use pocketmine\event\entity\ProjectileLaunchEvent;
+use pocketmine\item\enchantment\Enchantment;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\Player;
 
@@ -64,6 +66,21 @@ class Bow extends Tool{
 
 		$entity = Entity::createEntity("Arrow", $player->getLevel(), $nbt, $player, $force == 2);
 		if($entity instanceof Projectile){
+			$infinity = $this->hasEnchantment(Enchantment::INFINITY);
+			if($entity instanceof ArrowEntity){
+				if($infinity){
+					$entity->setPickupMode(ArrowEntity::PICKUP_CREATIVE);
+				}
+				if(($punchLevel = $this->getEnchantmentLevel(Enchantment::PUNCH)) > 0){
+					$entity->setPunchKnockback($punchLevel);
+				}
+			}
+			if(($powerLevel = $this->getEnchantmentLevel(Enchantment::POWER)) > 0){
+				$entity->setBaseDamage($entity->getBaseDamage() + (($powerLevel + 1) / 2));
+			}
+			if($this->hasEnchantment(Enchantment::FLAME)){
+				$entity->setOnFire(intdiv($entity->getFireTicks(), 20) + 100);
+			}
 			$ev = new EntityShootBowEvent($player, $this, $entity, $force);
 
 			if($force < 0.1 or $diff < 5){
@@ -80,7 +97,9 @@ class Bow extends Tool{
 			}else{
 				$entity->setMotion($entity->getMotion()->multiply($ev->getForce()));
 				if($player->isSurvival()){
-					$player->getInventory()->removeItem(ItemFactory::get(Item::ARROW, 0, 1));
+					if(!$infinity){ //TODO: tipped arrows are still consumed when Infinity is applied
+						$player->getInventory()->removeItem(ItemFactory::get(Item::ARROW, 0, 1));
+					}
 					$this->applyDamage(1);
 				}
 

src/pocketmine/item/Bucket.php

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

src/pocketmine/item/ChorusFruit.php

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

src/pocketmine/item/Item.php

@@ -196,7 +196,10 @@ class Item implements ItemIds, \JsonSerializable{
 	 * @param string $name
 	 */
 	public function __construct(int $id, int $meta = 0, string $name = "Unknown"){
-		$this->id = $id & 0xffff;
+		if($id < -0x8000 or $id > 0x7fff){ //signed short range
+			throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
+		}
+		$this->id = $id;
 		$this->setDamage($meta);
 		$this->name = $name;
 	}
@@ -916,7 +919,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 */
 	public function nbtSerialize(int $slot = -1, string $tagName = "") : CompoundTag{
 		$result = new CompoundTag($tagName, [
-			new ShortTag("id", Binary::signShort($this->id)),
+			new ShortTag("id", $this->id),
 			new ByteTag("Count", Binary::signByte($this->count)),
 			new ShortTag("Damage", $this->meta)
 		]);
@@ -951,9 +954,14 @@ class Item implements ItemIds, \JsonSerializable{
 
 		$idTag = $tag->getTag("id");
 		if($idTag instanceof ShortTag){
-			$item = ItemFactory::get(Binary::unsignShort($idTag->getValue()), $meta, $count);
+			$item = ItemFactory::get($idTag->getValue(), $meta, $count);
 		}elseif($idTag instanceof StringTag){ //PC item save format
-			$item = ItemFactory::fromString($idTag->getValue());
+			try{
+				$item = ItemFactory::fromString($idTag->getValue());
+			}catch(\InvalidArgumentException $e){
+				//TODO: improve error handling
+				return ItemFactory::get(Item::AIR, 0, 0);
+			}
 			$item->setDamage($meta);
 			$item->setCount($count);
 		}else{

src/pocketmine/item/ItemFactory.php

@@ -246,6 +246,8 @@ class ItemFactory{
 		self::registerItem(new Item(Item::NAUTILUS_SHELL, 0, "Nautilus Shell"));
 		self::registerItem(new GoldenAppleEnchanted());
 		self::registerItem(new Item(Item::HEART_OF_THE_SEA, 0, "Heart of the Sea"));
+		self::registerItem(new Item(Item::TURTLE_SHELL_PIECE, 0, "Scute"));
+		//TODO: TURTLE_HELMET
 
 		//TODO: COMPOUND
 		//TODO: RECORD_13
@@ -281,7 +283,7 @@ class ItemFactory{
 			throw new \RuntimeException("Trying to overwrite an already registered item");
 		}
 
-		self::$list[$id] = clone $item;
+		self::$list[self::getListOffset($id)] = clone $item;
 	}
 
 	/**
@@ -302,10 +304,10 @@ class ItemFactory{
 
 		try{
 			/** @var Item|null $listed */
-			$listed = self::$list[$id];
+			$listed = self::$list[self::getListOffset($id)];
 			if($listed !== null){
 				$item = clone $listed;
-			}elseif($id < 256){
+			}elseif($id < 256){ //intentionally includes negatives, for extended block IDs
 				/* Blocks must have a damage value 0-15, but items can have damage value -1 to indicate that they are
 				 * crafting ingredients with any-damage. */
 				$item = new ItemBlock($id, $meta);
@@ -353,13 +355,13 @@ class ItemFactory{
 			if(!isset($b[1])){
 				$meta = 0;
 			}elseif(is_numeric($b[1])){
-				$meta = $b[1] & 0xFFFF;
+				$meta = (int) $b[1];
 			}else{
 				throw new \InvalidArgumentException("Unable to parse \"" . $b[1] . "\" from \"" . $str . "\" as a valid meta value");
 			}
 
 			if(is_numeric($b[0])){
-				$item = self::get(((int) $b[0]) & 0xFFFF, $meta);
+				$item = self::get((int) $b[0], $meta);
 			}elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){
 				$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
 			}else{
@@ -380,6 +382,13 @@ class ItemFactory{
 		if($id < 256){
 			return BlockFactory::isRegistered($id);
 		}
-		return self::$list[$id] !== null;
+		return self::$list[self::getListOffset($id)] !== null;
+	}
+
+	private static function getListOffset(int $id) : int{
+		if($id < -0x8000 or $id > 0x7fff){
+			throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
+		}
+		return $id & 0xffff;
 	}
 }

src/pocketmine/item/ItemIds.php

@@ -193,7 +193,7 @@ interface ItemIds extends BlockIds{
 	public const LEAD = 420;
 	public const NAMETAG = 421, NAME_TAG = 421;
 	public const PRISMARINE_CRYSTALS = 422;
-	public const MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423;
+	public const MUTTON = 423, MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423;
 	public const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424;
 	public const ARMOR_STAND = 425;
 	public const END_CRYSTAL = 426;
@@ -235,6 +235,8 @@ interface ItemIds extends BlockIds{
 	public const NAUTILUS_SHELL = 465;
 	public const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466;
 	public const HEART_OF_THE_SEA = 467;
+	public const TURTLE_SHELL_PIECE = 468;
+	public const TURTLE_HELMET = 469;
 
 	public const COMPOUND = 499;
 	public const RECORD_13 = 500;

src/pocketmine/item/Potion.php

@@ -72,8 +72,6 @@ class Potion extends Item implements Consumable{
 	 *
 	 * @param int $id
 	 * @return EffectInstance[]
-	 *
-	 * @throws \InvalidArgumentException if the potion type is unknown
 	 */
 	public static function getPotionEffectsById(int $id) : array{
 		switch($id){
@@ -213,7 +211,7 @@ class Potion extends Item implements Consumable{
 				];
 		}
 
-		throw new \InvalidArgumentException("Unknown potion type $id");
+		return [];
 	}
 
 	public function __construct(int $meta = 0){

src/pocketmine/item/enchantment/Enchantment.php

@@ -114,13 +114,26 @@ class Enchantment{
 		self::registerEnchantment(new ProtectionEnchantment(self::PROJECTILE_PROTECTION, "%enchantment.protect.projectile", self::RARITY_UNCOMMON, self::SLOT_ARMOR, self::SLOT_NONE, 4, 1.5, [
 			EntityDamageEvent::CAUSE_PROJECTILE
 		]));
-
+		self::registerEnchantment(new Enchantment(self::THORNS, "%enchantment.thorns", self::RARITY_MYTHIC, self::SLOT_TORSO, self::SLOT_HEAD | self::SLOT_LEGS | self::SLOT_FEET, 3));
 		self::registerEnchantment(new Enchantment(self::RESPIRATION, "%enchantment.oxygen", self::RARITY_RARE, self::SLOT_HEAD, self::SLOT_NONE, 3));
 
+		self::registerEnchantment(new SharpnessEnchantment(self::SHARPNESS, "%enchantment.damage.all", self::RARITY_COMMON, self::SLOT_SWORD, self::SLOT_AXE, 5));
+		//TODO: smite, bane of arthropods (these don't make sense now because their applicable mobs don't exist yet)
+
+		self::registerEnchantment(new KnockbackEnchantment(self::KNOCKBACK, "%enchantment.knockback", self::RARITY_UNCOMMON, self::SLOT_SWORD, self::SLOT_NONE, 2));
+		self::registerEnchantment(new FireAspectEnchantment(self::FIRE_ASPECT, "%enchantment.fire", self::RARITY_RARE, self::SLOT_SWORD, self::SLOT_NONE, 2));
+
 		self::registerEnchantment(new Enchantment(self::EFFICIENCY, "%enchantment.digging", self::RARITY_COMMON, self::SLOT_DIG, self::SLOT_SHEARS, 5));
 		self::registerEnchantment(new Enchantment(self::SILK_TOUCH, "%enchantment.untouching", self::RARITY_MYTHIC, self::SLOT_DIG, self::SLOT_SHEARS, 1));
 		self::registerEnchantment(new Enchantment(self::UNBREAKING, "%enchantment.durability", self::RARITY_UNCOMMON, self::SLOT_DIG | self::SLOT_ARMOR | self::SLOT_FISHING_ROD | self::SLOT_BOW, self::SLOT_TOOL | self::SLOT_CARROT_STICK | self::SLOT_ELYTRA, 3));
 
+		self::registerEnchantment(new Enchantment(self::POWER, "%enchantment.arrowDamage", self::RARITY_COMMON, self::SLOT_BOW, self::SLOT_NONE, 5));
+		self::registerEnchantment(new Enchantment(self::PUNCH, "%enchantment.arrowKnockback", self::RARITY_RARE, self::SLOT_BOW, self::SLOT_NONE, 2));
+		self::registerEnchantment(new Enchantment(self::FLAME, "%enchantment.arrowFire", self::RARITY_RARE, self::SLOT_BOW, self::SLOT_NONE, 1));
+		self::registerEnchantment(new Enchantment(self::INFINITY, "%enchantment.arrowInfinite", self::RARITY_MYTHIC, self::SLOT_BOW, self::SLOT_NONE, 1));
+
+		self::registerEnchantment(new Enchantment(self::MENDING, "%enchantment.mending", self::RARITY_RARE, self::SLOT_NONE, self::SLOT_ALL, 1));
+
 		self::registerEnchantment(new Enchantment(self::VANISHING, "%enchantment.curse.vanishing", self::RARITY_MYTHIC, self::SLOT_NONE, self::SLOT_ALL, 1));
 	}
 

src/pocketmine/item/enchantment/FireAspectEnchantment.php

@@ -0,0 +1,41 @@
+<?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\item\enchantment;
+
+use pocketmine\entity\Entity;
+
+class FireAspectEnchantment extends MeleeWeaponEnchantment{
+
+	public function isApplicableTo(Entity $victim) : bool{
+		return true;
+	}
+
+	public function getDamageBonus(int $enchantmentLevel) : float{
+		return 0;
+	}
+
+	public function onPostAttack(Entity $attacker, Entity $victim, int $enchantmentLevel) : void{
+		$victim->setOnFire($enchantmentLevel * 4);
+	}
+}

src/pocketmine/item/enchantment/KnockbackEnchantment.php

@@ -0,0 +1,44 @@
+<?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\item\enchantment;
+
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
+
+class KnockbackEnchantment extends MeleeWeaponEnchantment{
+
+	public function isApplicableTo(Entity $victim) : bool{
+		return $victim instanceof Living;
+	}
+
+	public function getDamageBonus(int $enchantmentLevel) : float{
+		return 0;
+	}
+
+	public function onPostAttack(Entity $attacker, Entity $victim, int $enchantmentLevel) : void{
+		if($victim instanceof Living){
+			$victim->knockBack($attacker, 0, $victim->x - $attacker->x, $victim->z - $attacker->z, $enchantmentLevel * 0.5);
+		}
+	}
+}

src/pocketmine/item/enchantment/MeleeWeaponEnchantment.php

@@ -0,0 +1,63 @@
+<?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\item\enchantment;
+
+use pocketmine\entity\Entity;
+
+/**
+ * Classes extending this class can be applied to weapons and activate when used by a mob to attack another mob in melee
+ * combat.
+ */
+abstract class MeleeWeaponEnchantment extends Enchantment{
+
+	/**
+	 * Returns whether this melee enchantment has an effect on the target entity. For example, Smite only applies to
+	 * undead mobs.
+	 *
+	 * @param Entity $victim
+	 *
+	 * @return bool
+	 */
+	abstract public function isApplicableTo(Entity $victim) : bool;
+
+	/**
+	 * Returns the amount of additional damage caused by this enchantment to applicable targets.
+	 *
+	 * @param int $enchantmentLevel
+	 *
+	 * @return float
+	 */
+	abstract public function getDamageBonus(int $enchantmentLevel) : float;
+
+	/**
+	 * Called after damaging the entity to apply any post damage effects to the target.
+	 *
+	 * @param Entity $attacker
+	 * @param Entity $victim
+	 * @param int    $enchantmentLevel
+	 */
+	public function onPostAttack(Entity $attacker, Entity $victim, int $enchantmentLevel) : void{
+
+	}
+}

src/pocketmine/item/enchantment/SharpnessEnchantment.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\item\enchantment;
+
+use pocketmine\entity\Entity;
+
+class SharpnessEnchantment extends MeleeWeaponEnchantment{
+
+	public function isApplicableTo(Entity $victim) : bool{
+		return true;
+	}
+
+	public function getDamageBonus(int $enchantmentLevel) : float{
+		return 0.5 * ($enchantmentLevel + 1);
+	}
+}

src/pocketmine/level/Explosion.php

@@ -236,6 +236,9 @@ class Explosion{
 				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)));
 					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();
+						}
 						$ev->getBlock()->onNearbyBlockChange();
 					}
 					$updateBlocks[$index] = true;

src/pocketmine/level/Level.php

@@ -191,7 +191,7 @@ class Level implements ChunkManager, Metadatable{
 
 	/** @var Player[][] */
 	private $chunkSendQueue = [];
-	/** @var bool[] */
+	/** @var ChunkRequestTask[] */
 	private $chunkSendTasks = [];
 
 	/** @var bool[] */
@@ -200,6 +200,8 @@ class Level implements ChunkManager, Metadatable{
 	private $chunkPopulationLock = [];
 	/** @var int */
 	private $chunkPopulationQueueSize = 2;
+	/** @var bool[] */
+	private $generatorRegisteredWorkers = [];
 
 	/** @var bool */
 	private $autoSave = true;
@@ -245,9 +247,6 @@ class Level implements ChunkManager, Metadatable{
 	/** @var bool */
 	private $closed = false;
 
-	/** @var \Closure */
-	private $asyncPoolStartHook;
-
 	public static function chunkHash(int $x, int $z) : int{
 		return (($x & 0xFFFFFFFF) << 32) | ($z & 0xFFFFFFFF);
 	}
@@ -363,10 +362,6 @@ class Level implements ChunkManager, Metadatable{
 		$this->temporalPosition = new Position(0, 0, 0, $this);
 		$this->temporalVector = new Vector3(0, 0, 0);
 		$this->tickRate = 1;
-
-		$this->server->getAsyncPool()->addWorkerStartHook($this->asyncPoolStartHook = function(int $worker) : void{
-			$this->registerGeneratorToWorker($worker);
-		});
 	}
 
 	public function getTickRate() : int{
@@ -382,15 +377,18 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	public function registerGeneratorToWorker(int $worker) : void{
+		$this->generatorRegisteredWorkers[$worker] = true;
 		$this->server->getAsyncPool()->submitTaskToWorker(new GeneratorRegisterTask($this, $this->generator, $this->provider->getGeneratorOptions()), $worker);
 	}
 
 	public function unregisterGenerator(){
 		$pool = $this->server->getAsyncPool();
-		$pool->removeWorkerStartHook($this->asyncPoolStartHook);
 		foreach($pool->getRunningWorkers() as $i){
-			$pool->submitTaskToWorker(new GeneratorUnregisterTask($this), $i);
+			if(isset($this->generatorRegisteredWorkers[$i])){
+				$pool->submitTaskToWorker(new GeneratorUnregisterTask($this), $i);
+			}
 		}
+		$this->generatorRegisteredWorkers = [];
 	}
 
 	public function getBlockMetadata() : BlockMetadataStore{
@@ -769,6 +767,9 @@ class Level implements ChunkManager, Metadatable{
 		if(count($this->changedBlocks) > 0){
 			if(count($this->players) > 0){
 				foreach($this->changedBlocks as $index => $blocks){
+					if(empty($blocks)){ //blocks can be set normally and then later re-set with direct send
+						continue;
+					}
 					unset($this->chunkCache[$index]);
 					Level::getXZ($index, $chunkX, $chunkZ);
 					if(count($blocks) > 512){
@@ -776,7 +777,7 @@ class Level implements ChunkManager, Metadatable{
 						foreach($this->getChunkPlayers($chunkX, $chunkZ) as $p){
 							$p->onChunkChanged($chunk);
 						}
-					}elseif(!empty($blocks)){
+					}else{
 						$this->sendBlocks($this->getChunkPlayers($chunkX, $chunkZ), $blocks, UpdateBlockPacket::FLAG_ALL);
 					}
 				}
@@ -794,8 +795,10 @@ class Level implements ChunkManager, Metadatable{
 			$this->checkSleep();
 		}
 
-		if(!empty($this->players) and !empty($this->globalPackets)){
-			$this->server->batchPackets($this->players, $this->globalPackets);
+		if(!empty($this->globalPackets)){
+			if(!empty($this->players)){
+				$this->server->batchPackets($this->players, $this->globalPackets);
+			}
 			$this->globalPackets = [];
 		}
 
@@ -843,18 +846,18 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * @param Player[] $target
-	 * @param Block[]  $blocks
-	 * @param int      $flags
-	 * @param bool     $optimizeRebuilds
+	 * @param Player[]  $target
+	 * @param Vector3[] $blocks
+	 * @param int       $flags
+	 * @param bool      $optimizeRebuilds
 	 */
 	public function sendBlocks(array $target, array $blocks, int $flags = UpdateBlockPacket::FLAG_NONE, bool $optimizeRebuilds = false){
 		$packets = [];
 		if($optimizeRebuilds){
 			$chunks = [];
 			foreach($blocks as $b){
-				if($b === null){
-					continue;
+				if(!($b instanceof Vector3)){
+					throw new \TypeError("Expected Vector3 in blocks array, got " . (is_object($b) ? get_class($b) : gettype($b)));
 				}
 				$pk = new UpdateBlockPacket();
 
@@ -869,24 +872,20 @@ class Level implements ChunkManager, Metadatable{
 				$pk->z = $b->z;
 
 				if($b instanceof Block){
-					$blockId = $b->getId();
-					$blockData = $b->getDamage();
+					$pk->blockRuntimeId = $b->getRuntimeId();
 				}else{
 					$fullBlock = $this->getFullBlock($b->x, $b->y, $b->z);
-					$blockId = $fullBlock >> 4;
-					$blockData = $fullBlock & 0xf;
+					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4,  $fullBlock & 0xf);
 				}
 
-				$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($blockId, $blockData);
-
 				$pk->flags = $first ? $flags : UpdateBlockPacket::FLAG_NONE;
 
 				$packets[] = $pk;
 			}
 		}else{
 			foreach($blocks as $b){
-				if($b === null){
-					continue;
+				if(!($b instanceof Vector3)){
+					throw new \TypeError("Expected Vector3 in blocks array, got " . (is_object($b) ? get_class($b) : gettype($b)));
 				}
 				$pk = new UpdateBlockPacket();
 
@@ -895,16 +894,12 @@ class Level implements ChunkManager, Metadatable{
 				$pk->z = $b->z;
 
 				if($b instanceof Block){
-					$blockId = $b->getId();
-					$blockData = $b->getDamage();
+					$pk->blockRuntimeId = $b->getRuntimeId();
 				}else{
 					$fullBlock = $this->getFullBlock($b->x, $b->y, $b->z);
-					$blockId = $fullBlock >> 4;
-					$blockData = $fullBlock & 0xf;
+					$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($fullBlock >> 4,  $fullBlock & 0xf);
 				}
 
-				$pk->blockRuntimeId = BlockFactory::toStaticRuntimeId($blockId, $blockData);
-
 				$pk->flags = $flags;
 
 				$packets[] = $pk;
@@ -1624,7 +1619,7 @@ class Level implements ChunkManager, Metadatable{
 
 			$spawnLocation = $this->getSpawnLocation();
 			$s = new Vector2($spawnLocation->x, $spawnLocation->z);
-			if(count($this->server->getOps()->getAll()) > 0 and $t->distance($s) <= $distance){
+			if($t->distance($s) <= $distance){
 				return true;
 			}
 		}
@@ -1773,7 +1768,7 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		if($player !== null){
-			$ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, $blockClicked->getId() === 0 ? PlayerInteractEvent::RIGHT_CLICK_AIR : PlayerInteractEvent::RIGHT_CLICK_BLOCK);
+			$ev = new PlayerInteractEvent($player, $item, $blockClicked, $clickVector, $face, PlayerInteractEvent::RIGHT_CLICK_BLOCK);
 			if($this->checkSpawnProtection($player, $blockClicked)){
 				$ev->setCancelled(); //set it to cancelled so plugins can bypass this
 			}
@@ -1861,7 +1856,7 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		if($playSound){
-			$this->broadcastLevelSoundEvent($hand, LevelSoundEventPacket::SOUND_PLACE, 1, BlockFactory::toStaticRuntimeId($hand->getId(), $hand->getDamage()));
+			$this->broadcastLevelSoundEvent($hand, LevelSoundEventPacket::SOUND_PLACE, 1, $hand->getRuntimeId());
 		}
 
 		$item->pop();
@@ -2346,21 +2341,20 @@ class Level implements ChunkManager, Metadatable{
 
 		$chunkHash = Level::chunkHash($chunkX, $chunkZ);
 		$oldChunk = $this->getChunk($chunkX, $chunkZ, false);
-		if($unload and $oldChunk !== null){
-			$this->unloadChunk($chunkX, $chunkZ, false, false);
-		}else{
-			$oldEntities = $oldChunk !== null ? $oldChunk->getEntities() : [];
-			$oldTiles = $oldChunk !== null ? $oldChunk->getTiles() : [];
+		if($oldChunk !== null){
+			if($unload){
+				$this->unloadChunk($chunkX, $chunkZ, false, false);
+			}else{
+				foreach($oldChunk->getEntities() as $entity){
+					$chunk->addEntity($entity);
+					$oldChunk->removeEntity($entity);
+					$entity->chunk = $chunk;
+				}
 
-			foreach($oldEntities as $entity){
-				$chunk->addEntity($entity);
-				$oldChunk->removeEntity($entity);
-				$entity->chunk = $chunk;
-			}
-
-			foreach($oldTiles as $tile){
-				$chunk->addTile($tile);
-				$oldChunk->removeTile($tile);
+				foreach($oldChunk->getTiles() as $tile){
+					$chunk->addTile($tile);
+					$oldChunk->removeTile($tile);
+				}
 			}
 		}
 
@@ -2368,6 +2362,7 @@ class Level implements ChunkManager, Metadatable{
 
 		unset($this->blockCache[$chunkHash]);
 		unset($this->chunkCache[$chunkHash]);
+		unset($this->changedBlocks[$chunkHash]);
 		$chunk->setChanged();
 
 		if(!$this->isChunkInUse($chunkX, $chunkZ)){
@@ -2453,7 +2448,7 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	private function sendChunkFromCache(int $x, int $z){
-		if(isset($this->chunkSendTasks[$index = Level::chunkHash($x, $z)])){
+		if(isset($this->chunkSendQueue[$index = Level::chunkHash($x, $z)])){
 			foreach($this->chunkSendQueue[$index] as $player){
 				/** @var Player $player */
 				if($player->isConnected() and isset($player->usedChunks[$index])){
@@ -2461,7 +2456,6 @@ class Level implements ChunkManager, Metadatable{
 				}
 			}
 			unset($this->chunkSendQueue[$index]);
-			unset($this->chunkSendTasks[$index]);
 		}
 	}
 
@@ -2470,11 +2464,17 @@ class Level implements ChunkManager, Metadatable{
 			$this->timings->syncChunkSendTimer->startTiming();
 
 			foreach($this->chunkSendQueue as $index => $players){
-				if(isset($this->chunkSendTasks[$index])){
-					continue;
-				}
 				Level::getXZ($index, $x, $z);
-				$this->chunkSendTasks[$index] = true;
+
+				if(isset($this->chunkSendTasks[$index])){
+					if($this->chunkSendTasks[$index]->isCrashed()){
+						unset($this->chunkSendTasks[$index]);
+						$this->server->getLogger()->error("Failed to prepare chunk $x $z for sending, retrying");
+					}else{
+						//Not ready for sending yet
+						continue;
+					}
+				}
 				if(isset($this->chunkCache[$index])){
 					$this->sendChunkFromCache($x, $z);
 					continue;
@@ -2487,7 +2487,8 @@ class Level implements ChunkManager, Metadatable{
 				}
 				assert($chunk->getX() === $x and $chunk->getZ() === $z, "Chunk coordinate mismatch: expected $x $z, but chunk has coordinates " . $chunk->getX() . " " . $chunk->getZ() . ", did you forget to clone a chunk before setting?");
 
-				$this->server->getAsyncPool()->submitTask(new ChunkRequestTask($this, $x, $z, $chunk));
+				$this->server->getAsyncPool()->submitTask($task = new ChunkRequestTask($this, $x, $z, $chunk));
+				$this->chunkSendTasks[$index] = $task;
 
 				$this->timings->syncChunkSendPrepareTimer->stopTiming();
 			}
@@ -2500,24 +2501,14 @@ class Level implements ChunkManager, Metadatable{
 		$this->timings->syncChunkSendTimer->startTiming();
 
 		$index = Level::chunkHash($x, $z);
+		unset($this->chunkSendTasks[$index]);
 
-		if(!isset($this->chunkCache[$index]) and $this->server->getMemoryManager()->canUseChunkCache()){
-			$this->chunkCache[$index] = $payload;
-			$this->sendChunkFromCache($x, $z);
-			$this->timings->syncChunkSendTimer->stopTiming();
-			return;
+		$this->chunkCache[$index] = $payload;
+		$this->sendChunkFromCache($x, $z);
+		if(!$this->server->getMemoryManager()->canUseChunkCache()){
+			unset($this->chunkCache[$index]);
 		}
 
-		if(isset($this->chunkSendTasks[$index])){
-			foreach($this->chunkSendQueue[$index] as $player){
-				/** @var Player $player */
-				if($player->isConnected() and isset($player->usedChunks[$index])){
-					$player->sendChunk($x, $z, $payload);
-				}
-			}
-			unset($this->chunkSendQueue[$index]);
-			unset($this->chunkSendTasks[$index]);
-		}
 		$this->timings->syncChunkSendTimer->stopTiming();
 	}
 
@@ -2751,6 +2742,8 @@ class Level implements ChunkManager, Metadatable{
 		unset($this->chunkCache[$chunkHash]);
 		unset($this->blockCache[$chunkHash]);
 		unset($this->changedBlocks[$chunkHash]);
+		unset($this->chunkSendQueue[$chunkHash]);
+		unset($this->chunkSendTasks[$chunkHash]);
 
 		$this->timings->doChunkUnload->stopTiming();
 
@@ -2788,7 +2781,7 @@ class Level implements ChunkManager, Metadatable{
 		$chunk = $this->getChunk($v->x >> 4, $v->z >> 4, false);
 		$x = (int) $v->x;
 		$z = (int) $v->z;
-		if($chunk !== null){
+		if($chunk !== null and $chunk->isGenerated()){
 			$y = (int) min($max - 2, $v->y);
 			$wasAir = ($chunk->getBlockId($x & 0x0f, $y - 1, $z & 0x0f) === 0);
 			for(; $y > 0; --$y){
@@ -2944,16 +2937,19 @@ class Level implements ChunkManager, Metadatable{
 			}
 
 			if($populate){
-				if(!isset($this->chunkPopulationQueue[$index])){
-					$this->chunkPopulationQueue[$index] = true;
-					for($xx = -1; $xx <= 1; ++$xx){
-						for($zz = -1; $zz <= 1; ++$zz){
-							$this->chunkPopulationLock[Level::chunkHash($x + $xx, $z + $zz)] = true;
-						}
+				$this->chunkPopulationQueue[$index] = true;
+				for($xx = -1; $xx <= 1; ++$xx){
+					for($zz = -1; $zz <= 1; ++$zz){
+						$this->chunkPopulationLock[Level::chunkHash($x + $xx, $z + $zz)] = true;
 					}
-					$task = new PopulationTask($this, $chunk);
-					$this->server->getAsyncPool()->submitTask($task);
 				}
+
+				$task = new PopulationTask($this, $chunk);
+				$workerId = $this->server->getAsyncPool()->selectWorker();
+				if(!isset($this->generatorRegisteredWorkers[$workerId])){
+					$this->registerGeneratorToWorker($workerId);
+				}
+				$this->server->getAsyncPool()->submitTaskToWorker($task, $workerId);
 			}
 
 			Timings::$populationTimer->stopTiming();

src/pocketmine/level/format/Chunk.php

@@ -75,8 +75,8 @@ class Chunk{
 	/** @var Entity[] */
 	protected $entities = [];
 
-	/** @var int[] */
-	protected $heightMap = [];
+	/** @var \SplFixedArray|int[] */
+	protected $heightMap;
 
 	/** @var string */
 	protected $biomeIds;
@@ -110,11 +110,11 @@ class Chunk{
 		}
 
 		if(count($heightMap) === 256){
-			$this->heightMap = $heightMap;
+			$this->heightMap = \SplFixedArray::fromArray($heightMap);
 		}else{
 			assert(count($heightMap) === 0, "Wrong HeightMap value count, expected 256, got " . count($heightMap));
 			$val = ($this->height * 16);
-			$this->heightMap = array_fill(0, 256, $val);
+			$this->heightMap = \SplFixedArray::fromArray(array_fill(0, 256, $val));
 		}
 
 		if(strlen($biomeIds) === 256){
@@ -739,7 +739,7 @@ class Chunk{
 	 * @return int[]
 	 */
 	public function getHeightMapArray() : array{
-		return $this->heightMap;
+		return $this->heightMap->toArray();
 	}
 
 	/**

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

@@ -27,7 +27,6 @@ use pocketmine\level\format\io\leveldb\LevelDB;
 use pocketmine\level\format\io\region\Anvil;
 use pocketmine\level\format\io\region\McRegion;
 use pocketmine\level\format\io\region\PMAnvil;
-use pocketmine\level\LevelException;
 
 abstract class LevelProviderManager{
 	protected static $providers = [];
@@ -42,12 +41,21 @@ abstract class LevelProviderManager{
 	/**
 	 * @param string $class
 	 *
-	 * @throws LevelException
+	 * @throws \InvalidArgumentException
 	 */
 	public static function addProvider(string $class){
-		if(!is_subclass_of($class, LevelProvider::class)){
-			throw new LevelException("Class is not a subclass of LevelProvider");
+		try{
+			$reflection = new \ReflectionClass($class);
+		}catch(\ReflectionException $e){
+			throw new \InvalidArgumentException("Class $class does not exist");
 		}
+		if(!$reflection->implementsInterface(LevelProvider::class)){
+			throw new \InvalidArgumentException("Class $class does not implement " . LevelProvider::class);
+		}
+		if(!$reflection->isInstantiable()){
+			throw new \InvalidArgumentException("Class $class cannot be constructed");
+		}
+
 		/** @var LevelProvider $class */
 		self::$providers[strtolower($class::getProviderName())] = $class;
 	}

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

@@ -377,7 +377,7 @@ class LevelDB extends BaseLevelProvider{
 
 		/** @var CompoundTag[] $entities */
 		$entities = [];
-		if(($entityData = $this->db->get($index . self::TAG_ENTITY)) !== false and strlen($entityData) > 0){
+		if(($entityData = $this->db->get($index . self::TAG_ENTITY)) !== false and $entityData !== ""){
 			$entities = $nbt->read($entityData, true);
 			if(!is_array($entities)){
 				$entities = [$entities];
@@ -392,7 +392,7 @@ class LevelDB extends BaseLevelProvider{
 		}
 
 		$tiles = [];
-		if(($tileData = $this->db->get($index . self::TAG_BLOCK_ENTITY)) !== false and strlen($tileData) > 0){
+		if(($tileData = $this->db->get($index . self::TAG_BLOCK_ENTITY)) !== false and $tileData !== ""){
 			$tiles = $nbt->read($tileData, true);
 			if(!is_array($tiles)){
 				$tiles = [$tiles];
@@ -402,7 +402,7 @@ class LevelDB extends BaseLevelProvider{
 		//TODO: extra data should be converted into blockstorage layers (first they need to be implemented!)
 		/*
 		$extraData = [];
-		if(($extraRawData = $this->db->get($index . self::TAG_BLOCK_EXTRA_DATA)) !== false and strlen($extraRawData) > 0){
+		if(($extraRawData = $this->db->get($index . self::TAG_BLOCK_EXTRA_DATA)) !== false and $extraRawData !== ""){
 			$binaryStream->setBuffer($extraRawData, 0);
 			$count = $binaryStream->getLInt();
 			for($i = 0; $i < $count; ++$i){

src/pocketmine/level/format/io/region/RegionLoader.php

@@ -35,7 +35,6 @@ class RegionLoader{
 
 	public const MAX_SECTOR_LENGTH = 256 << 12; //256 sectors, (1 MiB)
 	public const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps
-	public const MAX_REGION_FILE_SIZE = 32 * 32 * self::MAX_SECTOR_LENGTH + self::REGION_HEADER_LENGTH; //32 * 32 1MiB chunks + header size
 
 	public static $COMPRESSION_LEVEL = 7;
 
@@ -64,13 +63,8 @@ class RegionLoader{
 		$exists = file_exists($this->filePath);
 		if(!$exists){
 			touch($this->filePath);
-		}else{
-			$fileSize = filesize($this->filePath);
-			if($fileSize > self::MAX_REGION_FILE_SIZE){
-				throw new CorruptedRegionException("Corrupted oversized region file found, should be a maximum of " . self::MAX_REGION_FILE_SIZE . " bytes, got " . $fileSize . " bytes");
-			}elseif($fileSize % 4096 !== 0){
-				throw new CorruptedRegionException("Region file should be padded to a multiple of 4KiB");
-			}
+		}elseif(filesize($this->filePath) % 4096 !== 0){
+			throw new CorruptedRegionException("Region file should be padded to a multiple of 4KiB");
 		}
 
 		$this->filePointer = fopen($this->filePath, "r+b");

src/pocketmine/level/generator/Flat.php

@@ -26,11 +26,13 @@ namespace pocketmine\level\generator;
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 use pocketmine\item\ItemFactory;
+use pocketmine\level\ChunkManager;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\generator\object\OreType;
 use pocketmine\level\generator\populator\Ore;
 use pocketmine\level\generator\populator\Populator;
 use pocketmine\math\Vector3;
+use pocketmine\utils\Random;
 
 class Flat extends Generator{
 	/** @var Chunk */
@@ -41,6 +43,8 @@ class Flat extends Generator{
 	private $structure;
 	/** @var int */
 	private $floorLevel;
+	/** @var int */
+	private $biome;
 	/** @var mixed[] */
 	private $options;
 	/** @var string */
@@ -55,9 +59,15 @@ class Flat extends Generator{
 	}
 
 	public function __construct(array $options = []){
-		$this->preset = "2;7,2x3,2;1;";
-		//$this->preset = "2;7,59x1,3x3,2;1;spawn(radius=10 block=89),decoration(treecount=80 grasscount=45)";
 		$this->options = $options;
+		if(isset($this->options["preset"]) and $this->options["preset"] != ""){
+			$this->preset = $this->options["preset"];
+		}else{
+			$this->preset = "2;7,2x3,2;1;";
+			//$this->preset = "2;7,59x1,3x3,2;1;spawn(radius=10 block=89),decoration(treecount=80 grasscount=45)";
+		}
+
+		$this->parsePreset();
 
 		if(isset($this->options["decoration"])){
 			$ores = new Ore();
@@ -90,39 +100,14 @@ class Flat extends Generator{
 		return $result;
 	}
 
-	protected function generateBaseChunk(string $preset) : void{
-		$this->preset = $preset;
-		$preset = explode(";", $preset);
-		$version = (int) $preset[0];
+	protected function parsePreset() : void{
+		$preset = explode(";", $this->preset);
 		$blocks = (string) ($preset[1] ?? "");
-		$biome = (int) ($preset[2] ?? 1);
+		$this->biome = (int) ($preset[2] ?? 1);
 		$options = (string) ($preset[3] ?? "");
 		$this->structure = self::parseLayers($blocks);
 
-		$this->floorLevel = $y = count($this->structure);
-
-		$this->chunk = new Chunk(0, 0);
-		$this->chunk->setGenerated();
-
-		for($Z = 0; $Z < 16; ++$Z){
-			for($X = 0; $X < 16; ++$X){
-				$this->chunk->setBiomeId($X, $Z, $biome);
-			}
-		}
-
-		$count = count($this->structure);
-		for($sy = 0; $sy < $count; $sy += 16){
-			$subchunk = $this->chunk->getSubChunk($sy >> 4, true);
-			for($y = 0; $y < 16 and isset($this->structure[$y | $sy]); ++$y){
-				list($id, $meta) = $this->structure[$y | $sy];
-
-				for($Z = 0; $Z < 16; ++$Z){
-					for($X = 0; $X < 16; ++$X){
-						$subchunk->setBlock($X, $y, $Z, $id, $meta);
-					}
-				}
-			}
-		}
+		$this->floorLevel = count($this->structure);
 
 		preg_match_all('#(([0-9a-z_]{1,})\(?([0-9a-z_ =:]{0,})\)?),?#', $options, $matches);
 		foreach($matches[2] as $i => $option){
@@ -141,14 +126,37 @@ class Flat extends Generator{
 		}
 	}
 
-	public function generateChunk(int $chunkX, int $chunkZ) : void{
-		if($this->chunk === null){
-			if(isset($this->options["preset"]) and $this->options["preset"] != ""){
-				$this->generateBaseChunk($this->options["preset"]);
-			}else{
-				$this->generateBaseChunk($this->preset);
+	protected function generateBaseChunk() : void{
+		$this->chunk = new Chunk(0, 0);
+		$this->chunk->setGenerated();
+
+		for($Z = 0; $Z < 16; ++$Z){
+			for($X = 0; $X < 16; ++$X){
+				$this->chunk->setBiomeId($X, $Z, $this->biome);
 			}
 		}
+
+		$count = count($this->structure);
+		for($sy = 0; $sy < $count; $sy += 16){
+			$subchunk = $this->chunk->getSubChunk($sy >> 4, true);
+			for($y = 0; $y < 16 and isset($this->structure[$y | $sy]); ++$y){
+				list($id, $meta) = $this->structure[$y | $sy];
+
+				for($Z = 0; $Z < 16; ++$Z){
+					for($X = 0; $X < 16; ++$X){
+						$subchunk->setBlock($X, $y, $Z, $id, $meta);
+					}
+				}
+			}
+		}
+	}
+
+	public function init(ChunkManager $level, Random $random) : void{
+		parent::init($level, $random);
+		$this->generateBaseChunk();
+	}
+
+	public function generateChunk(int $chunkX, int $chunkZ) : void{
 		$chunk = clone $this->chunk;
 		$chunk->setX($chunkX);
 		$chunk->setZ($chunkZ);

src/pocketmine/level/generator/GeneratorRegisterTask.php

@@ -52,7 +52,10 @@ class GeneratorRegisterTask extends AsyncTask{
 		$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
 		$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);
 
-		/** @var Generator $generator */
+		/**
+		 * @var Generator $generator
+		 * @see Generator::__construct()
+		 */
 		$generator = new $this->generatorClass(unserialize($this->settings));
 		$generator->init($manager, new Random($manager->getSeed()));
 		$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);

src/pocketmine/level/light/LightUpdate.php

@@ -54,14 +54,6 @@ abstract class LightUpdate{
 		$this->subChunkHandler = new SubChunkIteratorManager($this->level);
 	}
 
-	public function addSpreadNode(int $x, int $y, int $z){
-		$this->spreadQueue->enqueue([$x, $y, $z]);
-	}
-
-	public function addRemoveNode(int $x, int $y, int $z, int $oldLight){
-		$this->spreadQueue->enqueue([$x, $y, $z, $oldLight]);
-	}
-
 	abstract protected function getLight(int $x, int $y, int $z) : int;
 
 	abstract protected function setLight(int $x, int $y, int $z, int $level);

src/pocketmine/level/particle/DestroyBlockParticle.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\level\particle;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
@@ -35,7 +34,7 @@ class DestroyBlockParticle extends Particle{
 
 	public function __construct(Vector3 $pos, Block $b){
 		parent::__construct($pos->x, $pos->y, $pos->z);
-		$this->data = BlockFactory::toStaticRuntimeId($b->getId(), $b->getDamage());
+		$this->data = $b->getRuntimeId();
 	}
 
 	public function encode(){

src/pocketmine/level/particle/FloatingTextParticle.php

@@ -29,8 +29,9 @@ use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
-use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
+use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
+use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
 use pocketmine\utils\UUID;
 
 class FloatingTextParticle extends Particle{
@@ -89,9 +90,17 @@ class FloatingTextParticle extends Particle{
 		}
 
 		if(!$this->invisible){
+			$uuid = UUID::fromRandom();
+			$name = $this->title . ($this->text !== "" ? "\n" . $this->text : "");
+
+			$add = new PlayerListPacket();
+			$add->type = PlayerListPacket::TYPE_ADD;
+			$add->entries = [PlayerListEntry::createAdditionEntry($uuid, $this->entityId, $name, $name, 0, new Skin("Standard_Custom", str_repeat("\x00", 8192)))];
+			$p[] = $add;
+
 			$pk = new AddPlayerPacket();
-			$pk->uuid = $uuid = UUID::fromRandom();
-			$pk->username = $this->title . ($this->text !== "" ? "\n" . $this->text : "");
+			$pk->uuid = $uuid;
+			$pk->username = $name;
 			$pk->entityRuntimeId = $this->entityId;
 			$pk->position = $this->asVector3(); //TODO: check offset
 			$pk->item = ItemFactory::get(Item::AIR, 0, 0);
@@ -106,10 +115,10 @@ class FloatingTextParticle extends Particle{
 
 			$p[] = $pk;
 
-			$skinPk = new PlayerSkinPacket();
-			$skinPk->uuid = $uuid;
-			$skinPk->skin = new Skin("Standard_Custom", str_repeat("\x00", 8192));
-			$p[] = $skinPk;
+			$remove = new PlayerListPacket();
+			$remove->type = PlayerListPacket::TYPE_REMOVE;
+			$remove->entries = [PlayerListEntry::createRemovalEntry($uuid)];
+			$p[] = $remove;
 		}
 
 		return $p;

src/pocketmine/level/particle/TerrainParticle.php

@@ -24,11 +24,10 @@ declare(strict_types=1);
 namespace pocketmine\level\particle;
 
 use pocketmine\block\Block;
-use pocketmine\block\BlockFactory;
 use pocketmine\math\Vector3;
 
 class TerrainParticle extends GenericParticle{
 	public function __construct(Vector3 $pos, Block $b){
-		parent::__construct($pos, Particle::TYPE_TERRAIN, BlockFactory::toStaticRuntimeId($b->getId(), $b->getDamage()));
+		parent::__construct($pos, Particle::TYPE_TERRAIN, $b->getRuntimeId());
 	}
 }

src/pocketmine/network/mcpe/NetworkSession.php

@@ -76,8 +76,10 @@ use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
 use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
 use pocketmine\network\mcpe\protocol\ModalFormResponsePacket;
-use pocketmine\network\mcpe\protocol\MoveEntityPacket;
+use pocketmine\network\mcpe\protocol\MoveEntityAbsolutePacket;
+use pocketmine\network\mcpe\protocol\MoveEntityDeltaPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
+use pocketmine\network\mcpe\protocol\NetworkStackLatencyPacket;
 use pocketmine\network\mcpe\protocol\NpcRequestPacket;
 use pocketmine\network\mcpe\protocol\PhotoTransferPacket;
 use pocketmine\network\mcpe\protocol\PlaySoundPacket;
@@ -111,8 +113,10 @@ use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
 use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
 use pocketmine\network\mcpe\protocol\SetHealthPacket;
 use pocketmine\network\mcpe\protocol\SetLastHurtByPacket;
+use pocketmine\network\mcpe\protocol\SetLocalPlayerAsInitializedPacket;
 use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
 use pocketmine\network\mcpe\protocol\SetScorePacket;
+use pocketmine\network\mcpe\protocol\SetScoreboardIdentityPacket;
 use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
 use pocketmine\network\mcpe\protocol\SetTimePacket;
 use pocketmine\network\mcpe\protocol\SetTitlePacket;
@@ -132,6 +136,7 @@ use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockSyncedPacket;
 use pocketmine\network\mcpe\protocol\UpdateEquipPacket;
+use pocketmine\network\mcpe\protocol\UpdateSoftEnumPacket;
 use pocketmine\network\mcpe\protocol\UpdateTradePacket;
 use pocketmine\network\mcpe\protocol\WSConnectPacket;
 
@@ -207,7 +212,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleMoveEntity(MoveEntityPacket $packet) : bool{
+	public function handleMoveEntityAbsolute(MoveEntityAbsolutePacket $packet) : bool{
 		return false;
 	}
 
@@ -578,4 +583,24 @@ abstract class NetworkSession{
 	public function handleUpdateBlockSynced(UpdateBlockSyncedPacket $packet) : bool{
 		return false;
 	}
+
+	public function handleMoveEntityDelta(MoveEntityDeltaPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleSetScoreboardIdentity(SetScoreboardIdentityPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleSetLocalPlayerAsInitialized(SetLocalPlayerAsInitializedPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleUpdateSoftEnum(UpdateSoftEnumPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleNetworkStackLatency(NetworkStackLatencyPacket $packet) : bool{
+		return false;
+	}
 }

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -239,7 +239,37 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 	}
 
 	public function handleModalFormResponse(ModalFormResponsePacket $packet) : bool{
-		return false; //TODO: GUI stuff
+		return $this->player->onFormSubmit($packet->formId, self::stupid_json_decode($packet->formData, true));
+	}
+
+	/**
+	 * Hack to work around a stupid bug in Minecraft W10 which causes empty strings to be sent unquoted in form responses.
+	 *
+	 * @param string $json
+	 * @param bool   $assoc
+	 *
+	 * @return mixed
+	 */
+	private static function stupid_json_decode(string $json, bool $assoc = false){
+		if(preg_match('/^\[(.+)\]$/s', $json, $matches) > 0){
+			$parts = preg_split('/(?:"(?:\\"|[^"])*"|)\K(,)/', $matches[1]); //Splits on commas not inside quotes, ignoring escaped quotes
+			foreach($parts as $k => $part){
+				$part = trim($part);
+				if($part === ""){
+					$part = "\"\"";
+				}
+				$parts[$k] = $part;
+			}
+
+			$fixed = "[" . implode(",", $parts) . "]";
+			if(($ret = json_decode($fixed, $assoc)) === null){
+				throw new \InvalidArgumentException("Failed to fix JSON: " . json_last_error_msg() . "(original: $json, modified: $fixed)");
+			}
+
+			return $ret;
+		}
+
+		return json_decode($json, $assoc);
 	}
 
 	public function handleServerSettingsRequest(ServerSettingsRequestPacket $packet) : bool{

src/pocketmine/network/mcpe/RakLibInterface.php

@@ -46,7 +46,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 	 * Sometimes this gets changed when the MCPE-layer protocol gets broken to the point where old and new can't
 	 * communicate. It's important that we check this to avoid catastrophes.
 	 */
-	private const MCPE_RAKNET_PROTOCOL_VERSION = 8;
+	private const MCPE_RAKNET_PROTOCOL_VERSION = 9;
 
 	/** @var Server */
 	private $server;
@@ -76,10 +76,6 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 		$this->server = $server;
 
 		$this->sleeper = new SleeperNotifier();
-		$server->getTickSleeper()->addNotifier($this->sleeper, function() : void{
-			$this->server->getNetwork()->processInterface($this);
-		});
-
 		$this->rakLib = new RakLibServer(
 			$this->server->getLogger(),
 			\pocketmine\COMPOSER_AUTOLOADER_PATH,
@@ -92,6 +88,9 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 	}
 
 	public function start(){
+		$this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{
+			$this->server->getNetwork()->processInterface($this);
+		});
 		$this->rakLib->start(PTHREADS_INHERIT_CONSTANTS | PTHREADS_INHERIT_INI); //HACK: MainLogger needs INI and constants
 	}
 
@@ -141,6 +140,10 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 		$this->server->getPluginManager()->callEvent($ev);
 		$class = $ev->getPlayerClass();
 
+		/**
+		 * @var Player $player
+		 * @see Player::__construct()
+		 */
 		$player = new $class($this, $ev->getAddress(), $ev->getPort());
 		$this->players[$identifier] = $player;
 		$this->identifiersACK[$identifier] = 0;

src/pocketmine/network/mcpe/VerifyLoginTask.php

@@ -145,7 +145,7 @@ class VerifyLoginTask extends AsyncTask{
 	public function onCompletion(Server $server){
 		/** @var Player $player */
 		$player = $this->fetchLocal();
-		if($player->isClosed()){
+		if(!$player->isConnected()){
 			$server->getLogger()->error("Player " . $player->getName() . " was disconnected before their login could be verified");
 		}else{
 			$player->onVerifyCompleted($this->packet, $this->error, $this->authenticated);

src/pocketmine/network/mcpe/protocol/AddEntityPacket.php

@@ -44,9 +44,11 @@ class AddEntityPacket extends DataPacket{
 	/** @var Vector3|null */
 	public $motion;
 	/** @var float */
+	public $pitch = 0.0;
+	/** @var float */
 	public $yaw = 0.0;
 	/** @var float */
-	public $pitch = 0.0;
+	public $headYaw = 0.0;
 
 	/** @var Attribute[] */
 	public $attributes = [];
@@ -63,6 +65,7 @@ class AddEntityPacket extends DataPacket{
 		$this->motion = $this->getVector3();
 		$this->pitch = $this->getLFloat();
 		$this->yaw = $this->getLFloat();
+		$this->headYaw = $this->getLFloat();
 
 		$attrCount = $this->getUnsignedVarInt();
 		for($i = 0; $i < $attrCount; ++$i){
@@ -97,6 +100,7 @@ class AddEntityPacket extends DataPacket{
 		$this->putVector3Nullable($this->motion);
 		$this->putLFloat($this->pitch);
 		$this->putLFloat($this->yaw);
+		$this->putLFloat($this->headYaw);
 
 		$this->putUnsignedVarInt(count($this->attributes));
 		foreach($this->attributes as $attribute){

src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php

@@ -75,6 +75,9 @@ class AddPlayerPacket extends DataPacket{
 	/** @var EntityLink[] */
 	public $links = [];
 
+	/** @var string */
+	public $deviceId = ""; //TODO: fill player's device ID (???)
+
 	protected function decodePayload(){
 		$this->uuid = $this->getUUID();
 		$this->username = $this->getString();
@@ -103,6 +106,8 @@ class AddPlayerPacket extends DataPacket{
 		for($i = 0; $i < $linkCount; ++$i){
 			$this->links[$i] = $this->getEntityLink();
 		}
+
+		$this->deviceId = $this->getString();
 	}
 
 	protected function encodePayload(){
@@ -133,6 +138,8 @@ class AddPlayerPacket extends DataPacket{
 		foreach($this->links as $link){
 			$this->putEntityLink($link);
 		}
+
+		$this->putString($this->deviceId);
 	}
 
 	public function handle(NetworkSession $session) : bool{

src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php

@@ -103,6 +103,13 @@ class AvailableCommandsPacket extends DataPacket{
 	 */
 	public $commandData = [];
 
+	/**
+	 * @var CommandEnum[]
+	 * List of dynamic command enums, also referred to as "soft" enums. These can by dynamically updated mid-game
+	 * without resending this packet.
+	 */
+	public $softEnums = [];
+
 	protected function decodePayload(){
 		for($i = 0, $this->enumValuesCount = $this->getUnsignedVarInt(); $i < $this->enumValuesCount; ++$i){
 			$this->enumValues[] = $this->getString();
@@ -119,6 +126,10 @@ class AvailableCommandsPacket extends DataPacket{
 		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
 			$this->commandData[] = $this->getCommandData();
 		}
+
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$this->softEnums[] = $this->getSoftEnum();
+		}
 	}
 
 	protected function getEnum() : CommandEnum{
@@ -133,6 +144,18 @@ class AvailableCommandsPacket extends DataPacket{
 		return $retval;
 	}
 
+	protected function getSoftEnum() : CommandEnum{
+		$retval = new CommandEnum();
+		$retval->enumName = $this->getString();
+
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			//Get the enum value from the initial pile of mess
+			$retval->enumValues[] = $this->getString();
+		}
+
+		return $retval;
+	}
+
 	protected function putEnum(CommandEnum $enum){
 		$this->putString($enum->enumName);
 
@@ -147,6 +170,15 @@ class AvailableCommandsPacket extends DataPacket{
 		}
 	}
 
+	protected function putSoftEnum(CommandEnum $enum) : void{
+		$this->putString($enum->enumName);
+
+		$this->putUnsignedVarInt(count($enum->enumValues));
+		foreach($enum->enumValues as $value){
+			$this->putString($value);
+		}
+	}
+
 	protected function getEnumValueIndex() : int{
 		if($this->enumValuesCount < 256){
 			return $this->getByte();
@@ -185,13 +217,17 @@ class AvailableCommandsPacket extends DataPacket{
 				if($parameter->paramType & self::ARG_FLAG_ENUM){
 					$index = ($parameter->paramType & 0xffff);
 					$parameter->enum = $this->enums[$index] ?? null;
-
-					assert($parameter->enum !== null, "expected enum at $index, but got none");
-				}elseif(($parameter->paramType & self::ARG_FLAG_VALID) === 0){ //postfix (guessing)
+					if($parameter->enum === null){
+						throw new \UnexpectedValueException("expected enum at $index, but got none");
+					}
+				}elseif($parameter->paramType & self::ARG_FLAG_POSTFIX){
 					$index = ($parameter->paramType & 0xffff);
 					$parameter->postfix = $this->postfixes[$index] ?? null;
-
-					assert($parameter->postfix !== null, "expected postfix at $index, but got none");
+					if($parameter->postfix === null){
+						throw new \UnexpectedValueException("expected postfix at $index, but got none");
+					}
+				}elseif(($parameter->paramType & self::ARG_FLAG_VALID) === 0){
+					throw new \UnexpectedValueException("Invalid parameter type 0x" . dechex($parameter->paramType));
 				}
 
 				$retval->overloads[$overloadIndex][$paramIndex] = $parameter;
@@ -227,7 +263,7 @@ class AvailableCommandsPacket extends DataPacket{
 					if($key === false){
 						throw new \InvalidStateException("Postfix '$parameter->postfix' not in postfixes array");
 					}
-					$type = $parameter->paramType << 24 | $key;
+					$type = self::ARG_FLAG_POSTFIX | $key;
 				}else{
 					$type = $parameter->paramType;
 				}
@@ -266,13 +302,12 @@ class AvailableCommandsPacket extends DataPacket{
 				case self::ARG_TYPE_COMMAND:
 					return "command";
 			}
-		}elseif($argtype !== 0){
-			//guessed
-			$baseType = $argtype >> 24;
-			$typeName = $this->argTypeToString(self::ARG_FLAG_VALID | $baseType);
+		}elseif($argtype & self::ARG_FLAG_POSTFIX){
 			$postfix = $this->postfixes[$argtype & 0xffff];
 
-			return $typeName . " (postfix $postfix)";
+			return "int (postfix $postfix)";
+		}else{
+			throw new \UnexpectedValueException("Unknown arg type 0x" . dechex($argtype));
 		}
 
 		return "unknown ($argtype)";
@@ -334,6 +369,11 @@ class AvailableCommandsPacket extends DataPacket{
 		foreach($this->commandData as $data){
 			$this->putCommandData($data);
 		}
+
+		$this->putUnsignedVarInt(count($this->softEnums));
+		foreach($this->softEnums as $enum){
+			$this->putSoftEnum($enum);
+		}
 	}
 
 	public function handle(NetworkSession $session) : bool{

src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php

@@ -29,6 +29,7 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
+use pocketmine\network\mcpe\protocol\types\MapTrackedObject;
 use pocketmine\utils\Color;
 
 class ClientboundMapItemDataPacket extends DataPacket{
@@ -49,8 +50,8 @@ class ClientboundMapItemDataPacket extends DataPacket{
 	/** @var int */
 	public $scale;
 
-	/** @var int[] */
-	public $decorationEntityUniqueIds = [];
+	/** @var MapTrackedObject[] */
+	public $trackedEntities = [];
 	/** @var array */
 	public $decorations = [];
 
@@ -83,7 +84,16 @@ class ClientboundMapItemDataPacket extends DataPacket{
 
 		if(($this->type & self::BITFLAG_DECORATION_UPDATE) !== 0){
 			for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-				$this->decorationEntityUniqueIds[] = $this->getEntityUniqueId();
+				$object = new MapTrackedObject();
+				$object->type = $this->getLInt();
+				if($object->type === MapTrackedObject::TYPE_BLOCK){
+					$this->getBlockPosition($object->x, $object->y, $object->z);
+				}elseif($object->type === MapTrackedObject::TYPE_ENTITY){
+					$object->entityUniqueId = $this->getEntityUniqueId();
+				}else{
+					throw new \UnexpectedValueException("Unknown map object type");
+				}
+				$this->trackedEntities[] = $object;
 			}
 
 			for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
@@ -143,9 +153,16 @@ class ClientboundMapItemDataPacket extends DataPacket{
 		}
 
 		if(($type & self::BITFLAG_DECORATION_UPDATE) !== 0){
-			$this->putUnsignedVarInt(count($this->decorationEntityUniqueIds));
-			foreach($this->decorationEntityUniqueIds as $id){
-				$this->putEntityUniqueId($id);
+			$this->putUnsignedVarInt(count($this->trackedEntities));
+			foreach($this->trackedEntities as $object){
+				$this->putLInt($object->type);
+				if($object->type === MapTrackedObject::TYPE_BLOCK){
+					$this->putBlockPosition($object->x, $object->y, $object->z);
+				}elseif($object->type === MapTrackedObject::TYPE_ENTITY){
+					$this->putEntityUniqueId($object->entityUniqueId);
+				}else{
+					throw new \UnexpectedValueException("Unknown map object type");
+				}
 			}
 
 			$this->putUnsignedVarInt($decorationCount);