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

Merge branch 'release/3.3'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-05 18:29:37 +01:00
parent 495a0b1dc2 495fdbd19f
commit 4608ecde9b
12 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/block/Crops.php
View File

@ -28,7 +28,6 @@ use pocketmine\item\Item;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
use pocketmine\Server;
abstract class Crops extends Flowable{
/** @var int */
@ -67,8 +66,8 @@ abstract class Crops extends Flowable{
$block->age = 7;
}
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
$ev = new BlockGrowEvent($this, $block);
$ev->call();
if(!$ev->isCancelled()){
$this->getLevel()->setBlock($this, $ev->getNewState());
}
@ -95,8 +94,8 @@ abstract class Crops extends Flowable{
if($this->age < 7 and mt_rand(0, 2) === 1){
$block = clone $this;
++$block->age;
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
$ev = new BlockGrowEvent($this, $block);
$ev->call();
if(!$ev->isCancelled()){
$this->getLevel()->setBlock($this, $ev->getNewState());
}