mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-06 11:57:10 +00:00
Code Issues Projects Releases Wiki Activity

Improved chunk generation queue

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-14 03:10:25 +02:00
parent 7cdf5a73eb
commit 0db009b08f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/Server.php
View File

@ -1064,8 +1064,10 @@ class Server{
$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
for($Z = 5; $Z <= 11; ++$Z){
for($X = 5; $X <= 11; ++$X){
$this->getLogger()->notice("Spawn terrain for level \"$name\" is being generated in the background");
for($Z = 0; $Z <= 16; ++$Z){
for($X = 0; $X <= 16; ++$X){
$level->generateChunk($X, $Z);
}
}

12
src/pocketmine/level/Level.php
View File

@ -129,6 +129,8 @@ class Level implements ChunkManager, Metadatable{
private $chunkSendQueue = [];
private $chunkSendTasks = [];
private $chunkGenerationQueue = [];
private $autoSave = true;
/** @var BlockMetadataStore */
@ -1273,6 +1275,11 @@ class Level implements ChunkManager, Metadatable{
}
}
public function generateChunkCallback($x, $z, SimpleChunk $chunk){
unset($this->chunkGenerationQueue["$x:$z"]);
$this->setChunk($x, $z, $chunk);
}
public function setChunk($x, $z, SimpleChunk $chunk){
$index = Level::chunkHash($x, $z);
foreach($this->getUsingChunk($x, $z) as $player){
@ -1693,7 +1700,10 @@ class Level implements ChunkManager, Metadatable{
public function generateChunk($x, $z){
$this->server->getGenerationManager()->requestChunk($this, $x, $z);
if(!isset($this->chunkGenerationQueue["$x:$z"])){
$this->chunkGenerationQueue["$x:$z"] = true;
$this->server->getGenerationManager()->requestChunk($this, $x, $z);
}
}
public function regenerateChunk($x, $z){

2
src/pocketmine/level/generator/GenerationRequestManager.php
View File

@ -98,7 +98,7 @@ class GenerationRequestManager{
protected function receiveChunk($levelID, SimpleChunk $chunk){
if(($level = $this->server->getLevel($levelID)) instanceof Level){
$level->setChunk($chunk->getX(), $chunk->getZ(), $chunk);
$level->generateChunkCallback($chunk->getX(), $chunk->getZ(), $chunk);
}else{
$buffer = chr(GenerationManager::PACKET_CLOSE_LEVEL) . Binary::writeInt($levelID);
@socket_write($this->socket, Binary::writeInt(strlen($buffer)) . $buffer);