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

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-08-14 18:20:55 +01:00
parent d04793145c 677d43028a
commit 200bcb485e
12 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/world/generator/populator/TallGrass.php
View File

@ -31,8 +31,8 @@ use pocketmine\world\ChunkManager;
class TallGrass extends Populator{
/** @var ChunkManager */
private $world;
private $randomAmount;
private $baseAmount;
private $randomAmount = 1;
private $baseAmount = 0;
public function setRandomAmount(int $amount) : void{
$this->randomAmount = $amount;
@ -44,7 +44,7 @@ class TallGrass extends Populator{
public function populate(ChunkManager $world, int $chunkX, int $chunkZ, Random $random) : void{
$this->world = $world;
$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
$amount = $random->nextRange(0, $this->randomAmount) + $this->baseAmount;
$block = VanillaBlocks::TALL_GRASS();
for($i = 0; $i < $amount; ++$i){

6
src/world/generator/populator/Tree.php
View File

@ -32,8 +32,8 @@ use pocketmine\world\generator\object\Tree as ObjectTree;
class Tree extends Populator{
/** @var ChunkManager */
private $world;
private $randomAmount;
private $baseAmount;
private $randomAmount = 1;
private $baseAmount = 0;
/** @var TreeType */
private $type;
@ -55,7 +55,7 @@ class Tree extends Populator{
public function populate(ChunkManager $world, int $chunkX, int $chunkZ, Random $random) : void{
$this->world = $world;
$amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
$amount = $random->nextRange(0, $this->randomAmount) + $this->baseAmount;
for($i = 0; $i < $amount; ++$i){
$x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15);
$z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15);