Faster chunk setting on provider

PocketMine · Dec 12, 2014 · 71d602a · 71d602a
1 parent c81bbda
commit 71d602a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
@@ -1756,8 +1756,7 @@ public function generateChunkCallback($x, $z, FullChunk $chunk){
 		$oldChunk = $this->getChunk($x, $z, false);
 		unset($this->chunkGenerationQueue[Level::chunkHash($x, $z)]);
 		$this->setChunk($x, $z, $chunk);
-		$chunk = $this->getChunk($x, $z, false);
-		if($chunk !== null and (!($oldChunk !== null) or $oldChunk->isPopulated() === false) and $chunk->isPopulated()){
+		if($chunk !== null and ($oldChunk === null or $oldChunk->isPopulated() === false) and $chunk->isPopulated()){
 			$this->server->getPluginManager()->callEvent(new ChunkPopulateEvent($chunk));
 		}
 	}

diff --git a/src/pocketmine/level/format/mcregion/McRegion.php b/src/pocketmine/level/format/mcregion/McRegion.php
@@ -251,11 +251,11 @@ public function setChunk($chunkX, $chunkZ, FullChunk $chunk){
 		$chunk->setZ($chunkZ);
 
 
-		if($this->getChunk($chunkX, $chunkZ, false) !== $chunk){
+		if(isset($this->chunks[$index = Level::chunkHash($chunkX, $chunkZ)]) and $this->chunks[$index] !== $chunk){
 			$this->unloadChunk($chunkX, $chunkZ, false);
 		}
 
-		$this->chunks[Level::chunkHash($chunkX, $chunkZ)] = $chunk;
+		$this->chunks[$index] = $chunk;
 	}
 
 	public static function createChunkSection($Y){