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

Generator: small reduction of code duplication

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-07 19:49:51 +01:00
parent 996935e9b2
commit 3c9af5cd6d
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/level/generator/Flat.php
View File

@ -35,12 +35,8 @@ use pocketmine\math\Vector3;
use pocketmine\utils\Random; use pocketmine\utils\Random;
class Flat extends Generator{ class Flat extends Generator{
/** @var ChunkManager */
private $level;
/** @var Chunk */ /** @var Chunk */
private $chunk; private $chunk;
/** @var Random */
private $random;
/** @var Populator[] */ /** @var Populator[] */
private $populators = []; private $populators = [];
private $structure, $chunks, $options, $floorLevel, $preset; private $structure, $chunks, $options, $floorLevel, $preset;
@ -148,8 +144,7 @@ class Flat extends Generator{
} }
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random){
$this->level = $level; parent::init($level, $random);
$this->random = $random;
/* /*
// Commented out : We want to delay this // Commented out : We want to delay this

10
src/pocketmine/level/generator/Generator.php
View File

@ -52,10 +52,18 @@ abstract class Generator{
return $convertedSeed; return $convertedSeed;
} }
/** @var ChunkManager */
protected $level;
/** @var Random */
protected $random;
abstract public function __construct(array $settings = []); abstract public function __construct(array $settings = []);
abstract public function init(ChunkManager $level, Random $random); public function init(ChunkManager $level, Random $random){
$this->level = $level;
$this->random = $random;
}
abstract public function generateChunk(int $chunkX, int $chunkZ); abstract public function generateChunk(int $chunkX, int $chunkZ);

7
src/pocketmine/level/generator/hell/Nether.php
View File

@ -37,10 +37,6 @@ class Nether extends Generator{
/** @var Populator[] */ /** @var Populator[] */
private $populators = []; private $populators = [];
/** @var ChunkManager */
private $level;
/** @var Random */
private $random;
/** @var int */ /** @var int */
private $waterHeight = 32; private $waterHeight = 32;
/** @var int */ /** @var int */
@ -95,8 +91,7 @@ class Nether extends Generator{
} }
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random){
$this->level = $level; parent::init($level, $random);
$this->random = $random;
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 64); $this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 64);
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());

7
src/pocketmine/level/generator/normal/Normal.php
View File

@ -42,10 +42,6 @@ class Normal extends Generator{
/** @var Populator[] */ /** @var Populator[] */
private $populators = []; private $populators = [];
/** @var ChunkManager */
private $level;
/** @var Random */
private $random;
/** @var int */ /** @var int */
private $waterHeight = 62; private $waterHeight = 62;
/** @var int */ /** @var int */
@ -109,8 +105,7 @@ class Normal extends Generator{
} }
public function init(ChunkManager $level, Random $random){ public function init(ChunkManager $level, Random $random){
$this->level = $level; parent::init($level, $random);
$this->random = $random;
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 32); $this->noiseBase = new Simplex($this->random, 4, 1 / 4, 1 / 32);
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());