From 427e33442606e01af995f6dcd502fe9199216eb2 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 6 May 2019 19:58:02 +0100
Subject: [PATCH] rename PacketStream to PacketBatch

---
 src/pocketmine/Server.php                              | 10 +++++-----
 src/pocketmine/inventory/CraftingManager.php           |  4 ++--
 src/pocketmine/network/mcpe/ChunkRequestTask.php       |  2 +-
 src/pocketmine/network/mcpe/NetworkSession.php         |  6 +++---
 .../network/mcpe/{PacketStream.php => PacketBatch.php} |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename src/pocketmine/network/mcpe/{PacketStream.php => PacketBatch.php} (95%)

diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 531657d19..346e79dbf 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -67,7 +67,7 @@ use pocketmine\network\mcpe\CompressBatchTask;
 use pocketmine\network\mcpe\NetworkCipher;
 use pocketmine\network\mcpe\NetworkCompression;
 use pocketmine\network\mcpe\NetworkSession;
-use pocketmine\network\mcpe\PacketStream;
+use pocketmine\network\mcpe\PacketBatch;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\PlayerListPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
@@ -1492,7 +1492,7 @@ class Server{
 		}
 		$recipients = $ev->getTargets();
 
-		$stream = PacketStream::fromPackets(...$ev->getPackets());
+		$stream = PacketBatch::fromPackets(...$ev->getPackets());
 
 		if(NetworkCompression::$THRESHOLD < 0 or strlen($stream->getBuffer()) < NetworkCompression::$THRESHOLD){
 			foreach($recipients as $target){
@@ -1513,12 +1513,12 @@ class Server{
 	/**
 	 * Broadcasts a list of packets in a batch to a list of players
 	 *
-	 * @param PacketStream $stream
-	 * @param bool         $forceSync
+	 * @param PacketBatch $stream
+	 * @param bool        $forceSync
 	 *
 	 * @return CompressBatchPromise
 	 */
-	public function prepareBatch(PacketStream $stream, bool $forceSync = false) : CompressBatchPromise{
+	public function prepareBatch(PacketBatch $stream, bool $forceSync = false) : CompressBatchPromise{
 		try{
 			Timings::$playerNetworkSendCompressTimer->startTiming();
 
diff --git a/src/pocketmine/inventory/CraftingManager.php b/src/pocketmine/inventory/CraftingManager.php
index 79aa26799..bc54c53cf 100644
--- a/src/pocketmine/inventory/CraftingManager.php
+++ b/src/pocketmine/inventory/CraftingManager.php
@@ -26,7 +26,7 @@ namespace pocketmine\inventory;
 use pocketmine\item\Item;
 use pocketmine\network\mcpe\CompressBatchPromise;
 use pocketmine\network\mcpe\NetworkCompression;
-use pocketmine\network\mcpe\PacketStream;
+use pocketmine\network\mcpe\PacketBatch;
 use pocketmine\network\mcpe\protocol\CraftingDataPacket;
 use pocketmine\timings\Timings;
 use function array_map;
@@ -116,7 +116,7 @@ class CraftingManager{
 		}
 
 		$this->craftingDataCache = new CompressBatchPromise();
-		$this->craftingDataCache->resolve(NetworkCompression::compress(PacketStream::fromPackets($pk)->getBuffer()));
+		$this->craftingDataCache->resolve(NetworkCompression::compress(PacketBatch::fromPackets($pk)->getBuffer()));
 
 		Timings::$craftingDataCacheRebuildTimer->stopTiming();
 	}
diff --git a/src/pocketmine/network/mcpe/ChunkRequestTask.php b/src/pocketmine/network/mcpe/ChunkRequestTask.php
index 097e300cc..30d2725c1 100644
--- a/src/pocketmine/network/mcpe/ChunkRequestTask.php
+++ b/src/pocketmine/network/mcpe/ChunkRequestTask.php
@@ -57,7 +57,7 @@ class ChunkRequestTask extends AsyncTask{
 		$pk->chunkZ = $this->chunkZ;
 		$pk->data = $this->chunk;
 
-		$this->setResult(NetworkCompression::compress(PacketStream::fromPackets($pk)->getBuffer(), $this->compressionLevel));
+		$this->setResult(NetworkCompression::compress(PacketBatch::fromPackets($pk)->getBuffer(), $this->compressionLevel));
 	}
 
 	public function onError() : void{
diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php
index 579351f4f..d12347a75 100644
--- a/src/pocketmine/network/mcpe/NetworkSession.php
+++ b/src/pocketmine/network/mcpe/NetworkSession.php
@@ -119,7 +119,7 @@ class NetworkSession{
 	/** @var NetworkCipher */
 	private $cipher;
 
-	/** @var PacketStream|null */
+	/** @var PacketBatch|null */
 	private $sendBuffer;
 
 	/** @var \SplQueue|CompressBatchPromise[] */
@@ -264,7 +264,7 @@ class NetworkSession{
 
 		Timings::$playerNetworkReceiveDecompressTimer->startTiming();
 		try{
-			$stream = new PacketStream(NetworkCompression::decompress($payload));
+			$stream = new PacketBatch(NetworkCompression::decompress($payload));
 		}catch(\ErrorException $e){
 			$this->logger->debug("Failed to decompress packet: " . bin2hex($payload));
 			//TODO: this isn't incompatible game version if we already established protocol version
@@ -359,7 +359,7 @@ class NetworkSession{
 		$timings->startTiming();
 		try{
 			if($this->sendBuffer === null){
-				$this->sendBuffer = new PacketStream();
+				$this->sendBuffer = new PacketBatch();
 			}
 			$this->sendBuffer->putPacket($packet);
 			$this->manager->scheduleUpdate($this); //schedule flush at end of tick
diff --git a/src/pocketmine/network/mcpe/PacketStream.php b/src/pocketmine/network/mcpe/PacketBatch.php
similarity index 95%
rename from src/pocketmine/network/mcpe/PacketStream.php
rename to src/pocketmine/network/mcpe/PacketBatch.php
index df3cfae2d..4f710c84d 100644
--- a/src/pocketmine/network/mcpe/PacketStream.php
+++ b/src/pocketmine/network/mcpe/PacketBatch.php
@@ -27,7 +27,7 @@ use pocketmine\network\mcpe\protocol\Packet;
 use pocketmine\network\mcpe\protocol\PacketPool;
 use pocketmine\utils\BinaryDataException;
 
-class PacketStream extends NetworkBinaryStream{
+class PacketBatch extends NetworkBinaryStream{
 
 	public function putPacket(Packet $packet) : void{
 		if(!$packet->isEncoded()){
@@ -49,7 +49,7 @@ class PacketStream extends NetworkBinaryStream{
 	 *
 	 * @param Packet ...$packets
 	 *
-	 * @return PacketStream
+	 * @return PacketBatch
 	 */
 	public static function fromPackets(Packet ...$packets) : self{
 		$result = new self();