Release 3.11.1

there are no protocol changes in 1.14 that matter; the reason the protocol version has been bumped is because of new blocks, items, mobs and recipes.

.github/ISSUE_TEMPLATE/help---support.md

@@ -11,4 +11,4 @@ We don't accept support requests on the issue tracker. Please try the following
 
 Documentation: http://pmmp.rtfd.io
 Forums: https://forums.pmmp.io
-Discord: https://discord.gg/bge7dYQ
+Discord: https://discord.gg/bmSAZBG

.github/support.yml

@@ -5,10 +5,10 @@ supportLabel: "Support request"
 # Comment to post on issues marked as support requests. Add a link
 # to a support page, or set to `false` to disable
 supportComment: >
-  Thanks, but this issue tracker not intended for support requests.  Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
+  Thanks, but this issue tracker is not intended for support requests. Please read the guidelines on [submitting an issue](https://github.com/pmmp/PocketMine-MP/blob/master/CONTRIBUTING.md#creating-an-issue).
 
 
-  [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bge7dYQ) | [Forums](https://forums.pmmp.io)
+  [Docs](https://pmmp.rtfd.io) | [Discord](https://discord.gg/bmSAZBG) | [Forums](https://forums.pmmp.io)
 
 # Whether to close issues marked as support requests
 close: true

.gitignore

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

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "src/pocketmine/resources/vanilla"]
 	path = src/pocketmine/resources/vanilla
 	url = https://github.com/pmmp/BedrockData.git
+[submodule "build/php"]
+	path = build/php
+	url = https://github.com/pmmp/php-build-scripts.git

.travis.yml

@@ -9,7 +9,7 @@ before_script:
  - echo | pecl install channel://pecl.php.net/yaml-2.0.4
  - git clone https://github.com/pmmp/pthreads.git
  - cd pthreads
- - git checkout 6ca019c58b4fa09ee2ff490f2444e34bef0773d0
+ - git checkout 1b7da492b944146fa9680f6399bd9c6c6c6095e0
  - phpize
  - ./configure
  - make

README.md

@@ -5,25 +5,27 @@
 
 [![Build Status](https://travis-ci.org/pmmp/PocketMine-MP.svg?branch=master)](https://travis-ci.org/pmmp/PocketMine-MP)
 
-### Getting started
+## Getting started
 - [Documentation](http://pmmp.readthedocs.org/)
 - [Installation instructions](https://pmmp.readthedocs.io/en/rtfd/installation.html)
 - [Docker image](https://hub.docker.com/r/pmmp/pocketmine-mp)
-- [Plugin repository](https://poggit.pmmp.io)
+- [Plugin repository](https://poggit.pmmp.io/plugins)
 
-### Discussion
+## Discussion/Help
 - [Forums](https://forums.pmmp.io/)
-- [Community Discord](https://discord.gg/bge7dYQ)
+- [Community Discord](https://discord.gg/bmSAZBG)
+- [StackOverflow](https://stackoverflow.com/tags/pocketmine)
 
-### For developers
+## For developers
  * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development
  * [DevTools](https://github.com/pmmp/PocketMine-DevTools/) - Development tools plugin for creating plugins
  * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
  * [Contributing Guidelines](CONTRIBUTING.md)
 
-### Donate
-- Bitcoin Cash (BCH): `qz9p8dqkv0r7aahdatu5uewqfkvstrglv58f8yle07`
-- Bitcoin (BTC): `1PVAyDJ2g7kcjCxAC3C89oxpV2ZYcLad8T`
+## Donate
+- Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear`
+- Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
+- Stellar Lumens (XLM): `GAAC5WZ33HCTE3BFJFZJXONMEIBNHFLBXM2HJVAZHXXPYA3HP5XPPS7T`
 - [Patreon](https://www.patreon.com/pocketminemp)
 
 ## Licensing information

build/make-release.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\build_script;
+
+use pocketmine\utils\VersionString;
+use function dirname;
+use function fgets;
+use function file_get_contents;
+use function file_put_contents;
+use function preg_quote;
+use function preg_replace;
+use function sleep;
+use function sprintf;
+use function system;
+use const pocketmine\BASE_VERSION;
+use const STDIN;
+
+require_once dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+if(isset($argv[1])){
+	$currentVer = new VersionString($argv[1]);
+}else{
+	$currentVer = new VersionString(BASE_VERSION);
+}
+$nextVer = new VersionString(sprintf(
+	"%u.%u.%u",
+	$currentVer->getMajor(),
+	$currentVer->getMinor(),
+	$currentVer->getPatch() + 1
+));
+
+function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev) : void{
+	$versionInfo = file_get_contents($versionInfoPath);
+	$versionInfo = preg_replace(
+		$pattern = '/^const BASE_VERSION = "(\d+)\.(\d+)\.(\d+)(?:-(.*))?";$/m',
+		'const BASE_VERSION = "' . $newVersion . '";',
+		$versionInfo
+	);
+	$versionInfo = preg_replace(
+		'/^const IS_DEVELOPMENT_BUILD = (?:true|false);$/m',
+		'const IS_DEVELOPMENT_BUILD = ' . ($isDev ? 'true' : 'false'). ';',
+		$versionInfo
+	);
+	file_put_contents($versionInfoPath, $versionInfo);
+}
+$versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
+replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false);
+
+echo "please add appropriate notes to the changelog and press enter...";
+fgets(STDIN);
+system('git add "' . dirname(__DIR__) . '/changelogs"');
+system('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"');
+system('git tag ' . $currentVer->getBaseVersion());
+replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true);
+system('git add "' . $versionInfoPath . '"');
+system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
+echo "pushing changes in 5 seconds\n";
+sleep(5);
+system('git push origin HEAD ' . $currentVer->getBaseVersion());

changelogs/3.10.md

@@ -0,0 +1,20 @@
+**For Minecraft: Bedrock Edition 1.13.0**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.10.0
+- Added support for Minecraft: Bedrock Edition 1.13.0
+- Removed compatibility with 1.12.0
+
+## Note about skins
+PocketMine-MP **does not support skins made in the Charactor Creator** (known as Persona skins), due to technical changes which would require premature backwards compatibility breaks. The dev team has decided not to support Persona yet.
+These skins will be **replaced with a random solid-colour skin. This is not a bug.**
+Skins chosen from the Classic tab (classic skins) will continue to work as normal.
+
+# 3.10.1
+- Fixed custom plugin-created skins being invisible when no geometry name was specified.
+- Updated RakLib to 0.12.6 to fix security bugs.

changelogs/3.11.md

@@ -0,0 +1,14 @@
+**For Minecraft: Bedrock Edition 1.14.0**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.11.0
+- Added support for Minecraft: Bedrock Edition 1.14.0
+- Removed compatibility with 1.13.0
+
+# 3.11.1
+- Fixed blocks with incorrect properties when placed or interacted with.

changelogs/3.8.md

@@ -55,3 +55,15 @@ This changelog **does not account for protocol changes**. If your plugin uses th
 - Fixed sluggish playercount updating on MOTD.
 - Added new MultiRecipe UUIDs.
 - Added an extra field to `StartGamePacket` to resolve minor incompatibility issues on different 1.11.x patch versions.
+
+# 3.8.6
+- Fixed `Entity->isNameTagAlwaysVisible()` not working.
+- Log messages are now cleaned of invalid UTF-8 sequences before emitting them.
+- Fixed negative integers being considered as strings for world seeds.
+- Fixed out-of-bounds access on invalid inventory data in player data saves.
+- Fixed crash when custom liquids have flow decays which aren't factors of 4.
+- Fixed `Entity->noDamageTicks` not working when the entity had no previous damage cause.
+
+# 3.8.7
+- Improved documentation of `Player->getDisplayName()` and `Player::isValidUserName()`.
+- Fixed a bug in `SetScorePacket` decoding causing the entry list to always be empty.

changelogs/3.9.md

@@ -0,0 +1,129 @@
+**For Minecraft: Bedrock Edition 1.12.0**
+
+### Note about API versions
+Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps.
+Plugin developers should **only** update their required API to this version if you need the changes in this build.
+
+**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
+
+# 3.9.0
+- Added support for Minecraft: Bedrock Edition 1.12.0
+- Removed compatibility with 1.11.0
+
+## Protocol
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been renamed:
+  - `AddEntityPacket` -> `AddActorPacket`
+  - `AddItemEntityPacket` -> `AddItemActorPacket`
+  - `AvailableEntityIdentifiersPacket` -> `AvailableActorIdentifiersPacket`
+  - `BlockEntityDataPacket` -> `BlockActorDataPacket`
+  - `EntityEventPacket` -> `ActorEventPacket`
+  - `EntityFallPacket` -> `ActorFallPacket`
+  - `EntityPickRequestPacket` -> `ActorPickRequestPacket`
+  - `MoveEntityAbsolutePacket` -> `MoveActorAbsolutePacket`
+  - `MoveEntityDeltaPacket` -> `MoveActorDeltaPacket`
+  - `RemoveEntityPacket` -> `RemoveActorPacket`
+  - `SetEntityDataPacket` -> `SetActorDataPacket`
+  - `SetEntityLinkPacket` -> `SetActorLinkPacket`
+  - `SetEntityMotionPacket` -> `SetActorMotionPacket`
+  - `TakeItemEntityPacket` -> `TakeItemActorPacket`
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been removed:
+  - `FullChunkDataPacket`
+- The following classes in the `\pocketmine\network\mcpe\protocol` namespace have been added:
+  - `AddEntityPacket` (not to be confused with the old one)
+  - `ClientCacheBlobStatusPacket`
+  - `ClientCacheMissResponsePacket`
+  - `ClientCacheStatusPacket`
+  - `LevelChunkPacket`
+  - `RemoveEntityPacket` (not to be confused with the old one)
+  - `StructureTemplateDataExportRequestPacket`
+  - `StructureTemplateDataExportResponsePacket`
+
+# 3.9.1
+- Fixed resource packs not working on 1.12 clients.
+- Fixed some particles displaying incorrectly (some still don't render at all).
+- Fixed `Entity->setFireTicks()` with a value of `0` setting the on-fire flag.
+- Silenced a debug message which appeared every time a player right-clicked a block.
+- Updated constants for `LevelSoundEventPacket`.
+
+# 3.9.2
+- Logger warnings for illegal player movements have been lowered to debug.
+- TNT explosions now start from the center instead of the base. This fixes unexpected results when TNT is lit on top of obsidian.
+- Fixed the `loadbefore` directive in `plugin.yml` sometimes being ignored.
+- Fixed `Item->setCustomName()` with an empty string leaving behind an empty tag.
+- Fixed incorrect positioning of bucket empty sound.
+- Fixed some incorrect tag parsing in `/give` involving quoted numbers.
+
+# 3.9.3
+- Fixed a memory leak on async task removal in error conditions.
+- Fixed scheduled block updates (for example liquid) triggering chunk reloading. This could cause a significant performance issue in some conditions.
+- Fixed some minor cosmetic issues in documentation.
+
+# 3.9.4
+- Fixed a memory leak when scheduled updates were pending on a chunk being unloaded.
+- Fixed plugin detection in crashdumps. Previously `src/pocketmine` anywhere in the path would cause the error to be considered a core crash, regardless of the preceding path.
+- Fixed entity metadata types for 1.12. The SLOT type was removed and a COMPOUND_TAG type added. This change involves changes to internal API which may break plugins. **See the warning at the top of this changelog about API versioning.**
+- Fixed random and base populator amounts of trees and tallgrass never being initialized. This bug had no obvious effect, but may have become a problem in future PHP versions.
+- The following internal methods have been marked as `@deprecated` and documentation warnings added:
+  - `Entity->getBlocksAround()`
+  - `Entity->despawnFrom()`
+  - `Entity->despawnFromAll()`
+- Fixed plugin `softdepend` not influencing load order when a soft-depended plugin had an unresolved soft dependency of its own.
+- Fixed endless falling of sand on top of fences.
+
+# 3.9.5
+- Fixed some issues with multiple consecutive commas inside quotes in form responses.
+- Fixed server crash when the manifest json does not contain a json object in a resource pack.
+- Ender pearls no longer collide with blocks that do not have any collision boxes.
+
+# 3.9.6
+- Updated Composer dependencies to their latest versions.
+- Prevent clients repeating the resource pack sequence. This fixes error spam with bugged 1.12 clients.
+- `Internet::simpleCurl()` now includes the PocketMine-MP version in the user-agent string.
+- Spawn protection is now disabled by default in the setup wizard.
+- Default difficulty is now NORMAL(2) instead of EASY(1).
+- Fixed crashing on corrupted world manifest and unsupported world formats.
+- Fixed `/transferserver` being usable without appropriate permissions.
+- `RegionLoader->removeChunk()` now writes the region header as appropriate.
+- Fixed performance issue when loading large regions (bug in header validation).
+- Fixed skin geometry being removed when the JSON contained comments.
+- Added new constants to `EventPacket`.
+- Added encode/decode for `StructureTemplateDataExportRequestPacket` and `StructureTemplateDataExportResponsePacket`.
+- Fixed broken type asserts in `LevelChunkPacket::withCache()` and `ClientCacheMissResponsePacket::create()`.
+- `types\CommandParameter` field `byte1` has been renamed to `flags`.
+- Cleaned up public interface of `AvailableCommandsPacket`, removing fields which exposed details of the encoding scheme.
+- Improved documentation for the following API methods:
+  - `pocketmine\item\Item`:
+    - `addCreativeItem()`
+    - `removeCreativeItem()`
+    - `clearCreativeItems()`
+  - `pocketmine\level\Explosion`:
+    - `explodeA()`
+    - `explodeB()`
+- Fixed various cosmetic documentation inconsistencies in the core and dependencies.
+
+# 3.9.7
+- Fixed a crash that could occur during timezone detection.
+- Squid no longer spin around constantly in enclosed spaces. Their performance impact is reduced.
+- Cleaned up the bootstrap file.
+
+# 3.9.8
+- Added [PHPStan](https://github.com/phpstan/phpstan) configuration. PHPStan is now used on CI for automated QA, which should improve stability and quality going forward.
+- The following constants are now autoloaded when loading the Composer autoloader:
+  - `pocketmine\NAME`
+  - `pocketmine\BASE_VERSION`
+  - `pocketmine\IS_DEVELOPMENT_BUILD`
+  - `pocketmine\BUILD_NUMBER`
+  - `INT32_MIN`
+  - `INT32_MAX`
+  - `INT32_MASK`
+- Fixed memory leaks and crashes caused by plugin use of `Player->showPlayer()` and `Entity->spawnTo()`.
+- Fixed crashes that could occur when tile classes were overridden with classes incompatible with the originals.
+- Fixed improper handling of non-Compound root NBT tags on network itemstack decoding.
+- Fixed paintings dropping multiple items when destroyed by block updates.
+- Fixed `var_dump()` not showing private and protected properties of `DataPacket` subclasses.
+- Fixed overloads with zero arguments being missing when decoding `AvailableCommandsPacket`.
+- `CraftingDataPacket` now retains the `cleanRecipes` field when decoding.
+- Fixed `Block->getMetadata()` returning null (non-iterable).
+- `PlayerChatEvent` documentation has been updated to specify that `CommandSender` recipients are accepted. This behaviour was already present in previous versions, but incorrectly documented.
+- Fixed various issues with PHPDoc comments reported by PHPStan.
+- Fixed various minor code nits reported by PHPStan.

composer.json

@@ -17,17 +17,17 @@
       "ext-openssl": "*",
       "ext-pcre": "*",
       "ext-phar": "*",
-      "ext-pthreads": ">=3.1.7dev",
+      "ext-pthreads": "~3.2.0",
       "ext-reflection": "*",
       "ext-sockets": "*",
       "ext-spl": "*",
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "^0.12.0",
+      "pocketmine/raklib": "^0.12.5",
       "pocketmine/spl": "^0.3.0",
-      "pocketmine/binaryutils": "^0.1.0",
-      "pocketmine/nbt": "^0.2.6",
+      "pocketmine/binaryutils": "^0.1.9",
+      "pocketmine/nbt": "^0.2.10",
       "pocketmine/math": "^0.2.0",
       "pocketmine/snooze": "^0.1.0",
       "daverandom/callback-validator": "dev-master",
@@ -36,7 +36,11 @@
    "autoload": {
       "psr-4": {
          "": ["src"]
-      }
+      },
+      "files": [
+         "src/pocketmine/GlobalConstants.php",
+         "src/pocketmine/VersionInfo.php"
+      ]
    },
    "autoload-dev": {
       "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2f5313e4ebd7b62c785cf683b27464b4",
+    "content-hash": "377d9e0ab5f1a9a4ef9b664706d26f5b",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -92,16 +92,16 @@
         },
         {
             "name": "pocketmine/binaryutils",
-            "version": "0.1.8",
+            "version": "0.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BinaryUtils.git",
-                "reference": "33f511715d22418c03368b49b45a6c25d6b33806"
+                "reference": "435f2ee265bce75ef1aa9563f9b60ff36d705e80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/33f511715d22418c03368b49b45a6c25d6b33806",
-                "reference": "33f511715d22418c03368b49b45a6c25d6b33806",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/435f2ee265bce75ef1aa9563f9b60ff36d705e80",
+                "reference": "435f2ee265bce75ef1aa9563f9b60ff36d705e80",
                 "shasum": ""
             },
             "require": {
@@ -119,23 +119,23 @@
             ],
             "description": "Classes and methods for conveniently handling binary data",
             "support": {
-                "source": "https://github.com/pmmp/BinaryUtils/tree/0.1.8",
+                "source": "https://github.com/pmmp/BinaryUtils/tree/0.1.10",
                 "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2019-01-16T17:31:44+00:00"
+            "time": "2019-10-21T14:40:32+00:00"
         },
         {
             "name": "pocketmine/math",
-            "version": "0.2.2",
+            "version": "0.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Math.git",
-                "reference": "b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c"
+                "reference": "68be8a79fd0169043ef514797c304517cb8a6071"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Math/zipball/b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c",
-                "reference": "b755d3fb7025c4ddb7d9d6df0ba7e0b65125e51c",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/68be8a79fd0169043ef514797c304517cb8a6071",
+                "reference": "68be8a79fd0169043ef514797c304517cb8a6071",
                 "shasum": ""
             },
             "require": {
@@ -153,30 +153,30 @@
             ],
             "description": "PHP library containing math related code used in PocketMine-MP",
             "support": {
-                "source": "https://github.com/pmmp/Math/tree/0.2.2",
+                "source": "https://github.com/pmmp/Math/tree/0.2.3",
                 "issues": "https://github.com/pmmp/Math/issues"
             },
-            "time": "2019-01-04T15:42:36+00:00"
+            "time": "2019-10-21T14:35:10+00:00"
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.7",
+            "version": "0.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a"
+                "reference": "b5777265329753b74dd40bb105eedabeefb98724"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a",
-                "reference": "2f176c9f2fd9b31db8bc2ada2f38990157ec8f1a",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/b5777265329753b74dd40bb105eedabeefb98724",
+                "reference": "b5777265329753b74dd40bb105eedabeefb98724",
                 "shasum": ""
             },
             "require": {
                 "ext-zlib": "*",
                 "php": ">=7.2.0",
                 "php-64bit": "*",
-                "pocketmine/binaryutils": "^0.1.0"
+                "pocketmine/binaryutils": "^0.1.9"
             },
             "type": "library",
             "autoload": {
@@ -194,33 +194,33 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.7",
+                "source": "https://github.com/pmmp/NBT/tree/0.2",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2019-03-29T19:39:42+00:00"
+            "time": "2019-12-01T08:20:26+00:00"
         },
         {
             "name": "pocketmine/raklib",
-            "version": "0.12.4",
+            "version": "0.12.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "fc1ccc8e61b9033e5372436b2e28a7a95388373f"
+                "reference": "18450e01185e6064790bda563ac672e7141c6992"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/fc1ccc8e61b9033e5372436b2e28a7a95388373f",
-                "reference": "fc1ccc8e61b9033e5372436b2e28a7a95388373f",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/18450e01185e6064790bda563ac672e7141c6992",
+                "reference": "18450e01185e6064790bda563ac672e7141c6992",
                 "shasum": ""
             },
             "require": {
                 "ext-bcmath": "*",
-                "ext-pthreads": ">=3.1.7dev",
+                "ext-pthreads": "~3.2.0",
                 "ext-sockets": "*",
                 "php": ">=7.2.0",
                 "php-64bit": "*",
                 "php-ipv6": "*",
-                "pocketmine/binaryutils": "^0.1.0",
+                "pocketmine/binaryutils": "^0.1.9",
                 "pocketmine/snooze": "^0.1.0",
                 "pocketmine/spl": "^0.3.0"
             },
@@ -235,10 +235,10 @@
             ],
             "description": "A RakNet server implementation written in PHP",
             "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/0.12.4",
+                "source": "https://github.com/pmmp/RakLib/tree/0.12.6",
                 "issues": "https://github.com/pmmp/RakLib/issues"
             },
-            "time": "2019-05-02T14:53:51+00:00"
+            "time": "2019-12-07T13:43:34+00:00"
         },
         {
             "name": "pocketmine/snooze",
@@ -276,23 +276,20 @@
         },
         {
             "name": "pocketmine/spl",
-            "version": "0.3.2",
+            "version": "0.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/SPL.git",
-                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49"
+                "reference": "94d4df142fe837ba836e9348dd00209e4bdcc307"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/SPL/zipball/7fd53857cd000491ba69e8db865792a024dd2c49",
-                "reference": "7fd53857cd000491ba69e8db865792a024dd2c49",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/94d4df142fe837ba836e9348dd00209e4bdcc307",
+                "reference": "94d4df142fe837ba836e9348dd00209e4bdcc307",
                 "shasum": ""
             },
             "type": "library",
             "autoload": {
-                "exclude-from-classmap": [
-                    "stubs"
-                ],
                 "classmap": [
                     "./"
                 ]
@@ -302,16 +299,16 @@
             ],
             "description": "Standard library files required by PocketMine-MP and related projects",
             "support": {
-                "source": "https://github.com/pmmp/SPL/tree/0.3.2"
+                "source": "https://github.com/pmmp/SPL/tree/0.3.3",
+                "issues": "https://github.com/pmmp/SPL/issues"
             },
-            "time": "2018-08-12T15:17:39+00:00"
+            "time": "2019-10-28T11:41:20+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "ext-pthreads": 20,
         "daverandom/callback-validator": 20
     },
     "prefer-stable": false,
@@ -329,7 +326,7 @@
         "ext-openssl": "*",
         "ext-pcre": "*",
         "ext-phar": "*",
-        "ext-pthreads": ">=3.1.7dev",
+        "ext-pthreads": "~3.2.0",
         "ext-reflection": "*",
         "ext-sockets": "*",
         "ext-spl": "*",

doxygen/doxygen.conf

@@ -530,7 +530,7 @@ HIDE_FRIEND_COMPOUNDS  = NO
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
 
-HIDE_IN_BODY_DOCS      = NO
+HIDE_IN_BODY_DOCS      = YES
 
 # The INTERNAL_DOCS tag determines if documentation that is typed after a
 # \internal command is included. If the tag is set to NO then the documentation
@@ -600,7 +600,7 @@ SORT_MEMBER_DOCS       = YES
 # this will also influence the order of the classes in the class list.
 # The default value is: NO.
 
-SORT_BRIEF_DOCS        = NO
+SORT_BRIEF_DOCS        = YES
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
 # (brief and detailed) documentation of class members so that constructors and
@@ -612,7 +612,7 @@ SORT_BRIEF_DOCS        = NO
 # detailed member documentation.
 # The default value is: NO.
 
-SORT_MEMBERS_CTORS_1ST = NO
+SORT_MEMBERS_CTORS_1ST = YES
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
 # of group names into alphabetical order. If set to NO the group names will
@@ -1565,7 +1565,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH        = https://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example

phpstan.neon.dist

@@ -0,0 +1,124 @@
+includes:
+	- tests/phpstan/configs/gc-hacks.neon
+	- tests/phpstan/configs/optional-com-dotnet.neon
+	- tests/phpstan/configs/optional-leveldb.neon
+	- tests/phpstan/configs/phpstan-bugs.neon
+	- tests/phpstan/configs/pthreads-bugs.neon
+
+parameters:
+	level: 3
+	autoload_files:
+		- tests/phpstan/bootstrap.php
+		- src/pocketmine/PocketMine.php
+	paths:
+		- src
+	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
+	ignoreErrors:
+		-
+			message: "#^Cannot instantiate interface pocketmine\\\\level\\\\format\\\\io\\\\LevelProvider\\.$#"
+			count: 1
+			path: src/pocketmine/Server.php
+
+		-
+			message: "#^Call to an undefined method pocketmine\\\\command\\\\CommandSender\\:\\:teleport\\(\\)\\.$#"
+			count: 1
+			path: src/pocketmine/command/defaults/TeleportCommand.php
+#			comment: "not actually possible, but high cost to fix warning"
+
+		-
+			message: "#^Array \\(array\\<string\\>\\) does not accept pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 2
+			path: src/pocketmine/entity/Entity.php
+
+		-
+			message: "#^Invalid array key type pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/entity/Entity.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\EntityDeathEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\Living but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/EntityDeathEvent.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\EntityShootBowEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\Living but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/EntityShootBowEvent.php
+
+		-
+			message: "#^Property pocketmine\\\\event\\\\entity\\\\EntityShootBowEvent\\:\\:\\$projectile \\(pocketmine\\\\entity\\\\projectile\\\\Projectile\\) does not accept pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/EntityShootBowEvent.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\ItemDespawnEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\object\\\\ItemEntity but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/ItemDespawnEvent.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\ItemSpawnEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\object\\\\ItemEntity but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/ItemSpawnEvent.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\ProjectileHitEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\projectile\\\\Projectile but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/ProjectileHitEvent.php
+
+		-
+			message: "#^Method pocketmine\\\\event\\\\entity\\\\ProjectileLaunchEvent\\:\\:getEntity\\(\\) should return pocketmine\\\\entity\\\\projectile\\\\Projectile but returns pocketmine\\\\entity\\\\Entity\\.$#"
+			count: 1
+			path: src/pocketmine/event/entity/ProjectileLaunchEvent.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\hell\\\\Nether has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/pocketmine/level/generator/hell/Nether.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\normal\\\\Normal has an unused parameter \\$options\\.$#"
+			count: 1
+			path: src/pocketmine/level/generator/normal/Normal.php
+
+		-
+			message: "#^Used constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			count: 1
+			path: src/pocketmine/network/mcpe/protocol/StartGamePacket.php
+
+		-
+			message: "#^Constructor of class pocketmine\\\\scheduler\\\\TaskScheduler has an unused parameter \\$logger\\.$#"
+			count: 1
+			path: src/pocketmine/scheduler/TaskScheduler.php
+
+		-
+			message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\DATA not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\START_TIME not found\\.$#"
+			path: src
+
+		-
+			message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
+			path: src
+

src/pocketmine/CrashDump.php

@@ -291,7 +291,7 @@ class CrashDump{
 
 	private function determinePluginFromFile(string $filePath, bool $crashFrame) : bool{
 		$frameCleanPath = Utils::cleanPath($filePath); //this will be empty in phar stub
-		if($frameCleanPath !== "" and strpos($frameCleanPath, "src/pocketmine/") === false and strpos($frameCleanPath, "vendor/pocketmine/") === false and file_exists($filePath)){
+		if(strpos($frameCleanPath, "plugins") === 0 and file_exists($filePath)){
 			$this->addLine();
 			if($crashFrame){
 				$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
@@ -333,7 +333,7 @@ class CrashDump{
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
 		$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
-		$this->addLine("Git commit: " . GIT_COMMIT);
+		$this->addLine("Git commit: " . \pocketmine\GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());
 		$this->addLine("Zend version: " . zend_version());

src/pocketmine/GlobalConstants.php

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

src/pocketmine/Player.php

@@ -99,20 +99,20 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\DoubleTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\network\mcpe\PlayerNetworkSessionAdapter;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
+use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
-use pocketmine\network\mcpe\protocol\AvailableEntityIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
-use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
+use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
 use pocketmine\network\mcpe\protocol\BookEditPacket;
 use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\DisconnectPacket;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
 use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
@@ -146,6 +146,10 @@ use pocketmine\network\mcpe\protocol\types\CommandParameter;
 use pocketmine\network\mcpe\protocol\types\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\DimensionIds;
 use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
+use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
+use pocketmine\network\mcpe\protocol\types\SkinAnimation;
+use pocketmine\network\mcpe\protocol\types\SkinData;
+use pocketmine\network\mcpe\protocol\types\SkinImage;
 use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
 use pocketmine\network\mcpe\VerifyLoginTask;
@@ -211,7 +215,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	public const VIEW = Player::SPECTATOR;
 
 	/**
-	 * Checks a supplied username and checks it is valid.
+	 * Validates the given username.
 	 *
 	 * @param string $name
 	 *
@@ -261,6 +265,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/** @var bool */
 	public $loggedIn = false;
 
+	/** @var bool */
+	private $resourcePacksDone = false;
+
 	/** @var bool */
 	public $spawned = false;
 
@@ -800,7 +807,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	/**
-	 * Gets the "friendly" name to display of this player to use in the chat.
+	 * Returns the "friendly" display name of this player to use in the chat.
 	 *
 	 * @return string
 	 */
@@ -1109,9 +1116,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 	}
 
-	protected function sendRespawnPacket(Vector3 $pos){
+	protected function sendRespawnPacket(Vector3 $pos, int $respawnState = RespawnPacket::SEARCHING_FOR_SPAWN){
 		$pk = new RespawnPacket();
 		$pk->position = $pos->add(0, $this->baseOffset, 0);
+		$pk->respawnState = $respawnState;
+		$pk->entityRuntimeId = $this->getId();
 
 		$this->dataPacket($pk);
 	}
@@ -1596,7 +1605,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			 * If you must tamper with this code, be aware that this can cause very nasty results. Do not waste our time
 			 * asking for help if you suffer the consequences of messing with this.
 			 */
-			$this->server->getLogger()->warning($this->getName() . " moved too fast, reverting movement");
+			$this->server->getLogger()->debug($this->getName() . " moved too fast, reverting movement");
 			$this->server->getLogger()->debug("Old position: " . $this->asVector3() . ", new position: " . $this->newPosition);
 			$revert = true;
 		}elseif(!$this->level->isInLoadedTerrain($newPos) or !$this->level->isChunkGenerated($newPos->getFloorX() >> 4, $newPos->getFloorZ() >> 4)){
@@ -1613,7 +1622,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 			$diff = $this->distanceSquared($newPos) / $tickDiff ** 2;
 
-			if($this->isSurvival() and !$revert and $diff > 0.0625){
+			if($this->isSurvival() and $diff > 0.0625){
 				$ev = new PlayerIllegalMoveEvent($this, $newPos, new Vector3($this->lastX, $this->lastY, $this->lastZ));
 				$ev->setCancelled($this->allowMovementCheats);
 
@@ -1621,7 +1630,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 				if(!$ev->isCancelled()){
 					$revert = true;
-					$this->server->getLogger()->warning($this->getServer()->getLanguage()->translateString("pocketmine.player.invalidMove", [$this->getName()]));
+					$this->server->getLogger()->debug($this->getServer()->getLanguage()->translateString("pocketmine.player.invalidMove", [$this->getName()]));
 					$this->server->getLogger()->debug("Old position: " . $this->asVector3() . ", new position: " . $this->newPosition);
 				}
 			}
@@ -1910,14 +1919,27 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->uuid = UUID::fromString($packet->clientUUID);
 		$this->rawUUID = $this->uuid->toBinary();
 
-		$skin = new Skin(
+		$animations = [];
+		foreach($packet->clientData["AnimatedImageData"] as $animation){
+			$animations[] = new SkinAnimation(new SkinImage($animation["ImageHeight"], $animation["ImageWidth"], $animation["Image"]), $animation["Type"], $animation["Frames"]);
+		}
+
+		$skinData = new SkinData(
 			$packet->clientData["SkinId"],
-			base64_decode($packet->clientData["SkinData"] ?? ""),
-			base64_decode($packet->clientData["CapeData"] ?? ""),
-			$packet->clientData["SkinGeometryName"] ?? "",
-			base64_decode($packet->clientData["SkinGeometry"] ?? "")
+			base64_decode($packet->clientData["SkinResourcePatch"] ?? ""),
+			new SkinImage($packet->clientData["SkinImageHeight"], $packet->clientData["SkinImageWidth"], base64_decode($packet->clientData["SkinData"])),
+			$animations,
+			new SkinImage($packet->clientData["CapeImageHeight"], $packet->clientData["CapeImageWidth"], base64_decode($packet->clientData["CapeData"] ?? "")),
+			base64_decode($packet->clientData["SkinGeometryData"] ?? ""),
+			base64_decode($packet->clientData["AnimationData"] ?? ""),
+			$packet->clientData["PremiumSkin"] ?? false,
+			$packet->clientData["PersonaSkin"] ?? false,
+			$packet->clientData["CapeOnClassicSkin"] ?? false,
+			$packet->clientData["CapeId"] ?? ""
 		);
 
+		$skin = SkinAdapterSingleton::get()->fromSkinData($skinData);
+
 		if(!$skin->isValid()){
 			$this->close("", "disconnectionScreen.invalidSkin");
 
@@ -2056,6 +2078,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{
+		if($this->resourcePacksDone){
+			return false;
+		}
 		switch($packet->status){
 			case ResourcePackClientResponsePacket::STATUS_REFUSED:
 				//TODO: add lang strings for this
@@ -2097,6 +2122,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->dataPacket($pk);
 				break;
 			case ResourcePackClientResponsePacket::STATUS_COMPLETED:
+				$this->resourcePacksDone = true;
 				$this->completeLoginSequence();
 				break;
 			default:
@@ -2149,7 +2175,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk->spawnZ = $spawnPosition->getFloorZ();
 		$pk->hasAchievementsDisabled = true;
 		$pk->time = $this->level->getTime();
-		$pk->eduMode = false;
+		$pk->eduEditionOffer = 0;
 		$pk->rainLevel = 0; //TODO: implement these properly
 		$pk->lightningLevel = 0;
 		$pk->commandsEnabled = true;
@@ -2157,7 +2183,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk->worldName = $this->server->getMotd();
 		$this->dataPacket($pk);
 
-		$this->sendDataPacket(new AvailableEntityIdentifiersPacket());
+		$this->sendDataPacket(new AvailableActorIdentifiersPacket());
 		$this->sendDataPacket(new BiomeDefinitionListPacket());
 
 		$this->level->sendTime($this);
@@ -2279,14 +2305,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return true;
 	}
 
-	public function handleEntityEvent(EntityEventPacket $packet) : bool{
+	public function handleEntityEvent(ActorEventPacket $packet) : bool{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
 		$this->doCloseInventory();
 
 		switch($packet->event){
-			case EntityEventPacket::EATING_ITEM:
+			case ActorEventPacket::EATING_ITEM:
 				if($packet->data === 0){
 					return false;
 				}
@@ -2484,6 +2510,27 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 						return true;
 					case InventoryTransactionPacket::USE_ITEM_ACTION_CLICK_AIR:
+						if($this->isUsingItem()){
+							$slot = $this->inventory->getItemInHand();
+							if($slot instanceof Consumable){
+								$ev = new PlayerItemConsumeEvent($this, $slot);
+								if($this->hasItemCooldown($slot)){
+									$ev->setCancelled();
+								}
+								$ev->call();
+								if($ev->isCancelled() or !$this->consumeObject($slot)){
+									$this->inventory->sendContents($this);
+									return true;
+								}
+								$this->resetItemCooldown($slot);
+								if($this->isSurvival()){
+									$slot->pop();
+									$this->inventory->setItemInHand($slot);
+									$this->inventory->addItem($slot->getResidue());
+								}
+								$this->setUsingItem(false);
+							}
+						}
 						$directionVector = $this->getDirectionVector();
 
 						if($this->isCreative()){
@@ -2637,33 +2684,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							}
 
 							return true;
-						case InventoryTransactionPacket::RELEASE_ITEM_ACTION_CONSUME:
-							$slot = $this->inventory->getItemInHand();
-
-							if($slot instanceof Consumable){
-								$ev = new PlayerItemConsumeEvent($this, $slot);
-								if($this->hasItemCooldown($slot)){
-									$ev->setCancelled();
-								}
-								$ev->call();
-
-								if($ev->isCancelled() or !$this->consumeObject($slot)){
-									$this->inventory->sendContents($this);
-									return true;
-								}
-
-								$this->resetItemCooldown($slot);
-
-								if($this->isSurvival()){
-									$slot->pop();
-									$this->inventory->setItemInHand($slot);
-									$this->inventory->addItem($slot->getResidue());
-								}
-
-								return true;
-							}
-
-							break;
 						default:
 							break;
 					}
@@ -2821,7 +2841,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$this->stopSleep();
 				break;
 			case PlayerActionPacket::ACTION_RESPAWN:
-				if(!$this->spawned or $this->isAlive() or !$this->isOnline()){
+				if($this->isAlive()){
 					break;
 				}
 
@@ -2855,6 +2875,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			case PlayerActionPacket::ACTION_STOP_SWIMMING:
 				//TODO: handle this when it doesn't spam every damn tick (yet another spam bug!!)
 				break;
+			case PlayerActionPacket::ACTION_INTERACT_BLOCK: //ignored (for now)
+				break;
 			default:
 				$this->server->getLogger()->debug("Unhandled/unknown player action type " . $packet->action . " from " . $this->getName());
 				return false;
@@ -2904,6 +2926,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return true;
 	}
 
+	public function handleRespawn(RespawnPacket $packet) : bool{
+		if(!$this->isAlive() && $packet->respawnState === RespawnPacket::CLIENT_READY_TO_SPAWN){
+			$this->sendRespawnPacket($this, RespawnPacket::READY_TO_SPAWN);
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Drops an item on the ground in front of the player. Returns if the item drop was successful.
 	 *
@@ -2981,7 +3012,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		return $handled;
 	}
 
-	public function handleBlockEntityData(BlockEntityDataPacket $packet) : bool{
+	public function handleBlockEntityData(BlockActorDataPacket $packet) : bool{
 		if(!$this->spawned or !$this->isAlive()){
 			return true;
 		}
@@ -3047,6 +3078,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	}
 
 	public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{
+		if($this->resourcePacksDone){
+			return false;
+		}
 		$manager = $this->server->getResourcePackManager();
 		$pack = $manager->getPackById($packet->packId);
 		if(!($pack instanceof ResourcePack)){
@@ -3382,7 +3416,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$pk->needsTranslation = true;
 			$pk->message = $this->server->getLanguage()->translateString($message, $parameters, "pocketmine.");
 			foreach($parameters as $i => $p){
-				$parameters[$i] = $this->server->getLanguage()->translateString($p, $parameters, "pocketmine.");
+				$parameters[$i] = $this->server->getLanguage()->translateString($p, [], "pocketmine.");
 			}
 			$pk->parameters = $parameters;
 		}else{
@@ -3793,7 +3827,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->addWindow($this->getArmorInventory(), ContainerIds::ARMOR, true);
 
 		$this->cursorInventory = new PlayerCursorInventory($this);
-		$this->addWindow($this->cursorInventory, ContainerIds::CURSOR, true);
+		$this->addWindow($this->cursorInventory, ContainerIds::UI, true);
 
 		$this->craftingGrid = new CraftingGrid($this, CraftingGrid::SIZE_SMALL);
 

src/pocketmine/PocketMine.php

@@ -21,11 +21,6 @@
 
 declare(strict_types=1);
 
-namespace {
-	const INT32_MIN = -0x80000000;
-	const INT32_MAX = 0x7fffffff;
-}
-
 namespace pocketmine {
 
 	use pocketmine\utils\MainLogger;
@@ -57,18 +52,18 @@ namespace pocketmine {
 		if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
 			//If PHP version isn't high enough, anything below might break, so don't bother checking it.
 			return [
-				\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "."
+				"PHP >= " . MIN_PHP_VERSION . " is required, but you have PHP " . PHP_VERSION . "."
 			];
 		}
 
 		$messages = [];
 
 		if(PHP_INT_SIZE < 8){
-			$messages[] = "Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
+			$messages[] = "32-bit systems/PHP are no longer supported. Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.";
 		}
 
 		if(php_sapi_name() !== "cli"){
-			$messages[] = "You must run " . \pocketmine\NAME . " using the CLI.";
+			$messages[] = "Only PHP CLI is supported.";
 		}
 
 		$extensions = [
@@ -102,8 +97,8 @@ namespace pocketmine {
 			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(version_compare($pthreads_version, "3.2.0") < 0){
+				$messages[] = "pthreads >= 3.2.0 is required, while you have $pthreads_version.";
 			}
 		}
 
@@ -121,176 +116,182 @@ namespace pocketmine {
 		return $messages;
 	}
 
-	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;
+	function emit_performance_warnings(\Logger $logger){
+		if(extension_loaded("xdebug")){
+			$logger->warning("Xdebug extension is enabled. This has a major impact on performance.");
+		}
+		if(!extension_loaded("pocketmine_chunkutils")){
+			$logger->warning("ChunkUtils extension is missing. Anvil-format worlds will experience degraded performance.");
+		}
+		if(((int) ini_get('zend.assertions')) !== -1){
+			$logger->warning("Debugging assertions are enabled. This may degrade performance. To disable them, set `zend.assertions = -1` in php.ini.");
+		}
+		if(\Phar::running(true) === ""){
+			$logger->warning("Non-packaged installation detected. This will degrade autoloading speed and make startup times longer.");
 		}
-		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);
-
-	if(\Phar::running(true) !== ""){
-		define('pocketmine\PATH', \Phar::running(true) . "/");
-	}else{
-		define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
 	}
 
-	$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(\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 at " . $bootstrap);
-		critical_error("Please install/update Composer dependencies or use provided builds.");
-		exit(1);
+	function set_ini_entries(){
+		ini_set("allow_url_fopen", '1');
+		ini_set("display_errors", '1');
+		ini_set("display_startup_errors", '1');
+		ini_set("default_charset", "utf-8");
+		ini_set('assert.exception', '1');
 	}
 
-	set_error_handler([Utils::class, 'errorExceptionHandler']);
-
-	/*
-	 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
-	 */
-	$autoloader = new \BaseClassLoader();
-	$autoloader->register(false);
-
-	set_time_limit(0); //Who set it to 30 seconds?!?!
-
-	ini_set("allow_url_fopen", '1');
-	ini_set("display_errors", '1');
-	ini_set("display_startup_errors", '1');
-	ini_set("default_charset", "utf-8");
-
-	ini_set("memory_limit", '-1');
-
-	define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
-
-	$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
-
-	define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
-	define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
-
-	if(!file_exists(\pocketmine\DATA)){
-		mkdir(\pocketmine\DATA, 0777, true);
-	}
-
-	define('pocketmine\LOCK_FILE_PATH', \pocketmine\DATA . 'server.lock');
-	define('pocketmine\LOCK_FILE', fopen(\pocketmine\LOCK_FILE_PATH, "a+b"));
-	if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){
-		//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the
-		//other server wrote its PID and released exclusive lock before we get our lock
-		flock(\pocketmine\LOCK_FILE, LOCK_SH);
-		$pid = stream_get_contents(\pocketmine\LOCK_FILE);
-		critical_error("Another " . \pocketmine\NAME . " instance (PID $pid) is already using this folder (" . realpath(\pocketmine\DATA) . ").");
-		critical_error("Please stop the other server first before running a new one.");
-		exit(1);
-	}
-	ftruncate(\pocketmine\LOCK_FILE, 0);
-	fwrite(\pocketmine\LOCK_FILE, (string) getmypid());
-	fflush(\pocketmine\LOCK_FILE);
-	flock(\pocketmine\LOCK_FILE, LOCK_SH); //prevent acquiring an exclusive lock from another process, but allow reading
-
-	//Logger has a dependency on timezone
-	$tzError = Timezone::init();
-
-	if(isset($opts["enable-ansi"])){
-		Terminal::init(true);
-	}elseif(isset($opts["disable-ansi"])){
-		Terminal::init(false);
-	}else{
-		Terminal::init();
-	}
-
-	$logger = new MainLogger(\pocketmine\DATA . "server.log");
-	$logger->registerStatic();
-
-	foreach($tzError as $e){
-		$logger->warning($e);
-	}
-	unset($tzError);
-
-	if(extension_loaded("xdebug")){
-		$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
-	}
-	if(!extension_loaded("pocketmine_chunkutils")){
-		$logger->warning("ChunkUtils extension is missing. Anvil-format worlds will experience degraded performance.");
-	}
-
-	if(\Phar::running(true) === ""){
-		$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
-	}
-
-	$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
-	define('pocketmine\VERSION', $version->getFullVersion(true));
-
-	$gitHash = str_repeat("00", 20);
-
-	if(\Phar::running(true) === ""){
-		if(Utils::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
-			$gitHash = trim($out);
-			if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
-				$gitHash .= "-dirty";
+	function server(){
+		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);
 		}
-	}else{
-		$phar = new \Phar(\Phar::running(false));
-		$meta = $phar->getMetadata();
-		if(isset($meta["git"])){
-			$gitHash = $meta["git"];
+		unset($messages);
+
+		error_reporting(-1);
+		set_ini_entries();
+
+		if(\Phar::running(true) !== ""){
+			define('pocketmine\PATH', \Phar::running(true) . "/");
+		}else{
+			define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
 		}
-	}
 
-	define('pocketmine\GIT_COMMIT', $gitHash);
+		$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(\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 at " . $bootstrap);
+			critical_error("Please install/update Composer dependencies or use provided builds.");
+			exit(1);
+		}
 
-	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-	@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
+		set_error_handler([Utils::class, 'errorExceptionHandler']);
 
-	$exitCode = 0;
-	do{
-		if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
-			$installer = new SetupWizard();
-			if(!$installer->run()){
-				$exitCode = -1;
-				break;
+		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+		define('pocketmine\VERSION', $version->getFullVersion(true));
+
+		$gitHash = str_repeat("00", 20);
+
+		if(\Phar::running(true) === ""){
+			if(Utils::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
+				$gitHash = trim($out);
+				if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
+					$gitHash .= "-dirty";
+				}
+			}
+		}else{
+			$phar = new \Phar(\Phar::running(false));
+			$meta = $phar->getMetadata();
+			if(isset($meta["git"])){
+				$gitHash = $meta["git"];
 			}
 		}
 
-		//TODO: move this to a Server field
-		define('pocketmine\START_TIME', microtime(true));
-		ThreadManager::init();
-		new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
+		define('pocketmine\GIT_COMMIT', $gitHash);
 
-		$logger->info("Stopping other threads");
+		define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
 
-		$killer = new ServerKiller(8);
-		$killer->start(PTHREADS_INHERIT_NONE);
-		usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
+		$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
 
-		if(ThreadManager::getInstance()->stopAll() > 0){
-			if(\pocketmine\DEBUG > 1){
-				echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
-			}
-			Utils::kill(getmypid());
+		define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
+		define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+
+		if(!file_exists(\pocketmine\DATA)){
+			mkdir(\pocketmine\DATA, 0777, true);
 		}
-	}while(false);
 
-	$logger->shutdown();
-	$logger->join();
+		define('pocketmine\LOCK_FILE', fopen(\pocketmine\DATA . 'server.lock', "a+b"));
+		if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){
+			//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the
+			//other server wrote its PID and released exclusive lock before we get our lock
+			flock(\pocketmine\LOCK_FILE, LOCK_SH);
+			$pid = stream_get_contents(\pocketmine\LOCK_FILE);
+			critical_error("Another " . \pocketmine\NAME . " instance (PID $pid) is already using this folder (" . realpath(\pocketmine\DATA) . ").");
+			critical_error("Please stop the other server first before running a new one.");
+			exit(1);
+		}
+		ftruncate(\pocketmine\LOCK_FILE, 0);
+		fwrite(\pocketmine\LOCK_FILE, (string) getmypid());
+		fflush(\pocketmine\LOCK_FILE);
+		flock(\pocketmine\LOCK_FILE, LOCK_SH); //prevent acquiring an exclusive lock from another process, but allow reading
 
-	echo Terminal::$FORMAT_RESET . PHP_EOL;
+		//Logger has a dependency on timezone
+		$tzError = Timezone::init();
 
-	exit($exitCode);
+		if(isset($opts["enable-ansi"])){
+			Terminal::init(true);
+		}elseif(isset($opts["disable-ansi"])){
+			Terminal::init(false);
+		}else{
+			Terminal::init();
+		}
+
+		$logger = new MainLogger(\pocketmine\DATA . "server.log");
+		$logger->registerStatic();
+
+		foreach($tzError as $e){
+			$logger->warning($e);
+		}
+		unset($tzError);
+
+		emit_performance_warnings($logger);
+
+		$exitCode = 0;
+		do{
+			if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
+				$installer = new SetupWizard();
+				if(!$installer->run()){
+					$exitCode = -1;
+					break;
+				}
+			}
+
+			//TODO: move this to a Server field
+			define('pocketmine\START_TIME', microtime(true));
+			ThreadManager::init();
+
+			/*
+			 * We now use the Composer autoloader, but this autoloader is still for loading plugins.
+			 */
+			$autoloader = new \BaseClassLoader();
+			$autoloader->register(false);
+
+			new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
+
+			$logger->info("Stopping other threads");
+
+			$killer = new ServerKiller(8);
+			$killer->start(PTHREADS_INHERIT_NONE);
+			usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
+
+			if(ThreadManager::getInstance()->stopAll() > 0){
+				$logger->debug("Some threads could not be stopped, performing a force-kill");
+				Utils::kill(getmypid());
+			}
+		}while(false);
+
+		$logger->shutdown();
+		$logger->join();
+
+		echo Terminal::$FORMAT_RESET . PHP_EOL;
+
+		exit($exitCode);
+	}
+
+	if(!defined('pocketmine\_PHPSTAN_ANALYSIS')){
+		\pocketmine\server();
+	}
 }

src/pocketmine/Server.php

@@ -76,6 +76,7 @@ use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
+use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\network\mcpe\RakLibInterface;
 use pocketmine\network\Network;
 use pocketmine\network\query\QueryHandler;
@@ -113,6 +114,7 @@ use function asort;
 use function assert;
 use function base64_encode;
 use function class_exists;
+use function cli_set_process_title;
 use function count;
 use function define;
 use function explode;
@@ -127,7 +129,6 @@ use function getmypid;
 use function getopt;
 use function gettype;
 use function implode;
-use function ini_get;
 use function ini_set;
 use function is_array;
 use function is_bool;
@@ -227,7 +228,7 @@ class Server{
 	 * @var int
 	 */
 	private $tickCounter = 0;
-	/** @var int */
+	/** @var float */
 	private $nextTick = 0;
 	/** @var float[] */
 	private $tickAverage = [20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20];
@@ -593,7 +594,7 @@ class Server{
 	 * @return int
 	 */
 	public function getDifficulty() : int{
-		return $this->getConfigInt("difficulty", 1);
+		return $this->getConfigInt("difficulty", Level::DIFFICULTY_NORMAL);
 	}
 
 	/**
@@ -1101,11 +1102,17 @@ class Server{
 
 			return false;
 		}
-		/**
-		 * @var LevelProvider $provider
-		 * @see LevelProvider::__construct()
-		 */
-		$provider = new $providerClass($path);
+
+		try{
+			/**
+			 * @var LevelProvider $provider
+			 * @see LevelProvider::__construct()
+			 */
+			$provider = new $providerClass($path);
+		}catch(LevelException $e){
+			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, $e->getMessage()]));
+			return false;
+		}
 		try{
 			GeneratorManager::getGenerator($provider->getGenerator(), true);
 		}catch(\InvalidArgumentException $e){
@@ -1438,7 +1445,7 @@ class Server{
 	}
 
 	/**
-	 * @return string[]
+	 * @return string[][]
 	 */
 	public function getCommandAliases() : array{
 		$section = $this->getProperty("aliases");
@@ -1529,7 +1536,7 @@ class Server{
 				"force-gamemode" => false,
 				"hardcore" => false,
 				"pvp" => true,
-				"difficulty" => 1,
+				"difficulty" => Level::DIFFICULTY_NORMAL,
 				"generator-settings" => "",
 				"level-name" => "world",
 				"level-seed" => "",
@@ -1559,12 +1566,6 @@ class Server{
 				return;
 			}
 
-			if(((int) ini_get('zend.assertions')) !== -1){
-				$this->logger->warning("Debugging assertions are enabled, this may impact on performance. To disable them, set `zend.assertions = -1` in php.ini.");
-			}
-
-			ini_set('assert.exception', '1');
-
 			if($this->logger instanceof MainLogger){
 				$this->logger->setLogDebug(\pocketmine\DEBUG > 1);
 			}
@@ -1789,7 +1790,7 @@ class Server{
 
 	/**
 	 * @param TextContainer|string $message
-	 * @param Player[]             $recipients
+	 * @param CommandSender[]      $recipients
 	 *
 	 * @return int
 	 */
@@ -1798,7 +1799,6 @@ class Server{
 			return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
 		}
 
-		/** @var Player[] $recipients */
 		foreach($recipients as $recipient){
 			$recipient->sendMessage($message);
 		}
@@ -1823,7 +1823,6 @@ class Server{
 			}
 		}
 
-		/** @var Player[] $recipients */
 		foreach($recipients as $recipient){
 			$recipient->sendTip($tip);
 		}
@@ -1849,7 +1848,6 @@ class Server{
 			}
 		}
 
-		/** @var Player[] $recipients */
 		foreach($recipients as $recipient){
 			$recipient->sendPopup($popup);
 		}
@@ -1879,7 +1877,6 @@ class Server{
 			}
 		}
 
-		/** @var Player[] $recipients */
 		foreach($recipients as $recipient){
 			$recipient->addTitle($title, $subtitle, $fadeIn, $stay, $fadeOut);
 		}
@@ -2200,6 +2197,7 @@ class Server{
 
 		$this->logger->info($this->getLanguage()->translateString("pocketmine.server.defaultGameMode", [self::getGamemodeString($this->getGamemode())]));
 
+		$this->logger->info($this->getLanguage()->translateString("pocketmine.server.donate", [TextFormat::AQUA . "https://patreon.com/pocketminemp" . TextFormat::RESET]));
 		$this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - \pocketmine\START_TIME, 3)]));
 
 		$this->tickProcessor();
@@ -2398,7 +2396,7 @@ class Server{
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 
-		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, $skin, $xboxUserId);
+		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, SkinAdapterSingleton::get()->toSkinData($skin), $xboxUserId);
 
 		$this->broadcastPacket($players ?? $this->playerList, $pk);
 	}
@@ -2421,7 +2419,7 @@ class Server{
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 		foreach($this->playerList as $player){
-			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin(), $player->getXuid());
+			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), SkinAdapterSingleton::get()->toSkinData($player->getSkin()), $player->getXuid());
 		}
 
 		$p->dataPacket($pk);

src/pocketmine/VersionInfo.php

@@ -21,7 +21,15 @@
 
 namespace pocketmine;
 
+// composer autoload doesn't use require_once and also pthreads can inherit things
+// TODO: drop this file and use a final class with constants
+if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
+	return;
+}
+const _VERSION_INFO_INCLUDED = true;
+
+
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.8.5";
+const BASE_VERSION = "3.11.1";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

src/pocketmine/block/Block.php

@@ -69,7 +69,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	/** @var int|null */
 	protected $itemId;
 
-	/** @var AxisAlignedBB */
+	/** @var AxisAlignedBB|null */
 	protected $boundingBox = null;
 
 
@@ -763,7 +763,7 @@ class Block extends Position implements BlockIds, Metadatable{
 			return $this->level->getBlockMetadata()->getMetadata($this, $metadataKey);
 		}
 
-		return null;
+		return [];
 	}
 
 	public function hasMetadata(string $metadataKey) : bool{

src/pocketmine/block/BurningFurnace.php

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

src/pocketmine/block/Chest.php

@@ -109,6 +109,9 @@ class Chest extends Transparent{
 				$chest = $t;
 			}else{
 				$chest = Tile::createTile(Tile::CHEST, $this->getLevel(), TileChest::createNBT($this));
+				if(!($chest instanceof TileChest)){
+					return true;
+				}
 			}
 
 			if(

src/pocketmine/block/ItemFrame.php

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

src/pocketmine/block/Liquid.php

@@ -32,6 +32,7 @@ use pocketmine\level\sound\FizzSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use function array_fill;
+use function intdiv;
 use function lcg_value;
 use function min;
 
@@ -372,7 +373,7 @@ abstract class Liquid extends Transparent{
 	 */
 	private function getOptimalFlowDirections() : array{
 		$flowCost = array_fill(0, 4, 1000);
-		$maxCost = 4 / $this->getFlowDecayPerBlock();
+		$maxCost = intdiv(4, $this->getFlowDecayPerBlock());
 		for($j = 0; $j < 4; ++$j){
 			$x = $this->x;
 			$y = $this->y;

src/pocketmine/command/Command.php

@@ -55,7 +55,7 @@ abstract class Command{
 	 */
 	private $activeAliases = [];
 
-	/** @var CommandMap */
+	/** @var CommandMap|null */
 	private $commandMap = null;
 
 	/** @var string */

src/pocketmine/command/CommandReader.php

@@ -141,6 +141,7 @@ class CommandReader extends Thread{
 				case self::TYPE_STREAM:
 					//stream_select doesn't work on piped streams for some reason
 					$r = [self::$stdin];
+					$w = $e = null;
 					if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
 						return true;
 					}elseif($count === false){ //stream error

src/pocketmine/command/FormattedCommandAlias.php

@@ -74,14 +74,14 @@ class FormattedCommandAlias extends Command{
 		$index = strpos($formatString, '$');
 		while($index !== false){
 			$start = $index;
-			if($index > 0 and $formatString{$start - 1} === "\\"){
+			if($index > 0 and $formatString[$start - 1] === "\\"){
 				$formatString = substr($formatString, 0, $start - 1) . substr($formatString, $start);
 				$index = strpos($formatString, '$', $index);
 				continue;
 			}
 
 			$required = false;
-			if($formatString{$index + 1} == '$'){
+			if($formatString[$index + 1] == '$'){
 				$required = true;
 
 				++$index;
@@ -91,7 +91,7 @@ class FormattedCommandAlias extends Command{
 
 			$argStart = $index;
 
-			while($index < strlen($formatString) and self::inRange(ord($formatString{$index}) - 48, 0, 9)){
+			while($index < strlen($formatString) and self::inRange(ord($formatString[$index]) - 48, 0, 9)){
 				++$index;
 			}
 
@@ -109,7 +109,7 @@ class FormattedCommandAlias extends Command{
 
 			$rest = false;
 
-			if($index < strlen($formatString) and $formatString{$index} === "-"){
+			if($index < strlen($formatString) and $formatString[$index] === "-"){
 				$rest = true;
 				++$index;
 			}

src/pocketmine/command/defaults/GamemodeCommand.php

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

src/pocketmine/command/defaults/TransferServerCommand.php

@@ -42,6 +42,10 @@ class TransferServerCommand extends VanillaCommand{
 	}
 
 	public function execute(CommandSender $sender, string $commandLabel, array $args){
+		if(!$this->testPermission($sender)){
+			return true;
+		}
+
 		if(count($args) < 1){
 			throw new InvalidCommandSyntaxException();
 		}elseif(!($sender instanceof Player)){

src/pocketmine/command/defaults/VanillaCommand.php

@@ -65,7 +65,7 @@ abstract class VanillaCommand extends Command{
 	 * @return float
 	 */
 	protected function getRelativeDouble(float $original, CommandSender $sender, string $input, float $min = self::MIN_COORD, float $max = self::MAX_COORD) : float{
-		if($input{0} === "~"){
+		if($input[0] === "~"){
 			$value = $this->getDouble($sender, substr($input, 1));
 
 			return $original + $value;

src/pocketmine/entity/DataPropertyManager.php

@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
-use pocketmine\item\Item;
 use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
 use function assert;
 use function is_float;
 use function is_int;
@@ -140,25 +140,14 @@ class DataPropertyManager{
 		$this->setPropertyValue($key, Entity::DATA_TYPE_STRING, $value, $force);
 	}
 
-	/**
-	 * @param int $key
-	 *
-	 * @return null|Item
-	 */
-	public function getItem(int $key) : ?Item{
-		$value = $this->getPropertyValue($key, Entity::DATA_TYPE_SLOT);
-		assert($value instanceof Item or $value === null);
-
+	public function getCompoundTag(int $key) : ?CompoundTag{
+		$value = $this->getPropertyValue($key, Entity::DATA_TYPE_COMPOUND_TAG);
+		assert($value instanceof CompoundTag or $value === null);
 		return $value;
 	}
 
-	/**
-	 * @param int  $key
-	 * @param Item $value
-	 * @param bool $force
-	 */
-	public function setItem(int $key, Item $value, bool $force = false) : void{
-		$this->setPropertyValue($key, Entity::DATA_TYPE_SLOT, $value, $force);
+	public function setCompoundTag(int $key, CompoundTag $value, bool $force = false) : void{
+		$this->setPropertyValue($key, Entity::DATA_TYPE_COMPOUND_TAG, $value, $force);
 	}
 
 	/**

src/pocketmine/entity/Entity.php

@@ -62,12 +62,12 @@ use pocketmine\nbt\tag\DoubleTag;
 use pocketmine\nbt\tag\FloatTag;
 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\MoveEntityAbsolutePacket;
-use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
-use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
-use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\AddActorPacket;
+use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket;
+use pocketmine\network\mcpe\protocol\RemoveActorPacket;
+use pocketmine\network\mcpe\protocol\SetActorDataPacket;
+use pocketmine\network\mcpe\protocol\SetActorMotionPacket;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
@@ -102,7 +102,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_TYPE_INT = 2;
 	public const DATA_TYPE_FLOAT = 3;
 	public const DATA_TYPE_STRING = 4;
-	public const DATA_TYPE_SLOT = 5;
+	public const DATA_TYPE_COMPOUND_TAG = 5;
 	public const DATA_TYPE_POS = 6;
 	public const DATA_TYPE_LONG = 7;
 	public const DATA_TYPE_VECTOR3F = 8;
@@ -154,70 +154,76 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_LEAD_HOLDER_EID = 37; //long
 	public const DATA_SCALE = 38; //float
 	public const DATA_HAS_NPC_COMPONENT = 39; //byte (???)
-	public const DATA_SKIN_ID = 40; //string
-	public const DATA_NPC_SKIN_ID = 41; //string
-	public const DATA_URL_TAG = 42; //string
-	public const DATA_MAX_AIR = 43; //short
-	public const DATA_MARK_VARIANT = 44; //int
-	public const DATA_CONTAINER_TYPE = 45; //byte (ContainerComponent)
-	public const DATA_CONTAINER_BASE_SIZE = 46; //int (ContainerComponent)
-	public const DATA_CONTAINER_EXTRA_SLOTS_PER_STRENGTH = 47; //int (used for llamas, inventory size is baseSize + thisProp * strength)
-	public const DATA_BLOCK_TARGET = 48; //block coords (ender crystal)
-	public const DATA_WITHER_INVULNERABLE_TICKS = 49; //int
-	public const DATA_WITHER_TARGET_1 = 50; //long
-	public const DATA_WITHER_TARGET_2 = 51; //long
-	public const DATA_WITHER_TARGET_3 = 52; //long
-	/* 53 (short) */
-	public const DATA_BOUNDING_BOX_WIDTH = 54; //float
-	public const DATA_BOUNDING_BOX_HEIGHT = 55; //float
-	public const DATA_FUSE_LENGTH = 56; //int
-	public const DATA_RIDER_SEAT_POSITION = 57; //vector3f
-	public const DATA_RIDER_ROTATION_LOCKED = 58; //byte
-	public const DATA_RIDER_MAX_ROTATION = 59; //float
-	public const DATA_RIDER_MIN_ROTATION = 60; //float
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 61; //float
-	public const DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int
-	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int
-	/* 64 (int) shulker-related */
-	public const DATA_SHULKER_ATTACH_FACE = 65; //byte
-	/* 66 (short) shulker-related */
-	public const DATA_SHULKER_ATTACH_POS = 67; //block coords
-	public const DATA_TRADING_PLAYER_EID = 68; //long
+	public const DATA_NPC_SKIN_INDEX = 40; //string
+	public const DATA_NPC_ACTIONS = 41; //string (maybe JSON blob?)
+	public const DATA_MAX_AIR = 42; //short
+	public const DATA_MARK_VARIANT = 43; //int
+	public const DATA_CONTAINER_TYPE = 44; //byte (ContainerComponent)
+	public const DATA_CONTAINER_BASE_SIZE = 45; //int (ContainerComponent)
+	public const DATA_CONTAINER_EXTRA_SLOTS_PER_STRENGTH = 46; //int (used for llamas, inventory size is baseSize + thisProp * strength)
+	public const DATA_BLOCK_TARGET = 47; //block coords (ender crystal)
+	public const DATA_WITHER_INVULNERABLE_TICKS = 48; //int
+	public const DATA_WITHER_TARGET_1 = 49; //long
+	public const DATA_WITHER_TARGET_2 = 50; //long
+	public const DATA_WITHER_TARGET_3 = 51; //long
+	/* 52 (short) */
+	public const DATA_BOUNDING_BOX_WIDTH = 53; //float
+	public const DATA_BOUNDING_BOX_HEIGHT = 54; //float
+	public const DATA_FUSE_LENGTH = 55; //int
+	public const DATA_RIDER_SEAT_POSITION = 56; //vector3f
+	public const DATA_RIDER_ROTATION_LOCKED = 57; //byte
+	public const DATA_RIDER_MAX_ROTATION = 58; //float
+	public const DATA_RIDER_MIN_ROTATION = 59; //float
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS = 60; //float
+	public const DATA_AREA_EFFECT_CLOUD_WAITING = 61; //int
+	public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 62; //int
+	/* 63 (int) shulker-related */
+	public const DATA_SHULKER_ATTACH_FACE = 64; //byte
+	/* 65 (short) shulker-related */
+	public const DATA_SHULKER_ATTACH_POS = 66; //block coords
+	public const DATA_TRADING_PLAYER_EID = 67; //long
 
-	/* 70 (byte) command-block */
-	public const DATA_COMMAND_BLOCK_COMMAND = 71; //string
-	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string
-	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte
-	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte
-	public const DATA_STRENGTH = 75; //int
-	public const DATA_MAX_STRENGTH = 76; //int
-	/* 77 (int) */
-	public const DATA_LIMITED_LIFE = 78;
-	public const DATA_ARMOR_STAND_POSE_INDEX = 79; //int
-	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 80; //int
-	public const DATA_ALWAYS_SHOW_NAMETAG = 81; //byte: -1 = default, 0 = only when looked at, 1 = always
-	public const DATA_COLOR_2 = 82; //byte
-	/* 83 (unknown) */
-	public const DATA_SCORE_TAG = 84; //string
-	public const DATA_BALLOON_ATTACHED_ENTITY = 85; //int64, entity unique ID of owner
-	public const DATA_PUFFERFISH_SIZE = 86; //byte
-	public const DATA_BOAT_BUBBLE_TIME = 87; //int (time in bubble column)
-	public const DATA_PLAYER_AGENT_EID = 88; //long
-	/* 89 (float) related to panda sitting
-	 * 90 (float) related to panda sitting */
-	public const DATA_EAT_COUNTER = 91; //int (used by pandas)
-	public const DATA_FLAGS2 = 92; //long (extended data flags)
-	/* 93 (float) related to panda lying down
-	 * 94 (float) related to panda lying down */
-	public const DATA_AREA_EFFECT_CLOUD_DURATION = 95; //int
-	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 96; //int
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 97; //float, usually negative
-	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 98; //float
-	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 99; //int
-	public const DATA_INTERACTIVE_TAG = 100; //string (button text)
-	public const DATA_TRADE_TIER = 101; //int
-	public const DATA_MAX_TRADE_TIER = 102; //int
-	public const DATA_TRADE_XP = 103; //int
+	/* 69 (byte) command-block */
+	public const DATA_COMMAND_BLOCK_COMMAND = 70; //string
+	public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 71; //string
+	public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 72; //byte
+	public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 73; //byte
+	public const DATA_STRENGTH = 74; //int
+	public const DATA_MAX_STRENGTH = 75; //int
+	/* 76 (int) */
+	public const DATA_LIMITED_LIFE = 77;
+	public const DATA_ARMOR_STAND_POSE_INDEX = 78; //int
+	public const DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; //int
+	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
+	public const DATA_BALLOON_ATTACHED_ENTITY = 84; //int64, entity unique ID of owner
+	public const DATA_PUFFERFISH_SIZE = 85; //byte
+	public const DATA_BOAT_BUBBLE_TIME = 86; //int (time in bubble column)
+	public const DATA_PLAYER_AGENT_EID = 87; //long
+	/* 88 (float) related to panda sitting
+	 * 89 (float) related to panda sitting */
+	public const DATA_EAT_COUNTER = 90; //int (used by pandas)
+	public const DATA_FLAGS2 = 91; //long (extended data flags)
+	/* 92 (float) related to panda lying down
+	 * 93 (float) related to panda lying down */
+	public const DATA_AREA_EFFECT_CLOUD_DURATION = 94; //int
+	public const DATA_AREA_EFFECT_CLOUD_SPAWN_TIME = 95; //int
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_PER_TICK = 96; //float, usually negative
+	public const DATA_AREA_EFFECT_CLOUD_RADIUS_CHANGE_ON_PICKUP = 97; //float
+	public const DATA_AREA_EFFECT_CLOUD_PICKUP_COUNT = 98; //int
+	public const DATA_INTERACTIVE_TAG = 99; //string (button text)
+	public const DATA_TRADE_TIER = 100; //int
+	public const DATA_MAX_TRADE_TIER = 101; //int
+	public const DATA_TRADE_XP = 102; //int
+	public const DATA_SKIN_ID = 103; //int ???
+	/* 104 (int) related to wither */
+	public const DATA_COMMAND_BLOCK_TICK_DELAY = 105; //int
+	public const DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 106; //byte
+	public const DATA_AMBIENT_SOUND_INTERVAL_MIN = 107; //float
+	public const DATA_AMBIENT_SOUND_INTERVAL_RANGE = 108; //float
+	public const DATA_AMBIENT_SOUND_EVENT = 109; //string
 
 	public const DATA_FLAG_ONFIRE = 0;
 	public const DATA_FLAG_SNEAKING = 1;
@@ -312,7 +318,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	public const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK
 
 	public static $entityCount = 1;
-	/** @var Entity[] */
+	/** @var string[] */
 	private static $knownEntities = [];
 	/** @var string[][] */
 	private static $saveNames = [];
@@ -454,8 +460,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	/** @var EntityDamageEvent|null */
 	protected $lastDamageCause = null;
 
-	/** @var Block[] */
-	protected $blocksAround = [];
+	/** @var Block[]|null */
+	protected $blocksAround = null;
 
 	/** @var float|null */
 	public $lastX = null;
@@ -662,7 +668,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @return bool
 	 */
 	public function isNameTagAlwaysVisible() : bool{
-		return $this->getGenericFlag(self::DATA_FLAG_ALWAYS_SHOW_NAMETAG);
+		return $this->propertyManager->getByte(self::DATA_ALWAYS_SHOW_NAMETAG) === 1;
 	}
 
 
@@ -1137,7 +1143,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$this->setFireTicks($ticks);
 		}
 
-		$this->setGenericFlag(self::DATA_FLAG_ONFIRE, true);
+		$this->setGenericFlag(self::DATA_FLAG_ONFIRE, $this->isOnFire());
 	}
 
 	/**
@@ -1235,7 +1241,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	protected function broadcastMovement(bool $teleport = false) : void{
-		$pk = new MoveEntityAbsolutePacket();
+		$pk = new MoveActorAbsolutePacket();
 		$pk->entityRuntimeId = $this->id;
 		$pk->position = $this->getOffsetPosition($this);
 
@@ -1247,14 +1253,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		$pk->zRot = $this->yaw;
 
 		if($teleport){
-			$pk->flags |= MoveEntityAbsolutePacket::FLAG_TELEPORT;
+			$pk->flags |= MoveActorAbsolutePacket::FLAG_TELEPORT;
 		}
 
 		$this->level->broadcastPacketToViewers($this, $pk);
 	}
 
 	protected function broadcastMotion() : void{
-		$pk = new SetEntityMotionPacket();
+		$pk = new SetActorMotionPacket();
 		$pk->entityRuntimeId = $this->id;
 		$pk->motion = $this->getMotion();
 
@@ -1776,6 +1782,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	/**
+	 * @deprecated WARNING: Despite what its name implies, this function DOES NOT return all the blocks around the entity.
+	 * Instead, it returns blocks which have reactions for an entity intersecting with them.
+	 *
 	 * @return Block[]
 	 */
 	public function getBlocksAround() : array{
@@ -2021,7 +2030,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param Player $player
 	 */
 	protected function sendSpawnPacket(Player $player) : void{
-		$pk = new AddEntityPacket();
+		$pk = new AddActorPacket();
 		$pk->entityRuntimeId = $this->getId();
 		$pk->type = static::NETWORK_ID;
 		$pk->position = $this->asVector3();
@@ -2039,7 +2048,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	 * @param Player $player
 	 */
 	public function spawnTo(Player $player) : void{
-		if(!isset($this->hasSpawned[$player->getLoaderId()])){
+		if(!isset($this->hasSpawned[$player->getLoaderId()]) and $this->chunk !== null and isset($player->usedChunks[Level::chunkHash($this->chunk->getX(), $this->chunk->getZ())])){
 			$this->hasSpawned[$player->getLoaderId()] = $player;
 
 			$this->sendSpawnPacket($player);
@@ -2065,13 +2074,16 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	/**
+	 * @deprecated WARNING: This function DOES NOT permanently hide the entity from the player. As soon as the entity or
+	 * player moves, the player will once again be able to see the entity.
+	 *
 	 * @param Player $player
 	 * @param bool   $send
 	 */
 	public function despawnFrom(Player $player, bool $send = true) : void{
 		if(isset($this->hasSpawned[$player->getLoaderId()])){
 			if($send){
-				$pk = new RemoveEntityPacket();
+				$pk = new RemoveActorPacket();
 				$pk->entityUniqueId = $this->id;
 				$player->dataPacket($pk);
 			}
@@ -2079,6 +2091,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		}
 	}
 
+	/**
+	 * @deprecated WARNING: This function DOES NOT permanently hide the entity from viewers. As soon as the entity or
+	 * player moves, viewers will once again be able to see the entity.
+	 */
 	public function despawnFromAll() : void{
 		foreach($this->hasSpawned as $player){
 			$this->despawnFrom($player);
@@ -2193,7 +2209,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 			$player = [$player];
 		}
 
-		$pk = new SetEntityDataPacket();
+		$pk = new SetActorDataPacket();
 		$pk->entityRuntimeId = $this->getId();
 		$pk->metadata = $data ?? $this->propertyManager->getAll();
 
@@ -2210,7 +2226,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 	}
 
 	public function broadcastEntityEvent(int $eventId, ?int $eventData = null, ?array $players = null) : void{
-		$pk = new EntityEventPacket();
+		$pk = new ActorEventPacket();
 		$pk->entityRuntimeId = $this->id;
 		$pk->event = $eventId;
 		$pk->data = $eventData ?? 0;

src/pocketmine/entity/Human.php

@@ -46,13 +46,14 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 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\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\Player;
 use pocketmine\utils\UUID;
 use function array_filter;
@@ -182,7 +183,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 	public function sendSkin(?array $targets = null) : void{
 		$pk = new PlayerSkinPacket();
 		$pk->uuid = $this->getUniqueId();
-		$pk->skin = $this->skin;
+		$pk->skin = SkinAdapterSingleton::get()->toSkinData($this->skin);
 		$this->server->broadcastPacket($targets ?? $this->hasSpawned, $pk);
 	}
 
@@ -587,6 +588,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		return (int) min(100, 7 * $this->getXpLevel());
 	}
 
+	/**
+	 * @return PlayerInventory
+	 */
 	public function getInventory(){
 		return $this->inventory;
 	}
@@ -628,7 +632,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 					//Old hotbar saving stuff, ignore it
 				}elseif($slot >= 100 and $slot < 104){ //Armor
 					$this->armorInventory->setItem($slot - 100, Item::nbtDeserialize($item));
-				}else{
+				}elseif($slot >= 9 and $slot < $this->inventory->getSize() + 9){
 					$this->inventory->setItem($slot - 9, Item::nbtDeserialize($item));
 				}
 			}
@@ -754,7 +758,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			$this->addEffect(new EffectInstance(Effect::getEffect(Effect::FIRE_RESISTANCE), 40 * 20, 1));
 			$this->addEffect(new EffectInstance(Effect::getEffect(Effect::ABSORPTION), 5 * 20, 1));
 
-			$this->broadcastEntityEvent(EntityEventPacket::CONSUME_TOTEM);
+			$this->broadcastEntityEvent(ActorEventPacket::CONSUME_TOTEM);
 			$this->level->broadcastLevelEvent($this->add(0, $this->eyeHeight, 0), LevelEventPacket::EVENT_SOUND_TOTEM);
 
 			$hand = $this->inventory->getItemInHand();
@@ -847,7 +851,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			/* we don't use Server->updatePlayerListData() because that uses batches, which could cause race conditions in async compression mode */
 			$pk = new PlayerListPacket();
 			$pk->type = PlayerListPacket::TYPE_ADD;
-			$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->skin)];
+			$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), SkinAdapterSingleton::get()->toSkinData($this->skin))];
 			$player->dataPacket($pk);
 		}
 

src/pocketmine/entity/Living.php

@@ -44,7 +44,7 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\FloatTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\MobEffectPacket;
 use pocketmine\Player;
@@ -143,7 +143,7 @@ abstract class Living extends Entity implements Damageable{
 		parent::setHealth($amount);
 		$this->attributeMap->getAttribute(Attribute::HEALTH)->setValue(ceil($this->getHealth()), true);
 		if($this->isAlive() and !$wasAlive){
-			$this->broadcastEntityEvent(EntityEventPacket::RESPAWN);
+			$this->broadcastEntityEvent(ActorEventPacket::RESPAWN);
 		}
 	}
 
@@ -541,7 +541,9 @@ abstract class Living extends Entity implements Damageable{
 	}
 
 	public function attack(EntityDamageEvent $source) : void{
-		if($this->attackTime > 0 or $this->noDamageTicks > 0){
+		if($this->noDamageTicks > 0){
+			$source->setCancelled();
+		}elseif($this->attackTime > 0){
 			$lastCause = $this->getLastDamageCause();
 			if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){
 				$source->setCancelled();
@@ -604,7 +606,7 @@ abstract class Living extends Entity implements Damageable{
 	}
 
 	protected function doHitAnimation() : void{
-		$this->broadcastEntityEvent(EntityEventPacket::HURT_ANIMATION);
+		$this->broadcastEntityEvent(ActorEventPacket::HURT_ANIMATION);
 	}
 
 	public function knockBack(Entity $attacker, float $damage, float $x, float $z, float $base = 0.4) : void{
@@ -662,7 +664,7 @@ abstract class Living extends Entity implements Damageable{
 	}
 
 	protected function startDeathAnimation() : void{
-		$this->broadcastEntityEvent(EntityEventPacket::DEATH_ANIMATION);
+		$this->broadcastEntityEvent(ActorEventPacket::DEATH_ANIMATION);
 	}
 
 	protected function endDeathAnimation() : void{

src/pocketmine/entity/Skin.php

@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\entity;
 
+use Ahc\Json\Comment as CommentedJsonDecoder;
 use function implode;
 use function in_array;
-use function json_decode;
 use function json_encode;
 use function strlen;
 
@@ -129,7 +129,7 @@ class Skin{
 	 */
 	public function debloatGeometryData() : void{
 		if($this->geometryData !== ""){
-			$this->geometryData = (string) json_encode(json_decode($this->geometryData));
+			$this->geometryData = (string) json_encode((new CommentedJsonDecoder())->decode($this->geometryData));
 		}
 	}
 }

src/pocketmine/entity/Squid.php

@@ -28,7 +28,7 @@ use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use function atan2;
 use function mt_rand;
 use function sqrt;
@@ -40,7 +40,7 @@ class Squid extends WaterAnimal{
 	public $width = 0.95;
 	public $height = 0.95;
 
-	/** @var Vector3 */
+	/** @var Vector3|null */
 	public $swimDirection = null;
 	public $swimSpeed = 0.1;
 
@@ -68,7 +68,7 @@ class Squid extends WaterAnimal{
 				$this->swimDirection = (new Vector3($this->x - $e->x, $this->y - $e->y, $this->z - $e->z))->normalize();
 			}
 
-			$this->broadcastEntityEvent(EntityEventPacket::SQUID_INK_CLOUD);
+			$this->broadcastEntityEvent(ActorEventPacket::SQUID_INK_CLOUD);
 		}
 	}
 
@@ -82,7 +82,7 @@ class Squid extends WaterAnimal{
 			return false;
 		}
 
-		if(++$this->switchDirectionTicker === 100 or $this->isCollided){
+		if(++$this->switchDirectionTicker === 100){
 			$this->switchDirectionTicker = 0;
 			if(mt_rand(0, 100) < 50){
 				$this->swimDirection = null;

src/pocketmine/entity/object/FallingBlock.php

@@ -33,6 +33,7 @@ use pocketmine\item\ItemFactory;
 use pocketmine\level\Position;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\IntTag;
+use function abs;
 use function get_class;
 
 class FallingBlock extends Entity{
@@ -110,7 +111,7 @@ class FallingBlock extends Entity{
 				$this->flagForDespawn();
 
 				$block = $this->level->getBlock($pos);
-				if($block->getId() > 0 and $block->isTransparent() and !$block->canBeReplaced()){
+				if(($block->isTransparent() and !$block->canBeReplaced()) or ($this->onGround and abs($this->y - $this->getFloorY()) > 0.001)){
 					//FIXME: anvils are supposed to destroy torches
 					$this->getLevel()->dropItem($this, ItemFactory::get($this->getBlock(), $this->getDamage()));
 				}else{

src/pocketmine/entity/object/ItemEntity.php

@@ -28,8 +28,8 @@ use pocketmine\event\entity\ItemDespawnEvent;
 use pocketmine\event\entity\ItemSpawnEvent;
 use pocketmine\event\inventory\InventoryPickupItemEvent;
 use pocketmine\item\Item;
-use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
-use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemActorPacket;
+use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
 use pocketmine\Player;
 use function get_class;
 
@@ -192,7 +192,7 @@ class ItemEntity extends Entity{
 	}
 
 	protected function sendSpawnPacket(Player $player) : void{
-		$pk = new AddItemEntityPacket();
+		$pk = new AddItemActorPacket();
 		$pk->entityRuntimeId = $this->getId();
 		$pk->position = $this->asVector3();
 		$pk->motion = $this->getMotion();
@@ -229,7 +229,7 @@ class ItemEntity extends Entity{
 				break;
 		}
 
-		$pk = new TakeItemEntityPacket();
+		$pk = new TakeItemActorPacket();
 		$pk->eid = $player->getId();
 		$pk->target = $this->getId();
 		$this->server->broadcastPacket($this->getViewers(), $pk);

src/pocketmine/entity/object/Painting.php

@@ -90,6 +90,9 @@ class Painting extends Entity{
 	}
 
 	public function kill() : void{
+		if(!$this->isAlive()){
+			return;
+		}
 		parent::kill();
 
 		$drops = true;
@@ -152,9 +155,11 @@ class Painting extends Entity{
 	protected function sendSpawnPacket(Player $player) : void{
 		$pk = new AddPaintingPacket();
 		$pk->entityRuntimeId = $this->getId();
-		$pk->x = $this->blockIn->x;
-		$pk->y = $this->blockIn->y;
-		$pk->z = $this->blockIn->z;
+		$pk->position = new Vector3(
+			($this->boundingBox->minX + $this->boundingBox->maxX) / 2,
+			($this->boundingBox->minY + $this->boundingBox->maxY) / 2,
+			($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2
+		);
 		$pk->direction = $this->direction;
 		$pk->title = $this->motive;
 

src/pocketmine/entity/object/PrimedTNT.php

@@ -28,6 +28,7 @@ use pocketmine\entity\Explosive;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\ExplosionPrimeEvent;
 use pocketmine\level\Explosion;
+use pocketmine\level\Position;
 use pocketmine\nbt\tag\ShortTag;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
@@ -105,7 +106,7 @@ class PrimedTNT extends Entity implements Explosive{
 		$ev = new ExplosionPrimeEvent($this, 4);
 		$ev->call();
 		if(!$ev->isCancelled()){
-			$explosion = new Explosion($this, $ev->getForce(), $this);
+			$explosion = new Explosion(Position::fromObject($this->add(0, $this->height / 2, 0), $this->level), $ev->getForce(), $this);
 			if($ev->isBlockBreaking()){
 				$explosion->explodeA();
 			}

src/pocketmine/entity/projectile/Arrow.php

@@ -32,9 +32,9 @@ use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\RayTraceResult;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
-use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
+use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
 use pocketmine\Player;
 use function mt_rand;
 use function sqrt;
@@ -143,7 +143,7 @@ class Arrow extends Projectile{
 
 	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
 		parent::onHitBlock($blockHit, $hitResult);
-		$this->broadcastEntityEvent(EntityEventPacket::ARROW_SHAKE, 7); //7 ticks
+		$this->broadcastEntityEvent(ActorEventPacket::ARROW_SHAKE, 7); //7 ticks
 	}
 
 	protected function onHitEntity(Entity $entityHit, RayTraceResult $hitResult) : void{
@@ -193,7 +193,7 @@ class Arrow extends Projectile{
 			return;
 		}
 
-		$pk = new TakeItemEntityPacket();
+		$pk = new TakeItemActorPacket();
 		$pk->eid = $player->getId();
 		$pk->target = $this->getId();
 		$this->server->broadcastPacket($this->getViewers(), $pk);

src/pocketmine/entity/projectile/EnderPearl.php

@@ -23,36 +23,14 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\projectile;
 
-use pocketmine\block\Block;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\ProjectileHitEvent;
 use pocketmine\level\sound\EndermanTeleportSound;
-use pocketmine\math\AxisAlignedBB;
-use pocketmine\math\RayTraceResult;
-use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
 class EnderPearl extends Throwable{
 	public const NETWORK_ID = self::ENDER_PEARL;
 
-	protected function calculateInterceptWithBlock(Block $block, Vector3 $start, Vector3 $end) : ?RayTraceResult{
-		if($block->getId() !== Block::AIR and empty($block->getCollisionBoxes())){
-			//TODO: remove this once block collision boxes are fixed properly
-			$bb = new AxisAlignedBB(
-				$block->x,
-				$block->y,
-				$block->z,
-				$block->x + 1,
-				$block->y + 1,
-				$block->z + 1
-			);
-
-			return $bb->calculateIntercept($start, $end);
-		}
-
-		return parent::calculateInterceptWithBlock($block, $start, $end);
-	}
-
 	protected function onHit(ProjectileHitEvent $event) : void{
 		$owner = $this->getOwningEntity();
 		if($owner !== null){

src/pocketmine/event/Event.php

@@ -56,7 +56,6 @@ abstract class Event{
 			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
 		}
 
-		/** @var Event $this */
 		return $this->isCancelled;
 	}
 
@@ -70,7 +69,6 @@ abstract class Event{
 			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
 		}
 
-		/** @var Event $this */
 		$this->isCancelled = $value;
 	}
 
@@ -78,8 +76,6 @@ abstract class Event{
 	 * Calls event handlers registered for this event.
 	 *
 	 * @throws \RuntimeException if event call recursion reaches the max depth limit
-	 *
-	 * @throws \ReflectionException
 	 */
 	public function call() : void{
 		if(self::$eventCallDepth >= self::MAX_EVENT_CALL_DEPTH){

src/pocketmine/event/player/PlayerChatEvent.php

@@ -23,10 +23,12 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
+use pocketmine\command\CommandSender;
 use pocketmine\event\Cancellable;
 use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
+use function spl_object_id;
 
 /**
  * Called when a player chats something
@@ -39,15 +41,15 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	protected $format;
 
 	/**
-	 * @var Player[]
+	 * @var CommandSender[]
 	 */
 	protected $recipients = [];
 
 	/**
-	 * @param Player   $player
-	 * @param string   $message
-	 * @param string   $format
-	 * @param Player[] $recipients
+	 * @param Player          $player
+	 * @param string          $message
+	 * @param string          $format
+	 * @param CommandSender[] $recipients
 	 */
 	public function __construct(Player $player, string $message, string $format = "chat.type.text", array $recipients = null){
 		$this->player = $player;
@@ -56,7 +58,11 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 		$this->format = $format;
 
 		if($recipients === null){
-			$this->recipients = PermissionManager::getInstance()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_USERS);
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions(Server::BROADCAST_CHANNEL_USERS) as $permissible){
+				if($permissible instanceof CommandSender){
+					$this->recipients[spl_object_id($permissible)] = $permissible;
+				}
+			}
 		}else{
 			$this->recipients = $recipients;
 		}
@@ -100,14 +106,14 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
 	}
 
 	/**
-	 * @return Player[]
+	 * @return CommandSender[]
 	 */
 	public function getRecipients() : array{
 		return $this->recipients;
 	}
 
 	/**
-	 * @param Player[] $recipients
+	 * @param CommandSender[] $recipients
 	 */
 	public function setRecipients(array $recipients) : void{
 		$this->recipients = $recipients;

src/pocketmine/event/player/PlayerCreationEvent.php

@@ -39,15 +39,15 @@ class PlayerCreationEvent extends Event{
 	/** @var int */
 	private $port;
 
-	/** @var Player::class */
+	/** @var string */
 	private $baseClass;
-	/** @var Player::class */
+	/** @var string */
 	private $playerClass;
 
 	/**
 	 * @param SourceInterface $interface
-	 * @param Player::class   $baseClass
-	 * @param Player::class   $playerClass
+	 * @param string          $baseClass
+	 * @param string          $playerClass
 	 * @param string          $address
 	 * @param int             $port
 	 */
@@ -91,14 +91,14 @@ class PlayerCreationEvent extends Event{
 	}
 
 	/**
-	 * @return Player::class
+	 * @return string
 	 */
 	public function getBaseClass(){
 		return $this->baseClass;
 	}
 
 	/**
-	 * @param Player::class $class
+	 * @param string $class
 	 */
 	public function setBaseClass($class){
 		if(!is_a($class, $this->baseClass, true)){
@@ -109,14 +109,14 @@ class PlayerCreationEvent extends Event{
 	}
 
 	/**
-	 * @return Player::class
+	 * @return string
 	 */
 	public function getPlayerClass(){
 		return $this->playerClass;
 	}
 
 	/**
-	 * @param Player::class $class
+	 * @param string $class
 	 */
 	public function setPlayerClass($class){
 		if(!is_a($class, $this->baseClass, true)){

src/pocketmine/inventory/BaseInventory.php

@@ -47,7 +47,7 @@ abstract class BaseInventory implements Inventory{
 	/** @var string */
 	protected $title;
 	/** @var \SplFixedArray|Item[] */
-	protected $slots = [];
+	protected $slots;
 	/** @var Player[] */
 	protected $viewers = [];
 	/** @var InventoryEventProcessor */

src/pocketmine/inventory/CraftingManager.php

@@ -43,7 +43,7 @@ class CraftingManager{
 	/** @var FurnaceRecipe[] */
 	protected $furnaceRecipes = [];
 
-	/** @var BatchPacket */
+	/** @var BatchPacket|null */
 	private $craftingDataCache;
 
 	public function __construct(){

src/pocketmine/inventory/ShapedRecipe.php

@@ -79,8 +79,8 @@ class ShapedRecipe implements CraftingRecipe{
 			}
 
 			for($x = 0; $x < $this->width; ++$x){
-				if($row{$x} !== ' ' and !isset($ingredients[$row{$x}])){
-					throw new \InvalidArgumentException("No item specified for symbol '" . $row{$x} . "'");
+				if($row[$x] !== ' ' and !isset($ingredients[$row[$x]])){
+					throw new \InvalidArgumentException("No item specified for symbol '" . $row[$x] . "'");
 				}
 			}
 		}

src/pocketmine/inventory/transaction/CraftingTransaction.php

@@ -65,6 +65,7 @@ class CraftingTransaction extends InventoryTransaction{
 	 * @param int    $iterations
 	 *
 	 * @return int
+	 * @throws TransactionValidationException
 	 */
 	protected function matchRecipeItems(array $txItems, array $recipeItems, bool $wildcards, int $iterations = 0) : int{
 		if(empty($recipeItems)){

src/pocketmine/item/Bucket.php

@@ -85,7 +85,7 @@ class Bucket extends Item implements Consumable{
 			$ev->call();
 			if(!$ev->isCancelled()){
 				$player->getLevel()->setBlock($blockReplace, $resultBlock->getFlowingForm(), true, true);
-				$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());
+				$player->getLevel()->broadcastLevelSoundEvent($blockReplace->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());
 
 				if($player->isSurvival()){
 					$player->getInventory()->setItemInHand($ev->getItem());

src/pocketmine/item/Item.php

@@ -137,6 +137,10 @@ class Item implements ItemIds, \JsonSerializable{
 		}
 	}
 
+	/**
+	 * Removes all previously added items from the creative menu.
+	 * Note: Players who are already online when this is called will not see this change.
+	 */
 	public static function clearCreativeItems(){
 		Item::$creative = [];
 	}
@@ -145,10 +149,22 @@ class Item implements ItemIds, \JsonSerializable{
 		return Item::$creative;
 	}
 
+	/**
+	 * Adds an item to the creative menu.
+	 * Note: Players who are already online when this is called will not see this change.
+	 *
+	 * @param Item $item
+	 */
 	public static function addCreativeItem(Item $item){
 		Item::$creative[] = clone $item;
 	}
 
+	/**
+	 * Removes an item from the creative menu.
+	 * Note: Players who are already online when this is called will not see this change.
+	 *
+	 * @param Item $item
+	 */
 	public static function removeCreativeItem(Item $item){
 		$index = self::getCreativeItemIndex($item);
 		if($index !== -1){
@@ -467,7 +483,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 */
 	public function setCustomName(string $name) : Item{
 		if($name === ""){
-			$this->clearCustomName();
+			return $this->clearCustomName();
 		}
 
 		/** @var CompoundTag $display */

src/pocketmine/item/Shears.php

@@ -48,7 +48,7 @@ class Shears extends Tool{
 	}
 
 	public function onDestroyBlock(Block $block) : bool{
-		if($block->getHardness() === 0 or $block->isCompatibleWithTool($this)){
+		if($block->getHardness() === 0.0 or $block->isCompatibleWithTool($this)){
 			return $this->applyDamage(1);
 		}
 		return false;

src/pocketmine/item/WritableBook.php

@@ -186,16 +186,18 @@ class WritableBook extends Item{
 	 * @return CompoundTag[]
 	 */
 	public function getPages() : array{
-		$pages = $this->getNamedTag()->getListTag(self::TAG_PAGES);
-		if($pages === null){
-			return [];
-		}
+		/** @var CompoundTag[] $pages */
+		$pages = $this->getPagesTag()->getValue();
 
-		return $pages->getValue();
+		return $pages;
 	}
 
 	protected function getPagesTag() : ListTag{
-		return $this->getNamedTag()->getListTag(self::TAG_PAGES) ?? new ListTag(self::TAG_PAGES, [], NBT::TAG_Compound);
+		$pagesTag = $this->getNamedTag()->getListTag(self::TAG_PAGES);
+		if($pagesTag !== null and $pagesTag->getTagType() === NBT::TAG_Compound){
+			return $pagesTag;
+		}
+		return new ListTag(self::TAG_PAGES, [], NBT::TAG_Compound);
 	}
 
 	/**

src/pocketmine/item/enchantment/Enchantment.php

@@ -94,7 +94,7 @@ class Enchantment{
 	public const SLOT_ELYTRA = 0x4000;
 	public const SLOT_TRIDENT = 0x8000;
 
-	/** @var Enchantment[] */
+	/** @var \SplFixedArray|Enchantment[] */
 	protected static $enchantments;
 
 	public static function init() : void{

src/pocketmine/lang/BaseLang.php

@@ -190,7 +190,7 @@ class BaseLang{
 
 		$len = strlen($text);
 		for($i = 0; $i < $len; ++$i){
-			$c = $text{$i};
+			$c = $text[$i];
 			if($replaceString !== null){
 				$ord = ord($c);
 				if(

src/pocketmine/level/Explosion.php

@@ -38,7 +38,6 @@ use pocketmine\level\particle\HugeExplodeSeedParticle;
 use pocketmine\level\utils\SubChunkIteratorManager;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
-use pocketmine\network\mcpe\protocol\ExplodePacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\tile\Chest;
 use pocketmine\tile\Container;
@@ -89,6 +88,9 @@ class Explosion{
 	}
 
 	/**
+	 * Calculates which blocks will be destroyed by this explosion. If explodeB() is called without calling this, no blocks 
+	 * will be destroyed.
+	 *
 	 * @return bool
 	 */
 	public function explodeA() : bool{
@@ -148,6 +150,12 @@ class Explosion{
 		return true;
 	}
 
+	/**
+	 * Executes the explosion's effects on the world. This includes destroying blocks (if any), harming and knocking back entities,
+	 * and creating sounds and particles.
+	 *
+	 * @return bool
+	 */
 	public function explodeB() : bool{
 		$send = [];
 		$updateBlocks = [];
@@ -251,12 +259,6 @@ class Explosion{
 			$send[] = new Vector3($block->x - $source->x, $block->y - $source->y, $block->z - $source->z);
 		}
 
-		$pk = new ExplodePacket();
-		$pk->position = $this->source->asVector3();
-		$pk->radius = $this->size;
-		$pk->records = $send;
-		$this->level->broadcastPacketToViewers($source, $pk);
-
 		$this->level->addParticle(new HugeExplodeSeedParticle($source));
 		$this->level->broadcastLevelSoundEvent($source, LevelSoundEventPacket::SOUND_EXPLODE);
 

src/pocketmine/level/Level.php

@@ -72,7 +72,7 @@ use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\StringTag;
-use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
@@ -265,7 +265,7 @@ class Level implements ChunkManager, Metadatable{
 	/** @var LevelTimings */
 	public $timings;
 
-	/** @var int */
+	/** @var float */
 	public $tickRateTime = 0;
 	/**
 	 * @deprecated
@@ -564,7 +564,7 @@ class Level implements ChunkManager, Metadatable{
 		$pk = new LevelSoundEventPacket();
 		$pk->sound = $soundId;
 		$pk->extraData = $extraData;
-		$pk->entityType = AddEntityPacket::LEGACY_ID_MAP_BC[$entityTypeId] ?? ":";
+		$pk->entityType = AddActorPacket::LEGACY_ID_MAP_BC[$entityTypeId] ?? ":";
 		$pk->isBabyMob = $isBabyMob;
 		$pk->disableRelativeVolume = $disableRelativeVolume;
 		$pk->position = $pos->asVector3();
@@ -820,8 +820,13 @@ class Level implements ChunkManager, Metadatable{
 
 		//Delayed updates
 		while($this->scheduledBlockUpdateQueue->count() > 0 and $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
-			$block = $this->getBlock($this->scheduledBlockUpdateQueue->extract()["data"]);
-			unset($this->scheduledBlockUpdateQueueIndex[Level::blockHash($block->x, $block->y, $block->z)]);
+			/** @var Vector3 $vec */
+			$vec = $this->scheduledBlockUpdateQueue->extract()["data"];
+			unset($this->scheduledBlockUpdateQueueIndex[Level::blockHash($vec->x, $vec->y, $vec->z)]);
+			if(!$this->isInLoadedTerrain($vec)){
+				continue;
+			}
+			$block = $this->getBlock($vec);
 			$block->onScheduledUpdate();
 		}
 

src/pocketmine/level/Position.php

@@ -29,7 +29,7 @@ use function assert;
 
 class Position extends Vector3{
 
-	/** @var Level */
+	/** @var Level|null */
 	public $level = null;
 
 	/**

src/pocketmine/level/format/Chunk.php

@@ -460,7 +460,7 @@ class Chunk{
 	 * @return int 0-255
 	 */
 	public function getBiomeId(int $x, int $z) : int{
-		return ord($this->biomeIds{($z << 4) | $x});
+		return ord($this->biomeIds[($z << 4) | $x]);
 	}
 
 	/**
@@ -472,7 +472,7 @@ class Chunk{
 	 */
 	public function setBiomeId(int $x, int $z, int $biomeId){
 		$this->hasChanged = true;
-		$this->biomeIds{($z << 4) | $x} = chr($biomeId & 0xff);
+		$this->biomeIds[($z << 4) | $x] = chr($biomeId & 0xff);
 	}
 
 	/**
@@ -694,50 +694,48 @@ class Chunk{
 	public function initChunk(Level $level){
 		if(!$this->isInit){
 			$changed = false;
-			if($this->NBTentities !== null){
-				$level->timings->syncChunkLoadEntitiesTimer->startTiming();
-				foreach($this->NBTentities as $nbt){
-					if($nbt instanceof CompoundTag){
-						if(!$nbt->hasTag("id")){ //allow mixed types (because of leveldb)
-							$changed = true;
-							continue;
-						}
 
-						try{
-							$entity = Entity::createEntity($nbt->getTag("id")->getValue(), $level, $nbt);
-							if(!($entity instanceof Entity)){
-								$changed = true;
-								continue;
-							}
-						}catch(\Throwable $t){
-							$level->getServer()->getLogger()->logException($t);
+			$level->timings->syncChunkLoadEntitiesTimer->startTiming();
+			foreach($this->NBTentities as $nbt){
+				if($nbt instanceof CompoundTag){
+					if(!$nbt->hasTag("id")){ //allow mixed types (because of leveldb)
+						$changed = true;
+						continue;
+					}
+
+					try{
+						$entity = Entity::createEntity($nbt->getTag("id")->getValue(), $level, $nbt);
+						if(!($entity instanceof Entity)){
 							$changed = true;
 							continue;
 						}
+					}catch(\Throwable $t){
+						$level->getServer()->getLogger()->logException($t);
+						$changed = true;
+						continue;
 					}
 				}
-				$level->timings->syncChunkLoadEntitiesTimer->stopTiming();
-
-				$level->timings->syncChunkLoadTileEntitiesTimer->startTiming();
-				foreach($this->NBTtiles as $nbt){
-					if($nbt instanceof CompoundTag){
-						if(!$nbt->hasTag(Tile::TAG_ID, StringTag::class)){
-							$changed = true;
-							continue;
-						}
-
-						if(Tile::createTile($nbt->getString(Tile::TAG_ID), $level, $nbt) === null){
-							$changed = true;
-							continue;
-						}
-					}
-				}
-
-				$level->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
-
-				$this->NBTentities = null;
-				$this->NBTtiles = null;
 			}
+			$this->NBTentities = [];
+			$level->timings->syncChunkLoadEntitiesTimer->stopTiming();
+
+			$level->timings->syncChunkLoadTileEntitiesTimer->startTiming();
+			foreach($this->NBTtiles as $nbt){
+				if($nbt instanceof CompoundTag){
+					if(!$nbt->hasTag(Tile::TAG_ID, StringTag::class)){
+						$changed = true;
+						continue;
+					}
+
+					if(Tile::createTile($nbt->getString(Tile::TAG_ID), $level, $nbt) === null){
+						$changed = true;
+						continue;
+					}
+				}
+			}
+
+			$this->NBTtiles = [];
+			$level->timings->syncChunkLoadTileEntitiesTimer->stopTiming();
 
 			$this->hasChanged = $changed;
 
@@ -869,13 +867,10 @@ class Chunk{
 	public function networkSerialize() : string{
 		$result = "";
 		$subChunkCount = $this->getSubChunkSendCount();
-		$result .= chr($subChunkCount);
 		for($y = 0; $y < $subChunkCount; ++$y){
 			$result .= $this->subChunks[$y]->networkSerialize();
 		}
-		$result .= pack("v*", ...$this->heightMap)
-			. $this->biomeIds
-			. chr(0); //border block array count
+		$result .= $this->biomeIds . chr(0); //border block array count
 		//Border block entry format: 1 byte (4 bits X, 4 bits Z). These are however useless since they crash the regular client.
 
 		foreach($this->tiles as $tile){

src/pocketmine/level/format/SubChunk.php

@@ -71,31 +71,31 @@ class SubChunk implements SubChunkInterface{
 	}
 
 	public function getBlockId(int $x, int $y, int $z) : int{
-		return ord($this->ids{($x << 8) | ($z << 4) | $y});
+		return ord($this->ids[($x << 8) | ($z << 4) | $y]);
 	}
 
 	public function setBlockId(int $x, int $y, int $z, int $id) : bool{
-		$this->ids{($x << 8) | ($z << 4) | $y} = chr($id);
+		$this->ids[($x << 8) | ($z << 4) | $y] = chr($id);
 		return true;
 	}
 
 	public function getBlockData(int $x, int $y, int $z) : int{
-		return (ord($this->data{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
+		return (ord($this->data[($x << 7) | ($z << 3) | ($y >> 1)]) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockData(int $x, int $y, int $z, int $data) : bool{
 		$i = ($x << 7) | ($z << 3) | ($y >> 1);
 
 		$shift = ($y & 1) << 2;
-		$byte = ord($this->data{$i});
-		$this->data{$i} = chr(($byte & ~(0xf << $shift)) | (($data & 0xf) << $shift));
+		$byte = ord($this->data[$i]);
+		$this->data[$i] = chr(($byte & ~(0xf << $shift)) | (($data & 0xf) << $shift));
 
 		return true;
 	}
 
 	public function getFullBlock(int $x, int $y, int $z) : int{
 		$i = ($x << 8) | ($z << 4) | $y;
-		return (ord($this->ids{$i}) << 4) | ((ord($this->data{$i >> 1}) >> (($y & 1) << 2)) & 0xf);
+		return (ord($this->ids[$i]) << 4) | ((ord($this->data[$i >> 1]) >> (($y & 1) << 2)) & 0xf);
 	}
 
 	public function setBlock(int $x, int $y, int $z, ?int $id = null, ?int $data = null) : bool{
@@ -103,8 +103,8 @@ class SubChunk implements SubChunkInterface{
 		$changed = false;
 		if($id !== null){
 			$block = chr($id);
-			if($this->ids{$i} !== $block){
-				$this->ids{$i} = $block;
+			if($this->ids[$i] !== $block){
+				$this->ids[$i] = $block;
 				$changed = true;
 			}
 		}
@@ -113,10 +113,10 @@ class SubChunk implements SubChunkInterface{
 			$i >>= 1;
 
 			$shift = ($y & 1) << 2;
-			$oldPair = ord($this->data{$i});
+			$oldPair = ord($this->data[$i]);
 			$newPair = ($oldPair & ~(0xf << $shift)) | (($data & 0xf) << $shift);
 			if($newPair !== $oldPair){
-				$this->data{$i} = chr($newPair);
+				$this->data[$i] = chr($newPair);
 				$changed = true;
 			}
 		}
@@ -125,29 +125,29 @@ class SubChunk implements SubChunkInterface{
 	}
 
 	public function getBlockLight(int $x, int $y, int $z) : int{
-		return (ord($this->blockLight{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
+		return (ord($this->blockLight[($x << 7) | ($z << 3) | ($y >> 1)]) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockLight(int $x, int $y, int $z, int $level) : bool{
 		$i = ($x << 7) | ($z << 3) | ($y >> 1);
 
 		$shift = ($y & 1) << 2;
-		$byte = ord($this->blockLight{$i});
-		$this->blockLight{$i} = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
+		$byte = ord($this->blockLight[$i]);
+		$this->blockLight[$i] = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
 
 		return true;
 	}
 
 	public function getBlockSkyLight(int $x, int $y, int $z) : int{
-		return (ord($this->skyLight{($x << 7) | ($z << 3) | ($y >> 1)}) >> (($y & 1) << 2)) & 0xf;
+		return (ord($this->skyLight[($x << 7) | ($z << 3) | ($y >> 1)]) >> (($y & 1) << 2)) & 0xf;
 	}
 
 	public function setBlockSkyLight(int $x, int $y, int $z, int $level) : bool{
 		$i = ($x << 7) | ($z << 3) | ($y >> 1);
 
 		$shift = ($y & 1) << 2;
-		$byte = ord($this->skyLight{$i});
-		$this->skyLight{$i} = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
+		$byte = ord($this->skyLight[$i]);
+		$this->skyLight[$i] = chr(($byte & ~(0xf << $shift)) | (($level & 0xf) << $shift));
 
 		return true;
 	}
@@ -156,7 +156,7 @@ class SubChunk implements SubChunkInterface{
 		$low = ($x << 8) | ($z << 4);
 		$i = $low | 0x0f;
 		for(; $i >= $low; --$i){
-			if($this->ids{$i} !== "\x00"){
+			if($this->ids[$i] !== "\x00"){
 				return $i & 0x0f;
 			}
 		}

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

@@ -26,7 +26,7 @@ namespace pocketmine\level\format\io;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\Level;
 use pocketmine\network\mcpe\protocol\BatchPacket;
-use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
+use pocketmine\network\mcpe\protocol\LevelChunkPacket;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\Server;
 use function assert;
@@ -42,6 +42,9 @@ class ChunkRequestTask extends AsyncTask{
 
 	protected $compressionLevel;
 
+	/** @var int */
+	private $subChunkCount;
+
 	public function __construct(Level $level, int $chunkX, int $chunkZ, Chunk $chunk){
 		$this->levelId = $level->getId();
 		$this->compressionLevel = $level->getServer()->networkCompressionLevel;
@@ -49,13 +52,11 @@ class ChunkRequestTask extends AsyncTask{
 		$this->chunk = $chunk->networkSerialize();
 		$this->chunkX = $chunkX;
 		$this->chunkZ = $chunkZ;
+		$this->subChunkCount = $chunk->getSubChunkSendCount();
 	}
 
 	public function onRun(){
-		$pk = new FullChunkDataPacket();
-		$pk->chunkX = $this->chunkX;
-		$pk->chunkZ = $this->chunkZ;
-		$pk->data = $this->chunk;
+		$pk = LevelChunkPacket::withoutCache($this->chunkX, $this->chunkZ, $this->subChunkCount, $this->chunk);
 
 		$batch = new BatchPacket();
 		$batch->addPacket($pk);

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

@@ -47,7 +47,7 @@ if(!extension_loaded('pocketmine_chunkutils')){
 					for($z = $x; $z < $zM; $z += 16){
 						$yM = $z + 4096;
 						for($y = $z; $y < $yM; $y += 256){
-							$result{$i} = $array{$y};
+							$result[$i] = $array[$y];
 							++$i;
 						}
 					}
@@ -76,13 +76,13 @@ if(!extension_loaded('pocketmine_chunkutils')){
 						for($y = 0; $y < 8; ++$y){
 							$j = (($y << 8) | $zx);
 							$j80 = ($j | 0x80);
-							if($array{$j} === $commonValue and $array{$j80} === $commonValue){
+							if($array[$j] === $commonValue and $array[$j80] === $commonValue){
 								//values are already filled
 							}else{
-								$i1 = ord($array{$j});
-								$i2 = ord($array{$j80});
-								$result{$i}        = chr(($i2 << 4) | ($i1 & 0x0f));
-								$result{$i | 0x80} = chr(($i1 >> 4) | ($i2 & 0xf0));
+								$i1 = ord($array[$j]);
+								$i2 = ord($array[$j80]);
+								$result[$i]        = chr(($i2 << 4) | ($i1 & 0x0f));
+								$result[$i | 0x80] = chr(($i1 >> 4) | ($i2 & 0xf0));
 							}
 							$i++;
 						}
@@ -104,7 +104,7 @@ if(!extension_loaded('pocketmine_chunkutils')){
 		public static function convertBiomeColors(array $array) : string{
 			$result = str_repeat("\x00", 256);
 			foreach($array as $i => $color){
-				$result{$i} = chr(($color >> 24) & 0xff);
+				$result[$i] = chr(($color >> 24) & 0xff);
 			}
 			return $result;
 		}

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

@@ -33,7 +33,12 @@ use pocketmine\level\generator\GeneratorManager;
 use pocketmine\level\Level;
 use pocketmine\level\LevelException;
 use pocketmine\nbt\LittleEndianNBTStream;
-use pocketmine\nbt\tag\{ByteTag, CompoundTag, FloatTag, IntTag, LongTag, StringTag};
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\FloatTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\LongTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\utils\Binary;
 use pocketmine\utils\BinaryStream;
@@ -129,7 +134,7 @@ class LevelDB extends BaseLevelProvider{
 
 		$version = $this->levelData->getInt("StorageVersion", INT32_MAX, true);
 		if($version > self::CURRENT_STORAGE_VERSION){
-			throw new LevelException("Specified LevelDB world format version ($version) is not supported by " . \pocketmine\NAME);
+			throw new LevelException("Specified LevelDB world format version ($version) is not supported");
 		}
 	}
 

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

@@ -27,11 +27,10 @@ use pocketmine\level\format\ChunkException;
 use pocketmine\level\format\io\exception\CorruptedChunkException;
 use pocketmine\utils\Binary;
 use pocketmine\utils\MainLogger;
-use function array_fill;
 use function ceil;
 use function chr;
 use function fclose;
-use function fgetc;
+use function feof;
 use function file_exists;
 use function filesize;
 use function fopen;
@@ -40,6 +39,7 @@ use function fseek;
 use function ftruncate;
 use function fwrite;
 use function is_resource;
+use function max;
 use function ord;
 use function pack;
 use function str_pad;
@@ -60,6 +60,8 @@ class RegionLoader{
 	public const MAX_SECTOR_LENGTH = 255 << 12; //255 sectors (~0.996 MiB)
 	public const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps
 
+	private const FIRST_SECTOR = 2; //location table occupies 0 and 1
+
 	public static $COMPRESSION_LEVEL = 7;
 
 	/** @var int */
@@ -71,8 +73,8 @@ class RegionLoader{
 	/** @var resource */
 	protected $filePointer;
 	/** @var int */
-	protected $lastSector;
-	/** @var int[][] [offset in sectors, chunk size in sectors, timestamp] */
+	protected $nextSector = self::FIRST_SECTOR;
+	/** @var RegionLocationTableEntry[] */
 	protected $locationTable = [];
 	/** @var int */
 	public $lastUsed = 0;
@@ -83,6 +85,9 @@ class RegionLoader{
 		$this->filePath = $filePath;
 	}
 
+	/**
+	 * @throws CorruptedRegionException
+	 */
 	public function open(){
 		$exists = file_exists($this->filePath);
 		if(!$exists){
@@ -111,7 +116,7 @@ class RegionLoader{
 	}
 
 	protected function isChunkGenerated(int $index) : bool{
-		return !($this->locationTable[$index][0] === 0 or $this->locationTable[$index][1] === 0);
+		return !$this->locationTable[$index]->isNull();
 	}
 
 	/**
@@ -131,23 +136,25 @@ class RegionLoader{
 			return null;
 		}
 
-		fseek($this->filePointer, $this->locationTable[$index][0] << 12);
+		fseek($this->filePointer, $this->locationTable[$index]->getFirstSector() << 12);
+
 		$prefix = fread($this->filePointer, 4);
 		if($prefix === false or strlen($prefix) !== 4){
 			throw new CorruptedChunkException("Corrupted chunk header detected (unexpected end of file reading length prefix)");
 		}
 		$length = Binary::readInt($prefix);
 
-		if($length <= 0 or $length > self::MAX_SECTOR_LENGTH){ //Not yet generated / corrupted
-			if($length >= self::MAX_SECTOR_LENGTH){
-				throw new CorruptedChunkException("Corrupted chunk header detected (sector count $length larger than max " . self::MAX_SECTOR_LENGTH . ")");
-			}
+		if($length <= 0){ //TODO: if we reached here, the locationTable probably needs updating
 			return null;
 		}
+		if($length > self::MAX_SECTOR_LENGTH){ //corrupted
+			throw new CorruptedChunkException("Length for chunk x=$x,z=$z ($length) is larger than maximum " . self::MAX_SECTOR_LENGTH);
+		}
 
-		if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
-			MainLogger::getLogger()->error("Chunk x=$x,z=$z length mismatch (expected " . ($this->locationTable[$index][1] << 12) . " sectors, got $length sectors)");
-			$this->locationTable[$index][1] = $length >> 12;
+		if($length > ($this->locationTable[$index]->getSectorCount() << 12)){ //Invalid chunk, bigger than defined number of sectors
+			MainLogger::getLogger()->error("Chunk x=$x,z=$z length mismatch (expected " . ($this->locationTable[$index]->getSectorCount() << 12) . " sectors, got $length sectors)");
+			$old = $this->locationTable[$index];
+			$this->locationTable[$index] = new RegionLocationTableEntry($old->getFirstSector(), $length >> 12, time());
 			$this->writeLocationIndex($index);
 		}
 
@@ -190,26 +197,22 @@ class RegionLoader{
 		if($length + 4 > self::MAX_SECTOR_LENGTH){
 			throw new ChunkException("Chunk is too big! " . ($length + 4) . " > " . self::MAX_SECTOR_LENGTH);
 		}
-		$sectors = (int) ceil(($length + 4) / 4096);
+
+		$newSize = (int) ceil(($length + 4) / 4096);
 		$index = self::getChunkOffset($x, $z);
-		$indexChanged = false;
-		if($this->locationTable[$index][1] < $sectors){
-			$this->locationTable[$index][0] = $this->lastSector + 1;
-			$this->lastSector += $sectors; //The GC will clean this shift "later"
-			$indexChanged = true;
-		}elseif($this->locationTable[$index][1] != $sectors){
-			$indexChanged = true;
+		$offset = $this->locationTable[$index]->getFirstSector();
+
+		if($this->locationTable[$index]->getSectorCount() < $newSize){
+			$offset = $this->nextSector;
 		}
 
-		$this->locationTable[$index][1] = $sectors;
-		$this->locationTable[$index][2] = time();
+		$this->locationTable[$index] = new RegionLocationTableEntry($offset, $newSize, time());
+		$this->bumpNextFreeSector($this->locationTable[$index]);
 
-		fseek($this->filePointer, $this->locationTable[$index][0] << 12);
-		fwrite($this->filePointer, str_pad(Binary::writeInt($length) . chr(self::COMPRESSION_ZLIB) . $chunkData, $sectors << 12, "\x00", STR_PAD_RIGHT));
+		fseek($this->filePointer, $offset << 12);
+		fwrite($this->filePointer, str_pad(Binary::writeInt($length) . chr(self::COMPRESSION_ZLIB) . $chunkData, $newSize << 12, "\x00", STR_PAD_RIGHT));
 
-		if($indexChanged){
-			$this->writeLocationIndex($index);
-		}
+		$this->writeLocationIndex($index);
 	}
 
 	/**
@@ -220,8 +223,8 @@ class RegionLoader{
 	 */
 	public function removeChunk(int $x, int $z){
 		$index = self::getChunkOffset($x, $z);
-		$this->locationTable[$index][0] = 0;
-		$this->locationTable[$index][1] = 0;
+		$this->locationTable[$index] = new RegionLocationTableEntry(0, 0, 0);
+		$this->writeLocationIndex($index);
 	}
 
 	/**
@@ -263,9 +266,11 @@ class RegionLoader{
 		}
 	}
 
+	/**
+	 * @throws CorruptedRegionException
+	 */
 	protected function loadLocationTable(){
 		fseek($this->filePointer, 0);
-		$this->lastSector = 1;
 
 		$headerRaw = fread($this->filePointer, self::REGION_HEADER_LENGTH);
 		if(($len = strlen($headerRaw)) !== self::REGION_HEADER_LENGTH){
@@ -273,43 +278,64 @@ class RegionLoader{
 		}
 
 		$data = unpack("N*", $headerRaw);
-		/** @var int[] $usedOffsets */
-		$usedOffsets = [];
+
 		for($i = 0; $i < 1024; ++$i){
 			$index = $data[$i + 1];
 			$offset = $index >> 8;
-			if($offset !== 0){
-				self::getChunkCoords($i, $x, $z);
-				$fileOffset = $offset << 12;
+			$timestamp = $data[$i + 1025];
 
-				fseek($this->filePointer, $fileOffset);
-				if(fgetc($this->filePointer) === false){ //Try and read from the location
-					throw new CorruptedRegionException("Region file location offset x=$x,z=$z points to invalid file location $fileOffset");
-				}elseif(isset($usedOffsets[$offset])){
-					self::getChunkCoords($usedOffsets[$offset], $existingX, $existingZ);
-					throw new CorruptedRegionException("Found two chunk offsets (chunk1: x=$existingX,z=$existingZ, chunk2: x=$x,z=$z) pointing to the file location $fileOffset");
-				}else{
-					$usedOffsets[$offset] = $i;
-				}
-			}
-
-			$this->locationTable[$i] = [$index >> 8, $index & 0xff, $data[1024 + $i + 1]];
-			if(($this->locationTable[$i][0] + $this->locationTable[$i][1] - 1) > $this->lastSector){
-				$this->lastSector = $this->locationTable[$i][0] + $this->locationTable[$i][1] - 1;
+			if($offset === 0){
+				$this->locationTable[$i] = new RegionLocationTableEntry(0, 0, 0);
+			}else{
+				$this->locationTable[$i] = new RegionLocationTableEntry($offset, $index & 0xff, $timestamp);
+				$this->bumpNextFreeSector($this->locationTable[$i]);
 			}
 		}
 
+		$this->checkLocationTableValidity();
+
 		fseek($this->filePointer, 0);
 	}
 
+	/**
+	 * @throws CorruptedRegionException
+	 */
+	private function checkLocationTableValidity() : void{
+		/** @var int[] $usedOffsets */
+		$usedOffsets = [];
+
+		for($i = 0; $i < 1024; ++$i){
+			$entry = $this->locationTable[$i];
+			if($entry->isNull()){
+				continue;
+			}
+
+			self::getChunkCoords($i, $x, $z);
+			$offset = $entry->getFirstSector();
+			$fileOffset = $offset << 12;
+
+			//TODO: more validity checks
+
+			fseek($this->filePointer, $fileOffset);
+			if(feof($this->filePointer)){
+				throw new CorruptedRegionException("Region file location offset x=$x,z=$z points to invalid file location $fileOffset");
+			}
+			if(isset($usedOffsets[$offset])){
+				self::getChunkCoords($usedOffsets[$offset], $existingX, $existingZ);
+				throw new CorruptedRegionException("Found two chunk offsets (chunk1: x=$existingX,z=$existingZ, chunk2: x=$x,z=$z) pointing to the file location $fileOffset");
+			}
+			$usedOffsets[$offset] = $i;
+		}
+	}
+
 	private function writeLocationTable(){
 		$write = [];
 
 		for($i = 0; $i < 1024; ++$i){
-			$write[] = (($this->locationTable[$i][0] << 8) | $this->locationTable[$i][1]);
+			$write[] = (($this->locationTable[$i]->getFirstSector() << 8) | $this->locationTable[$i]->getSectorCount());
 		}
 		for($i = 0; $i < 1024; ++$i){
-			$write[] = $this->locationTable[$i][2];
+			$write[] = $this->locationTable[$i]->getTimestamp();
 		}
 		fseek($this->filePointer, 0);
 		fwrite($this->filePointer, pack("N*", ...$write), 4096 * 2);
@@ -317,16 +343,21 @@ class RegionLoader{
 
 	protected function writeLocationIndex($index){
 		fseek($this->filePointer, $index << 2);
-		fwrite($this->filePointer, Binary::writeInt(($this->locationTable[$index][0] << 8) | $this->locationTable[$index][1]), 4);
+		fwrite($this->filePointer, Binary::writeInt(($this->locationTable[$index]->getFirstSector() << 8) | $this->locationTable[$index]->getSectorCount()), 4);
 		fseek($this->filePointer, 4096 + ($index << 2));
-		fwrite($this->filePointer, Binary::writeInt($this->locationTable[$index][2]), 4);
+		fwrite($this->filePointer, Binary::writeInt($this->locationTable[$index]->getTimestamp()), 4);
 	}
 
 	protected function createBlank(){
 		fseek($this->filePointer, 0);
 		ftruncate($this->filePointer, 8192); // this fills the file with the null byte
-		$this->lastSector = 1;
-		$this->locationTable = array_fill(0, 1024, [0, 0, 0]);
+		for($i = 0; $i < 1024; ++$i){
+			$this->locationTable[$i] = new RegionLocationTableEntry(0, 0, 0);
+		}
+	}
+
+	private function bumpNextFreeSector(RegionLocationTableEntry $entry) : void{
+		$this->nextSector = max($this->nextSector, $entry->getLastSector()) + 1;
 	}
 
 	public function getX() : int{

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

@@ -0,0 +1,98 @@
+<?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\level\format\io\region;
+
+use function range;
+
+class RegionLocationTableEntry{
+
+	/** @var int */
+	private $firstSector;
+	/** @var int */
+	private $sectorCount;
+	/** @var int */
+	private $timestamp;
+
+	/**
+	 * @param int $firstSector
+	 * @param int $sectorCount
+	 * @param int $timestamp
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(int $firstSector, int $sectorCount, int $timestamp){
+		if($firstSector < 0){
+			throw new \InvalidArgumentException("Start sector must be positive, got $firstSector");
+		}
+		$this->firstSector = $firstSector;
+		if($sectorCount < 0 or $sectorCount > 255){
+			throw new \InvalidArgumentException("Sector count must be in range 0...255, got $sectorCount");
+		}
+		$this->sectorCount = $sectorCount;
+		$this->timestamp = $timestamp;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getFirstSector() : int{
+		return $this->firstSector;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLastSector() : int{
+		return $this->firstSector + $this->sectorCount - 1;
+	}
+
+	/**
+	 * Returns an array of sector offsets reserved by this chunk.
+	 * @return int[]
+	 */
+	public function getUsedSectors() : array{
+		return range($this->getFirstSector(), $this->getLastSector());
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getSectorCount() : int{
+		return $this->sectorCount;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTimestamp() : int{
+		return $this->timestamp;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isNull() : bool{
+		return $this->firstSector === 0 or $this->sectorCount === 0;
+	}
+}

src/pocketmine/level/generator/Generator.php

@@ -30,7 +30,7 @@ use pocketmine\level\ChunkManager;
 use pocketmine\math\Vector3;
 use pocketmine\utils\Random;
 use pocketmine\utils\Utils;
-use function ctype_digit;
+use function preg_match;
 
 abstract class Generator{
 
@@ -44,7 +44,7 @@ abstract class Generator{
 	public static function convertSeed(string $seed) : ?int{
 		if($seed === ""){ //empty seed should cause a random seed to be selected - can't use 0 here because 0 is a valid seed
 			$convertedSeed = null;
-		}elseif(ctype_digit($seed)){ //this avoids treating seeds like "404.4" as integer seeds
+		}elseif(preg_match('/^-?\d+$/', $seed) === 1){ //this avoids treating seeds like "404.4" as integer seeds
 			$convertedSeed = (int) $seed;
 		}else{
 			$convertedSeed = Utils::javaStringHash($seed);

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

@@ -48,7 +48,7 @@ class GroundCover extends Populator{
 
 					$column = $chunk->getBlockIdColumn($x, $z);
 					for($y = 127; $y > 0; --$y){
-						if($column{$y} !== "\x00" and !BlockFactory::get(ord($column{$y}))->isTransparent()){
+						if($column[$y] !== "\x00" and !BlockFactory::get(ord($column[$y]))->isTransparent()){
 							break;
 						}
 					}
@@ -56,10 +56,10 @@ class GroundCover extends Populator{
 					$endY = $startY - count($cover);
 					for($y = $startY; $y > $endY and $y >= 0; --$y){
 						$b = $cover[$startY - $y];
-						if($column{$y} === "\x00" and $b->isSolid()){
+						if($column[$y] === "\x00" and $b->isSolid()){
 							break;
 						}
-						if($b->canBeFlowedInto() and BlockFactory::get(ord($column{$y})) instanceof Liquid){
+						if($b->canBeFlowedInto() and BlockFactory::get(ord($column[$y])) instanceof Liquid){
 							continue;
 						}
 						if($b->getDamage() === 0){

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

@@ -30,8 +30,8 @@ use pocketmine\utils\Random;
 class TallGrass extends Populator{
 	/** @var ChunkManager */
 	private $level;
-	private $randomAmount;
-	private $baseAmount;
+	private $randomAmount = 1;
+	private $baseAmount = 0;
 
 	public function setRandomAmount($amount){
 		$this->randomAmount = $amount;
@@ -43,7 +43,7 @@ class TallGrass extends Populator{
 
 	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
 		$this->level = $level;
-		$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
+		$amount = $random->nextRange(0, $this->randomAmount) + $this->baseAmount;
 		for($i = 0; $i < $amount; ++$i){
 			$x = $random->nextRange($chunkX * 16, $chunkX * 16 + 15);
 			$z = $random->nextRange($chunkZ * 16, $chunkZ * 16 + 15);

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

@@ -32,8 +32,8 @@ use pocketmine\utils\Random;
 class Tree extends Populator{
 	/** @var ChunkManager */
 	private $level;
-	private $randomAmount;
-	private $baseAmount;
+	private $randomAmount = 1;
+	private $baseAmount = 0;
 
 	private $type;
 
@@ -51,7 +51,7 @@ class Tree extends Populator{
 
 	public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random){
 		$this->level = $level;
-		$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
+		$amount = $random->nextRange(0, $this->randomAmount) + $this->baseAmount;
 		for($i = 0; $i < $amount; ++$i){
 			$x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15);
 			$z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15);

src/pocketmine/level/light/LightUpdate.php

@@ -34,7 +34,7 @@ abstract class LightUpdate{
 	/** @var ChunkManager */
 	protected $level;
 
-	/** @var int[] blockhash => new light level */
+	/** @var int[][] blockhash => [x, y, z, new light level] */
 	protected $updateNodes = [];
 
 	/** @var \SplQueue */

src/pocketmine/level/particle/FloatingTextParticle.php

@@ -30,8 +30,9 @@ use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
-use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
+use pocketmine\network\mcpe\protocol\RemoveActorPacket;
 use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
+use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\utils\UUID;
 use function str_repeat;
 
@@ -84,7 +85,7 @@ class FloatingTextParticle extends Particle{
 		if($this->entityId === null){
 			$this->entityId = Entity::$entityCount++;
 		}else{
-			$pk0 = new RemoveEntityPacket();
+			$pk0 = new RemoveActorPacket();
 			$pk0->entityUniqueId = $this->entityId;
 
 			$p[] = $pk0;
@@ -96,7 +97,7 @@ class FloatingTextParticle extends Particle{
 
 			$add = new PlayerListPacket();
 			$add->type = PlayerListPacket::TYPE_ADD;
-			$add->entries = [PlayerListEntry::createAdditionEntry($uuid, $this->entityId, $name, new Skin("Standard_Custom", str_repeat("\x00", 8192)))];
+			$add->entries = [PlayerListEntry::createAdditionEntry($uuid, $this->entityId, $name, SkinAdapterSingleton::get()->toSkinData(new Skin("Standard_Custom", str_repeat("\x00", 8192))))];
 			$p[] = $add;
 
 			$pk = new AddPlayerPacket();

src/pocketmine/level/particle/Particle.php

@@ -29,59 +29,67 @@ use pocketmine\network\mcpe\protocol\DataPacket;
 abstract class Particle extends Vector3{
 
 	public const TYPE_BUBBLE = 1;
-	public const TYPE_CRITICAL = 2;
-	public const TYPE_BLOCK_FORCE_FIELD = 3;
-	public const TYPE_SMOKE = 4;
-	public const TYPE_EXPLODE = 5;
-	public const TYPE_EVAPORATION = 6;
-	public const TYPE_FLAME = 7;
-	public const TYPE_LAVA = 8;
-	public const TYPE_LARGE_SMOKE = 9;
-	public const TYPE_REDSTONE = 10;
-	public const TYPE_RISING_RED_DUST = 11;
-	public const TYPE_ITEM_BREAK = 12;
-	public const TYPE_SNOWBALL_POOF = 13;
-	public const TYPE_HUGE_EXPLODE = 14;
-	public const TYPE_HUGE_EXPLODE_SEED = 15;
-	public const TYPE_MOB_FLAME = 16;
-	public const TYPE_HEART = 17;
-	public const TYPE_TERRAIN = 18;
-	public const TYPE_SUSPENDED_TOWN = 19, TYPE_TOWN_AURA = 19;
-	public const TYPE_PORTAL = 20;
-	public const TYPE_SPLASH = 21, TYPE_WATER_SPLASH = 21;
-	public const TYPE_WATER_WAKE = 22;
-	public const TYPE_DRIP_WATER = 23;
-	public const TYPE_DRIP_LAVA = 24;
-	public const TYPE_FALLING_DUST = 25, TYPE_DUST = 25;
-	public const TYPE_MOB_SPELL = 26;
-	public const TYPE_MOB_SPELL_AMBIENT = 27;
-	public const TYPE_MOB_SPELL_INSTANTANEOUS = 28;
-	public const TYPE_INK = 29;
-	public const TYPE_SLIME = 30;
-	public const TYPE_RAIN_SPLASH = 31;
-	public const TYPE_VILLAGER_ANGRY = 32;
-	public const TYPE_VILLAGER_HAPPY = 33;
-	public const TYPE_ENCHANTMENT_TABLE = 34;
-	public const TYPE_TRACKING_EMITTER = 35;
-	public const TYPE_NOTE = 36;
-	public const TYPE_WITCH_SPELL = 37;
-	public const TYPE_CARROT = 38;
-	//39 unknown
-	public const TYPE_END_ROD = 40;
-	public const TYPE_DRAGONS_BREATH = 41;
-	public const TYPE_SPIT = 42;
-	public const TYPE_TOTEM = 43;
-	public const TYPE_FOOD = 44;
-	public const TYPE_FIREWORKS_STARTER = 45;
-	public const TYPE_FIREWORKS_SPARK = 46;
-	public const TYPE_FIREWORKS_OVERLAY = 47;
-	public const TYPE_BALLOON_GAS = 48;
-	public const TYPE_COLORED_FLAME = 49;
-	public const TYPE_SPARKLER = 50;
-	public const TYPE_CONDUIT = 51;
-	public const TYPE_BUBBLE_COLUMN_UP = 52;
-	public const TYPE_BUBBLE_COLUMN_DOWN = 53;
-	public const TYPE_SNEEZE = 54;
+	//2 same as 1
+	public const TYPE_CRITICAL = 3;
+	public const TYPE_BLOCK_FORCE_FIELD = 4;
+	public const TYPE_SMOKE = 5;
+	public const TYPE_EXPLODE = 6;
+	public const TYPE_EVAPORATION = 7;
+	public const TYPE_FLAME = 8;
+	public const TYPE_LAVA = 9;
+	public const TYPE_LARGE_SMOKE = 10;
+	public const TYPE_REDSTONE = 11;
+	public const TYPE_RISING_RED_DUST = 12;
+	//62 same as 12
+	public const TYPE_ITEM_BREAK = 13;
+	public const TYPE_SNOWBALL_POOF = 14;
+	public const TYPE_HUGE_EXPLODE = 15;
+	//60 same as 15
+	public const TYPE_HUGE_EXPLODE_SEED = 16;
+	public const TYPE_MOB_FLAME = 17;
+	public const TYPE_HEART = 18;
+	public const TYPE_TERRAIN = 19;
+	public const TYPE_SUSPENDED_TOWN = 20, TYPE_TOWN_AURA = 20;
+	//61 same as 20
+	public const TYPE_PORTAL = 21;
+	//22 same as 21
+	public const TYPE_SPLASH = 23, TYPE_WATER_SPLASH = 23;
+	//24 same as 23
+	public const TYPE_WATER_WAKE = 25;
+	public const TYPE_DRIP_WATER = 26;
+	public const TYPE_DRIP_LAVA = 27;
+	public const TYPE_FALLING_DUST = 28, TYPE_DUST = 28;
+	public const TYPE_MOB_SPELL = 29;
+	public const TYPE_MOB_SPELL_AMBIENT = 30;
+	public const TYPE_MOB_SPELL_INSTANTANEOUS = 31;
+	public const TYPE_INK = 32;
+	public const TYPE_SLIME = 33;
+	public const TYPE_RAIN_SPLASH = 34;
+	public const TYPE_VILLAGER_ANGRY = 35;
+	//59 same as 35
+	public const TYPE_VILLAGER_HAPPY = 36;
+	public const TYPE_ENCHANTMENT_TABLE = 37;
+	public const TYPE_TRACKING_EMITTER = 38;
+	public const TYPE_NOTE = 39;
+	public const TYPE_WITCH_SPELL = 40;
+	public const TYPE_CARROT = 41;
+	//42 unknown
+	public const TYPE_END_ROD = 43;
+	//58 same as 43
+	public const TYPE_DRAGONS_BREATH = 44;
+	public const TYPE_SPIT = 45;
+	public const TYPE_TOTEM = 46;
+	public const TYPE_FOOD = 47;
+	public const TYPE_FIREWORKS_STARTER = 48;
+	public const TYPE_FIREWORKS_SPARK = 49;
+	public const TYPE_FIREWORKS_OVERLAY = 50;
+	public const TYPE_BALLOON_GAS = 51;
+	public const TYPE_COLORED_FLAME = 52;
+	public const TYPE_SPARKLER = 53;
+	public const TYPE_CONDUIT = 54;
+	public const TYPE_BUBBLE_COLUMN_UP = 55;
+	public const TYPE_BUBBLE_COLUMN_DOWN = 56;
+	public const TYPE_SNEEZE = 57;
 
 	/**
 	 * @return DataPacket|DataPacket[]

src/pocketmine/metadata/MetadataStore.php

@@ -29,7 +29,7 @@ namespace pocketmine\metadata;
 use pocketmine\plugin\Plugin;
 
 abstract class MetadataStore{
-	/** @var \SplObjectStorage[] */
+	/** @var \SplObjectStorage[]|MetadataValue[][] */
 	private $metadataMap;
 
 	/**
@@ -100,7 +100,7 @@ abstract class MetadataStore{
 	 * @param Plugin $owningPlugin
 	 */
 	public function invalidateAll(Plugin $owningPlugin){
-		/** @var MetadataValue[] $values */
+		/** @var \SplObjectStorage|MetadataValue[] $values */
 		foreach($this->metadataMap as $values){
 			if(isset($values[$owningPlugin])){
 				$values[$owningPlugin]->invalidate();

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -27,14 +27,21 @@ namespace pocketmine\network\mcpe;
 
 use pocketmine\entity\Attribute;
 use pocketmine\entity\Entity;
+use pocketmine\entity\Skin;
+use pocketmine\item\Durable;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\ItemIds;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\NetworkLittleEndianNBTStream;
 use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\IntTag;
 use pocketmine\network\mcpe\protocol\types\CommandOriginData;
 use pocketmine\network\mcpe\protocol\types\EntityLink;
+use pocketmine\network\mcpe\protocol\types\SkinAnimation;
+use pocketmine\network\mcpe\protocol\types\SkinData;
+use pocketmine\network\mcpe\protocol\types\SkinImage;
+use pocketmine\network\mcpe\protocol\types\StructureSettings;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\UUID;
 use function count;
@@ -42,6 +49,9 @@ use function strlen;
 
 class NetworkBinaryStream extends BinaryStream{
 
+	private const DAMAGE_TAG = "Damage"; //TAG_Int
+	private const DAMAGE_TAG_CONFLICT_RESOLUTION = "___Damage_ProtocolCollisionResolution___";
+
 	public function getString() : string{
 		return $this->get($this->getUnsignedVarInt());
 	}
@@ -68,6 +78,66 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putLInt($uuid->getPart(2));
 	}
 
+	public function getSkin() : SkinData{
+		$skinId = $this->getString();
+		$skinResourcePatch = $this->getString();
+		$skinData = $this->getSkinImage();
+		$animationCount = $this->getLInt();
+		$animations = [];
+		for($i = 0; $i < $animationCount; ++$i){
+			$animations[] = new SkinAnimation(
+				$skinImage = $this->getSkinImage(),
+				$animationType = $this->getLInt(),
+				$animationFrames = $this->getLFloat()
+			);
+		}
+		$capeData = $this->getSkinImage();
+		$geometryData = $this->getString();
+		$animationData = $this->getString();
+		$premium = $this->getBool();
+		$persona = $this->getBool();
+		$capeOnClassic = $this->getBool();
+		$capeId = $this->getString();
+		$fullSkinId = $this->getString();
+
+		return new SkinData($skinId, $skinResourcePatch, $skinData, $animations, $capeData, $geometryData, $animationData, $premium, $persona, $capeOnClassic, $capeId);
+	}
+
+	public function putSkin(SkinData $skin){
+		$this->putString($skin->getSkinId());
+		$this->putString($skin->getResourcePatch());
+		$this->putSkinImage($skin->getSkinImage());
+		$this->putLInt(count($skin->getAnimations()));
+		foreach($skin->getAnimations() as $animation){
+			$this->putSkinImage($animation->getImage());
+			$this->putLInt($animation->getType());
+			$this->putLFloat($animation->getFrames());
+		}
+		$this->putSkinImage($skin->getCapeImage());
+		$this->putString($skin->getGeometryData());
+		$this->putString($skin->getAnimationData());
+		$this->putBool($skin->isPremium());
+		$this->putBool($skin->isPersona());
+		$this->putBool($skin->isPersonaCapeOnClassic());
+		$this->putString($skin->getCapeId());
+
+		//this has to be unique or the client will do stupid things
+		$this->putString(UUID::fromRandom()->toString()); //full skin ID
+	}
+
+	private function getSkinImage() : SkinImage{
+		$width = $this->getLInt();
+		$height = $this->getLInt();
+		$data = $this->getString();
+		return new SkinImage($height, $width, $data);
+	}
+
+	private function putSkinImage(SkinImage $image) : void{
+		$this->putLInt($image->getWidth());
+		$this->putLInt($image->getHeight());
+		$this->putString($image->getData());
+	}
+
 	public function getSlot() : Item{
 		$id = $this->getVarInt();
 		if($id === 0){
@@ -76,21 +146,22 @@ class NetworkBinaryStream extends BinaryStream{
 
 		$auxValue = $this->getVarInt();
 		$data = $auxValue >> 8;
-		if($data === 0x7fff){
-			$data = -1;
-		}
 		$cnt = $auxValue & 0xff;
 
 		$nbtLen = $this->getLShort();
 
-		/** @var CompoundTag|string $nbt */
-		$nbt = "";
+		/** @var CompoundTag|null $nbt */
+		$nbt = null;
 		if($nbtLen === 0xffff){
 			$c = $this->getByte();
 			if($c !== 1){
 				throw new \UnexpectedValueException("Unexpected NBT count $c");
 			}
-			$nbt = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset, 512);
+			$decodedNBT = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset, 512);
+			if(!($decodedNBT instanceof CompoundTag)){
+				throw new \UnexpectedValueException("Unexpected root tag type for itemstack");
+			}
+			$nbt = $decodedNBT;
 		}elseif($nbtLen !== 0){
 			throw new \UnexpectedValueException("Unexpected fake NBT length $nbtLen");
 		}
@@ -108,7 +179,22 @@ class NetworkBinaryStream extends BinaryStream{
 		if($id === ItemIds::SHIELD){
 			$this->getVarLong(); //"blocking tick" (ffs mojang)
 		}
-
+		if($nbt !== null){
+			if($nbt->hasTag(self::DAMAGE_TAG, IntTag::class)){
+				$data = $nbt->getInt(self::DAMAGE_TAG);
+				$nbt->removeTag(self::DAMAGE_TAG);
+				if($nbt->count() === 0){
+					$nbt = null;
+					goto end;
+				}
+			}
+			if(($conflicted = $nbt->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
+				$nbt->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
+				$conflicted->setName(self::DAMAGE_TAG);
+				$nbt->setTag($conflicted);
+			}
+		}
+		end:
 		return ItemFactory::get($id, $data, $cnt, $nbt);
 	}
 
@@ -124,10 +210,27 @@ class NetworkBinaryStream extends BinaryStream{
 		$auxValue = (($item->getDamage() & 0x7fff) << 8) | $item->getCount();
 		$this->putVarInt($auxValue);
 
+		$nbt = null;
 		if($item->hasCompoundTag()){
+			$nbt = clone $item->getNamedTag();
+		}
+		if($item instanceof Durable and $item->getDamage() > 0){
+			if($nbt !== null){
+				if(($existing = $nbt->getTag(self::DAMAGE_TAG)) !== null){
+					$nbt->removeTag(self::DAMAGE_TAG);
+					$existing->setName(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
+					$nbt->setTag($existing);
+				}
+			}else{
+				$nbt = new CompoundTag();
+			}
+			$nbt->setInt(self::DAMAGE_TAG, $item->getDamage());
+		}
+
+		if($nbt !== null){
 			$this->putLShort(0xffff);
 			$this->putByte(1); //TODO: some kind of count field? always 1 as of 1.9.0
-			$this->put((new NetworkLittleEndianNBTStream())->write($item->getNamedTag()));
+			$this->put((new NetworkLittleEndianNBTStream())->write($nbt));
 		}else{
 			$this->putLShort(0);
 		}
@@ -140,6 +243,29 @@ class NetworkBinaryStream extends BinaryStream{
 		}
 	}
 
+	public function getRecipeIngredient() : Item{
+		$id = $this->getVarInt();
+		if($id === 0){
+			return ItemFactory::get(ItemIds::AIR, 0, 0);
+		}
+		$meta = $this->getVarInt();
+		if($meta === 0x7fff){
+			$meta = -1;
+		}
+		$count = $this->getVarInt();
+		return ItemFactory::get($id, $meta, $count);
+	}
+
+	public function putRecipeIngredient(Item $item) : void{
+		if($item->isNull()){
+			$this->putVarInt(0);
+		}else{
+			$this->putVarInt($item->getId());
+			$this->putVarInt($item->getDamage() & 0x7fff);
+			$this->putVarInt($item->getCount());
+		}
+	}
+
 	/**
 	 * Decodes entity metadata from the stream.
 	 *
@@ -170,8 +296,8 @@ class NetworkBinaryStream extends BinaryStream{
 				case Entity::DATA_TYPE_STRING:
 					$value = $this->getString();
 					break;
-				case Entity::DATA_TYPE_SLOT:
-					$value = $this->getSlot();
+				case Entity::DATA_TYPE_COMPOUND_TAG:
+					$value = (new NetworkLittleEndianNBTStream())->read($this->buffer, false, $this->offset, 512);
 					break;
 				case Entity::DATA_TYPE_POS:
 					$value = new Vector3();
@@ -222,8 +348,8 @@ class NetworkBinaryStream extends BinaryStream{
 				case Entity::DATA_TYPE_STRING:
 					$this->putString($d[1]);
 					break;
-				case Entity::DATA_TYPE_SLOT:
-					$this->putSlot($d[1]);
+				case Entity::DATA_TYPE_COMPOUND_TAG:
+					$this->put((new NetworkLittleEndianNBTStream())->write($d[1]));
 					break;
 				case Entity::DATA_TYPE_POS:
 					$v = $d[1];
@@ -320,7 +446,7 @@ class NetworkBinaryStream extends BinaryStream{
 	}
 
 	/**
-	 * Writes an EntityUniqueID
+	 * Writes an EntityRuntimeID
 	 *
 	 * @param int $eid
 	 */
@@ -535,4 +661,40 @@ class NetworkBinaryStream extends BinaryStream{
 			$this->putVarLong($data->varlong1);
 		}
 	}
+
+	protected function getStructureSettings() : StructureSettings{
+		$result = new StructureSettings();
+
+		$result->paletteName = $this->getString();
+
+		$result->ignoreEntities = $this->getBool();
+		$result->ignoreBlocks = $this->getBool();
+
+		$this->getBlockPosition($result->structureSizeX, $result->structureSizeY, $result->structureSizeZ);
+		$this->getBlockPosition($result->structureOffsetX, $result->structureOffsetY, $result->structureOffsetZ);
+
+		$result->lastTouchedByPlayerID = $this->getEntityUniqueId();
+		$result->rotation = $this->getByte();
+		$result->mirror = $this->getByte();
+		$result->integrityValue = $this->getFloat();
+		$result->integritySeed = $this->getInt();
+
+		return $result;
+	}
+
+	protected function putStructureSettings(StructureSettings $structureSettings) : void{
+		$this->putString($structureSettings->paletteName);
+
+		$this->putBool($structureSettings->ignoreEntities);
+		$this->putBool($structureSettings->ignoreBlocks);
+
+		$this->putBlockPosition($structureSettings->structureSizeX, $structureSettings->structureSizeY, $structureSettings->structureSizeZ);
+		$this->putBlockPosition($structureSettings->structureOffsetX, $structureSettings->structureOffsetY, $structureSettings->structureOffsetZ);
+
+		$this->putEntityUniqueId($structureSettings->lastTouchedByPlayerID);
+		$this->putByte($structureSettings->rotation);
+		$this->putByte($structureSettings->mirror);
+		$this->putFloat($structureSettings->integrityValue);
+		$this->putInt($structureSettings->integritySeed);
+	}
 }

src/pocketmine/network/mcpe/NetworkSession.php

@@ -23,18 +23,23 @@ declare(strict_types=1);
 
 namespace pocketmine\network\mcpe;
 
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\ActorFallPacket;
+use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
+use pocketmine\network\mcpe\protocol\AddActorPacket;
 use pocketmine\network\mcpe\protocol\AddBehaviorTreePacket;
 use pocketmine\network\mcpe\protocol\AddEntityPacket;
-use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
+use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\AddPaintingPacket;
 use pocketmine\network\mcpe\protocol\AddPlayerPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
+use pocketmine\network\mcpe\protocol\AnvilDamagePacket;
 use pocketmine\network\mcpe\protocol\AutomationClientConnectPacket;
+use pocketmine\network\mcpe\protocol\AvailableActorIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
-use pocketmine\network\mcpe\protocol\AvailableEntityIdentifiersPacket;
 use pocketmine\network\mcpe\protocol\BiomeDefinitionListPacket;
-use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
+use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\BlockEventPacket;
 use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
 use pocketmine\network\mcpe\protocol\BookEditPacket;
@@ -43,10 +48,14 @@ use pocketmine\network\mcpe\protocol\CameraPacket;
 use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
 use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
 use pocketmine\network\mcpe\protocol\ClientboundMapItemDataPacket;
+use pocketmine\network\mcpe\protocol\ClientCacheBlobStatusPacket;
+use pocketmine\network\mcpe\protocol\ClientCacheMissResponsePacket;
+use pocketmine\network\mcpe\protocol\ClientCacheStatusPacket;
 use pocketmine\network\mcpe\protocol\ClientToServerHandshakePacket;
 use pocketmine\network\mcpe\protocol\CommandBlockUpdatePacket;
 use pocketmine\network\mcpe\protocol\CommandOutputPacket;
 use pocketmine\network\mcpe\protocol\CommandRequestPacket;
+use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
 use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
@@ -54,12 +63,9 @@ use pocketmine\network\mcpe\protocol\CraftingDataPacket;
 use pocketmine\network\mcpe\protocol\CraftingEventPacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\network\mcpe\protocol\DisconnectPacket;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
-use pocketmine\network\mcpe\protocol\EntityFallPacket;
-use pocketmine\network\mcpe\protocol\EntityPickRequestPacket;
+use pocketmine\network\mcpe\protocol\EducationSettingsPacket;
+use pocketmine\network\mcpe\protocol\EmotePacket;
 use pocketmine\network\mcpe\protocol\EventPacket;
-use pocketmine\network\mcpe\protocol\ExplodePacket;
-use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
 use pocketmine\network\mcpe\protocol\GameRulesChangedPacket;
 use pocketmine\network\mcpe\protocol\GuiDataPickItemPacket;
 use pocketmine\network\mcpe\protocol\HurtArmorPacket;
@@ -70,6 +76,8 @@ use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
 use pocketmine\network\mcpe\protocol\LabTablePacket;
 use pocketmine\network\mcpe\protocol\LecternUpdatePacket;
+use pocketmine\network\mcpe\protocol\LevelChunkPacket;
+use pocketmine\network\mcpe\protocol\LevelEventGenericPacket;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
 use pocketmine\network\mcpe\protocol\LevelSoundEventPacketV1;
@@ -82,15 +90,18 @@ 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\MoveEntityAbsolutePacket;
-use pocketmine\network\mcpe\protocol\MoveEntityDeltaPacket;
+use pocketmine\network\mcpe\protocol\MoveActorAbsolutePacket;
+use pocketmine\network\mcpe\protocol\MoveActorDeltaPacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
+use pocketmine\network\mcpe\protocol\MultiplayerSettingsPacket;
 use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
+use pocketmine\network\mcpe\protocol\NetworkSettingsPacket;
 use pocketmine\network\mcpe\protocol\NetworkStackLatencyPacket;
 use pocketmine\network\mcpe\protocol\NpcRequestPacket;
 use pocketmine\network\mcpe\protocol\OnScreenTextureAnimationPacket;
 use pocketmine\network\mcpe\protocol\PhotoTransferPacket;
 use pocketmine\network\mcpe\protocol\PlayerActionPacket;
+use pocketmine\network\mcpe\protocol\PlayerAuthInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerHotbarPacket;
 use pocketmine\network\mcpe\protocol\PlayerInputPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
@@ -98,6 +109,7 @@ use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
 use pocketmine\network\mcpe\protocol\PlaySoundPacket;
 use pocketmine\network\mcpe\protocol\PlayStatusPacket;
 use pocketmine\network\mcpe\protocol\PurchaseReceiptPacket;
+use pocketmine\network\mcpe\protocol\RemoveActorPacket;
 use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
 use pocketmine\network\mcpe\protocol\RemoveObjectivePacket;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
@@ -113,13 +125,13 @@ use pocketmine\network\mcpe\protocol\ScriptCustomEventPacket;
 use pocketmine\network\mcpe\protocol\ServerSettingsRequestPacket;
 use pocketmine\network\mcpe\protocol\ServerSettingsResponsePacket;
 use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
+use pocketmine\network\mcpe\protocol\SetActorDataPacket;
+use pocketmine\network\mcpe\protocol\SetActorLinkPacket;
+use pocketmine\network\mcpe\protocol\SetActorMotionPacket;
 use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
 use pocketmine\network\mcpe\protocol\SetDefaultGameTypePacket;
 use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
 use pocketmine\network\mcpe\protocol\SetDisplayObjectivePacket;
-use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
-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;
@@ -128,6 +140,7 @@ use pocketmine\network\mcpe\protocol\SetScoreboardIdentityPacket;
 use pocketmine\network\mcpe\protocol\SetScorePacket;
 use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
 use pocketmine\network\mcpe\protocol\SetTimePacket;
+use pocketmine\network\mcpe\protocol\SettingsCommandPacket;
 use pocketmine\network\mcpe\protocol\SetTitlePacket;
 use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
 use pocketmine\network\mcpe\protocol\ShowProfilePacket;
@@ -138,12 +151,16 @@ use pocketmine\network\mcpe\protocol\SpawnParticleEffectPacket;
 use pocketmine\network\mcpe\protocol\StartGamePacket;
 use pocketmine\network\mcpe\protocol\StopSoundPacket;
 use pocketmine\network\mcpe\protocol\StructureBlockUpdatePacket;
+use pocketmine\network\mcpe\protocol\StructureTemplateDataRequestPacket;
+use pocketmine\network\mcpe\protocol\StructureTemplateDataResponsePacket;
 use pocketmine\network\mcpe\protocol\SubClientLoginPacket;
-use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
+use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
 use pocketmine\network\mcpe\protocol\TextPacket;
+use pocketmine\network\mcpe\protocol\TickSyncPacket;
 use pocketmine\network\mcpe\protocol\TransferPacket;
 use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
+use pocketmine\network\mcpe\protocol\UpdateBlockPropertiesPacket;
 use pocketmine\network\mcpe\protocol\UpdateBlockSyncedPacket;
 use pocketmine\network\mcpe\protocol\UpdateEquipPacket;
 use pocketmine\network\mcpe\protocol\UpdateSoftEnumPacket;
@@ -202,23 +219,23 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleAddEntity(AddEntityPacket $packet) : bool{
+	public function handleAddActor(AddActorPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleRemoveEntity(RemoveEntityPacket $packet) : bool{
+	public function handleRemoveActor(RemoveActorPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleAddItemEntity(AddItemEntityPacket $packet) : bool{
+	public function handleAddItemActor(AddItemActorPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleTakeItemEntity(TakeItemEntityPacket $packet) : bool{
+	public function handleTakeItemActor(TakeItemActorPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleMoveEntityAbsolute(MoveEntityAbsolutePacket $packet) : bool{
+	public function handleMoveActorAbsolute(MoveActorAbsolutePacket $packet) : bool{
 		return false;
 	}
 
@@ -238,7 +255,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleExplode(ExplodePacket $packet) : bool{
+	public function handleTickSync(TickSyncPacket $packet) : bool{
 		return false;
 	}
 
@@ -254,7 +271,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleEntityEvent(EntityEventPacket $packet) : bool{
+	public function handleActorEvent(ActorEventPacket $packet) : bool{
 		return false;
 	}
 
@@ -286,7 +303,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleEntityPickRequest(EntityPickRequestPacket $packet) : bool{
+	public function handleActorPickRequest(ActorPickRequestPacket $packet) : bool{
 		return false;
 	}
 
@@ -294,7 +311,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleEntityFall(EntityFallPacket $packet) : bool{
+	public function handleActorFall(ActorFallPacket $packet) : bool{
 		return false;
 	}
 
@@ -302,15 +319,15 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleSetEntityData(SetEntityDataPacket $packet) : bool{
+	public function handleSetActorData(SetActorDataPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleSetEntityMotion(SetEntityMotionPacket $packet) : bool{
+	public function handleSetActorMotion(SetActorMotionPacket $packet) : bool{
 		return false;
 	}
 
-	public function handleSetEntityLink(SetEntityLinkPacket $packet) : bool{
+	public function handleSetActorLink(SetActorLinkPacket $packet) : bool{
 		return false;
 	}
 
@@ -370,7 +387,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleBlockEntityData(BlockEntityDataPacket $packet) : bool{
+	public function handleBlockActorData(BlockActorDataPacket $packet) : bool{
 		return false;
 	}
 
@@ -378,7 +395,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleFullChunkData(FullChunkDataPacket $packet) : bool{
+	public function handleLevelChunk(LevelChunkPacket $packet) : bool{
 		return false;
 	}
 
@@ -590,7 +607,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleMoveEntityDelta(MoveEntityDeltaPacket $packet) : bool{
+	public function handleMoveActorDelta(MoveActorDeltaPacket $packet) : bool{
 		return false;
 	}
 
@@ -618,7 +635,7 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleAvailableEntityIdentifiers(AvailableEntityIdentifiersPacket $packet) : bool{
+	public function handleAvailableActorIdentifiers(AvailableActorIdentifiersPacket $packet) : bool{
 		return false;
 	}
 
@@ -638,6 +655,10 @@ abstract class NetworkSession{
 		return false;
 	}
 
+	public function handleLevelEventGeneric(LevelEventGenericPacket $packet) : bool{
+		return false;
+	}
+
 	public function handleLecternUpdate(LecternUpdatePacket $packet) : bool{
 		return false;
 	}
@@ -646,11 +667,75 @@ abstract class NetworkSession{
 		return false;
 	}
 
-	public function handleMapCreateLockedCopy(MapCreateLockedCopyPacket $packet) : bool{
+	public function handleAddEntity(AddEntityPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleRemoveEntity(RemoveEntityPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleClientCacheStatus(ClientCacheStatusPacket $packet) : bool{
 		return false;
 	}
 
 	public function handleOnScreenTextureAnimation(OnScreenTextureAnimationPacket $packet) : bool{
 		return false;
 	}
+
+	public function handleMapCreateLockedCopy(MapCreateLockedCopyPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleStructureTemplateDataRequest(StructureTemplateDataRequestPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleStructureTemplateDataResponse(StructureTemplateDataResponsePacket $packet) : bool{
+		return false;
+	}
+
+	public function handleUpdateBlockProperties(UpdateBlockPropertiesPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleClientCacheBlobStatus(ClientCacheBlobStatusPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleClientCacheMissResponse(ClientCacheMissResponsePacket $packet) : bool{
+		return false;
+	}
+
+	public function handleEducationSettings(EducationSettingsPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleEmote(EmotePacket $packet) : bool{
+		return false;
+	}
+
+	public function handleMultiplayerSettings(MultiplayerSettingsPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleSettingsCommand(SettingsCommandPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleAnvilDamage(AnvilDamagePacket $packet) : bool{
+		return false;
+	}
+
+	public function handleCompletedUsingItem(CompletedUsingItemPacket $packet) : bool{
+		return false;
+	}
+
+	public function handleNetworkSettings(NetworkSettingsPacket $packet) : bool{
+		return false;
+	}
+
+	public function handlePlayerAuthInput(PlayerAuthInputPacket $packet) : bool{
+		return false;
+	}
 }

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -25,9 +25,12 @@ namespace pocketmine\network\mcpe;
 
 
 use pocketmine\event\server\DataPacketReceiveEvent;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
+use pocketmine\network\mcpe\protocol\ActorFallPacket;
+use pocketmine\network\mcpe\protocol\ActorPickRequestPacket;
 use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
-use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
+use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\BlockPickRequestPacket;
 use pocketmine\network\mcpe\protocol\BookEditPacket;
 use pocketmine\network\mcpe\protocol\BossEventPacket;
@@ -37,9 +40,6 @@ use pocketmine\network\mcpe\protocol\CommandRequestPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
 use pocketmine\network\mcpe\protocol\CraftingEventPacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
-use pocketmine\network\mcpe\protocol\EntityEventPacket;
-use pocketmine\network\mcpe\protocol\EntityFallPacket;
-use pocketmine\network\mcpe\protocol\EntityPickRequestPacket;
 use pocketmine\network\mcpe\protocol\InteractPacket;
 use pocketmine\network\mcpe\protocol\InventoryTransactionPacket;
 use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
@@ -59,12 +59,14 @@ use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
 use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
 use pocketmine\network\mcpe\protocol\ResourcePackChunkRequestPacket;
 use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
+use pocketmine\network\mcpe\protocol\RespawnPacket;
 use pocketmine\network\mcpe\protocol\ServerSettingsRequestPacket;
 use pocketmine\network\mcpe\protocol\SetLocalPlayerAsInitializedPacket;
 use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
 use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
 use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
 use pocketmine\network\mcpe\protocol\TextPacket;
+use pocketmine\network\mcpe\protocol\types\SkinAdapterSingleton;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\timings\Timings;
@@ -74,7 +76,6 @@ use function implode;
 use function json_decode;
 use function json_last_error_msg;
 use function preg_match;
-use function preg_split;
 use function strlen;
 use function substr;
 use function trim;
@@ -142,7 +143,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return true; //useless leftover from 1.8
 	}
 
-	public function handleEntityEvent(EntityEventPacket $packet) : bool{
+	public function handleActorEvent(ActorEventPacket $packet) : bool{
 		return $this->player->handleEntityEvent($packet);
 	}
 
@@ -166,7 +167,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return $this->player->handleBlockPickRequest($packet);
 	}
 
-	public function handleEntityPickRequest(EntityPickRequestPacket $packet) : bool{
+	public function handleActorPickRequest(ActorPickRequestPacket $packet) : bool{
 		return false; //TODO
 	}
 
@@ -174,7 +175,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return $this->player->handlePlayerAction($packet);
 	}
 
-	public function handleEntityFall(EntityFallPacket $packet) : bool{
+	public function handleActorFall(ActorFallPacket $packet) : bool{
 		return true; //Not used
 	}
 
@@ -182,6 +183,10 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return $this->player->handleAnimate($packet);
 	}
 
+	public function handleRespawn(RespawnPacket $packet) : bool{
+		return $this->player->handleRespawn($packet);
+	}
+
 	public function handleContainerClose(ContainerClosePacket $packet) : bool{
 		return $this->player->handleContainerClose($packet);
 	}
@@ -198,7 +203,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 		return $this->player->handleAdventureSettings($packet);
 	}
 
-	public function handleBlockEntityData(BlockEntityDataPacket $packet) : bool{
+	public function handleBlockActorData(BlockActorDataPacket $packet) : bool{
 		return $this->player->handleBlockEntityData($packet);
 	}
 
@@ -249,7 +254,7 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 	}
 
 	public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{
-		return $this->player->changeSkin($packet->skin, $packet->newSkinName, $packet->oldSkinName);
+		return $this->player->changeSkin(SkinAdapterSingleton::get()->fromSkinData($packet->skin), $packet->newSkinName, $packet->oldSkinName);
 	}
 
 	public function handleBookEdit(BookEditPacket $packet) : bool{
@@ -270,16 +275,31 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
 	 */
 	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 = "\"\"";
+			$raw = $matches[1];
+			$lastComma = -1;
+			$newParts = [];
+			$quoteType = null;
+			for($i = 0, $len = strlen($raw); $i <= $len; ++$i){
+				if($i === $len or ($raw[$i] === "," and $quoteType === null)){
+					$part = substr($raw, $lastComma + 1, $i - ($lastComma + 1));
+					if(trim($part) === ""){ //regular parts will have quotes or something else that makes them non-empty
+						$part = '""';
+					}
+					$newParts[] = $part;
+					$lastComma = $i;
+				}elseif($raw[$i] === '"'){
+					if($quoteType === null){
+						$quoteType = $raw[$i];
+					}elseif($raw[$i] === $quoteType){
+						for($backslashes = 0; $backslashes < $i && $raw[$i - $backslashes - 1] === "\\"; ++$backslashes){}
+						if(($backslashes % 2) === 0){ //unescaped quote
+							$quoteType = null;
+						}
+					}
 				}
-				$parts[$k] = $part;
 			}
 
-			$fixed = "[" . implode(",", $parts) . "]";
+			$fixed = "[" . implode(",", $newParts) . "]";
 			if(($ret = json_decode($fixed, $assoc)) === null){
 				throw new \InvalidArgumentException("Failed to fix JSON: " . json_last_error_msg() . "(original: $json, modified: $fixed)");
 			}

src/pocketmine/network/mcpe/VerifyLoginTask.php

@@ -37,6 +37,7 @@ use function openssl_verify;
 use function ord;
 use function str_split;
 use function strlen;
+use function strtr;
 use function time;
 use function wordwrap;
 use const OPENSSL_ALGO_SHA384;
@@ -120,12 +121,12 @@ class VerifyLoginTask extends AsyncTask{
 		[$rString, $sString] = str_split($plainSignature, 48);
 
 		$rString = ltrim($rString, "\x00");
-		if(ord($rString{0}) >= 128){ //Would be considered signed, pad it with an extra zero
+		if(ord($rString[0]) >= 128){ //Would be considered signed, pad it with an extra zero
 			$rString = "\x00" . $rString;
 		}
 
 		$sString = ltrim($sString, "\x00");
-		if(ord($sString{0}) >= 128){ //Would be considered signed, pad it with an extra zero
+		if(ord($sString[0]) >= 128){ //Would be considered signed, pad it with an extra zero
 			$sString = "\x00" . $sString;
 		}
 

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

@@ -28,8 +28,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkSession;
 
-class EntityEventPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET;
+class ActorEventPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::ACTOR_EVENT_PACKET;
 
 	public const HURT_ANIMATION = 2;
 	public const DEATH_ANIMATION = 3;
@@ -103,6 +103,6 @@ class EntityEventPacket extends DataPacket{
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleEntityEvent($this);
+		return $session->handleActorEvent($this);
 	}
 }

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

@@ -28,8 +28,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkSession;
 
-class EntityFallPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::ENTITY_FALL_PACKET;
+class ActorFallPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::ACTOR_FALL_PACKET;
 
 	/** @var int */
 	public $entityRuntimeId;
@@ -51,6 +51,6 @@ class EntityFallPacket extends DataPacket{
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleEntityFall($this);
+		return $session->handleActorFall($this);
 	}
 }

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

@@ -27,8 +27,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkSession;
 
-class EntityPickRequestPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET;
+class ActorPickRequestPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::ACTOR_PICK_REQUEST_PACKET;
 
 	/** @var int */
 	public $entityUniqueId;
@@ -46,6 +46,6 @@ class EntityPickRequestPacket extends DataPacket{
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleEntityPickRequest($this);
+		return $session->handleActorPickRequest($this);
 	}
 }

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

@@ -0,0 +1,240 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\entity\Attribute;
+use pocketmine\entity\EntityIds;
+use pocketmine\math\Vector3;
+use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\EntityLink;
+use function array_search;
+use function count;
+
+class AddActorPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::ADD_ACTOR_PACKET;
+
+	/*
+	 * Really really really really really nasty hack, to preserve backwards compatibility.
+	 * We can't transition to string IDs within 3.x because the network IDs (the integer ones) are exposed
+	 * to the API in some places (for god's sake shoghi).
+	 *
+	 * TODO: remove this on 4.0
+	 */
+	public const LEGACY_ID_MAP_BC = [
+		EntityIds::NPC => "minecraft:npc",
+		EntityIds::PLAYER => "minecraft:player",
+		EntityIds::WITHER_SKELETON => "minecraft:wither_skeleton",
+		EntityIds::HUSK => "minecraft:husk",
+		EntityIds::STRAY => "minecraft:stray",
+		EntityIds::WITCH => "minecraft:witch",
+		EntityIds::ZOMBIE_VILLAGER => "minecraft:zombie_villager",
+		EntityIds::BLAZE => "minecraft:blaze",
+		EntityIds::MAGMA_CUBE => "minecraft:magma_cube",
+		EntityIds::GHAST => "minecraft:ghast",
+		EntityIds::CAVE_SPIDER => "minecraft:cave_spider",
+		EntityIds::SILVERFISH => "minecraft:silverfish",
+		EntityIds::ENDERMAN => "minecraft:enderman",
+		EntityIds::SLIME => "minecraft:slime",
+		EntityIds::ZOMBIE_PIGMAN => "minecraft:zombie_pigman",
+		EntityIds::SPIDER => "minecraft:spider",
+		EntityIds::SKELETON => "minecraft:skeleton",
+		EntityIds::CREEPER => "minecraft:creeper",
+		EntityIds::ZOMBIE => "minecraft:zombie",
+		EntityIds::SKELETON_HORSE => "minecraft:skeleton_horse",
+		EntityIds::MULE => "minecraft:mule",
+		EntityIds::DONKEY => "minecraft:donkey",
+		EntityIds::DOLPHIN => "minecraft:dolphin",
+		EntityIds::TROPICALFISH => "minecraft:tropicalfish",
+		EntityIds::WOLF => "minecraft:wolf",
+		EntityIds::SQUID => "minecraft:squid",
+		EntityIds::DROWNED => "minecraft:drowned",
+		EntityIds::SHEEP => "minecraft:sheep",
+		EntityIds::MOOSHROOM => "minecraft:mooshroom",
+		EntityIds::PANDA => "minecraft:panda",
+		EntityIds::SALMON => "minecraft:salmon",
+		EntityIds::PIG => "minecraft:pig",
+		EntityIds::VILLAGER => "minecraft:villager",
+		EntityIds::COD => "minecraft:cod",
+		EntityIds::PUFFERFISH => "minecraft:pufferfish",
+		EntityIds::COW => "minecraft:cow",
+		EntityIds::CHICKEN => "minecraft:chicken",
+		EntityIds::BALLOON => "minecraft:balloon",
+		EntityIds::LLAMA => "minecraft:llama",
+		EntityIds::IRON_GOLEM => "minecraft:iron_golem",
+		EntityIds::RABBIT => "minecraft:rabbit",
+		EntityIds::SNOW_GOLEM => "minecraft:snow_golem",
+		EntityIds::BAT => "minecraft:bat",
+		EntityIds::OCELOT => "minecraft:ocelot",
+		EntityIds::HORSE => "minecraft:horse",
+		EntityIds::CAT => "minecraft:cat",
+		EntityIds::POLAR_BEAR => "minecraft:polar_bear",
+		EntityIds::ZOMBIE_HORSE => "minecraft:zombie_horse",
+		EntityIds::TURTLE => "minecraft:turtle",
+		EntityIds::PARROT => "minecraft:parrot",
+		EntityIds::GUARDIAN => "minecraft:guardian",
+		EntityIds::ELDER_GUARDIAN => "minecraft:elder_guardian",
+		EntityIds::VINDICATOR => "minecraft:vindicator",
+		EntityIds::WITHER => "minecraft:wither",
+		EntityIds::ENDER_DRAGON => "minecraft:ender_dragon",
+		EntityIds::SHULKER => "minecraft:shulker",
+		EntityIds::ENDERMITE => "minecraft:endermite",
+		EntityIds::MINECART => "minecraft:minecart",
+		EntityIds::HOPPER_MINECART => "minecraft:hopper_minecart",
+		EntityIds::TNT_MINECART => "minecraft:tnt_minecart",
+		EntityIds::CHEST_MINECART => "minecraft:chest_minecart",
+		EntityIds::COMMAND_BLOCK_MINECART => "minecraft:command_block_minecart",
+		EntityIds::ARMOR_STAND => "minecraft:armor_stand",
+		EntityIds::ITEM => "minecraft:item",
+		EntityIds::TNT => "minecraft:tnt",
+		EntityIds::FALLING_BLOCK => "minecraft:falling_block",
+		EntityIds::XP_BOTTLE => "minecraft:xp_bottle",
+		EntityIds::XP_ORB => "minecraft:xp_orb",
+		EntityIds::EYE_OF_ENDER_SIGNAL => "minecraft:eye_of_ender_signal",
+		EntityIds::ENDER_CRYSTAL => "minecraft:ender_crystal",
+		EntityIds::SHULKER_BULLET => "minecraft:shulker_bullet",
+		EntityIds::FISHING_HOOK => "minecraft:fishing_hook",
+		EntityIds::DRAGON_FIREBALL => "minecraft:dragon_fireball",
+		EntityIds::ARROW => "minecraft:arrow",
+		EntityIds::SNOWBALL => "minecraft:snowball",
+		EntityIds::EGG => "minecraft:egg",
+		EntityIds::PAINTING => "minecraft:painting",
+		EntityIds::THROWN_TRIDENT => "minecraft:thrown_trident",
+		EntityIds::FIREBALL => "minecraft:fireball",
+		EntityIds::SPLASH_POTION => "minecraft:splash_potion",
+		EntityIds::ENDER_PEARL => "minecraft:ender_pearl",
+		EntityIds::LEASH_KNOT => "minecraft:leash_knot",
+		EntityIds::WITHER_SKULL => "minecraft:wither_skull",
+		EntityIds::WITHER_SKULL_DANGEROUS => "minecraft:wither_skull_dangerous",
+		EntityIds::BOAT => "minecraft:boat",
+		EntityIds::LIGHTNING_BOLT => "minecraft:lightning_bolt",
+		EntityIds::SMALL_FIREBALL => "minecraft:small_fireball",
+		EntityIds::LLAMA_SPIT => "minecraft:llama_spit",
+		EntityIds::AREA_EFFECT_CLOUD => "minecraft:area_effect_cloud",
+		EntityIds::LINGERING_POTION => "minecraft:lingering_potion",
+		EntityIds::FIREWORKS_ROCKET => "minecraft:fireworks_rocket",
+		EntityIds::EVOCATION_FANG => "minecraft:evocation_fang",
+		EntityIds::EVOCATION_ILLAGER => "minecraft:evocation_illager",
+		EntityIds::VEX => "minecraft:vex",
+		EntityIds::AGENT => "minecraft:agent",
+		EntityIds::ICE_BOMB => "minecraft:ice_bomb",
+		EntityIds::PHANTOM => "minecraft:phantom",
+		EntityIds::TRIPOD_CAMERA => "minecraft:tripod_camera"
+	];
+
+	/** @var int|null */
+	public $entityUniqueId = null; //TODO
+	/** @var int */
+	public $entityRuntimeId;
+	/** @var int */
+	public $type;
+	/** @var Vector3 */
+	public $position;
+	/** @var Vector3|null */
+	public $motion;
+	/** @var float */
+	public $pitch = 0.0;
+	/** @var float */
+	public $yaw = 0.0;
+	/** @var float */
+	public $headYaw = 0.0;
+
+	/** @var Attribute[] */
+	public $attributes = [];
+	/** @var array */
+	public $metadata = [];
+	/** @var EntityLink[] */
+	public $links = [];
+
+	protected function decodePayload(){
+		$this->entityUniqueId = $this->getEntityUniqueId();
+		$this->entityRuntimeId = $this->getEntityRuntimeId();
+		$this->type = array_search($t = $this->getString(), self::LEGACY_ID_MAP_BC, true);
+		if($this->type === false){
+			throw new \UnexpectedValueException("Can't map ID $t to legacy ID");
+		}
+		$this->position = $this->getVector3();
+		$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){
+			$name = $this->getString();
+			$min = $this->getLFloat();
+			$current = $this->getLFloat();
+			$max = $this->getLFloat();
+			$attr = Attribute::getAttributeByName($name);
+
+			if($attr !== null){
+				$attr->setMinValue($min);
+				$attr->setMaxValue($max);
+				$attr->setValue($current);
+				$this->attributes[] = $attr;
+			}else{
+				throw new \UnexpectedValueException("Unknown attribute type \"$name\"");
+			}
+		}
+
+		$this->metadata = $this->getEntityMetadata();
+		$linkCount = $this->getUnsignedVarInt();
+		for($i = 0; $i < $linkCount; ++$i){
+			$this->links[] = $this->getEntityLink();
+		}
+	}
+
+	protected function encodePayload(){
+		$this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId);
+		$this->putEntityRuntimeId($this->entityRuntimeId);
+		if(!isset(self::LEGACY_ID_MAP_BC[$this->type])){
+			throw new \InvalidArgumentException("Unknown entity numeric ID $this->type");
+		}
+		$this->putString(self::LEGACY_ID_MAP_BC[$this->type]);
+		$this->putVector3($this->position);
+		$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){
+			$this->putString($attribute->getName());
+			$this->putLFloat($attribute->getMinValue());
+			$this->putLFloat($attribute->getValue());
+			$this->putLFloat($attribute->getMaxValue());
+		}
+
+		$this->putEntityMetadata($this->metadata);
+		$this->putUnsignedVarInt(count($this->links));
+		foreach($this->links as $link){
+			$this->putEntityLink($link);
+		}
+	}
+
+	public function handle(NetworkSession $session) : bool{
+		return $session->handleAddActor($this);
+	}
+}

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

@@ -25,216 +25,36 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-use pocketmine\entity\Attribute;
-use pocketmine\entity\EntityIds;
-use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
-use pocketmine\network\mcpe\protocol\types\EntityLink;
-use function array_search;
-use function count;
 
-class AddEntityPacket extends DataPacket{
+class AddEntityPacket extends DataPacket/* implements ClientboundPacket*/{
 	public const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET;
 
-	/*
-	 * Really really really really really nasty hack, to preserve backwards compatibility.
-	 * We can't transition to string IDs within 3.x because the network IDs (the integer ones) are exposed
-	 * to the API in some places (for god's sake shoghi).
-	 *
-	 * TODO: remove this on 4.0
+	/** @var int */
+	private $uvarint1;
+
+	public static function create(int $uvarint1) : self{
+		$result = new self;
+		$result->uvarint1 = $uvarint1;
+		return $result;
+	}
+
+	/**
+	 * @return int
 	 */
-	public const LEGACY_ID_MAP_BC = [
-		EntityIds::NPC => "minecraft:npc",
-		EntityIds::PLAYER => "minecraft:player",
-		EntityIds::WITHER_SKELETON => "minecraft:wither_skeleton",
-		EntityIds::HUSK => "minecraft:husk",
-		EntityIds::STRAY => "minecraft:stray",
-		EntityIds::WITCH => "minecraft:witch",
-		EntityIds::ZOMBIE_VILLAGER => "minecraft:zombie_villager",
-		EntityIds::BLAZE => "minecraft:blaze",
-		EntityIds::MAGMA_CUBE => "minecraft:magma_cube",
-		EntityIds::GHAST => "minecraft:ghast",
-		EntityIds::CAVE_SPIDER => "minecraft:cave_spider",
-		EntityIds::SILVERFISH => "minecraft:silverfish",
-		EntityIds::ENDERMAN => "minecraft:enderman",
-		EntityIds::SLIME => "minecraft:slime",
-		EntityIds::ZOMBIE_PIGMAN => "minecraft:zombie_pigman",
-		EntityIds::SPIDER => "minecraft:spider",
-		EntityIds::SKELETON => "minecraft:skeleton",
-		EntityIds::CREEPER => "minecraft:creeper",
-		EntityIds::ZOMBIE => "minecraft:zombie",
-		EntityIds::SKELETON_HORSE => "minecraft:skeleton_horse",
-		EntityIds::MULE => "minecraft:mule",
-		EntityIds::DONKEY => "minecraft:donkey",
-		EntityIds::DOLPHIN => "minecraft:dolphin",
-		EntityIds::TROPICALFISH => "minecraft:tropicalfish",
-		EntityIds::WOLF => "minecraft:wolf",
-		EntityIds::SQUID => "minecraft:squid",
-		EntityIds::DROWNED => "minecraft:drowned",
-		EntityIds::SHEEP => "minecraft:sheep",
-		EntityIds::MOOSHROOM => "minecraft:mooshroom",
-		EntityIds::PANDA => "minecraft:panda",
-		EntityIds::SALMON => "minecraft:salmon",
-		EntityIds::PIG => "minecraft:pig",
-		EntityIds::VILLAGER => "minecraft:villager",
-		EntityIds::COD => "minecraft:cod",
-		EntityIds::PUFFERFISH => "minecraft:pufferfish",
-		EntityIds::COW => "minecraft:cow",
-		EntityIds::CHICKEN => "minecraft:chicken",
-		EntityIds::BALLOON => "minecraft:balloon",
-		EntityIds::LLAMA => "minecraft:llama",
-		EntityIds::IRON_GOLEM => "minecraft:iron_golem",
-		EntityIds::RABBIT => "minecraft:rabbit",
-		EntityIds::SNOW_GOLEM => "minecraft:snow_golem",
-		EntityIds::BAT => "minecraft:bat",
-		EntityIds::OCELOT => "minecraft:ocelot",
-		EntityIds::HORSE => "minecraft:horse",
-		EntityIds::CAT => "minecraft:cat",
-		EntityIds::POLAR_BEAR => "minecraft:polar_bear",
-		EntityIds::ZOMBIE_HORSE => "minecraft:zombie_horse",
-		EntityIds::TURTLE => "minecraft:turtle",
-		EntityIds::PARROT => "minecraft:parrot",
-		EntityIds::GUARDIAN => "minecraft:guardian",
-		EntityIds::ELDER_GUARDIAN => "minecraft:elder_guardian",
-		EntityIds::VINDICATOR => "minecraft:vindicator",
-		EntityIds::WITHER => "minecraft:wither",
-		EntityIds::ENDER_DRAGON => "minecraft:ender_dragon",
-		EntityIds::SHULKER => "minecraft:shulker",
-		EntityIds::ENDERMITE => "minecraft:endermite",
-		EntityIds::MINECART => "minecraft:minecart",
-		EntityIds::HOPPER_MINECART => "minecraft:hopper_minecart",
-		EntityIds::TNT_MINECART => "minecraft:tnt_minecart",
-		EntityIds::CHEST_MINECART => "minecraft:chest_minecart",
-		EntityIds::COMMAND_BLOCK_MINECART => "minecraft:command_block_minecart",
-		EntityIds::ARMOR_STAND => "minecraft:armor_stand",
-		EntityIds::ITEM => "minecraft:item",
-		EntityIds::TNT => "minecraft:tnt",
-		EntityIds::FALLING_BLOCK => "minecraft:falling_block",
-		EntityIds::XP_BOTTLE => "minecraft:xp_bottle",
-		EntityIds::XP_ORB => "minecraft:xp_orb",
-		EntityIds::EYE_OF_ENDER_SIGNAL => "minecraft:eye_of_ender_signal",
-		EntityIds::ENDER_CRYSTAL => "minecraft:ender_crystal",
-		EntityIds::SHULKER_BULLET => "minecraft:shulker_bullet",
-		EntityIds::FISHING_HOOK => "minecraft:fishing_hook",
-		EntityIds::DRAGON_FIREBALL => "minecraft:dragon_fireball",
-		EntityIds::ARROW => "minecraft:arrow",
-		EntityIds::SNOWBALL => "minecraft:snowball",
-		EntityIds::EGG => "minecraft:egg",
-		EntityIds::PAINTING => "minecraft:painting",
-		EntityIds::THROWN_TRIDENT => "minecraft:thrown_trident",
-		EntityIds::FIREBALL => "minecraft:fireball",
-		EntityIds::SPLASH_POTION => "minecraft:splash_potion",
-		EntityIds::ENDER_PEARL => "minecraft:ender_pearl",
-		EntityIds::LEASH_KNOT => "minecraft:leash_knot",
-		EntityIds::WITHER_SKULL => "minecraft:wither_skull",
-		EntityIds::WITHER_SKULL_DANGEROUS => "minecraft:wither_skull_dangerous",
-		EntityIds::BOAT => "minecraft:boat",
-		EntityIds::LIGHTNING_BOLT => "minecraft:lightning_bolt",
-		EntityIds::SMALL_FIREBALL => "minecraft:small_fireball",
-		EntityIds::LLAMA_SPIT => "minecraft:llama_spit",
-		EntityIds::AREA_EFFECT_CLOUD => "minecraft:area_effect_cloud",
-		EntityIds::LINGERING_POTION => "minecraft:lingering_potion",
-		EntityIds::FIREWORKS_ROCKET => "minecraft:fireworks_rocket",
-		EntityIds::EVOCATION_FANG => "minecraft:evocation_fang",
-		EntityIds::EVOCATION_ILLAGER => "minecraft:evocation_illager",
-		EntityIds::VEX => "minecraft:vex",
-		EntityIds::AGENT => "minecraft:agent",
-		EntityIds::ICE_BOMB => "minecraft:ice_bomb",
-		EntityIds::PHANTOM => "minecraft:phantom",
-		EntityIds::TRIPOD_CAMERA => "minecraft:tripod_camera"
-	];
-
-	/** @var int|null */
-	public $entityUniqueId = null; //TODO
-	/** @var int */
-	public $entityRuntimeId;
-	/** @var int */
-	public $type;
-	/** @var Vector3 */
-	public $position;
-	/** @var Vector3|null */
-	public $motion;
-	/** @var float */
-	public $pitch = 0.0;
-	/** @var float */
-	public $yaw = 0.0;
-	/** @var float */
-	public $headYaw = 0.0;
-
-	/** @var Attribute[] */
-	public $attributes = [];
-	/** @var array */
-	public $metadata = [];
-	/** @var EntityLink[] */
-	public $links = [];
-
-	protected function decodePayload(){
-		$this->entityUniqueId = $this->getEntityUniqueId();
-		$this->entityRuntimeId = $this->getEntityRuntimeId();
-		$this->type = array_search($t = $this->getString(), self::LEGACY_ID_MAP_BC, true);
-		if($this->type === false){
-			throw new \UnexpectedValueException("Can't map ID $t to legacy ID");
-		}
-		$this->position = $this->getVector3();
-		$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){
-			$name = $this->getString();
-			$min = $this->getLFloat();
-			$current = $this->getLFloat();
-			$max = $this->getLFloat();
-			$attr = Attribute::getAttributeByName($name);
-
-			if($attr !== null){
-				$attr->setMinValue($min);
-				$attr->setMaxValue($max);
-				$attr->setValue($current);
-				$this->attributes[] = $attr;
-			}else{
-				throw new \UnexpectedValueException("Unknown attribute type \"$name\"");
-			}
-		}
-
-		$this->metadata = $this->getEntityMetadata();
-		$linkCount = $this->getUnsignedVarInt();
-		for($i = 0; $i < $linkCount; ++$i){
-			$this->links[] = $this->getEntityLink();
-		}
+	public function getUvarint1() : int{
+		return $this->uvarint1;
 	}
 
-	protected function encodePayload(){
-		$this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId);
-		$this->putEntityRuntimeId($this->entityRuntimeId);
-		if(!isset(self::LEGACY_ID_MAP_BC[$this->type])){
-			throw new \InvalidArgumentException("Unknown entity numeric ID $this->type");
-		}
-		$this->putString(self::LEGACY_ID_MAP_BC[$this->type]);
-		$this->putVector3($this->position);
-		$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){
-			$this->putString($attribute->getName());
-			$this->putLFloat($attribute->getMinValue());
-			$this->putLFloat($attribute->getValue());
-			$this->putLFloat($attribute->getMaxValue());
-		}
-
-		$this->putEntityMetadata($this->metadata);
-		$this->putUnsignedVarInt(count($this->links));
-		foreach($this->links as $link){
-			$this->putEntityLink($link);
-		}
+	protected function decodePayload() : void{
+		$this->uvarint1 = $this->getUnsignedVarInt();
 	}
 
-	public function handle(NetworkSession $session) : bool{
-		return $session->handleAddEntity($this);
+	protected function encodePayload() : void{
+		$this->putUnsignedVarInt($this->uvarint1);
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleAddEntity($this);
 	}
 }

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

@@ -29,8 +29,8 @@ use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
 
-class AddItemEntityPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET;
+class AddItemActorPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ACTOR_PACKET;
 
 	/** @var int|null */
 	public $entityUniqueId = null; //TODO
@@ -68,6 +68,6 @@ class AddItemEntityPacket extends DataPacket{
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleAddItemEntity($this);
+		return $session->handleAddItemActor($this);
 	}
 }

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

@@ -26,30 +26,27 @@ namespace pocketmine\network\mcpe\protocol;
 #include <rules/DataPacket.h>
 
 
+use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\NetworkSession;
 
 class AddPaintingPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET;
 
-	/** @var string */
-	public $title;
-	/** @var int */
-	public $entityRuntimeId;
-	/** @var int */
-	public $x;
 	/** @var int|null */
 	public $entityUniqueId = null;
 	/** @var int */
-	public $y;
-	/** @var int */
-	public $z;
+	public $entityRuntimeId;
+	/** @var Vector3 */
+	public $position;
 	/** @var int */
 	public $direction;
+	/** @var string */
+	public $title;
 
 	protected function decodePayload(){
 		$this->entityUniqueId = $this->getEntityUniqueId();
 		$this->entityRuntimeId = $this->getEntityRuntimeId();
-		$this->getBlockPosition($this->x, $this->y, $this->z);
+		$this->position = $this->getVector3();
 		$this->direction = $this->getVarInt();
 		$this->title = $this->getString();
 	}
@@ -57,7 +54,7 @@ class AddPaintingPacket extends DataPacket{
 	protected function encodePayload(){
 		$this->putEntityUniqueId($this->entityUniqueId ?? $this->entityRuntimeId);
 		$this->putEntityRuntimeId($this->entityRuntimeId);
-		$this->putBlockPosition($this->x, $this->y, $this->z);
+		$this->putVector3($this->position);
 		$this->putVarInt($this->direction);
 		$this->putString($this->title);
 	}

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

@@ -74,6 +74,8 @@ class AddPlayerPacket extends DataPacket{
 
 	/** @var string */
 	public $deviceId = ""; //TODO: fill player's device ID (???)
+	/** @var int */
+	public $buildPlatform = -1;
 
 	protected function decodePayload(){
 		$this->uuid = $this->getUUID();
@@ -103,6 +105,7 @@ class AddPlayerPacket extends DataPacket{
 		}
 
 		$this->deviceId = $this->getString();
+		$this->buildPlatform = $this->getLInt();
 	}
 
 	protected function encodePayload(){
@@ -133,6 +136,7 @@ class AddPlayerPacket extends DataPacket{
 		}
 
 		$this->putString($this->deviceId);
+		$this->putLInt($this->buildPlatform);
 	}
 
 	public function handle(NetworkSession $session) : bool{

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

@@ -35,6 +35,8 @@ class AnimatePacket extends DataPacket{
 
 	public const ACTION_STOP_SLEEP = 3;
 	public const ACTION_CRITICAL_HIT = 4;
+	public const ACTION_ROW_RIGHT = 128;
+	public const ACTION_ROW_LEFT = 129;
 
 	/** @var int */
 	public $action;

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

@@ -0,0 +1,78 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+
+class AnvilDamagePacket extends DataPacket/* implements ServerboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::ANVIL_DAMAGE_PACKET;
+
+	/** @var int */
+	private $x;
+	/** @var int */
+	private $y;
+	/** @var int */
+	private $z;
+	/** @var int */
+	private $damageAmount;
+
+	public static function create(int $x, int $y, int $z, int $damageAmount) : self{
+		$result = new self;
+		[$result->x, $result->y, $result->z] = [$x, $y, $z];
+		$result->damageAmount = $damageAmount;
+		return $result;
+	}
+
+	public function getDamageAmount() : int{
+		return $this->damageAmount;
+	}
+
+	public function getX() : int{
+		return $this->x;
+	}
+
+	public function getY() : int{
+		return $this->y;
+	}
+
+	public function getZ() : int{
+		return $this->z;
+	}
+
+	protected function decodePayload() : void{
+		$this->damageAmount = $this->getByte();
+		$this->getBlockPosition($this->x, $this->y, $this->z);
+	}
+
+	protected function encodePayload() : void{
+		$this->putByte($this->damageAmount);
+		$this->putBlockPosition($this->x, $this->y, $this->z);
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleAnvilDamage($this);
+	}
+}

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

@@ -25,32 +25,31 @@ namespace pocketmine\network\mcpe\protocol;
 
 #include <rules/DataPacket.h>
 
-
 use pocketmine\network\mcpe\NetworkSession;
+use function file_get_contents;
 
-class FullChunkDataPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET;
+class AvailableActorIdentifiersPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::AVAILABLE_ACTOR_IDENTIFIERS_PACKET;
+
+	/** @var string|null */
+	private static $DEFAULT_NBT_CACHE = null;
 
-	/** @var int */
-	public $chunkX;
-	/** @var int */
-	public $chunkZ;
 	/** @var string */
-	public $data;
+	public $namedtag;
 
 	protected function decodePayload(){
-		$this->chunkX = $this->getVarInt();
-		$this->chunkZ = $this->getVarInt();
-		$this->data = $this->getString();
+		$this->namedtag = $this->getRemaining();
 	}
 
 	protected function encodePayload(){
-		$this->putVarInt($this->chunkX);
-		$this->putVarInt($this->chunkZ);
-		$this->putString($this->data);
+		$this->put(
+			$this->namedtag ??
+			self::$DEFAULT_NBT_CACHE ??
+			(self::$DEFAULT_NBT_CACHE = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/entity_identifiers.nbt'))
+		);
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleFullChunkData($this);
+		return $session->handleAvailableActorIdentifiers($this);
 	}
 }

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

@@ -28,12 +28,10 @@ namespace pocketmine\network\mcpe\protocol;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\types\CommandData;
 use pocketmine\network\mcpe\protocol\types\CommandEnum;
+use pocketmine\network\mcpe\protocol\types\CommandEnumConstraint;
 use pocketmine\network\mcpe\protocol\types\CommandParameter;
-use function array_flip;
-use function array_keys;
-use function array_map;
+use pocketmine\utils\BinaryDataException;
 use function array_search;
-use function array_values;
 use function count;
 use function dechex;
 
@@ -60,17 +58,17 @@ class AvailableCommandsPacket extends DataPacket{
 
 	public const ARG_TYPE_FILEPATH = 0x0e;
 
-	public const ARG_TYPE_STRING   = 0x1b;
+	public const ARG_TYPE_STRING   = 0x1d;
 
-	public const ARG_TYPE_POSITION = 0x1d;
+	public const ARG_TYPE_POSITION = 0x25;
 
-	public const ARG_TYPE_MESSAGE  = 0x20;
+	public const ARG_TYPE_MESSAGE  = 0x29;
 
-	public const ARG_TYPE_RAWTEXT  = 0x22;
+	public const ARG_TYPE_RAWTEXT  = 0x2b;
 
-	public const ARG_TYPE_JSON     = 0x25;
+	public const ARG_TYPE_JSON     = 0x2f;
 
-	public const ARG_TYPE_COMMAND  = 0x2c;
+	public const ARG_TYPE_COMMAND  = 0x36;
 
 	/**
 	 * Enums are a little different: they are composed as follows:
@@ -83,29 +81,9 @@ class AvailableCommandsPacket extends DataPacket{
 	 */
 	public const ARG_FLAG_POSTFIX = 0x1000000;
 
-	/**
-	 * @var string[]
-	 * A list of every single enum value for every single command in the packet, including alias names.
-	 */
-	public $enumValues = [];
-	/** @var int */
-	private $enumValuesCount = 0;
-
-	/**
-	 * @var string[]
-	 * A list of argument postfixes. Used for the /xp command's <int>L.
-	 */
-	public $postfixes = [];
-
-	/**
-	 * @var CommandEnum[]
-	 * List of command enums, from command aliases to argument enums.
-	 */
-	public $enums = [];
-	/**
-	 * @var int[] string => int map of enum name to index
-	 */
-	private $enumMap = [];
+	public const HARDCODED_ENUM_NAMES = [
+		"CommandName" => true
+	];
 
 	/**
 	 * @var CommandData[]
@@ -113,6 +91,13 @@ class AvailableCommandsPacket extends DataPacket{
 	 */
 	public $commandData = [];
 
+	/**
+	 * @var CommandEnum[]
+	 * List of enums which aren't directly referenced by any vanilla command.
+	 * This is used for the `CommandName` enum, which is a magic enum used by the `command` argument type.
+	 */
+	public $hardcodedEnums = [];
+
 	/**
 	 * @var CommandEnum[]
 	 * List of dynamic command enums, also referred to as "soft" enums. These can by dynamically updated mid-game
@@ -120,39 +105,67 @@ class AvailableCommandsPacket extends DataPacket{
 	 */
 	public $softEnums = [];
 
+	/**
+	 * @var CommandEnumConstraint[]
+	 * List of constraints for enum members. Used to constrain gamerules that can bechanged in nocheats mode and more.
+	 */
+	public $enumConstraints = [];
+
 	protected function decodePayload(){
-		for($i = 0, $this->enumValuesCount = $this->getUnsignedVarInt(); $i < $this->enumValuesCount; ++$i){
-			$this->enumValues[] = $this->getString();
+		/** @var string[] $enumValues */
+		$enumValues = [];
+		for($i = 0, $enumValuesCount = $this->getUnsignedVarInt(); $i < $enumValuesCount; ++$i){
+			$enumValues[] = $this->getString();
+		}
+
+		/** @var string[] $postfixes */
+		$postfixes = [];
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$postfixes[] = $this->getString();
+		}
+
+		/** @var CommandEnum[] $enums */
+		$enums = [];
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$enums[] = $enum = $this->getEnum($enumValues);
+			if(isset(self::HARDCODED_ENUM_NAMES[$enum->enumName])){
+				$this->hardcodedEnums[] = $enum;
+			}
 		}
 
 		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-			$this->postfixes[] = $this->getString();
-		}
-
-		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-			$this->enums[] = $this->getEnum();
-		}
-
-		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-			$this->commandData[] = $this->getCommandData();
+			$this->commandData[] = $this->getCommandData($enums, $postfixes);
 		}
 
 		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
 			$this->softEnums[] = $this->getSoftEnum();
 		}
+
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$this->enumConstraints[] = $this->getEnumConstraint($enums, $enumValues);
+		}
 	}
 
-	protected function getEnum() : CommandEnum{
+	/**
+	 * @param string[] $enumValueList
+	 *
+	 * @return CommandEnum
+	 * @throws \UnexpectedValueException
+	 * @throws BinaryDataException
+	 */
+	protected function getEnum(array $enumValueList) : CommandEnum{
 		$retval = new CommandEnum();
 		$retval->enumName = $this->getString();
 
+		$listSize = count($enumValueList);
+
 		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
-			$index = $this->getEnumValueIndex();
-			if(!isset($this->enumValues[$index])){
+			$index = $this->getEnumValueIndex($listSize);
+			if(!isset($enumValueList[$index])){
 				throw new \UnexpectedValueException("Invalid enum value index $index");
 			}
 			//Get the enum value from the initial pile of mess
-			$retval->enumValues[] = $this->enumValues[$index];
+			$retval->enumValues[] = $enumValueList[$index];
 		}
 
 		return $retval;
@@ -170,17 +183,21 @@ class AvailableCommandsPacket extends DataPacket{
 		return $retval;
 	}
 
-	protected function putEnum(CommandEnum $enum){
+	/**
+	 * @param CommandEnum $enum
+	 * @param int[]       $enumValueMap string enum name -> int index
+	 */
+	protected function putEnum(CommandEnum $enum, array $enumValueMap) : void{
 		$this->putString($enum->enumName);
 
 		$this->putUnsignedVarInt(count($enum->enumValues));
+		$listSize = count($enumValueMap);
 		foreach($enum->enumValues as $value){
-			//Dumb bruteforce search. I hate this packet.
-			$index = array_search($value, $this->enumValues, true);
-			if($index === false){
+			$index = $enumValueMap[$value] ?? -1;
+			if($index === -1){
 				throw new \InvalidStateException("Enum value '$value' not found");
 			}
-			$this->putEnumValueIndex($index);
+			$this->putEnumValueIndex($index, $listSize);
 		}
 	}
 
@@ -193,51 +210,110 @@ class AvailableCommandsPacket extends DataPacket{
 		}
 	}
 
-	protected function getEnumValueIndex() : int{
-		if($this->enumValuesCount < 256){
+	/**
+	 * @param int $valueCount
+	 *
+	 * @return int
+	 * @throws BinaryDataException
+	 */
+	protected function getEnumValueIndex(int $valueCount) : int{
+		if($valueCount < 256){
 			return $this->getByte();
-		}elseif($this->enumValuesCount < 65536){
+		}elseif($valueCount < 65536){
 			return $this->getLShort();
 		}else{
 			return $this->getLInt();
 		}
 	}
 
-	protected function putEnumValueIndex(int $index){
-		if($this->enumValuesCount < 256){
+	protected function putEnumValueIndex(int $index, int $valueCount) : void{
+		if($valueCount < 256){
 			$this->putByte($index);
-		}elseif($this->enumValuesCount < 65536){
+		}elseif($valueCount < 65536){
 			$this->putLShort($index);
 		}else{
 			$this->putLInt($index);
 		}
 	}
 
-	protected function getCommandData() : CommandData{
+	/**
+	 * @param CommandEnum[] $enums
+	 * @param string[]      $enumValues
+	 *
+	 * @return CommandEnumConstraint
+	 */
+	protected function getEnumConstraint(array $enums, array $enumValues) : CommandEnumConstraint{
+		//wtf, what was wrong with an offset inside the enum? :(
+		$valueIndex = $this->getLInt();
+		if(!isset($enumValues[$valueIndex])){
+			throw new \UnexpectedValueException("Enum constraint refers to unknown enum value index $valueIndex");
+		}
+		$enumIndex = $this->getLInt();
+		if(!isset($enums[$enumIndex])){
+			throw new \UnexpectedValueException("Enum constraint refers to unknown enum index $enumIndex");
+		}
+		$enum = $enums[$enumIndex];
+		$valueOffset = array_search($enumValues[$valueIndex], $enum->enumValues, true);
+		if($valueOffset === false){
+			throw new \UnexpectedValueException("Value \"" . $enumValues[$valueIndex] . "\" does not belong to enum \"$enum->enumName\"");
+		}
+
+		$constraintIds = [];
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$constraintIds[] = $this->getByte();
+		}
+
+		return new CommandEnumConstraint($enum, $valueOffset, $constraintIds);
+	}
+
+	/**
+	 * @param CommandEnumConstraint $constraint
+	 * @param int[]                 $enumIndexes string enum name -> int index
+	 * @param int[]                 $enumValueIndexes string value -> int index
+	 */
+	protected function putEnumConstraint(CommandEnumConstraint $constraint, array $enumIndexes, array $enumValueIndexes) : void{
+		$this->putLInt($enumValueIndexes[$constraint->getAffectedValue()]);
+		$this->putLInt($enumIndexes[$constraint->getEnum()->enumName]);
+		$this->putUnsignedVarInt(count($constraint->getConstraints()));
+		foreach($constraint->getConstraints() as $v){
+			$this->putByte($v);
+		}
+	}
+
+	/**
+	 * @param CommandEnum[] $enums
+	 * @param string[]      $postfixes
+	 *
+	 * @return CommandData
+	 * @throws \UnexpectedValueException
+	 * @throws BinaryDataException
+	 */
+	protected function getCommandData(array $enums, array $postfixes) : CommandData{
 		$retval = new CommandData();
 		$retval->commandName = $this->getString();
 		$retval->commandDescription = $this->getString();
 		$retval->flags = $this->getByte();
 		$retval->permission = $this->getByte();
-		$retval->aliases = $this->enums[$this->getLInt()] ?? null;
+		$retval->aliases = $enums[$this->getLInt()] ?? null;
 
 		for($overloadIndex = 0, $overloadCount = $this->getUnsignedVarInt(); $overloadIndex < $overloadCount; ++$overloadIndex){
+			$retval->overloads[$overloadIndex] = [];
 			for($paramIndex = 0, $paramCount = $this->getUnsignedVarInt(); $paramIndex < $paramCount; ++$paramIndex){
 				$parameter = new CommandParameter();
 				$parameter->paramName = $this->getString();
 				$parameter->paramType = $this->getLInt();
 				$parameter->isOptional = $this->getBool();
-				$parameter->byte1 = $this->getByte();
+				$parameter->flags = $this->getByte();
 
 				if($parameter->paramType & self::ARG_FLAG_ENUM){
 					$index = ($parameter->paramType & 0xffff);
-					$parameter->enum = $this->enums[$index] ?? null;
+					$parameter->enum = $enums[$index] ?? null;
 					if($parameter->enum === null){
 						throw new \UnexpectedValueException("deserializing $retval->commandName parameter $parameter->paramName: expected enum at $index, but got none");
 					}
 				}elseif($parameter->paramType & self::ARG_FLAG_POSTFIX){
 					$index = ($parameter->paramType & 0xffff);
-					$parameter->postfix = $this->postfixes[$index] ?? null;
+					$parameter->postfix = $postfixes[$index] ?? null;
 					if($parameter->postfix === null){
 						throw new \UnexpectedValueException("deserializing $retval->commandName parameter $parameter->paramName: expected postfix at $index, but got none");
 					}
@@ -252,14 +328,19 @@ class AvailableCommandsPacket extends DataPacket{
 		return $retval;
 	}
 
-	protected function putCommandData(CommandData $data){
+	/**
+	 * @param CommandData $data
+	 * @param int[]       $enumIndexes string enum name -> int index
+	 * @param int[]       $postfixIndexes
+	 */
+	protected function putCommandData(CommandData $data, array $enumIndexes, array $postfixIndexes) : void{
 		$this->putString($data->commandName);
 		$this->putString($data->commandDescription);
 		$this->putByte($data->flags);
 		$this->putByte($data->permission);
 
 		if($data->aliases !== null){
-			$this->putLInt($this->enumMap[$data->aliases->enumName] ?? -1);
+			$this->putLInt($enumIndexes[$data->aliases->enumName] ?? -1);
 		}else{
 			$this->putLInt(-1);
 		}
@@ -272,10 +353,10 @@ class AvailableCommandsPacket extends DataPacket{
 				$this->putString($parameter->paramName);
 
 				if($parameter->enum !== null){
-					$type = self::ARG_FLAG_ENUM | self::ARG_FLAG_VALID | ($this->enumMap[$parameter->enum->enumName] ?? -1);
+					$type = self::ARG_FLAG_ENUM | self::ARG_FLAG_VALID | ($enumIndexes[$parameter->enum->enumName] ?? -1);
 				}elseif($parameter->postfix !== null){
-					$key = array_search($parameter->postfix, $this->postfixes, true);
-					if($key === false){
+					$key = $postfixIndexes[$parameter->postfix] ?? -1;
+					if($key === -1){
 						throw new \InvalidStateException("Postfix '$parameter->postfix' not in postfixes array");
 					}
 					$type = self::ARG_FLAG_POSTFIX | $key;
@@ -285,12 +366,12 @@ class AvailableCommandsPacket extends DataPacket{
 
 				$this->putLInt($type);
 				$this->putBool($parameter->isOptional);
-				$this->putByte($parameter->byte1);
+				$this->putByte($parameter->flags);
 			}
 		}
 	}
 
-	private function argTypeToString(int $argtype) : string{
+	private function argTypeToString(int $argtype, array $postfixes) : string{
 		if($argtype & self::ARG_FLAG_VALID){
 			if($argtype & self::ARG_FLAG_ENUM){
 				return "stringenum (" . ($argtype & 0xffff) . ")";
@@ -319,7 +400,7 @@ class AvailableCommandsPacket extends DataPacket{
 					return "command";
 			}
 		}elseif($argtype & self::ARG_FLAG_POSTFIX){
-			$postfix = $this->postfixes[$argtype & 0xffff];
+			$postfix = $postfixes[$argtype & 0xffff];
 
 			return "int (postfix $postfix)";
 		}else{
@@ -330,66 +411,74 @@ class AvailableCommandsPacket extends DataPacket{
 	}
 
 	protected function encodePayload(){
-		$enumValuesMap = [];
-		$postfixesMap = [];
-		$enumMap = [];
+		/** @var int[] $enumValueIndexes */
+		$enumValueIndexes = [];
+		/** @var int[] $postfixIndexes */
+		$postfixIndexes = [];
+		/** @var int[] $enumIndexes */
+		$enumIndexes = [];
+		/** @var CommandEnum[] $enums */
+		$enums = [];
+
+		$addEnumFn = static function(CommandEnum $enum) use (&$enums, &$enumIndexes, &$enumValueIndexes){
+			if(!isset($enumIndexes[$enum->enumName])){
+				$enums[$enumIndexes[$enum->enumName] = count($enumIndexes)] = $enum;
+			}
+			foreach($enum->enumValues as $str){
+				$enumValueIndexes[$str] = $enumValueIndexes[$str] ?? count($enumValueIndexes);
+			}
+		};
+		foreach($this->hardcodedEnums as $enum){
+			$addEnumFn($enum);
+		}
 		foreach($this->commandData as $commandData){
 			if($commandData->aliases !== null){
-				$enumMap[$commandData->aliases->enumName] = $commandData->aliases;
-
-				foreach($commandData->aliases->enumValues as $str){
-					$enumValuesMap[$str] = true;
-				}
+				$addEnumFn($commandData->aliases);
 			}
-
+			/** @var CommandParameter[] $overload */
 			foreach($commandData->overloads as $overload){
-				/**
-				 * @var CommandParameter[] $overload
-				 * @var CommandParameter   $parameter
-				 */
+				/** @var CommandParameter $parameter */
 				foreach($overload as $parameter){
 					if($parameter->enum !== null){
-						$enumMap[$parameter->enum->enumName] = $parameter->enum;
-						foreach($parameter->enum->enumValues as $str){
-							$enumValuesMap[$str] = true;
-						}
+						$addEnumFn($parameter->enum);
 					}
 
 					if($parameter->postfix !== null){
-						$postfixesMap[$parameter->postfix] = true;
+						$postfixIndexes[$parameter->postfix] = $postfixIndexes[$parameter->postfix] ?? count($postfixIndexes);
 					}
 				}
 			}
 		}
 
-		$this->enumValues = array_map('\strval', array_keys($enumValuesMap)); //stupid PHP key casting D:
-		$this->putUnsignedVarInt($this->enumValuesCount = count($this->enumValues));
-		foreach($this->enumValues as $enumValue){
-			$this->putString($enumValue);
+		$this->putUnsignedVarInt(count($enumValueIndexes));
+		foreach($enumValueIndexes as $enumValue => $index){
+			$this->putString((string) $enumValue); //stupid PHP key casting D:
 		}
 
-		$this->postfixes = array_map('\strval', array_keys($postfixesMap));
-		$this->putUnsignedVarInt(count($this->postfixes));
-		foreach($this->postfixes as $postfix){
-			$this->putString($postfix);
+		$this->putUnsignedVarInt(count($postfixIndexes));
+		foreach($postfixIndexes as $postfix => $index){
+			$this->putString((string) $postfix); //stupid PHP key casting D:
 		}
 
-		$this->enums = array_values($enumMap);
-		$this->enumMap = array_flip(array_keys($enumMap));
-		$this->putUnsignedVarInt(count($this->enums));
-		foreach($this->enums as $enum){
-			$this->putEnum($enum);
+		$this->putUnsignedVarInt(count($enums));
+		foreach($enums as $enum){
+			$this->putEnum($enum, $enumValueIndexes);
 		}
 
 		$this->putUnsignedVarInt(count($this->commandData));
 		foreach($this->commandData as $data){
-			$this->putCommandData($data);
+			$this->putCommandData($data, $enumIndexes, $postfixIndexes);
 		}
 
 		$this->putUnsignedVarInt(count($this->softEnums));
 		foreach($this->softEnums as $enum){
 			$this->putSoftEnum($enum);
 		}
+
+		$this->putUnsignedVarInt(count($this->enumConstraints));
+		foreach($this->enumConstraints as $constraint){
+			$this->putEnumConstraint($constraint, $enumIndexes, $enumValueIndexes);
+		}
 	}
 
 	public function handle(NetworkSession $session) : bool{

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

@@ -26,11 +26,14 @@ namespace pocketmine\network\mcpe\protocol;
 #include <rules/DataPacket.h>
 
 use pocketmine\network\mcpe\NetworkSession;
+use function file_get_contents;
 
 class BiomeDefinitionListPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::BIOME_DEFINITION_LIST_PACKET;
 
-	public const HARDCODED_NBT_BLOB = "CgAKDWJhbWJvb19qdW5nbGUFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoTYmFtYm9vX2p1bmdsZV9oaWxscwUIZG93bmZhbGxmZmY/BQt0ZW1wZXJhdHVyZTMzcz8ACgViZWFjaAUIZG93bmZhbGzNzMw+BQt0ZW1wZXJhdHVyZc3MTD8ACgxiaXJjaF9mb3Jlc3QFCGRvd25mYWxsmpkZPwULdGVtcGVyYXR1cmWamRk/AAoSYmlyY2hfZm9yZXN0X2hpbGxzBQhkb3duZmFsbJqZGT8FC3RlbXBlcmF0dXJlmpkZPwAKGmJpcmNoX2ZvcmVzdF9oaWxsc19tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKFGJpcmNoX2ZvcmVzdF9tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKCmNvbGRfYmVhY2gFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw9AAoKY29sZF9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgpjb2xkX3RhaWdhBQhkb3duZmFsbM3MzD4FC3RlbXBlcmF0dXJlAAAAvwAKEGNvbGRfdGFpZ2FfaGlsbHMFCGRvd25mYWxszczMPgULdGVtcGVyYXR1cmUAAAC/AAoSY29sZF90YWlnYV9tdXRhdGVkBQhkb3duZmFsbM3MzD4FC3RlbXBlcmF0dXJlAAAAvwAKD2RlZXBfY29sZF9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8AChFkZWVwX2Zyb3plbl9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAAChNkZWVwX2x1a2V3YXJtX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKCmRlZXBfb2NlYW4FCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAA/AAoPZGVlcF93YXJtX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKBmRlc2VydAUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAACgxkZXNlcnRfaGlsbHMFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoOZGVzZXJ0X211dGF0ZWQFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoNZXh0cmVtZV9oaWxscwUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4AChJleHRyZW1lX2hpbGxzX2VkZ2UFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw+AAoVZXh0cmVtZV9oaWxsc19tdXRhdGVkBQhkb3duZmFsbJqZmT4FC3RlbXBlcmF0dXJlzcxMPgAKGGV4dHJlbWVfaGlsbHNfcGx1c190cmVlcwUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4ACiBleHRyZW1lX2hpbGxzX3BsdXNfdHJlZXNfbXV0YXRlZAUIZG93bmZhbGyamZk+BQt0ZW1wZXJhdHVyZc3MTD4ACg1mbG93ZXJfZm9yZXN0BQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKBmZvcmVzdAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzMz8ACgxmb3Jlc3RfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUzMzM/AAoMZnJvemVuX29jZWFuBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAAAAKDGZyb3plbl9yaXZlcgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAACgRoZWxsBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlAAAAQAAKDWljZV9tb3VudGFpbnMFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAAAAAoKaWNlX3BsYWlucwUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAAChFpY2VfcGxhaW5zX3NwaWtlcwUIZG93bmZhbGwAAIA/BQt0ZW1wZXJhdHVyZQAAAAAACgZqdW5nbGUFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoLanVuZ2xlX2VkZ2UFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUzM3M/AAoTanVuZ2xlX2VkZ2VfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzcz8ACgxqdW5nbGVfaGlsbHMFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoOanVuZ2xlX211dGF0ZWQFCGRvd25mYWxsZmZmPwULdGVtcGVyYXR1cmUzM3M/AAoTbGVnYWN5X2Zyb3plbl9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAAAACg5sdWtld2FybV9vY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgptZWdhX3RhaWdhBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlmpmZPgAKEG1lZ2FfdGFpZ2FfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmWamZk+AAoEbWVzYQUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAACgptZXNhX2JyeWNlBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlAAAAQAAKDG1lc2FfcGxhdGVhdQUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAAChRtZXNhX3BsYXRlYXVfbXV0YXRlZAUIZG93bmZhbGwAAAAABQt0ZW1wZXJhdHVyZQAAAEAAChJtZXNhX3BsYXRlYXVfc3RvbmUFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoabWVzYV9wbGF0ZWF1X3N0b25lX211dGF0ZWQFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAABAAAoPbXVzaHJvb21faXNsYW5kBQhkb3duZmFsbAAAgD8FC3RlbXBlcmF0dXJlZmZmPwAKFW11c2hyb29tX2lzbGFuZF9zaG9yZQUIZG93bmZhbGwAAIA/BQt0ZW1wZXJhdHVyZWZmZj8ACgVvY2VhbgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACgZwbGFpbnMFCGRvd25mYWxszczMPgULdGVtcGVyYXR1cmXNzEw/AAobcmVkd29vZF90YWlnYV9oaWxsc19tdXRhdGVkBQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlmpmZPgAKFXJlZHdvb2RfdGFpZ2FfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZQAAgD4ACgVyaXZlcgUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZQAAAD8ACg1yb29mZWRfZm9yZXN0BQhkb3duZmFsbM3MTD8FC3RlbXBlcmF0dXJlMzMzPwAKFXJvb2ZlZF9mb3Jlc3RfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZTMzMz8ACgdzYXZhbm5hBQhkb3duZmFsbAAAAAAFC3RlbXBlcmF0dXJlmpmZPwAKD3NhdmFubmFfbXV0YXRlZAUIZG93bmZhbGwAAAA/BQt0ZW1wZXJhdHVyZc3MjD8ACg9zYXZhbm5hX3BsYXRlYXUFCGRvd25mYWxsAAAAAAULdGVtcGVyYXR1cmUAAIA/AAoXc2F2YW5uYV9wbGF0ZWF1X211dGF0ZWQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAIA/AAoLc3RvbmVfYmVhY2gFCGRvd25mYWxsmpmZPgULdGVtcGVyYXR1cmXNzEw+AAoQc3VuZmxvd2VyX3BsYWlucwUIZG93bmZhbGzNzMw+BQt0ZW1wZXJhdHVyZc3MTD8ACglzd2FtcGxhbmQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmXNzEw/AAoRc3dhbXBsYW5kX211dGF0ZWQFCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmXNzEw/AAoFdGFpZ2EFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUAAIA+AAoLdGFpZ2FfaGlsbHMFCGRvd25mYWxszcxMPwULdGVtcGVyYXR1cmUAAIA+AAoNdGFpZ2FfbXV0YXRlZAUIZG93bmZhbGzNzEw/BQt0ZW1wZXJhdHVyZQAAgD4ACgd0aGVfZW5kBQhkb3duZmFsbAAAAD8FC3RlbXBlcmF0dXJlAAAAPwAKCndhcm1fb2NlYW4FCGRvd25mYWxsAAAAPwULdGVtcGVyYXR1cmUAAAA/AAA=";
+	/** @var string|null */
+	private static $DEFAULT_NBT_CACHE = null;
+
 	/** @var string */
 	public $namedtag;
 
@@ -39,7 +42,11 @@ class BiomeDefinitionListPacket extends DataPacket{
 	}
 
 	protected function encodePayload(){
-		$this->put($this->namedtag ?? self::HARDCODED_NBT_BLOB);
+		$this->put(
+			$this->namedtag ??
+			self::$DEFAULT_NBT_CACHE ??
+			(self::$DEFAULT_NBT_CACHE = file_get_contents(\pocketmine\RESOURCE_PATH . '/vanilla/biome_definitions.nbt'))
+		);
 	}
 
 	public function handle(NetworkSession $session) : bool{

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

@@ -28,8 +28,8 @@ namespace pocketmine\network\mcpe\protocol;
 
 use pocketmine\network\mcpe\NetworkSession;
 
-class BlockEntityDataPacket extends DataPacket{
-	public const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET;
+class BlockActorDataPacket extends DataPacket{
+	public const NETWORK_ID = ProtocolInfo::BLOCK_ACTOR_DATA_PACKET;
 
 	/** @var int */
 	public $x;
@@ -51,6 +51,6 @@ class BlockEntityDataPacket extends DataPacket{
 	}
 
 	public function handle(NetworkSession $session) : bool{
-		return $session->handleBlockEntityData($this);
+		return $session->handleBlockActorData($this);
 	}
 }

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

@@ -39,9 +39,9 @@ class BossEventPacket extends DataPacket{
 	public const TYPE_HIDE = 2;
 	/* C2S: Unregisters a player from a boss fight. */
 	public const TYPE_UNREGISTER_PLAYER = 3;
-	/* S2C: Appears not to be implemented. Currently bar percentage only appears to change in response to the target entity's health. */
+	/* S2C: Sets the bar percentage. */
 	public const TYPE_HEALTH_PERCENT = 4;
-	/* S2C: Also appears to not be implemented. Title client-side sticks as the target entity's nametag, or their entity type name if not set. */
+	/* S2C: Sets title of the bar. */
 	public const TYPE_TITLE = 5;
 	/* S2C: Not sure on this. Includes color and overlay fields, plus an unknown short. TODO: check this */
 	public const TYPE_UNKNOWN_6 = 6;

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

@@ -0,0 +1,95 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+use function count;
+
+class ClientCacheBlobStatusPacket extends DataPacket/* implements ServerboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CLIENT_CACHE_BLOB_STATUS_PACKET;
+
+	/** @var int[] xxHash64 subchunk data hashes */
+	private $hitHashes = [];
+	/** @var int[] xxHash64 subchunk data hashes */
+	private $missHashes = [];
+
+	/**
+	 * @param int[] $hitHashes
+	 * @param int[] $missHashes
+	 *
+	 * @return self
+	 */
+	public static function create(array $hitHashes, array $missHashes) : self{
+		//type checks
+		(static function(int ...$hashes){})(...$hitHashes);
+		(static function(int ...$hashes){})(...$missHashes);
+
+		$result = new self;
+		$result->hitHashes = $hitHashes;
+		$result->missHashes = $missHashes;
+		return $result;
+	}
+
+	/**
+	 * @return int[]
+	 */
+	public function getHitHashes() : array{
+		return $this->hitHashes;
+	}
+
+	/**
+	 * @return int[]
+	 */
+	public function getMissHashes() : array{
+		return $this->missHashes;
+	}
+
+	protected function decodePayload() : void{
+		$hitCount = $this->getUnsignedVarInt();
+		$missCount = $this->getUnsignedVarInt();
+		for($i = 0; $i < $hitCount; ++$i){
+			$this->hitHashes[] = $this->getLLong();
+		}
+		for($i = 0; $i < $missCount; ++$i){
+			$this->missHashes[] = $this->getLLong();
+		}
+	}
+
+	protected function encodePayload() : void{
+		$this->putUnsignedVarInt(count($this->hitHashes));
+		$this->putUnsignedVarInt(count($this->missHashes));
+		foreach($this->hitHashes as $hash){
+			$this->putLLong($hash);
+		}
+		foreach($this->missHashes as $hash){
+			$this->putLLong($hash);
+		}
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleClientCacheBlobStatus($this);
+	}
+}

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

@@ -0,0 +1,78 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+use pocketmine\network\mcpe\protocol\types\ChunkCacheBlob;
+use function count;
+
+class ClientCacheMissResponsePacket extends DataPacket/* implements ClientboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CLIENT_CACHE_MISS_RESPONSE_PACKET;
+
+	/** @var ChunkCacheBlob[] */
+	private $blobs = [];
+
+	/**
+	 * @param ChunkCacheBlob[] $blobs
+	 *
+	 * @return self
+	 */
+	public static function create(array $blobs) : self{
+		//type check
+		(static function(ChunkCacheBlob ...$blobs){})(...$blobs);
+
+		$result = new self;
+		$result->blobs = $blobs;
+		return $result;
+	}
+
+	/**
+	 * @return ChunkCacheBlob[]
+	 */
+	public function getBlobs() : array{
+		return $this->blobs;
+	}
+
+	protected function decodePayload() : void{
+		for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
+			$hash = $this->getLLong();
+			$payload = $this->getString();
+			$this->blobs[] = new ChunkCacheBlob($hash, $payload);
+		}
+	}
+
+	protected function encodePayload() : void{
+		$this->putUnsignedVarInt(count($this->blobs));
+		foreach($this->blobs as $blob){
+			$this->putLLong($blob->getHash());
+			$this->putString($blob->getPayload());
+		}
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleClientCacheMissResponse($this);
+	}
+}

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

@@ -0,0 +1,60 @@
+<?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\network\mcpe\protocol;
+
+#include <rules/DataPacket.h>
+
+use pocketmine\network\mcpe\NetworkSession;
+
+class ClientCacheStatusPacket extends DataPacket/* implements ServerboundPacket*/{
+	public const NETWORK_ID = ProtocolInfo::CLIENT_CACHE_STATUS_PACKET;
+
+	/** @var bool */
+	private $enabled;
+
+	public static function create(bool $enabled) : self{
+		$result = new self;
+		$result->enabled = $enabled;
+		return $result;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isEnabled() : bool{
+		return $this->enabled;
+	}
+
+	protected function decodePayload() : void{
+		$this->enabled = $this->getBool();
+	}
+
+	protected function encodePayload() : void{
+		$this->putBool($this->enabled);
+	}
+
+	public function handle(NetworkSession $handler) : bool{
+		return $handler->handleClientCacheStatus($this);
+	}
+}