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

Fix sugarcane behaviour on fertilizers (#4930)

Browse Source
This commit is contained in:
ShockedPlot7560 2022-09-28 17:38:24 +02:00 committed by GitHub
parent b87e4d8bd3
commit 1c7b1e9e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/block/Sugarcane.php
View File

@ -31,6 +31,7 @@ use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
use pocketmine\world\Position;
class Sugarcane extends Flowable{ class Sugarcane extends Flowable{
public const MAX_AGE = 15; public const MAX_AGE = 15;
@ -49,14 +50,23 @@ class Sugarcane extends Flowable{
return 0b1111; return 0b1111;
} }
private function grow() : bool{ private function seekToBottom() : Position{
$grew = false;
$world = $this->position->getWorld(); $world = $this->position->getWorld();
$bottom = $this->position;
while(($next = $world->getBlock($bottom->down()))->isSameType($this)){
$bottom = $next->position;
}
return $bottom;
}
private function grow(Position $pos) : bool{
$grew = false;
$world = $pos->getWorld();
for($y = 1; $y < 3; ++$y){ for($y = 1; $y < 3; ++$y){
if(!$world->isInWorld($this->position->x, $this->position->y + $y, $this->position->z)){ if(!$world->isInWorld($pos->x, $pos->y + $y, $pos->z)){
break; break;
} }
$b = $world->getBlockAt($this->position->x, $this->position->y + $y, $this->position->z); $b = $world->getBlockAt($pos->x, $pos->y + $y, $pos->z);
if($b->getId() === BlockLegacyIds::AIR){ if($b->getId() === BlockLegacyIds::AIR){
$ev = new BlockGrowEvent($b, VanillaBlocks::SUGARCANE()); $ev = new BlockGrowEvent($b, VanillaBlocks::SUGARCANE());
$ev->call(); $ev->call();
@ -65,12 +75,12 @@ class Sugarcane extends Flowable{
} }
$world->setBlock($b->position, $ev->getNewState()); $world->setBlock($b->position, $ev->getNewState());
$grew = true; $grew = true;
}else{ }elseif(!$b->isSameType($this)){
break; break;
} }
} }
$this->age = 0; $this->age = 0;
$world->setBlock($this->position, $this); $world->setBlock($pos, $this);
return $grew; return $grew;
} }
@ -87,7 +97,7 @@ class Sugarcane extends Flowable{
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if($item instanceof Fertilizer){ if($item instanceof Fertilizer){
if(!$this->getSide(Facing::DOWN)->isSameType($this) && $this->grow()){ if($this->grow($this->seekToBottom())){
$item->pop(); $item->pop();
} }
@ -111,7 +121,7 @@ class Sugarcane extends Flowable{
public function onRandomTick() : void{ public function onRandomTick() : void{
if(!$this->getSide(Facing::DOWN)->isSameType($this)){ if(!$this->getSide(Facing::DOWN)->isSameType($this)){
if($this->age === self::MAX_AGE){ if($this->age === self::MAX_AGE){
$this->grow(); $this->grow($this->position);
}else{ }else{
++$this->age; ++$this->age;
$this->position->getWorld()->setBlock($this->position, $this); $this->position->getWorld()->setBlock($this->position, $this);