Merge remote-tracking branch 'upstream/stable' into stable

src/pocketmine/Server.php

@@ -228,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];
@@ -1445,7 +1445,7 @@ class Server{
 	}
 
 	/**
-	 * @return string[]
+	 * @return string[][]
 	 */
 	public function getCommandAliases() : array{
 		$section = $this->getProperty("aliases");
@@ -1790,7 +1790,7 @@ class Server{
 
 	/**
 	 * @param TextContainer|string $message
-	 * @param Player[]             $recipients
+	 * @param CommandSender[]      $recipients
 	 *
 	 * @return int
 	 */
@@ -1799,7 +1799,7 @@ class Server{
 			return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
 		}
 
-		/** @var Player[] $recipients */
+		/** @var CommandSender[] $recipients */
 		foreach($recipients as $recipient){
 			$recipient->sendMessage($message);
 		}

src/pocketmine/block/Block.php

@@ -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/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/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/entity/Entity.php

@@ -318,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 = [];
@@ -460,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;

src/pocketmine/entity/Squid.php

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

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/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/level/Level.php

@@ -265,7 +265,7 @@ class Level implements ChunkManager, Metadatable{
 	/** @var LevelTimings */
 	public $timings;
 
-	/** @var int */
+	/** @var float */
 	public $tickRateTime = 0;
 	/**
 	 * @deprecated

src/pocketmine/level/format/Chunk.php

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

src/pocketmine/network/mcpe/NetworkBinaryStream.php

@@ -157,7 +157,11 @@ class NetworkBinaryStream extends BinaryStream{
 			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");
 		}

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

@@ -227,6 +227,7 @@ class AvailableCommandsPacket extends DataPacket{
 		$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();

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

@@ -140,7 +140,7 @@ class CraftingDataPacket extends DataPacket{
 			}
 			$this->decodedEntries[] = $entry;
 		}
-		$this->getBool(); //cleanRecipes
+		$this->cleanRecipes = $this->getBool();
 	}
 
 	private static function writeEntry($entry, NetworkBinaryStream $stream, int $pos){

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

@@ -135,7 +135,7 @@ abstract class DataPacket extends NetworkBinaryStream{
 	abstract public function handle(NetworkSession $session) : bool;
 
 	public function clean(){
-		$this->buffer = null;
+		$this->buffer = "";
 		$this->isEncoded = false;
 		$this->offset = 0;
 		return $this;

src/pocketmine/scheduler/AsyncPool.php

@@ -263,6 +263,7 @@ class AsyncPool{
 			while(($task = $worker->unstack()) !== null){
 				//cancelRun() is not strictly necessary here, but it might be used to inform plugins of the task state
 				//(i.e. it never executed).
+				assert($task instanceof AsyncTask);
 				$task->cancelRun();
 				$this->removeTask($task, true);
 			}