From 0f6b7e48cb29f1abc2cb957c546077398f5b8a05 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 2 Nov 2021 01:37:56 +0000
Subject: [PATCH] Updated BedrockProtocol: it's weirdly satisfying that
 LevelChunkPacket::create() with the extra parameter turns out to be exactly
 the same length as the old way.

---
 composer.lock                         | 8 ++++----
 src/network/mcpe/ChunkRequestTask.php | 2 +-
 src/network/mcpe/NetworkSession.php   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6f587ce0f..b2878d494 100644
--- a/composer.lock
+++ b/composer.lock
@@ -253,12 +253,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/BedrockProtocol.git",
-                "reference": "c76e31fc948f58ad2b788679c84335684396d025"
+                "reference": "67c0c15b4044cab2190501933912c3d02c5f63ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/c76e31fc948f58ad2b788679c84335684396d025",
-                "reference": "c76e31fc948f58ad2b788679c84335684396d025",
+                "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/67c0c15b4044cab2190501933912c3d02c5f63ab",
+                "reference": "67c0c15b4044cab2190501933912c3d02c5f63ab",
                 "shasum": ""
             },
             "require": {
@@ -293,7 +293,7 @@
                 "issues": "https://github.com/pmmp/BedrockProtocol/issues",
                 "source": "https://github.com/pmmp/BedrockProtocol/tree/master"
             },
-            "time": "2021-11-01T18:59:44+00:00"
+            "time": "2021-11-02T01:27:05+00:00"
         },
         {
             "name": "pocketmine/binaryutils",
diff --git a/src/network/mcpe/ChunkRequestTask.php b/src/network/mcpe/ChunkRequestTask.php
index 676a480a9..8279fc00e 100644
--- a/src/network/mcpe/ChunkRequestTask.php
+++ b/src/network/mcpe/ChunkRequestTask.php
@@ -72,7 +72,7 @@ class ChunkRequestTask extends AsyncTask{
 		$subCount = ChunkSerializer::getSubChunkCount($chunk);
 		$encoderContext = new PacketSerializerContext(GlobalItemTypeDictionary::getInstance()->getDictionary());
 		$payload = ChunkSerializer::serializeFullChunk($chunk, RuntimeBlockMapping::getInstance(), $encoderContext, $this->tiles);
-		$this->setResult($this->compressor->compress(PacketBatch::fromPackets($encoderContext, LevelChunkPacket::withoutCache($this->chunkX, $this->chunkZ, $subCount, $payload))->getBuffer()));
+		$this->setResult($this->compressor->compress(PacketBatch::fromPackets($encoderContext, LevelChunkPacket::create($this->chunkX, $this->chunkZ, $subCount, null, $payload))->getBuffer()));
 	}
 
 	public function onError() : void{
diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index 4a7cfe259..ed910c45e 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -563,7 +563,7 @@ class NetworkSession{
 	 */
 	private function doServerDisconnect(string $reason, bool $notify = true) : void{
 		if($notify){
-			$this->sendDataPacket($reason === "" ? DisconnectPacket::silent() : DisconnectPacket::message($reason), true);
+			$this->sendDataPacket(DisconnectPacket::create($reason !== "" ? $reason : null), true);
 		}
 
 		$this->sender->close($notify ? $reason : "");