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

ChunkCache: clean up handling of cache cleanup on world unload

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-05-06 13:41:36 +01:00
parent e392a6a807
commit 88c6dcf46d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/mcpe/ChunkCache.php
View File

@ -51,6 +51,16 @@ class ChunkCache implements ChunkListener{
public static function getInstance(World $world, Compressor $compressor) : self{ public static function getInstance(World $world, Compressor $compressor) : self{
$worldId = spl_object_id($world); $worldId = spl_object_id($world);
$compressorId = spl_object_id($compressor); $compressorId = spl_object_id($compressor);
if(!isset(self::$instances[$worldId])){
self::$instances[$worldId] = [];
$world->addOnUnloadCallback(static function() use ($worldId) : void{
foreach(self::$instances[$worldId] as $cache){
$cache->caches = [];
}
unset(self::$instances[$worldId]);
\GlobalLogger::get()->debug("Destroyed chunk packet caches for world#$worldId");
});
}
if(!isset(self::$instances[$worldId][$compressorId])){ if(!isset(self::$instances[$worldId][$compressorId])){
\GlobalLogger::get()->debug("Created new chunk packet cache (world#$worldId, compressor#$compressorId)"); \GlobalLogger::get()->debug("Created new chunk packet cache (world#$worldId, compressor#$compressorId)");
self::$instances[$worldId][$compressorId] = new self($world, $compressor); self::$instances[$worldId][$compressorId] = new self($world, $compressor);
@ -74,12 +84,6 @@ class ChunkCache implements ChunkListener{
private function __construct(World $world, Compressor $compressor){ private function __construct(World $world, Compressor $compressor){
$this->world = $world; $this->world = $world;
$this->compressor = $compressor; $this->compressor = $compressor;
$worldId = spl_object_id($world);
$this->world->addOnUnloadCallback(function() use ($worldId) : void{
$this->caches = [];
unset(self::$instances[$worldId]);
\GlobalLogger::get()->debug("Destroyed chunk packet caches for world#$worldId");
});
} }
/** /**