Release 3.9.5

closes #3113

.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

.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

README.md

@@ -5,23 +5,24 @@
 
 [![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/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
+## Donate
 - Bitcoin Cash (BCH): `qq3r46hn6ljnhnqnfwxt5pg3g447eq9jhvw5ddfear`
 - Bitcoin (BTC): `171u8K9e4FtU6j3e5sqNoxKUgEw9qWQdRV`
 - [Patreon](https://www.patreon.com/pocketminemp)

changelogs/3.9.md

@@ -52,3 +52,25 @@ Plugin developers should **only** update their required API to this version if y
 - 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.

doxygen/doxygen.conf

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

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");

src/pocketmine/PocketMine.php

@@ -121,176 +121,180 @@ 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;
-		}
-		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);
-	}
-
-	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);
+
+		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;
+		/*
+		 * 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";
+				}
+			}
+		}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");
 
-		$killer = new ServerKiller(8);
-		$killer->start(PTHREADS_INHERIT_NONE);
-		usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
+		@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
+		@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
 
-		if(ThreadManager::getInstance()->stopAll() > 0){
-			if(\pocketmine\DEBUG > 1){
-				echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
+		$exitCode = 0;
+		do{
+			if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
+				$installer = new SetupWizard();
+				if(!$installer->run()){
+					$exitCode = -1;
+					break;
+				}
 			}
-			Utils::kill(getmypid());
-		}
-	}while(false);
 
-	$logger->shutdown();
-	$logger->join();
+			//TODO: move this to a Server field
+			define('pocketmine\START_TIME', microtime(true));
+			ThreadManager::init();
+			new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
 
-	echo Terminal::$FORMAT_RESET . PHP_EOL;
+			$logger->info("Stopping other threads");
 
-	exit($exitCode);
+			$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){
+				if(\pocketmine\DEBUG > 1){
+					echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
+				}
+				Utils::kill(getmypid());
+			}
+		}while(false);
+
+		$logger->shutdown();
+		$logger->join();
+
+		echo Terminal::$FORMAT_RESET . PHP_EOL;
+
+		exit($exitCode);
+	}
+
+	\pocketmine\server();
 }

src/pocketmine/Server.php

@@ -2200,6 +2200,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();

src/pocketmine/VersionInfo.php

@@ -22,6 +22,6 @@
 namespace pocketmine;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.9.2";
+const BASE_VERSION = "3.9.5";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;

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

@@ -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;
@@ -1782,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{
@@ -2071,6 +2074,9 @@ 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
 	 */
@@ -2085,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);

src/pocketmine/entity/object/FallingBlock.php

@@ -33,6 +33,8 @@ use pocketmine\item\ItemFactory;
 use pocketmine\level\Position;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\IntTag;
+use function abs;
+use function floor;
 use function get_class;
 
 class FallingBlock extends Entity{
@@ -110,7 +112,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/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/level/Level.php

@@ -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/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/network/mcpe/NetworkBinaryStream.php

@@ -227,8 +227,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();
@@ -279,8 +279,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];

src/pocketmine/network/mcpe/PlayerNetworkSessionAdapter.php

@@ -74,7 +74,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;
@@ -270,16 +269,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/plugin/PluginManager.php

@@ -305,7 +305,7 @@ class PluginManager{
 
 
 		while(count($plugins) > 0){
-			$missingDependency = true;
+			$loadedThisLoop = 0;
 			foreach($plugins as $name => $file){
 				if(isset($dependencies[$name])){
 					foreach($dependencies[$name] as $key => $dependency){
@@ -329,7 +329,14 @@ class PluginManager{
 				if(isset($softDependencies[$name])){
 					foreach($softDependencies[$name] as $key => $dependency){
 						if(isset($loadedPlugins[$dependency]) or $this->getPlugin($dependency) instanceof Plugin){
+							$this->server->getLogger()->debug("Successfully resolved soft dependency \"$dependency\" for plugin \"$name\"");
 							unset($softDependencies[$name][$key]);
+						}elseif(!isset($plugins[$dependency])){
+							//this dependency is never going to be resolved, so don't bother trying
+							$this->server->getLogger()->debug("Skipping resolution of missing soft dependency \"$dependency\" for plugin \"$name\"");
+							unset($softDependencies[$name][$key]);
+						}else{
+							$this->server->getLogger()->debug("Deferring resolution of soft dependency \"$dependency\" for plugin \"$name\" (found but not loaded yet)");
 						}
 					}
 
@@ -340,7 +347,7 @@ class PluginManager{
 
 				if(!isset($dependencies[$name]) and !isset($softDependencies[$name])){
 					unset($plugins[$name]);
-					$missingDependency = false;
+					$loadedThisLoop++;
 					if($plugin = $this->loadPlugin($file, $loaders) and $plugin instanceof Plugin){
 						$loadedPlugins[$name] = $plugin;
 					}else{
@@ -349,27 +356,12 @@ class PluginManager{
 				}
 			}
 
-			if($missingDependency){
-				foreach($plugins as $name => $file){
-					if(!isset($dependencies[$name])){
-						unset($softDependencies[$name]);
-						unset($plugins[$name]);
-						$missingDependency = false;
-						if($plugin = $this->loadPlugin($file, $loaders) and $plugin instanceof Plugin){
-							$loadedPlugins[$name] = $plugin;
-						}else{
-							$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.genericLoadError", [$name]));
-						}
-					}
-				}
-
+			if($loadedThisLoop === 0){
 				//No plugins loaded :(
-				if($missingDependency){
-					foreach($plugins as $name => $file){
-						$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.circularDependency"]));
-					}
-					$plugins = [];
+				foreach($plugins as $name => $file){
+					$this->server->getLogger()->critical($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.circularDependency"]));
 				}
+				$plugins = [];
 			}
 		}
 

src/pocketmine/resourcepacks/ZippedResourcePack.php

@@ -104,7 +104,9 @@ class ZippedResourcePack implements ResourcePack{
 		}catch(\RuntimeException $e){
 			throw new ResourcePackException("Failed to parse manifest.json: " . $e->getMessage(), $e->getCode(), $e);
 		}
-
+		if(!($manifest instanceof \stdClass)){
+			throw new ResourcePackException("manifest.json should contain a JSON object, not " . gettype($manifest));
+		}
 		if(!self::verifyManifest($manifest)){
 			throw new ResourcePackException("manifest.json is missing required fields");
 		}

src/pocketmine/scheduler/AsyncPool.php

@@ -248,6 +248,7 @@ class AsyncPool{
 			$this->workerUsage[$this->taskWorkers[$task->getTaskId()]]--;
 		}
 
+		$task->removeDanglingStoredObjects();
 		unset($this->tasks[$task->getTaskId()]);
 		unset($this->taskWorkers[$task->getTaskId()]);
 	}

src/pocketmine/scheduler/AsyncTask.php

@@ -34,12 +34,12 @@ use function unserialize;
  *
  * An AsyncTask does not have its own thread. It is queued into an AsyncPool and executed if there is an async worker
  * with no AsyncTask running. Therefore, an AsyncTask SHOULD NOT execute for more than a few seconds. For tasks that
- * run for a long time or infinitely, start another {@link \pocketmine\Thread} instead.
+ * run for a long time or infinitely, start another thread instead.
  *
  * WARNING: Any non-Threaded objects WILL BE SERIALIZED when assigned to members of AsyncTasks or other Threaded object.
  * If later accessed from said Threaded object, you will be operating on a COPY OF THE OBJECT, NOT THE ORIGINAL OBJECT.
  * If you want to store non-serializable objects to access when the task completes, store them using
- * {@link AsyncTask#storeLocal}.
+ * {@link AsyncTask::storeLocal}.
  *
  * WARNING: As of pthreads v3.1.6, arrays are converted to Volatile objects when assigned as members of Threaded objects.
  * Keep this in mind when using arrays stored as members of your AsyncTask.
@@ -185,8 +185,8 @@ abstract class AsyncTask extends Collectable{
 	}
 
 	/**
-	 * Call this method from {@link AsyncTask#onRun} (AsyncTask execution thread) to schedule a call to
-	 * {@link AsyncTask#onProgressUpdate} from the main thread with the given progress parameter.
+	 * Call this method from {@link AsyncTask::onRun} (AsyncTask execution thread) to schedule a call to
+	 * {@link AsyncTask::onProgressUpdate} from the main thread with the given progress parameter.
 	 *
 	 * @param mixed $progress A value that can be safely serialize()'ed.
 	 */
@@ -207,12 +207,12 @@ abstract class AsyncTask extends Collectable{
 	}
 
 	/**
-	 * Called from the main thread after {@link AsyncTask#publishProgress} is called.
-	 * All {@link AsyncTask#publishProgress} calls should result in {@link AsyncTask#onProgressUpdate} calls before
-	 * {@link AsyncTask#onCompletion} is called.
+	 * Called from the main thread after {@link AsyncTask::publishProgress} is called.
+	 * All {@link AsyncTask::publishProgress} calls should result in {@link AsyncTask::onProgressUpdate} calls before
+	 * {@link AsyncTask::onCompletion} is called.
 	 *
 	 * @param Server $server
-	 * @param mixed  $progress The parameter passed to {@link AsyncTask#publishProgress}. It is serialize()'ed
+	 * @param mixed  $progress The parameter passed to {@link AsyncTask::publishProgress}. It is serialize()'ed
 	 *                         and then unserialize()'ed, as if it has been cloned.
 	 */
 	public function onProgressUpdate(Server $server, $progress){
@@ -221,21 +221,14 @@ abstract class AsyncTask extends Collectable{
 
 	/**
 	 * Saves mixed data in thread-local storage on the parent thread. You may use this to retain references to objects
-	 * or arrays which you need to access in {@link AsyncTask#onCompletion} which cannot be stored as a property of
+	 * or arrays which you need to access in {@link AsyncTask::onCompletion} which cannot be stored as a property of
 	 * your task (due to them becoming serialized).
 	 *
 	 * Scalar types can be stored directly in class properties instead of using this storage.
 	 *
-	 * Objects stored in this storage MUST be retrieved through {@link #fetchLocal} when {@link #onCompletion} is called.
+	 * Objects stored in this storage MUST be retrieved through {@link AsyncTask::fetchLocal} when {@link AsyncTask::onCompletion} is called.
 	 * Otherwise, a NOTICE level message will be raised and the reference will be removed after onCompletion exits.
 	 *
-	 * WARNING: Use this method carefully. It might take a long time before an AsyncTask is completed. PocketMine will
-	 * keep a strong reference to objects passed in this method. This may result in a light memory leak. Usually this
-	 * does not cause memory failure, but be aware that the object may be no longer usable when the AsyncTask completes.
-	 * (E.g. a {@link \pocketmine\Level} object is no longer usable because it is unloaded while the AsyncTask is
-	 * executing, or even a plugin might be unloaded). Since PocketMine keeps a strong reference, the objects are still
-	 * valid, but the implementation is responsible for checking whether these objects are still usable.
-	 *
 	 * WARNING: THIS METHOD SHOULD ONLY BE CALLED FROM THE MAIN THREAD!
 	 *
 	 * @param mixed $complexData the data to store
@@ -259,13 +252,13 @@ abstract class AsyncTask extends Collectable{
 
 	/**
 	 * Returns and removes mixed data in thread-local storage on the parent thread. Call this method from
-	 * {@link AsyncTask#onCompletion} to fetch the data stored in the object store, if any.
+	 * {@link AsyncTask::onCompletion} to fetch the data stored in the object store, if any.
 	 *
 	 * If no data was stored in the local store, or if the data was already retrieved by a previous call to fetchLocal,
 	 * do NOT call this method, or an exception will be thrown.
 	 *
-	 * Do not call this method from {@link AsyncTask#onProgressUpdate}, because this method deletes stored data, which
-	 * means that you will not be able to retrieve it again afterwards. Use {@link AsyncTask#peekLocal} instead to
+	 * Do not call this method from {@link AsyncTask::onProgressUpdate}, because this method deletes stored data, which
+	 * means that you will not be able to retrieve it again afterwards. Use {@link AsyncTask::peekLocal} instead to
 	 * retrieve stored data without removing it from the store.
 	 *
 	 * WARNING: THIS METHOD SHOULD ONLY BE CALLED FROM THE MAIN THREAD!
@@ -287,11 +280,11 @@ abstract class AsyncTask extends Collectable{
 
 	/**
 	 * Returns mixed data in thread-local storage on the parent thread **without clearing** it. Call this method from
-	 * {@link AsyncTask#onProgressUpdate} to fetch the data stored if you need to be able to access the data later on,
+	 * {@link AsyncTask::onProgressUpdate} to fetch the data stored if you need to be able to access the data later on,
 	 * such as in another progress update.
 	 *
-	 * Use {@link AsyncTask#fetchLocal} instead from {@link AsyncTask#onCompletion}, because this method does not delete
-	 * the data, and not clearing the data will result in a warning for memory leak after {@link AsyncTask#onCompletion}
+	 * Use {@link AsyncTask::fetchLocal} instead from {@link AsyncTask::onCompletion}, because this method does not delete
+	 * the data, and not clearing the data will result in a warning for memory leak after {@link AsyncTask::onCompletion}
 	 * finished executing.
 	 *
 	 * WARNING: THIS METHOD SHOULD ONLY BE CALLED FROM THE MAIN THREAD!

src/pocketmine/scheduler/BulkCurlTask.php

@@ -31,9 +31,7 @@ use function unserialize;
 /**
  * Executes a consecutive list of cURL operations.
  *
- * The result of this AsyncTask is an array of arrays (returned from {@link Utils::simpleCurl}) or InternetException objects.
- *
- * @package pocketmine\scheduler
+ * The result of this AsyncTask is an array of arrays (returned from {@link Internet::simpleCurl}) or InternetException objects.
  */
 class BulkCurlTask extends AsyncTask{
 	private $operations;

tests/phpunit/network/mcpe/StupidJsonDecodeTest.php

@@ -26,6 +26,12 @@ namespace pocketmine\network\mcpe;
 use PHPUnit\Framework\TestCase;
 
 class StupidJsonDecodeTest extends TestCase{
+	/** @var \Closure */
+	private $stupidJsonDecodeFunc;
+
+	public function setUp() : void{
+		$this->stupidJsonDecodeFunc = (new \ReflectionMethod(PlayerNetworkSessionAdapter::class, 'stupid_json_decode'))->getClosure();
+	}
 
 	public function stupidJsonDecodeProvider() : array{
 		return [
@@ -34,7 +40,10 @@ class StupidJsonDecodeTest extends TestCase{
 			["false", false],
 			["NULL", null],
 			['["\",,\"word","a\",,\"word2",]', ['",,"word', 'a",,"word2', '']],
-			['["\",,\"word","a\",,\"word2",""]', ['",,"word', 'a",,"word2', '']]
+			['["\",,\"word","a\",,\"word2",""]', ['",,"word', 'a",,"word2', '']],
+			['["Hello,, PocketMine"]', ['Hello,, PocketMine']],
+			['[,]', ['', '']],
+			['[]', []]
 		];
 	}
 
@@ -47,10 +56,7 @@ class StupidJsonDecodeTest extends TestCase{
 	 * @throws \ReflectionException
 	 */
 	public function testStupidJsonDecode(string $brokenJson, $expect){
-		$func = new \ReflectionMethod(PlayerNetworkSessionAdapter::class, 'stupid_json_decode');
-		$func->setAccessible(true);
-
-		$decoded = $func->invoke(null, $brokenJson, true);
+		$decoded = ($this->stupidJsonDecodeFunc)($brokenJson, true);
 		self::assertEquals($expect, $decoded);
 	}
 }