Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2020-01-09 17:17:42 +00:00
32 changed files with 96 additions and 2 deletions

View File

@ -32,10 +32,15 @@ use function unserialize;
class GeneratorRegisterTask extends AsyncTask{
/** @var string */
public $generatorClass;
/** @var string */
public $settings;
/** @var int */
public $seed;
/** @var int */
public $worldId;
/** @var int */
public $worldHeight = World::Y_MAX;
public function __construct(World $world, string $generatorClass, array $generatorSettings = []){

View File

@ -28,6 +28,7 @@ use pocketmine\world\World;
class GeneratorUnregisterTask extends AsyncTask{
/** @var int */
public $worldId;
public function __construct(World $world){

View File

@ -32,18 +32,31 @@ use pocketmine\world\World;
class PopulationTask extends AsyncTask{
private const TLS_KEY_WORLD = "world";
/** @var bool */
public $state;
/** @var int */
public $worldId;
/** @var string */
public $chunk;
/** @var string */
public $chunk0;
/** @var string */
public $chunk1;
/** @var string */
public $chunk2;
/** @var string */
public $chunk3;
//center chunk
/** @var string */
public $chunk5;
/** @var string */
public $chunk6;
/** @var string */
public $chunk7;
/** @var string */
public $chunk8;
public function __construct(World $world, Chunk $chunk){

View File

@ -52,7 +52,9 @@ class Normal extends Generator{
/** @var BiomeSelector */
private $selector;
/** @var float[][]|null */
private static $GAUSSIAN_KERNEL = null;
/** @var int */
private static $SMOOTH_SIZE = 2;
/**

View File

@ -31,7 +31,9 @@ use pocketmine\world\ChunkManager;
class TallGrass extends Populator{
/** @var ChunkManager */
private $world;
/** @var int */
private $randomAmount = 1;
/** @var int */
private $baseAmount = 0;
public function setRandomAmount(int $amount) : void{

View File

@ -32,7 +32,9 @@ use pocketmine\world\generator\object\Tree as ObjectTree;
class Tree extends Populator{
/** @var ChunkManager */
private $world;
/** @var int */
private $randomAmount = 1;
/** @var int */
private $baseAmount = 0;
/** @var TreeType */