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

src/muqsit/invmenu/type/graphic/BlockInvMenuGraphic.php

@@ -6,11 +6,9 @@
 
 use muqsit\invmenu\type\graphic\network\InvMenuGraphicNetworkTranslator;
 use pocketmine\block\Block;
-use pocketmine\block\tile\Spawnable;
 use pocketmine\inventory\Inventory;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\convert\TypeConverter;
-use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
 use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
 use pocketmine\player\Player;
@@ -45,19 +43,9 @@ public function sendInventory(Player $player, Inventory $inventory) : bool{
 
 	public function remove(Player $player) : void{
 		$network = $player->getNetworkSession();
-		$world = $player->getWorld();
-		$blockPosition = BlockPosition::fromVector3($this->position);
-		$block = $world->getBlockAt($this->position->x, $this->position->y, $this->position->z);
-		$network->sendDataPacket(UpdateBlockPacket::create(
-			$blockPosition,
-            $network->getTypeConverter()->getBlockTranslator()->internalIdToNetworkId($block->getStateId()),
-			UpdateBlockPacket::FLAG_NETWORK,
-			UpdateBlockPacket::DATA_LAYER_NORMAL
-		), true);
 
-		$tile = $world->getTileAt($this->position->x, $this->position->y, $this->position->z);
-		if($tile instanceof Spawnable){
-			$network->sendDataPacket(BlockActorDataPacket::create($blockPosition, $tile->getSerializedSpawnCompound($network->getTypeConverter())), true);
+		foreach($player->getWorld()->createBlockUpdatePackets($network->getTypeConverter(), [$this->position]) as $packet){
+			$network->sendDataPacket($packet);
 		}
 	}