Fixed Pocket format importing

This commit is contained in:
Shoghi Cervantes 2014-03-01 22:08:28 +01:00
parent 5bf440d820
commit 11f5691104
2 changed files with 29 additions and 23 deletions

View File

@ -188,6 +188,7 @@ class PMFLevel extends PMF{
@mkdir(dirname($path), 0755); @mkdir(dirname($path), 0755);
} }
$this->initCleanChunk($X, $Z); $this->initCleanChunk($X, $Z);
if($this->level instanceof Level){
$ret = $this->level->generateChunk($X, $Z); $ret = $this->level->generateChunk($X, $Z);
$this->saveChunk($X, $Z); $this->saveChunk($X, $Z);
$this->populateChunk($X - 1, $Z); $this->populateChunk($X - 1, $Z);
@ -200,9 +201,12 @@ class PMFLevel extends PMF{
$this->populateChunk($X - 1, $Z + 1); $this->populateChunk($X - 1, $Z + 1);
return $ret; return $ret;
} }
}
public function populateChunk($X, $Z){ public function populateChunk($X, $Z){
if($this->level instanceof Level){
if($this->isGenerating === 0 and if($this->isGenerating === 0 and
$this->isChunkLoaded($X, $Z) and
!$this->isPopulated($X, $Z) and !$this->isPopulated($X, $Z) and
$this->isGenerated($X - 1, $Z) and $this->isGenerated($X - 1, $Z) and
$this->isGenerated($X, $Z - 1) and $this->isGenerated($X, $Z - 1) and
@ -216,6 +220,7 @@ class PMFLevel extends PMF{
$this->saveChunk($X, $Z); $this->saveChunk($X, $Z);
} }
} }
}
public function loadChunk($X, $Z){ public function loadChunk($X, $Z){
if($this->isChunkLoaded($X, $Z)){ if($this->isChunkLoaded($X, $Z)){

View File

@ -98,6 +98,7 @@ class LevelImport{
foreach($chunk as $Y => $data){ foreach($chunk as $Y => $data){
$pmf->setMiniChunk($X, $Z, $Y, $data); $pmf->setMiniChunk($X, $Z, $Y, $data);
} }
$pmf->setPopulated($X, $Z);
$pmf->saveChunk($X, $Z); $pmf->saveChunk($X, $Z);
} }
console("[NOTICE] Importing level ".ceil(($Z + 1)/0.16)."%"); console("[NOTICE] Importing level ".ceil(($Z + 1)/0.16)."%");