mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-07 02:21:46 +00:00
Code Issues Projects Releases Wiki Activity

Improved initial chunk loading, do not skip near chunks, fixes world loading getting stuck

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-06 00:45:02 +02:00
parent 376e359577
commit 9abd2c63f4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/Player.php
View File

@ -612,7 +612,11 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$Z = null; $Z = null;
Level::getXZ($index, $X, $Z); Level::getXZ($index, $X, $Z);
if(!$this->getLevel()->isChunkPopulated($X, $Z)){ if(!$this->getLevel()->isChunkPopulated($X, $Z)){
continue; if($this->spawned === true){
continue;
}else{
break;
}
} }
unset($this->loadQueue[$index]); unset($this->loadQueue[$index]);
@ -704,7 +708,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$chunkZ = $Z + $centerZ; $chunkZ = $Z + $centerZ;
$index = Level::chunkHash($chunkX, $chunkZ); $index = Level::chunkHash($chunkX, $chunkZ);
if(!isset($this->usedChunks[$index])){ if(!isset($this->usedChunks[$index])){
if($this->level->isChunkPopulated($chunkX, $chunkZ)){ if($this->spawned === false or $this->level->isChunkPopulated($chunkX, $chunkZ)){
$newOrder[$index] = $distance; $newOrder[$index] = $distance;
}else{ }else{
$generateQueue->insert([$chunkX, $chunkZ], $distance); $generateQueue->insert([$chunkX, $chunkZ], $distance);
@ -729,7 +733,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
$i = 0; $i = 0;
while(count($this->loadQueue) < 8 and $generateQueue->count() > 0 and $i < 32){ while($generateQueue->count() > 0 and $i < 32){
$d = $generateQueue->extract(); $d = $generateQueue->extract();
$this->getLevel()->generateChunk($d[0], $d[1]); $this->getLevel()->generateChunk($d[0], $d[1]);
++$i; ++$i;
@ -2240,7 +2244,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
$this->tasks = []; $this->tasks = [];
if($this->connected === true){ if($this->connected and !$this->closed){
$this->connected = false; $this->connected = false;
if($this->username != ""){ if($this->username != ""){