mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 20:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary PacketBatch instantiations

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-03-16 13:35:12 +00:00
parent 11ef6414b0
commit ec2b53f61a
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Server.php
View File

@ -59,7 +59,6 @@ use pocketmine\network\mcpe\EntityEventBroadcaster;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\PacketBroadcaster; use pocketmine\network\mcpe\PacketBroadcaster;
use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext; use pocketmine\network\mcpe\protocol\serializer\PacketSerializerContext;
use pocketmine\network\mcpe\raklib\RakLibInterface; use pocketmine\network\mcpe\raklib\RakLibInterface;
use pocketmine\network\mcpe\StandardEntityEventBroadcaster; use pocketmine\network\mcpe\StandardEntityEventBroadcaster;
@ -1347,16 +1346,14 @@ class Server{
* *
* @param bool|null $sync Compression on the main thread (true) or workers (false). Default is automatic (null). * @param bool|null $sync Compression on the main thread (true) or workers (false). Default is automatic (null).
*/ */
public function prepareBatch(PacketBatch $stream, Compressor $compressor, ?bool $sync = null, ?TimingsHandler $timings = null) : CompressBatchPromise{ public function prepareBatch(string $buffer, Compressor $compressor, ?bool $sync = null, ?TimingsHandler $timings = null) : CompressBatchPromise{
$timings ??= Timings::$playerNetworkSendCompress; $timings ??= Timings::$playerNetworkSendCompress;
try{ try{
$timings->startTiming(); $timings->startTiming();
$buffer = $stream->getBuffer();
if($sync === null){ if($sync === null){
$threshold = $compressor->getCompressionThreshold(); $threshold = $compressor->getCompressionThreshold();
$sync = !$this->networkCompressionAsync || $threshold === null || strlen($stream->getBuffer()) < $threshold; $sync = !$this->networkCompressionAsync || $threshold === null || strlen($buffer) < $threshold;
} }
$promise = new CompressBatchPromise(); $promise = new CompressBatchPromise();

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

@ -523,7 +523,7 @@ class NetworkSession{
PacketBatch::encodeRaw($stream, $this->sendBuffer); PacketBatch::encodeRaw($stream, $this->sendBuffer);
if($this->enableCompression){ if($this->enableCompression){
$promise = $this->server->prepareBatch(new PacketBatch($stream->getBuffer()), $this->compressor, $syncMode, Timings::$playerNetworkSendCompressSessionBuffer); $promise = $this->server->prepareBatch($stream->getBuffer(), $this->compressor, $syncMode, Timings::$playerNetworkSendCompressSessionBuffer);
}else{ }else{
$promise = new CompressBatchPromise(); $promise = new CompressBatchPromise();
$promise->resolve($stream->getBuffer()); $promise->resolve($stream->getBuffer());

2
src/network/mcpe/StandardPacketBroadcaster.php
View File

@ -76,7 +76,7 @@ final class StandardPacketBroadcaster implements PacketBroadcaster{
PacketBatch::encodeRaw($stream, $packetBuffers); PacketBatch::encodeRaw($stream, $packetBuffers);
$batchBuffer = $stream->getBuffer(); $batchBuffer = $stream->getBuffer();
$promise = $this->server->prepareBatch(new PacketBatch($batchBuffer), $compressor, timings: Timings::$playerNetworkSendCompressBroadcast); $promise = $this->server->prepareBatch($batchBuffer, $compressor, timings: Timings::$playerNetworkSendCompressBroadcast);
foreach($compressorTargets as $target){ foreach($compressorTargets as $target){
$target->queueCompressed($promise); $target->queueCompressed($promise);
} }