mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 08:56:15 +00:00
Code Issues Projects Releases Wiki Activity

More tweaks

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-11-28 18:24:36 +00:00
parent ecabe945e6
commit d70be232d8
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/level/format/generic/EmptySubChunk.php
View File

@ -105,4 +105,12 @@ class EmptySubChunk extends SubChunk{
public function getSkyLightArray() : string{ public function getSkyLightArray() : string{
return str_repeat("\xff", 2048); return str_repeat("\xff", 2048);
} }
public function networkSerialize() : string{
return "\x00" . str_repeat("\x00", 10240);
}
public function fastSerialize() : string{
return "";
}
} }

15
src/pocketmine/level/format/generic/GenericChunk.php
View File

@ -621,12 +621,7 @@ class GenericChunk implements Chunk{
$subChunkCount = $this->getSubChunkSendCount(); $subChunkCount = $this->getSubChunkSendCount();
$result .= chr($subChunkCount); $result .= chr($subChunkCount);
for($y = 0; $y < $subChunkCount; ++$y){ for($y = 0; $y < $subChunkCount; ++$y){
$subChunk = $this->subChunks[$y]; $result .= $this->subChunks[$y]->networkSerialize();
$result .= "\x00" //unknown byte!
. $subChunk->getBlockIdArray()
. $subChunk->getBlockDataArray()
. str_repeat("\x00", 2048) //$subChunk->getSkyLightArray()
. $subChunk->getBlockLightArray();
} }
//TODO: heightmaps, tile data //TODO: heightmaps, tile data
@ -644,11 +639,7 @@ class GenericChunk implements Chunk{
continue; continue;
} }
++$count; ++$count;
$subChunks .= chr($subChunk->getY()) $subChunks .= $subChunk->fastSerialize();
. $subChunk->getBlockIdArray()
. $subChunk->getBlockDataArray()
. $subChunk->getSkyLightArray()
. $subChunk->getBlockLightArray();
} }
$stream->putByte($count); $stream->putByte($count);
$stream->put($subChunks); $stream->put($subChunks);
@ -677,7 +668,7 @@ class GenericChunk implements Chunk{
); );
} }
$heightMap = array_values(unpack("C*", $stream->get(256))); $heightMap = array_values(unpack("C*", $stream->get(256)));
$biomeColors = array_values(unpack("N*", $stream->get(1024))); $biomeColors = array_values(unpack("N*", $stream->get(1024))); //TODO: remove this
$chunk = new GenericChunk($provider, $x, $z, $subChunks, $heightMap, $biomeColors); $chunk = new GenericChunk($provider, $x, $z, $subChunks, $heightMap, $biomeColors);
$flags = $stream->getByte(); $flags = $stream->getByte();

10
src/pocketmine/level/format/generic/SubChunk.php
View File

@ -202,4 +202,14 @@ class SubChunk{
assert(strlen($this->skyLight) === 2048, "Wrong length of skylight array, expecting 2048 bytes, got " . strlen($this->skyLight)); assert(strlen($this->skyLight) === 2048, "Wrong length of skylight array, expecting 2048 bytes, got " . strlen($this->skyLight));
return $this->skyLight; return $this->skyLight;
} }
public function networkSerialize() : string{
// storage version, ids, data, skylight, blocklight
return "\x00" . $this->ids . $this->data . $this->skyLight . $this->blockLight;
}
public function fastSerialize() : string{
// y, ids, data, skylight, blocklight
return chr($this->y) . $this->ids . $this->data . $this->skyLight . $this->blockLight;
}
} }