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

Level: Remove dead generator leftovers

Browse Source 
This is all handled by the population mechanism now. Nothing uses these things anymore since years.
This commit is contained in:
Dylan K. Taylor 2018-03-11 13:56:41 +00:00
parent ba0a256834
commit 3f7b14bf59
3 changed files with 1 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pocketmine/level/Level.php
View File

@ -51,7 +51,6 @@ use pocketmine\level\format\EmptySubChunk;
use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkRequestTask;
use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\generator\GenerationTask;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorRegisterTask;
use pocketmine\level\generator\GeneratorUnregisterTask;
@ -206,10 +205,6 @@ class Level implements ChunkManager, Metadatable{
private $chunkPopulationQueue = [];
/** @var bool[] */
private $chunkPopulationLock = [];
/** @var bool[] */
private $chunkGenerationQueue = [];
/** @var int */
private $chunkGenerationQueueSize = 8;
/** @var int */
private $chunkPopulationQueueSize = 2;
@ -368,7 +363,6 @@ class Level implements ChunkManager, Metadatable{
$this->chunkTickRadius = min($this->server->getViewDistance(), max(1, (int) $this->server->getProperty("chunk-ticking.tick-radius", 4)));
$this->chunksPerTick = (int) $this->server->getProperty("chunk-ticking.per-tick", 40);
$this->chunkGenerationQueueSize = (int) $this->server->getProperty("chunk-generation.queue-size", 8);
$this->chunkPopulationQueueSize = (int) $this->server->getProperty("chunk-generation.population-queue-size", 2);
$this->clearChunksOnTick = (bool) $this->server->getProperty("chunk-ticking.clear-tick-list", true);
@ -2400,8 +2394,7 @@ class Level implements ChunkManager, Metadatable{
$loader->onChunkPopulated($chunk);
}
}
}elseif(isset($this->chunkGenerationQueue[$index]) or isset($this->chunkPopulationLock[$index])){
unset($this->chunkGenerationQueue[$index]);
}elseif(isset($this->chunkPopulationLock[$index])){
unset($this->chunkPopulationLock[$index]);
$this->setChunk($x, $z, $chunk, false);
}else{
@ -3030,29 +3023,6 @@ class Level implements ChunkManager, Metadatable{
return true;
}
public function generateChunk(int $x, int $z, bool $force = false){
if(count($this->chunkGenerationQueue) >= $this->chunkGenerationQueueSize and !$force){
return;
}
if(!isset($this->chunkGenerationQueue[$index = Level::chunkHash($x, $z)])){
Timings::$generationTimer->startTiming();
$this->chunkGenerationQueue[$index] = true;
$task = new GenerationTask($this, $this->getChunk($x, $z, true));
$this->server->getScheduler()->scheduleAsyncTask($task);
Timings::$generationTimer->stopTiming();
}
}
public function regenerateChunk(int $x, int $z){
$this->unloadChunk($x, $z, false);
$this->cancelUnloadChunkRequest($x, $z);
$this->generateChunk($x, $z);
//TODO: generate & refresh chunk from the generator object
}
public function doChunkGarbageCollection(){
$this->timings->doChunkGC->startTiming();

88
src/pocketmine/level/generator/GenerationTask.php
View File

@ -1,88 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
declare(strict_types=1);
namespace pocketmine\level\generator;
use pocketmine\level\format\Chunk;
use pocketmine\level\Level;
use pocketmine\level\SimpleChunkManager;
use pocketmine\scheduler\AsyncTask;
use pocketmine\Server;
class GenerationTask extends AsyncTask{
public $state;
public $levelId;
public $chunk;
public function __construct(Level $level, Chunk $chunk){
$this->state = true;
$this->levelId = $level->getId();
$this->chunk = $chunk->fastSerialize();
}
public function onRun(){
/** @var SimpleChunkManager $manager */
$manager = $this->getFromThreadStore("generation.level{$this->levelId}.manager");
/** @var Generator $generator */
$generator = $this->getFromThreadStore("generation.level{$this->levelId}.generator");
if($manager === null or $generator === null){
$this->state = false;
return;
}
/** @var Chunk $chunk */
$chunk = Chunk::fastDeserialize($this->chunk);
if($chunk === null){
//TODO error
return;
}
$manager->setChunk($chunk->getX(), $chunk->getZ(), $chunk);
$generator->generateChunk($chunk->getX(), $chunk->getZ());
$chunk = $manager->getChunk($chunk->getX(), $chunk->getZ());
$chunk->setGenerated();
$this->chunk = $chunk->fastSerialize();
$manager->setChunk($chunk->getX(), $chunk->getZ(), null);
}
public function onCompletion(Server $server){
$level = $server->getLevel($this->levelId);
if($level !== null){
if($this->state === false){
$level->registerGenerator();
return;
}
/** @var Chunk $chunk */
$chunk = Chunk::fastDeserialize($this->chunk);
if($chunk === null){
//TODO error
return;
}
$level->generateChunkCallback($chunk->getX(), $chunk->getZ(), $chunk);
}
}
}

2
src/pocketmine/resources/pocketmine.yml
View File

@ -142,8 +142,6 @@ chunk-ticking:
#- 2 # grass
chunk-generation:
#Max. amount of chunks in the waiting queue to be generated
queue-size: 8
#Max. amount of chunks in the waiting queue to be populated
population-queue-size: 8