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

Implemented partial chunk saving on LevelDB (#3078)

Browse Source
This commit is contained in:
Dylan T
2019-08-07 17:39:36 +01:00
committed by GitHub
parent 9598af7683
commit c533f6a0bd
6 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,10 @@ use function str_repeat;
use function strlen;
class Chunk{
public const DIRTY_FLAG_TERRAIN = 1 << 0;
public const DIRTY_FLAG_ENTITIES = 1 << 1;
public const DIRTY_FLAG_TILES = 1 << 2;
public const DIRTY_FLAG_BIOMES = 1 << 3;
public const MAX_SUBCHUNKS = 16;
@ -54,8 +58,8 @@ class Chunk{
/** @var int */
protected $z;
/** @var bool */
protected $hasChanged = false;
/** @var int */
private $dirtyFlags = 0;
/** @var bool */
protected $lightPopulated = false;
@ -189,7 +193,7 @@ class Chunk{
*/
public function setFullBlock(int $x, int $y, int $z, int $block) : void{
$this->getSubChunk($y >> 4, true)->setFullBlock($x, $y & 0xf, $z, $block);
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_TERRAIN;
}
/**
@ -396,8 +400,8 @@ class Chunk{
* @param int $biomeId 0-255
*/
public function setBiomeId(int $x, int $z, int $biomeId) : void{
$this->hasChanged = true;
$this->biomeIds[($z << 4) | $x] = chr($biomeId & 0xff);
$this->dirtyFlags |= self::DIRTY_FLAG_BIOMES;
}
/**
@ -451,7 +455,7 @@ class Chunk{
}
$this->entities[$entity->getId()] = $entity;
if(!($entity instanceof Player)){
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_ENTITIES;
}
}
@ -461,7 +465,7 @@ class Chunk{
public function removeEntity(Entity $entity) : void{
unset($this->entities[$entity->getId()]);
if(!($entity instanceof Player)){
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_ENTITIES;
}
}
@ -478,7 +482,7 @@ class Chunk{
$this->tiles[$index]->close();
}
$this->tiles[$index] = $tile;
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_TILES;
}
/**
@ -487,7 +491,7 @@ class Chunk{
public function removeTile(Tile $tile) : void{
$pos = $tile->getPos();
unset($this->tiles[Chunk::blockHash($pos->x, $pos->y, $pos->z)]);
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_TILES;
}
/**
@ -563,7 +567,7 @@ class Chunk{
*/
public function initChunk(World $world) : void{
if($this->NBTentities !== null){
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_ENTITIES;
$world->timings->syncChunkLoadEntitiesTimer->startTiming();
foreach($this->NBTentities as $nbt){
if($nbt instanceof CompoundTag){
@ -584,7 +588,7 @@ class Chunk{
$world->timings->syncChunkLoadEntitiesTimer->stopTiming();
}
if($this->NBTtiles !== null){
$this->hasChanged = true;
$this->dirtyFlags |= self::DIRTY_FLAG_TILES;
$world->timings->syncChunkLoadTileEntitiesTimer->startTiming();
foreach($this->NBTtiles as $nbt){
if($nbt instanceof CompoundTag){
@ -619,15 +623,35 @@ class Chunk{
/**
* @return bool
*/
public function hasChanged() : bool{
return $this->hasChanged or !empty($this->tiles) or !empty($this->getSavableEntities());
public function isDirty() : bool{
return $this->dirtyFlags !== 0 or !empty($this->tiles) or !empty($this->getSavableEntities());
}
public function getDirtyFlag(int $flag) : bool{
return ($this->dirtyFlags & $flag) !== 0;
}
/**
* @param bool $value
* @return int
*/
public function setChanged(bool $value = true) : void{
$this->hasChanged = $value;
public function getDirtyFlags() : int{
return $this->dirtyFlags;
}
public function setDirtyFlag(int $flag, bool $value) : void{
if($value){
$this->dirtyFlags |= $flag;
}else{
$this->dirtyFlags &= ~$flag;
}
}
public function setDirty() : void{
$this->dirtyFlags = ~0;
}
public function clearDirtyFlags() : void{
$this->dirtyFlags = 0;
}
/**
@ -666,7 +690,7 @@ class Chunk{
}else{
$this->subChunks[$y] = $subChunk;
}
$this->hasChanged = true;
$this->setDirtyFlag(self::DIRTY_FLAG_TERRAIN, true);
return true;
}