From 925b0c1b0707fbc218ac5e6ebae4c4a10a47b35c Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sun, 10 May 2015 13:18:39 +0200
Subject: [PATCH] Fixed empty chunks on generation, closes #2998

---
 src/pocketmine/level/Level.php                  |  6 +++---
 src/pocketmine/level/format/anvil/Chunk.php     |  4 ++++
 .../level/generator/PopulationTask.php          | 17 +++++------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index a95c24dae..81aa50629 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -2413,8 +2413,8 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		Timings::$populationTimer->startTiming();
-		$chunk = $this->getChunk($x, $z, false);
-		if($chunk === null or !$chunk->isPopulated()){
+		$chunk = $this->getChunk($x, $z, true);
+		if(!$chunk->isPopulated()){
 			$populate = true;
 			for($xx = -1; $xx <= 1; ++$xx){
 				for($zz = -1; $zz <= 1; ++$zz){
@@ -2433,7 +2433,7 @@ class Level implements ChunkManager, Metadatable{
 							$this->chunkPopulationLock[Level::chunkHash($x + $xx, $z + $zz)] = true;
 						}
 					}
-					$task = new PopulationTask($this, $x, $z, $chunk);
+					$task = new PopulationTask($this, $chunk);
 					$this->server->getScheduler()->scheduleAsyncTask($task);
 				}
 				Timings::$populationTimer->stopTiming();
diff --git a/src/pocketmine/level/format/anvil/Chunk.php b/src/pocketmine/level/format/anvil/Chunk.php
index 1a255a099..2935a0349 100644
--- a/src/pocketmine/level/format/anvil/Chunk.php
+++ b/src/pocketmine/level/format/anvil/Chunk.php
@@ -305,6 +305,10 @@ class Chunk extends BaseChunk{
 			$chunk->x = $chunkX;
 			$chunk->z = $chunkZ;
 
+			for($y = 0; $y < 8; ++$y){
+				$chunk->sections[$y] = new EmptyChunkSection($y);
+			}
+
 			$chunk->heightMap = array_fill(0, 256, 0);
 			$chunk->biomeColors = array_fill(0, 256, 0);
 
diff --git a/src/pocketmine/level/generator/PopulationTask.php b/src/pocketmine/level/generator/PopulationTask.php
index 3879c6434..b023a6542 100644
--- a/src/pocketmine/level/generator/PopulationTask.php
+++ b/src/pocketmine/level/generator/PopulationTask.php
@@ -36,8 +36,6 @@ class PopulationTask extends AsyncTask{
 	public $state;
 	public $levelId;
 	public $chunk;
-	public $chunkX;
-	public $chunkZ;
 	public $chunkClass;
 
 	public $chunk0;
@@ -50,12 +48,10 @@ class PopulationTask extends AsyncTask{
 	public $chunk7;
 	public $chunk8;
 
-	public function __construct(Level $level, $chunkX, $chunkZ, FullChunk $chunk = null){
+	public function __construct(Level $level, FullChunk $chunk){
 		$this->state = true;
 		$this->levelId = $level->getId();
-		$this->chunk = $chunk !== null ? $chunk->toFastBinary() : null;
-		$this->chunkX = $chunkX;
-		$this->chunkZ = $chunkZ;
+		$this->chunk = $chunk->toFastBinary();
 		$this->chunkClass = get_class($chunk);
 
 		for($i = 0; $i < 9; ++$i){
@@ -64,7 +60,7 @@ class PopulationTask extends AsyncTask{
 			}
 			$xx = -1 + $i % 3;
 			$zz = -1 + (int) ($i / 3);
-			$ck = $level->getChunk($chunkX + $xx, $chunkZ + $zz, false);
+			$ck = $level->getChunk($chunk->getX() + $xx, $chunk->getZ() + $zz, false);
 			$this->{"chunk$i"} = $ck !== null ? $ck->toFastBinary() : null;
 		}
 	}
@@ -79,15 +75,12 @@ class PopulationTask extends AsyncTask{
 			return;
 		}
 
-		$chunkX = $this->chunkX;
-		$chunkZ = $this->chunkZ;
-
 		/** @var FullChunk[] $chunks */
 		$chunks = [];
 		/** @var FullChunk $chunkC */
 		$chunkC = $this->chunkClass;
 
-		$chunk = $this->chunk !== null ? $chunkC::fromFastBinary($this->chunk) : $chunkC::getEmptyChunk($chunkX, $chunkZ);
+		$chunk = $chunkC::fromFastBinary($this->chunk);
 
 		for($i = 0; $i < 9; ++$i){
 			if($i === 4){
@@ -97,7 +90,7 @@ class PopulationTask extends AsyncTask{
 			$zz = -1 + (int) ($i / 3);
 			$ck = $this->{"chunk$i"};
 			if($ck === null){
-				$chunks[$i] = $chunkC::getEmptyChunk($chunkX + $xx, $chunkZ + $zz);
+				$chunks[$i] = $chunkC::getEmptyChunk($chunk->getX() + $xx, $chunk->getZ() + $zz);
 			}else{
 				$chunks[$i] = $chunkC::fromFastBinary($ck);
 			}