mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 19:50:18 +00:00
Code Issues Projects Releases Wiki Activity

PacketBatch: added a getPackets() method which encapsulates some logic

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-07-01 13:35:34 +01:00
parent 29612cded3
commit 30591d047c
3 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/network/mcpe/NetworkSession.php
View File

@@ -98,7 +98,6 @@ use pocketmine\player\Player;
use pocketmine\player\PlayerInfo;
use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\utils\BinaryDataException;
use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils;
use pocketmine\world\Position;
@@ -328,24 +327,18 @@ class NetworkSession{
Timings::$playerNetworkReceiveDecompressTimer->stopTiming();
}
$count = 0;
while(!$stream->feof() and $this->connected){
if($count++ >= 500){
throw new BadPacketException("Too many packets in a single batch");
}
try{
$pk = $stream->getPacket($this->packetPool);
}catch(BinaryDataException $e){
$this->logger->debug("Packet batch: " . base64_encode($stream->getBuffer()));
throw BadPacketException::wrap($e, "Packet batch decode error");
}
try{
$this->handleDataPacket($pk);
}catch(BadPacketException $e){
$this->logger->debug($pk->getName() . ": " . base64_encode($pk->getSerializer()->getBuffer()));
throw BadPacketException::wrap($e, "Error processing " . $pk->getName());
try{
foreach($stream->getPackets($this->packetPool, 500) as $packet){
try{
$this->handleDataPacket($packet);
}catch(BadPacketException $e){
$this->logger->debug($packet->getName() . ": " . base64_encode($packet->getSerializer()->getBuffer()));
throw BadPacketException::wrap($e, "Error processing " . $packet->getName());
}
}
}catch(PacketDecodeException $e){
$this->logger->logException($e);
throw BadPacketException::wrap($e, "Packet batch decode error");
}
}