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

Fixed canUseChunkCache() logic (#1446)

Browse Source 
Fix setting disable chunk cache on low memory being useless, fix chunk cache not working if low memory cache clear is enabled
This commit is contained in:
xFlare 2017-10-03 15:27:53 -04:00 committed by Dylan K. Taylor
parent 4dfd171af0
commit bf68a6a9fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/MemoryManager.php
View File

@ -72,7 +72,7 @@ class MemoryManager{
private $chunkTrigger; private $chunkTrigger;
/** @var bool */ /** @var bool */
private $chunkCache; private $disableChunkCacheOnLowMemory;
/** @var bool */ /** @var bool */
private $cacheTrigger; private $cacheTrigger;
@ -133,7 +133,7 @@ class MemoryManager{
$this->chunkCollect = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true); $this->chunkCollect = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true);
$this->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true); $this->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true);
$this->chunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true); $this->disableChunkCacheOnLowMemory = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
$this->cacheTrigger = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true); $this->cacheTrigger = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true);
$this->dumpWorkers = (bool) $this->server->getProperty("memory.memory-dump.dump-async-worker", true); $this->dumpWorkers = (bool) $this->server->getProperty("memory.memory-dump.dump-async-worker", true);
@ -151,7 +151,7 @@ class MemoryManager{
* @return bool * @return bool
*/ */
public function canUseChunkCache() : bool{ public function canUseChunkCache() : bool{
return !($this->lowMemory and $this->chunkTrigger); return !$this->lowMemory or !$this->disableChunkCacheOnLowMemory;
} }
/** /**