From 16ba004fd6b88d14fc4fd177727d91fefd1baf7d Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 25 Feb 2023 10:08:58 +0300 Subject: [PATCH] more chunk loading tweaks --- src/Player.php | 9 ++++----- src/world/Level.php | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Player.php b/src/Player.php index b3223009..5c68f789 100755 --- a/src/Player.php +++ b/src/Player.php @@ -412,7 +412,6 @@ class Player{ } } asort($this->chunksOrder); - var_dump($this->chunksOrder); } public function loadAllChunks(){ @@ -945,7 +944,7 @@ class Player{ $pk->z = $this->z; $pk->spawnX = $spwnPos->x; $pk->spawnY = $spwnPos->y; - $pk->spwnZ = $spwnPos->z; + $pk->spawnZ = $spwnPos->z; $pk->generator = 0; //TODO multiple generators $pk->gamemode = $this->gamemode & 0x01; $pk->eid = 0; @@ -1407,9 +1406,9 @@ class Player{ } $pk = new StartGamePacket; $pk->seed = $this->level->getSeed(); - $pk->spawnX = (int) $this->entity->x; - $pk->spawnY = (int) $this->entity->y; - $pk->spawnZ = (int) $this->entity->z; + $pk->spawnX = (int) $spawnPos->x; + $pk->spawnY = (int) $spawnPos->y; + $pk->spawnZ = (int) $spawnPos->z; $pk->x = (int) $this->entity->x; $pk->y = (int) $this->entity->x; $pk->z = (int) $this->entity->x; diff --git a/src/world/Level.php b/src/world/Level.php index a8ae9784..d1f791d9 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -83,6 +83,8 @@ class Level{ public function getOrderedFullChunk($X, $Z){ + $X = (int)$X; + $Z = (int)$Z; //todo: make asynchronous if(!isset($this->level)){ return false; @@ -93,7 +95,7 @@ class Level{ return $cache; } }*/ - + $gen = !($X > 15 || $X < 0 || $Z > 15 || $Z < 0); //TODO inf Worlds $orderedIds = ""; $orderedData = ""; $orderedSkyLight = str_repeat("\x00", 16*16*64); @@ -101,13 +103,16 @@ class Level{ $orderedBiomeIds = str_repeat("\x01", 16*16); //all plains, according to PocketMine 1.4 source $orderedBiomeColors = str_repeat("\x00\x85\xb2\x4a", 256); // also PM 1.4 $tileEntities = ""; - $this->level->loadChunk($X, $Z); - $miniChunks = []; - - for($y = 0; $y < 8; ++$y){ - $miniChunks[$y] = $this->level->getMiniChunk($X, $Z, $y); + if($gen){ + $this->level->loadChunk($X, $Z); } + $miniChunks = []; + + for($y = 0; $y < 8; ++$y){ + $miniChunks[$y] = $gen ? $this->level->getMiniChunk($X, $Z, $y) : str_repeat("\x00", 8192); + } + for ($i = 0; $i < 16; $i++){ for ($j = 0; $j < 16; $j++){ @@ -229,6 +234,7 @@ class Level{ } public function useChunk($X, $Z, Player $player){ + if($X > 15 || $X < 0 || $Z > 15 || $Z < 0) return; //TODO inf worlds if(!isset($this->usedChunks[$X . "." . $Z])){ $this->usedChunks[$X . "." . $Z] = []; }