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

Merge remote-tracking branch 'origin/release/3.4'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-17 14:47:35 +00:00
commit e67b1a20de
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/level/format/Chunk.php
View File

@ -771,8 +771,12 @@ class Chunk{
*/ */
public function collectGarbage() : void{ public function collectGarbage() : void{
foreach($this->subChunks as $y => $subChunk){ foreach($this->subChunks as $y => $subChunk){
if(!($subChunk instanceof EmptySubChunk) and $subChunk->isEmpty()){ //normal subchunk full of air, remove it and replace it with an empty stub if($subChunk instanceof SubChunk){
$this->subChunks[$y] = $this->emptySubChunk; if($subChunk->isEmpty()){
$this->subChunks[$y] = $this->emptySubChunk;
}else{
$subChunk->collectGarbage();
}
} }
} }
} }

23
src/pocketmine/level/format/SubChunk.php
View File

@ -23,8 +23,9 @@ declare(strict_types=1);
namespace pocketmine\level\format; namespace pocketmine\level\format;
class SubChunk implements SubChunkInterface{ define(__NAMESPACE__ . '\ZERO_NIBBLE_ARRAY', str_repeat("\x00", 2048));
class SubChunk implements SubChunkInterface{
protected $ids; protected $ids;
protected $data; protected $data;
protected $blockLight; protected $blockLight;
@ -44,6 +45,7 @@ class SubChunk implements SubChunkInterface{
self::assignData($this->data, $data, 2048); self::assignData($this->data, $data, 2048);
self::assignData($this->skyLight, $skyLight, 2048, "\xff"); self::assignData($this->skyLight, $skyLight, 2048, "\xff");
self::assignData($this->blockLight, $blockLight, 2048); self::assignData($this->blockLight, $blockLight, 2048);
$this->collectGarbage();
} }
public function isEmpty(bool $checkLight = true) : bool{ public function isEmpty(bool $checkLight = true) : bool{
@ -51,7 +53,7 @@ class SubChunk implements SubChunkInterface{
substr_count($this->ids, "\x00") === 4096 and substr_count($this->ids, "\x00") === 4096 and
(!$checkLight or ( (!$checkLight or (
substr_count($this->skyLight, "\xff") === 2048 and substr_count($this->skyLight, "\xff") === 2048 and
substr_count($this->blockLight, "\x00") === 2048 $this->blockLight === ZERO_NIBBLE_ARRAY
)) ))
); );
} }
@ -203,4 +205,21 @@ class SubChunk implements SubChunkInterface{
public function __debugInfo(){ public function __debugInfo(){
return []; return [];
} }
public function collectGarbage() : void{
/*
* This strange looking code is designed to exploit PHP's copy-on-write behaviour. Assigning will copy a
* reference to the const instead of duplicating the whole string. The string will only be duplicated when
* modified, which is perfect for this purpose.
*/
if($this->data === ZERO_NIBBLE_ARRAY){
$this->data = ZERO_NIBBLE_ARRAY;
}
if($this->skyLight === ZERO_NIBBLE_ARRAY){
$this->skyLight = ZERO_NIBBLE_ARRAY;
}
if($this->blockLight === ZERO_NIBBLE_ARRAY){
$this->blockLight = ZERO_NIBBLE_ARRAY;
}
}
} }