Merge branch 'master' into master

This commit is contained in:
XenialDan 2017-05-13 13:47:13 +02:00 committed by GitHub
commit dd8ec304ee
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa

Näytä tiedosto

@ -13,6 +13,7 @@ name: BetterGen
author: Ad5001
main: Ad5001\BetterGen\Main
version: 1.1
load: STARTUP
api: [3.0.1, 3.0.0-ALPHA3]
commands:
createworld:

Näytä tiedosto

@ -450,7 +450,8 @@ class SakuraTree extends Tree {
*/
public function __construct() {
$this->trunkBlock = Block::LOG;
$this->leafBlock = Block::WOOL;
$this->leafBlock = Block::AIR; // To remove bushes
$this->realLeafBlock = Block::WOOL;
$this->leafType = 6;
$this->leaf2Type = 0;
$this->type = Wood::OAK;
@ -680,7 +681,7 @@ class SakuraTree extends Tree {
$this->leafType,
$this->leaf2Type
] [( int )$random->nextBoolean()];
$level->setBlockIdAt($x, $y, $z, $this->leafBlock);
$level->setBlockIdAt($x, $y, $z, $this->realLeafBlock);
$level->setBlockDataAt($x, $y, $z, $data);
}
}