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

Refactor Tree classes (#4407)

Browse Source
This commit is contained in:
Colin
2021-08-27 21:11:05 +02:00
committed by GitHub
parent ee16a00c57
commit 8f89c04c51
6 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/block/Sapling.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\block\utils\TreeType;
use pocketmine\event\block\StructureGrowEvent;
use pocketmine\item\Fertilizer;
use pocketmine\item\Item;
use pocketmine\math\Facing;
@ -76,7 +77,7 @@ class Sapling extends Flowable{
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if($item instanceof Fertilizer){
Tree::growTree($this->position->getWorld(), $this->position->x, $this->position->y, $this->position->z, new Random(mt_rand()), $this->treeType, true);
$this->grow();
$item->pop();
@ -97,9 +98,9 @@ class Sapling extends Flowable{
}
public function onRandomTick() : void{
if($this->position->getWorld()->getFullLightAt($this->position->x, $this->position->y, $this->position->z) >= 8 and mt_rand(1, 7) === 1){
if($this->position->getWorld()->getFullLightAt($this->position->getFloorX(), $this->position->getFloorY(), $this->position->getFloorZ()) >= 8 and mt_rand(1, 7) === 1){
if($this->ready){
Tree::growTree($this->position->getWorld(), $this->position->x, $this->position->y, $this->position->z, new Random(mt_rand()), $this->treeType, true);
$this->grow();
}else{
$this->ready = true;
$this->position->getWorld()->setBlock($this->position, $this);
@ -107,6 +108,23 @@ class Sapling extends Flowable{
}
}
private function grow() : void{
$random = new Random(mt_rand());
$tree = Tree::get($random, $this->treeType);
$transaction = $tree?->getBlockTransaction($this->position->getWorld(), $this->position->getFloorX(), $this->position->getFloorY(), $this->position->getFloorZ(), $random);
if($transaction === null){
return;
}
$ev = new StructureGrowEvent($this, $transaction);
$ev->call();
if($ev->isCancelled()){
return;
}
$transaction->apply();
}
public function getFuelTime() : int{
return 100;
}