mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 17:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Chunk: move protocol-specific getSubChunkSendCount() to network chunk serializer

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-10-23 18:34:47 +01:00
parent 23e2e7c320
commit eedc9eaee1
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ class ChunkRequestTask extends AsyncTask{
public function onRun() : void{ public function onRun() : void{
$chunk = FastChunkSerializer::deserialize($this->chunk); $chunk = FastChunkSerializer::deserialize($this->chunk);
$subCount = $chunk->getSubChunkSendCount(); $subCount = ChunkSerializer::getSubChunkCount($chunk);
$payload = ChunkSerializer::serialize($chunk, $this->tiles); $payload = ChunkSerializer::serialize($chunk, $this->tiles);
$this->setResult(Zlib::compress(PacketBatch::fromPackets(LevelChunkPacket::withoutCache($this->chunkX, $this->chunkZ, $subCount, $payload))->getBuffer(), $this->compressionLevel)); $this->setResult(Zlib::compress(PacketBatch::fromPackets(LevelChunkPacket::withoutCache($this->chunkX, $this->chunkZ, $subCount, $payload))->getBuffer(), $this->compressionLevel));
} }

20
src/network/mcpe/serializer/ChunkSerializer.php
View File

@ -35,6 +35,24 @@ final class ChunkSerializer{
//NOOP //NOOP
} }
/**
* Returns the number of subchunks that will be sent from the given chunk.
* Chunks are sent in a stack, so every chunk below the top non-empty one must be sent.
* @param Chunk $chunk
*
* @return int
*/
public static function getSubChunkCount(Chunk $chunk) : int{
for($count = $chunk->getSubChunks()->count(); $count > 0; --$count){
if($chunk->getSubChunk($count - 1)->isEmptyFast()){
continue;
}
break;
}
return $count;
}
/** /**
* @param Chunk $chunk * @param Chunk $chunk
* *
@ -44,7 +62,7 @@ final class ChunkSerializer{
*/ */
public static function serialize(Chunk $chunk, ?string $tiles = null) : string{ public static function serialize(Chunk $chunk, ?string $tiles = null) : string{
$stream = new NetworkBinaryStream(); $stream = new NetworkBinaryStream();
$subChunkCount = $chunk->getSubChunkSendCount(); $subChunkCount = self::getSubChunkCount($chunk);
for($y = 0; $y < $subChunkCount; ++$y){ for($y = 0; $y < $subChunkCount; ++$y){
$layers = $chunk->getSubChunk($y)->getBlockLayers(); $layers = $chunk->getSubChunk($y)->getBlockLayers();
$stream->putByte(8); //version $stream->putByte(8); //version

16
src/world/format/Chunk.php
View File

@ -682,22 +682,6 @@ class Chunk{
return $this->subChunks; return $this->subChunks;
} }
/**
* Returns the count of subchunks that need sending to players
*
* @return int
*/
public function getSubChunkSendCount() : int{
for($count = $this->subChunks->count(); $count > 0; --$count){
if($this->subChunks[$count - 1]->isEmptyFast()){
continue;
}
break;
}
return $count;
}
/** /**
* Disposes of empty subchunks and frees data where possible * Disposes of empty subchunks and frees data where possible
*/ */