Fixed confusing hierarchy of BlockGrow/Form/SpreadEvent, closes #2792

src/event/block/BaseBlockChangeEvent.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\event\block;
+
+use pocketmine\block\Block;
+use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
+
+/**
+ * @internal
+ */
+abstract class BaseBlockChangeEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
+	private Block $newState;
+
+	public function __construct(Block $block, Block $newState){
+		parent::__construct($block);
+		$this->newState = $newState;
+	}
+
+	public function getNewState() : Block{
+		return $this->newState;
+	}
+}

src/event/block/BlockFormEvent.php

@@ -23,6 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\event\block;
 
-class BlockFormEvent extends BlockGrowEvent{
+class BlockFormEvent extends BaseBlockChangeEvent{
 
 }

src/event/block/BlockGrowEvent.php

@@ -23,25 +23,11 @@ declare(strict_types=1);
 
 namespace pocketmine\event\block;
 
-use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
-use pocketmine\event\CancellableTrait;
 
 /**
  * Called when plants or crops grow.
  */
-class BlockGrowEvent extends BlockEvent implements Cancellable{
-	use CancellableTrait;
+class BlockGrowEvent extends BaseBlockChangeEvent implements Cancellable{
 
-	/** @var Block */
-	private $newState;
-
-	public function __construct(Block $block, Block $newState){
-		parent::__construct($block);
-		$this->newState = $newState;
-	}
-
-	public function getNewState() : Block{
-		return $this->newState;
-	}
 }

src/event/block/BlockSpreadEvent.php

@@ -28,7 +28,7 @@ use pocketmine\block\Block;
 /**
  * Called when a block spreads to another block, such as grass spreading to nearby dirt blocks.
  */
-class BlockSpreadEvent extends BlockFormEvent{
+class BlockSpreadEvent extends BaseBlockChangeEvent{
 	/** @var Block */
 	private $source;