From f140fef52da5d62e2ea15833ef8d9300ce6594ee Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Thu, 4 Sep 2014 12:37:27 +0200 Subject: [PATCH] Possible fix for level save issues, related to #1985 #1982 #1758 --- src/pocketmine/level/Level.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 4862ae9bb..97e0a3a2f 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -141,8 +141,6 @@ class Level implements ChunkManager, Metadatable{ /** @var Chunk[] */ protected $unloadQueue; - protected $nextSave; - protected $time; public $stopTime; @@ -254,7 +252,6 @@ class Level implements ChunkManager, Metadatable{ $this->updateQueue = new ReversePriorityQueue(); $this->updateQueue->setExtractFlags(\SplPriorityQueue::EXTR_BOTH); $this->time = (int) $this->provider->getTime(); - $this->nextSave = microtime(true) + 90; $this->chunkTickRadius = min($this->server->getViewDistance(), max(1, (int) $this->server->getProperty("chunk-ticking.tick-radius", 3))); $this->chunksPerTick = (int) $this->server->getProperty("chunk-ticking.per-tick", 80); @@ -296,7 +293,7 @@ class Level implements ChunkManager, Metadatable{ public function close(){ if($this->getAutoSave()){ - $this->provider->saveChunks(); + $this->save(); } $this->provider->close(); } @@ -337,7 +334,6 @@ class Level implements ChunkManager, Metadatable{ } $this->server->getLogger()->info("Unloading level \"" . $this->getName() . "\""); - $this->nextSave = PHP_INT_MAX; $defaultLevel = $this->server->getDefaultLevel(); foreach($this->getPlayers() as $player){ if($this === $defaultLevel or $defaultLevel === null){ @@ -658,7 +654,6 @@ class Level implements ChunkManager, Metadatable{ if($this->provider instanceof BaseLevelProvider){ $this->provider->saveLevelData(); } - $this->nextSave = microtime(true) + 45; return true; }