From 1d1a8a316e7fd7ba6a206ffc9df9cb411a79ad16 Mon Sep 17 00:00:00 2001
From: Alejandro Liu <alejandro_liu@hotmail.com>
Date: Fri, 20 Mar 2015 08:13:55 +0100
Subject: [PATCH] Take-2: Delay "parsePreset" until we have to really generate
 a block

---
 src/pocketmine/level/generator/Flat.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pocketmine/level/generator/Flat.php b/src/pocketmine/level/generator/Flat.php
index a4e15f7b9..2264c1ea8 100644
--- a/src/pocketmine/level/generator/Flat.php
+++ b/src/pocketmine/level/generator/Flat.php
@@ -59,6 +59,7 @@ class Flat extends Generator{
 		$this->preset = "2;7,2x3,2;1;";
 		//$this->preset = "2;7,59x1,3x3,2;1;spawn(radius=10 block=89),decoration(treecount=80 grasscount=45)";
 		$this->options = $options;
+		$this->chunk = null;
 
 		if(isset($this->options["decoration"])){
 			$ores = new Ore();
@@ -80,7 +81,7 @@ class Flat extends Generator{
 		}*/
 	}
 
-	protected function parsePreset($preset){
+	protected function parsePreset($preset, $chunkX, $chunkZ){
 		$this->preset = $preset;
 		$preset = explode(";", $preset);
 		$version = (int) $preset[0];
@@ -106,7 +107,7 @@ class Flat extends Generator{
 		}
 
 
-		$this->chunk = clone $this->level->getChunk(0, 0);
+		$this->chunk = $this->level->getChunk($chunkX, $chunkZ);
 		$this->chunk->setGenerated();
 
 		for($Z = 0; $Z < 16; ++$Z){
@@ -139,15 +140,24 @@ class Flat extends Generator{
 		$this->level = $level;
 		$this->random = $random;
 
+		/*
+		  // Commented out : We want to delay this
 		if(isset($this->options["preset"]) and $this->options["preset"] != ""){
 			$this->parsePreset($this->options["preset"]);
 		}else{
 			$this->parsePreset($this->preset);
 		}
-
+		*/
 	}
 
 	public function generateChunk($chunkX, $chunkZ){
+		if($this->chunk === null) {
+			if(isset($this->options["preset"]) and $this->options["preset"] != ""){
+				$this->parsePreset($this->options["preset"], $chunkX, $chunkZ);
+			}else{
+				$this->parsePreset($this->preset, $chunkX, $chunkZ);
+			}
+		}
 		$chunk = clone $this->chunk;
 		$chunk->setX($chunkX);
 		$chunk->setZ($chunkZ);