Release 3.5.11

these are now treated the same as any unknown item, and are now not possible to place.

composer.json

@@ -27,7 +27,7 @@
       "pocketmine/raklib": "^0.12.0",
       "pocketmine/spl": "^0.3.0",
       "pocketmine/binaryutils": "^0.1.0",
-      "pocketmine/nbt": "^0.2.1",
+      "pocketmine/nbt": "^0.2.6",
       "pocketmine/math": "^0.2.0",
       "pocketmine/snooze": "^0.1.0",
       "daverandom/callback-validator": "dev-master",

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": "d3fb809caf4d5a5c99054f47f28ff271",
+    "content-hash": "2f5313e4ebd7b62c785cf683b27464b4",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -160,16 +160,16 @@
         },
         {
             "name": "pocketmine/nbt",
-            "version": "0.2.5",
+            "version": "0.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "0b290fa0f5b44835ebeea8146c9ac960cac833f5"
+                "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/0b290fa0f5b44835ebeea8146c9ac960cac833f5",
-                "reference": "0b290fa0f5b44835ebeea8146c9ac960cac833f5",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/92eaf84dd61f700d3ec02ebd01b606cb5b1590d4",
+                "reference": "92eaf84dd61f700d3ec02ebd01b606cb5b1590d4",
                 "shasum": ""
             },
             "require": {
@@ -194,23 +194,23 @@
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/NBT/tree/0.2.5",
+                "source": "https://github.com/pmmp/NBT/tree/0.2.6",
                 "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2019-01-07T17:28:16+00:00"
+            "time": "2019-02-07T16:28:11+00:00"
         },
         {
             "name": "pocketmine/raklib",
-            "version": "0.12.1",
+            "version": "0.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "334b469f2d0f070f17902d7ac584bea7c6149dc6"
+                "reference": "54a36d55eeba0a182e00439920ee2fcfa8c72bf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/334b469f2d0f070f17902d7ac584bea7c6149dc6",
-                "reference": "334b469f2d0f070f17902d7ac584bea7c6149dc6",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/54a36d55eeba0a182e00439920ee2fcfa8c72bf3",
+                "reference": "54a36d55eeba0a182e00439920ee2fcfa8c72bf3",
                 "shasum": ""
             },
             "require": {
@@ -235,10 +235,10 @@
             ],
             "description": "A RakNet server implementation written in PHP",
             "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/0.12.1",
+                "source": "https://github.com/pmmp/RakLib/tree/0.12",
                 "issues": "https://github.com/pmmp/RakLib/issues"
             },
-            "time": "2019-01-04T14:23:37+00:00"
+            "time": "2019-01-21T14:17:30+00:00"
         },
         {
             "name": "pocketmine/snooze",

src/pocketmine/PocketMine.php

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

src/pocketmine/Thread.php

@@ -28,7 +28,7 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
-	/** @var \ClassLoader */
+	/** @var \ClassLoader|null */
 	protected $classLoader;
 	/** @var string|null */
 	protected $composerAutoloaderPath;

src/pocketmine/Worker.php

@@ -28,7 +28,7 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
-	/** @var \ClassLoader */
+	/** @var \ClassLoader|null */
 	protected $classLoader;
 	/** @var string|null */
 	protected $composerAutoloaderPath;

src/pocketmine/block/TallGrass.php

@@ -51,8 +51,8 @@ class TallGrass extends Flowable{
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
-		$down = $this->getSide(Vector3::SIDE_DOWN);
-		if($down->getId() === self::GRASS){
+		$down = $this->getSide(Vector3::SIDE_DOWN)->getId();
+		if($down === self::GRASS or $down === self::DIRT){
 			$this->getLevel()->setBlock($blockReplace, $this, true);
 
 			return true;

src/pocketmine/entity/projectile/SplashPotion.php

@@ -85,7 +85,7 @@ class SplashPotion extends Throwable{
 			if(!$this->willLinger()){
 				foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
 					if($entity instanceof Living and $entity->isAlive()){
-						$distanceSquared = $entity->distanceSquared($this);
+						$distanceSquared = $entity->add(0, $entity->getEyeHeight(), 0)->distanceSquared($this);
 						if($distanceSquared > 16){ //4 blocks
 							continue;
 						}

src/pocketmine/item/ItemFactory.php

@@ -318,7 +318,7 @@ class ItemFactory{
 			$listed = self::$list[self::getListOffset($id)];
 			if($listed !== null){
 				$item = clone $listed;
-			}elseif($id < 256){ //intentionally includes negatives, for extended block IDs
+			}elseif($id >= 0 and $id < 256){ //intentionally excludes negatives because extended blocks aren't supported yet
 				/* Blocks must have a damage value 0-15, but items can have damage value -1 to indicate that they are
 				 * crafting ingredients with any-damage. */
 				$item = new ItemBlock($id, $meta);

src/pocketmine/level/Level.php

@@ -568,7 +568,8 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * @internal DO NOT use this from plugins, it's for internal use only. Use Server->unloadLevel() instead.
+	 * @internal
+	 * @see Server::unloadLevel()
 	 *
 	 * Unloads the current level from memory safely
 	 *
@@ -746,8 +747,7 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * WARNING: Do not use this, it's only for internal use.
-	 * Changes to this function won't be recorded on the version.
+	 * @internal
 	 */
 	public function checkTime(){
 		if($this->stopTime){
@@ -758,8 +758,7 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * WARNING: Do not use this, it's only for internal use.
-	 * Changes to this function won't be recorded on the version.
+	 * @internal
 	 *
 	 * @param Player ...$targets If empty, will send to all players in the level.
 	 */
@@ -771,8 +770,7 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	/**
-	 * WARNING: Do not use this, it's only for internal use.
-	 * Changes to this function won't be recorded on the version.
+	 * @internal
 	 *
 	 * @param int $currentTick
 	 *
@@ -2841,6 +2839,7 @@ class Level implements ChunkManager, Metadatable{
 				$loader->onChunkLoaded($chunk);
 			}
 		}else{
+			$this->server->getLogger()->debug("Newly loaded chunk $x $z has no loaders registered, will be unloaded at next available opportunity");
 			$this->unloadChunkRequest($x, $z);
 		}
 

src/pocketmine/network/query/QueryHandler.php

@@ -40,7 +40,18 @@ use function strlen;
 use function substr;
 
 class QueryHandler{
-	private $server, $lastToken, $token, $longData, $shortData, $timeout;
+	/** @var Server */
+	private $server;
+	/** @var string */
+	private $lastToken;
+	/** @var string */
+	private $token;
+	/** @var string */
+	private $longData;
+	/** @var string */
+	private $shortData;
+	/** @var float */
+	private $timeout;
 
 	public const HANDSHAKE = 9;
 	public const STATISTICS = 0;

src/pocketmine/utils/Color.php

@@ -30,7 +30,13 @@ use function count;
 class Color{
 
 	/** @var int */
-	protected $a, $r, $g, $b;
+	protected $a;
+	/** @var int */
+	protected $r;
+	/** @var int */
+	protected $g;
+	/** @var int */
+	protected $b;
 
 	public function __construct(int $r, int $g, int $b, int $a = 0xff){
 		$this->r = $r & 0xff;