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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-29 17:34:12 +00:00
commit 90f3cb95d8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/block/Cactus.php
View File

@ -106,9 +106,12 @@ class Cactus extends Transparent{
if($b->getId() === self::AIR){ if($b->getId() === self::AIR){
$ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)); $ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS));
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if($ev->isCancelled()){
$this->getLevel()->setBlock($b, $ev->getNewState()); break;
} }
$this->getLevel()->setBlock($b, $ev->getNewState());
}else{
break;
} }
} }
$this->age = 0; $this->age = 0;

6
src/pocketmine/block/Sugarcane.php
View File

@ -67,9 +67,11 @@ class Sugarcane extends Flowable{
if($b->getId() === self::AIR){ if($b->getId() === self::AIR){
$ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK)); $ev = new BlockGrowEvent($b, BlockFactory::get(Block::SUGARCANE_BLOCK));
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if($ev->isCancelled()){
$this->getLevel()->setBlock($b, $ev->getNewState()); break;
} }
$this->getLevel()->setBlock($b, $ev->getNewState());
}else{
break; break;
} }
} }