From 0aa98434580aa9b0cbe366d6823439ed03008ca6 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 2 Jul 2023 07:23:18 +0300 Subject: [PATCH] time flow is better --- src/Player.php | 4 ++-- src/pmf/PMFLevel.php | 2 +- src/world/Level.php | 11 ++++++++--- src/world/generator/NormalGenerator.php | 2 -- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Player.php b/src/Player.php index 8048dd7e..5ca11d68 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1463,12 +1463,12 @@ class Player{ $this->evid[] = $this->server->event("tile.update", [$this, "eventHandler"]); $this->lastMeasure = microtime(true); $this->server->schedule(50, [$this, "measureLag"], [], true); - /* + $pk = new SetTimePacket; $pk->time = (int) $this->level->getTime(); $pk->started = !$this->level->isTimeStopped(); $this->dataPacket($pk); - */ + console("[INFO] " . FORMAT_AQUA . $this->username . FORMAT_RESET . "[/" . $this->ip . ":" . $this->port . "] logged in with entity id " . $this->eid . " at (" . $this->entity->level->getName() . ", " . round($this->entity->x, 2) . ", " . round($this->entity->y, 2) . ", " . round($this->entity->z, 2) . ")"); //spawn! diff --git a/src/pmf/PMFLevel.php b/src/pmf/PMFLevel.php index 18b2ae04..5b91fb31 100644 --- a/src/pmf/PMFLevel.php +++ b/src/pmf/PMFLevel.php @@ -387,7 +387,7 @@ class PMFLevel extends PMF{ $this->chunks[$index][$Y] = str_repeat("\x00", 16384); $this->chunkChange[$index][-1] = true; $this->chunkChange[$index][$Y] = 16384; - $this->locationTable[$index][0] |= 1 << $Y; + //$this->locationTable[$index][0] |= 1 << $Y; $this->chunkInfo[$index][0] = str_repeat("\x00", 256); return true; } diff --git a/src/world/Level.php b/src/world/Level.php index 2266cea1..e2420090 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -377,7 +377,7 @@ class Level{ public function onTick(PocketMinecraftServer $server){ //$ents = $server->api->entity->getAll($this); - if(!$this->stopTime) ++$this->time; + if(!$this->stopTime) $this->time+=2; foreach($this->entityList as $k => $e){ if(!($e instanceof Entity)){ unset($this->entityList[$k]); @@ -629,7 +629,7 @@ class Level{ } public function checkTime(){ - if(!isset($this->level)){ + /*if(!isset($this->level)){ return false; } $now = microtime(true); @@ -642,11 +642,16 @@ class Level{ $this->time = $time; $pk = new SetTimePacket; $pk->time = (int) $this->time; + console($pk->time); $pk->started = $this->stopTime == false; $this->server->api->player->broadcastPacket($this->players, $pk); }else{ $this->time -= 20 * 13; - } + }*/ + $pk = new SetTimePacket; + $pk->time = (int) $this->time; + $pk->started = $this->stopTime == false; + $this->server->api->player->broadcastPacket($this->players, $pk); } public function isTimeStopped(){ diff --git a/src/world/generator/NormalGenerator.php b/src/world/generator/NormalGenerator.php index ef6897d1..2c996d15 100644 --- a/src/world/generator/NormalGenerator.php +++ b/src/world/generator/NormalGenerator.php @@ -64,7 +64,6 @@ class NormalGenerator implements NewLevelGenerator{ public function generateChunk($chunkX, $chunkZ){ $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $hills = array(); - $patchesSmall = array(); $base = array(); for($z = 0; $z < 16; ++$z){ for($x = 0; $x < 16; ++$x){ @@ -137,7 +136,6 @@ class NormalGenerator implements NewLevelGenerator{ $this->level->level->setBiomeIdArrayForChunk($chunkX, $chunkZ, str_repeat(chr(BIOME_PLAINS), 256)); $this->level->setMiniChunk($chunkX, $chunkZ, $chunkY, $chunk); } - } public function populateChunk($chunkX, $chunkZ){