Block: Split onUpdate() into several functions, removed Level::BLOCK_UPDATE_* constants

This allows the removal of lots of ugly code, and also exposes lots of similarities with how this update type was handled. This can be further improved in the future to more generically handle cases.

I realized in the process of changing this, that it might actually be simpler to treat to treat scheduled updates and neighbour updates as one and the same. They use the same mechanism for being saved on chunks (TileTicks),
and doing that would make updating only require one queue instead of two.

RedstoneOre: use onActivate() to trigger glowing
this is not technically correct behaviour, but this preserves the current behaviour.

src/pocketmine/block/Block.php

@@ -278,6 +278,12 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $base;
 	}
 
+	/**
+	 * Called when this block or a block immediately adjacent to it changes state.
+	 */
+	public function onNearbyBlockChange() : void{
+
+	}
 
 	/**
 	 * Returns whether random block updates will be done on this block.
@@ -289,14 +295,18 @@ class Block extends Position implements BlockIds, Metadatable{
 	}
 
 	/**
-	 * Fires a block update on the Block
-	 *
-	 * @param int $type
-	 *
-	 * @return bool|int
+	 * Called when this block is randomly updated due to chunk ticking.
+	 * WARNING: This will not be called if ticksRandomly() does not return true!
 	 */
-	public function onUpdate(int $type){
-		return false;
+	public function onRandomTick() : void{
+
+	}
+
+	/**
+	 * Called when this block is updated by the delayed blockupdate scheduler in the level.
+	 */
+	public function onScheduledUpdate() : void{
+
 	}
 
 	/**

src/pocketmine/block/Cactus.php

@@ -28,7 +28,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -66,31 +65,31 @@ class Cactus extends Transparent{
 		);
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
 		$entity->attack($ev);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
 			$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-
+		}else{
 			for($side = 2; $side <= 5; ++$side){
 				$b = $this->getSide($side);
 				if(!$b->canBeFlowedInto()){
 					$this->getLevel()->useBreakOn($this);
-					return Level::BLOCK_UPDATE_NORMAL;
+					break;
 				}
 			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
 			if($this->meta === 0x0f){
 				for($y = 1; $y < 3; ++$y){
@@ -111,9 +110,6 @@ class Cactus extends Transparent{
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::SAND or $down->getId() === self::CACTUS){

src/pocketmine/block/Cake.php

@@ -27,7 +27,6 @@ use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -73,18 +72,12 @@ class Cake extends Transparent implements FoodSource{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];
 	}

src/pocketmine/block/Carpet.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -73,16 +72,10 @@ class Carpet extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 }

src/pocketmine/block/ConcretePowder.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\level\Level;
 
 class ConcretePowder extends Fallable{
 
@@ -46,13 +45,10 @@ class ConcretePowder extends Fallable{
 		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and ($block = $this->checkAdjacentWater()) !== null){
+	public function onNearbyBlockChange() : void{
+		if(($block = $this->checkAdjacentWater()) !== null){
 			$this->level->setBlock($this, $block);
-			return $type;
 		}
-
-		return parent::onUpdate($type);
 	}
 
 	/**

src/pocketmine/block/Crops.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -65,17 +64,17 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
 	public function ticksRandomly() : bool{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		if(mt_rand(0, 2) === 1){
 			if($this->meta < 0x07){
 				$block = clone $this;
@@ -84,18 +83,11 @@ abstract class Crops extends Flowable{
 
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
-					}else{
-						return Level::BLOCK_UPDATE_RANDOM;
 				}
 			}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
 		}
 	}
 
-		return false;
-	}
-
 	public function isAffectedBySilkTouch() : bool{
 		return false;
 	}

src/pocketmine/block/Dandelion.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -52,15 +51,9 @@ class Dandelion extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
-
-		return false;
-	}
 }

src/pocketmine/block/DeadBush.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 class DeadBush extends Flowable{
@@ -40,18 +39,12 @@ class DeadBush extends Flowable{
 		return "Dead Bush";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getToolType() : int{
 		return BlockToolType::TYPE_SHEARS;
 	}

src/pocketmine/block/Door.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -201,21 +200,15 @@ abstract class Door extends Transparent{
 		return $bb;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
 			if($this->getSide(Vector3::SIDE_UP) instanceof Door){
 				$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
 			}
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($face === Vector3::SIDE_UP){
 			$blockUp = $this->getSide(Vector3::SIDE_UP);

src/pocketmine/block/DoublePlant.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -84,19 +83,12 @@ class DoublePlant extends Flowable{
 		);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $down->isTransparent())){
+	public function onNearbyBlockChange() : void{
+		if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $this->getSide(Vector3::SIDE_DOWN)->isTransparent())){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getVariantBitmask() : int{
 		return 0x07;
 	}

src/pocketmine/block/Fallable.php

@@ -24,13 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 abstract class Fallable extends Solid{
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
 			$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
@@ -46,7 +44,6 @@ abstract class Fallable extends Solid{
 			}
 		}
 	}
-	}
 
 	/**
 	 * @return null|Block

src/pocketmine/block/Farmland.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -49,9 +48,6 @@ class Farmland extends Transparent{
 		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
@@ -64,11 +60,17 @@ class Farmland extends Transparent{
 		);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if(!$this->canHydrate()){
 			if($this->meta > 0){
 				$this->meta--;
@@ -76,19 +78,12 @@ class Farmland extends Transparent{
 			}else{
 				$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
 			}
-
-				return $type;
 		}elseif($this->meta < 7){
 			$this->meta = 7;
 			$this->level->setBlock($this, $this, false, false);
-
-				return $type;
 		}
 	}
 
-		return false;
-	}
-
 	protected function canHydrate() : bool{
 		//TODO: check rain
 		$start = $this->add(-4, 0, -4);

src/pocketmine/block/Fire.php

@@ -29,7 +29,6 @@ use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -61,10 +60,6 @@ class Fire extends Flowable{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
 		$entity->attack($ev);
@@ -83,18 +78,22 @@ class Fire extends Flowable{
 		return [];
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		for($s = 0; $s <= 5; ++$s){
 			$side = $this->getSide($s);
 			if($side->getId() !== self::AIR and !($side instanceof Liquid)){
-					return false;
+				return;
 			}
 		}
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
 
-			return Level::BLOCK_UPDATE_NORMAL;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::NETHERRACK){
 			if(mt_rand(0, 2) === 0){
 				if($this->meta === 0x0F){
@@ -103,15 +102,9 @@ class Fire extends Flowable{
 					$this->meta++;
 					$this->level->setBlock($this, $this);
 				}
-
-					return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}
 
 		//TODO: fire spread
 	}
-
-		return false;
-	}
-
 }

src/pocketmine/block/Flower.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -71,15 +70,9 @@ class Flower extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
-
-		return false;
-	}
 }

src/pocketmine/block/FlowerPot.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -68,18 +67,12 @@ class FlowerPot extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		$pot = $this->getLevel()->getTile($this);
 		if(!($pot instanceof TileFlowerPot)){

src/pocketmine/block/GlowingRedstoneOre.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
-
 class GlowingRedstoneOre extends RedstoneOre{
 
 	protected $id = self::GLOWING_REDSTONE_ORE;
@@ -39,13 +37,11 @@ class GlowingRedstoneOre extends RedstoneOre{
 		return 9;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
-
-			return Level::BLOCK_UPDATE_WEAK;
+	public function ticksRandomly() : bool{
+		return true;
 	}
 
-		return false;
+	public function onRandomTick() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
 	}
 }

src/pocketmine/block/Grass.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\Random;
@@ -62,8 +61,7 @@ class Grass extends Solid{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
 		if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
 			//grass dies
@@ -71,8 +69,6 @@ class Grass extends Solid{
 			if(!$ev->isCancelled()){
 				$this->level->setBlock($this, $ev->getNewState(), false, false);
 			}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 		}elseif($lightAbove >= 9){
 			//try grass spread
 			for($i = 0; $i < 4; ++$i){
@@ -93,14 +89,9 @@ class Grass extends Solid{
 					$this->level->setBlock($b, $ev->getNewState(), false, false);
 				}
 			}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 		}
 	}
 
-		return false;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){
 			$item->count--;

src/pocketmine/block/GrassPath.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -60,13 +59,10 @@ class GrassPath extends Transparent{
 		return 0.6;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
 		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Ice.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Ice extends Transparent{
@@ -67,16 +66,11 @@ class Ice extends Transparent{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
 			$this->level->useBreakOn($this);
-
-				return $type;
 		}
 	}
-		return false;
-	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [];

src/pocketmine/block/ItemFrame.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\ItemFrame as TileItemFrame;
@@ -58,8 +57,7 @@ class ItemFrame extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$sides = [
 			0 => Vector3::SIDE_WEST,
 			1 => Vector3::SIDE_EAST,
@@ -68,11 +66,8 @@ class ItemFrame extends Flowable{
 		];
 		if(!$this->getSide($sides[$this->meta])->isSolid()){
 			$this->level->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
-		return false;
-	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($face === Vector3::SIDE_DOWN or $face === Vector3::SIDE_UP or !$blockClicked->isSolid()){

src/pocketmine/block/Ladder.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -109,17 +108,12 @@ class Ladder extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if(!$this->getSide($this->meta ^ 0x01)->isSolid()){ //Replace with common break method
 			$this->level->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}

src/pocketmine/block/Leaves.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -67,9 +66,6 @@ class Leaves extends Transparent{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
 
 	protected function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
 		++$check;
@@ -136,13 +132,18 @@ class Leaves extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if(($this->meta & 0b00001100) === 0){
 			$this->meta |= 0x08;
 			$this->getLevel()->setBlock($this, $this, true, false);
 		}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if(($this->meta & 0b00001100) === 0x08){
 			$this->meta &= 0x03;
 			$visited = [];
@@ -154,15 +155,10 @@ class Leaves extends Transparent{
 				$this->getLevel()->setBlock($this, $this, false, false);
 			}else{
 				$this->getLevel()->useBreakOn($this);
-
-					return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$this->meta |= 0x04;
 		return $this->getLevel()->setBlock($this, $this, true);

src/pocketmine/block/Lever.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -74,8 +73,7 @@ class Lever extends Flowable{
 		return $this->level->setBlock($blockReplace, $this, true, true);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$faces = [
 			0 => Vector3::SIDE_UP,
 			1 => Vector3::SIDE_WEST,
@@ -88,13 +86,8 @@ class Lever extends Flowable{
 		];
 		if(!$this->getSide($faces[$this->meta & 0x07])->isSolid()){
 			$this->level->useBreakOn($this);
-
-				return $type;
 		}
 	}
 
-		return false;
-	}
-
 	//TODO
 }

src/pocketmine/block/Liquid.php

@@ -206,20 +206,12 @@ abstract class Liquid extends Transparent{
 		return 1;
 	}
 
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param int $type
-	 *
-	 * @return bool|int
-	 */
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$this->checkForHarden();
 		$this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
+	}
 
-			return $type;
-		}elseif($type === Level::BLOCK_UPDATE_SCHEDULED){
+	public function onScheduledUpdate() : void{
 		$decay = $this->getFlowDecay($this);
 		$multiplier = $this->getFlowDecayPerBlock();
 
@@ -296,11 +288,6 @@ abstract class Liquid extends Transparent{
 
 			$this->checkForHarden();
 		}
-
-			return $type;
-		}
-
-		return false;
 	}
 
 	protected function flowIntoBlock(Block $block, int $newFlowDecay) : void{

src/pocketmine/block/MelonStem.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -42,13 +41,7 @@ class MelonStem extends Crops{
 		$this->meta = $meta;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		if(mt_rand(0, 2) === 1){
 			if($this->meta < 0x07){
 				$block = clone $this;
@@ -57,13 +50,11 @@ class MelonStem extends Crops{
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
 				}
-
-					return Level::BLOCK_UPDATE_RANDOM;
 			}else{
 				for($side = 2; $side <= 5; ++$side){
 					$b = $this->getSide($side);
 					if($b->getId() === self::MELON_BLOCK){
-							return Level::BLOCK_UPDATE_RANDOM;
+						return;
 					}
 				}
 				$side = $this->getSide(mt_rand(2, 5));
@@ -76,11 +67,6 @@ class MelonStem extends Crops{
 				}
 			}
 		}
-
-			return Level::BLOCK_UPDATE_RANDOM;
-		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Mycelium.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -60,8 +59,7 @@ class Mycelium extends Solid{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		//TODO: light levels
 		$x = mt_rand($this->x - 1, $this->x + 1);
 		$y = mt_rand($this->y - 2, $this->y + 2);
@@ -76,5 +74,4 @@ class Mycelium extends Solid{
 			}
 		}
 	}
-	}
 }

src/pocketmine/block/NetherWartPlant.php

@@ -27,7 +27,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,10 +43,6 @@ class NetherWartPlant extends Flowable{
 		return "Nether Wart";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === Block::SOUL_SAND){
@@ -59,9 +54,17 @@ class NetherWartPlant extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		switch($type){
-			case Level::BLOCK_UPDATE_RANDOM:
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::SOUL_SAND){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if($this->meta < 3 and mt_rand(0, 10) === 0){ //Still growing
 			$block = clone $this;
 			$block->meta++;
@@ -69,20 +72,8 @@ class NetherWartPlant extends Flowable{
 
 			if(!$ev->isCancelled()){
 				$this->getLevel()->setBlock($this, $ev->getNewState(), false, true);
-
-						return $type;
 			}
 		}
-				break;
-			case Level::BLOCK_UPDATE_NORMAL:
-				if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::SOUL_SAND){
-					$this->getLevel()->useBreakOn($this);
-					return $type;
-				}
-				break;
-		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/PumpkinStem.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -42,13 +41,7 @@ class PumpkinStem extends Crops{
 		return "Pumpkin Stem";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	public function onRandomTick() : void{
 		if(mt_rand(0, 2) === 1){
 			if($this->meta < 0x07){
 				$block = clone $this;
@@ -57,13 +50,11 @@ class PumpkinStem extends Crops{
 				if(!$ev->isCancelled()){
 					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
 				}
-
-					return Level::BLOCK_UPDATE_RANDOM;
 			}else{
 				for($side = 2; $side <= 5; ++$side){
 					$b = $this->getSide($side);
 					if($b->getId() === self::PUMPKIN){
-							return Level::BLOCK_UPDATE_RANDOM;
+						return;
 					}
 				}
 				$side = $this->getSide(mt_rand(2, 5));
@@ -76,11 +67,6 @@ class PumpkinStem extends Crops{
 				}
 			}
 		}
-
-			return Level::BLOCK_UPDATE_RANDOM;
-		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Rail.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -63,19 +62,14 @@ class Rail extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-				return $type;
 		}else{
 			//TODO: Update rail connectivity
 		}
 	}
 
-		return false;
-	}
-
 	public function getVariantBitmask() : int{
 		return 0;
 	}

src/pocketmine/block/RedMushroom.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,18 +43,12 @@ class RedMushroom extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->isTransparent() === false){

src/pocketmine/block/RedstoneOre.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -50,14 +49,12 @@ class RedstoneOre extends Solid{
 		return $this->getLevel()->setBlock($this, $this, true, false);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
-
-			return Level::BLOCK_UPDATE_WEAK;
+	public function onActivate(Item $item, Player $player = null) : bool{
+		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
 	}
 
-		return false;
+	public function onNearbyBlockChange() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
 	}
 
 	public function getToolType() : int{

src/pocketmine/block/Sapling.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\generator\object\Tree;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\Random;
@@ -56,10 +55,6 @@ class Sapling extends Flowable{
 		return $names[$this->getVariant()] ?? "Unknown";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::FARMLAND){
@@ -84,29 +79,25 @@ class Sapling extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){ //Growth
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if(mt_rand(1, 7) === 1){
 			if(($this->meta & 0x08) === 0x08){
 				Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant());
 			}else{
 				$this->meta |= 0x08;
 				$this->getLevel()->setBlock($this, $this, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{

src/pocketmine/block/SignPost.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -77,18 +76,12 @@ class SignPost extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}

src/pocketmine/block/SnowLayer.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -58,10 +57,6 @@ class SnowLayer extends Flowable{
 		return TieredTool::TIER_WOODEN;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($blockReplace->getSide(Vector3::SIDE_DOWN)->isSolid()){
 			//TODO: fix placement
@@ -73,24 +68,22 @@ class SnowLayer extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid()){
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if($this->level->getBlockLightAt($this->x, $this->y, $this->z) >= 12){
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
-
-				return Level::BLOCK_UPDATE_RANDOM;
 		}
 	}
 
-		return false;
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			ItemFactory::get(Item::SNOWBALL) //TODO: check layer count

src/pocketmine/block/StandingBanner.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -75,18 +74,12 @@ class StandingBanner extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}

src/pocketmine/block/Sugarcane.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -44,10 +43,6 @@ class Sugarcane extends Flowable{
 		return "Sugarcane";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
 			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){
@@ -73,15 +68,18 @@ class Sugarcane extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
-			if($down->isTransparent() === true and $down->getId() !== self::SUGARCANE_BLOCK){
+		if($down->isTransparent() and $down->getId() !== self::SUGARCANE_BLOCK){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){
 			if($this->meta === 0x0F){
 				for($y = 1; $y < 3; ++$y){
@@ -97,14 +95,9 @@ class Sugarcane extends Flowable{
 				++$this->meta;
 				$this->getLevel()->setBlock($this, $this, true);
 			}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::SUGARCANE_BLOCK){

src/pocketmine/block/TallGrass.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -61,19 +60,12 @@ class TallGrass extends Flowable{
 		return false;
 	}
 
-
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ //Replace with common break method
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){ //Replace with common break method
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getToolType() : int{
 		return BlockToolType::TYPE_SHEARS;
 	}

src/pocketmine/block/Torch.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,9 +43,7 @@ class Torch extends Flowable{
 		return "Torch";
 	}
 
-
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$below = $this->getSide(Vector3::SIDE_DOWN);
 		$side = $this->getDamage();
 		$faces = [
@@ -58,16 +55,11 @@ class Torch extends Flowable{
 			5 => Vector3::SIDE_DOWN
 		];
 
-			if($this->getSide($faces[$side])->isTransparent() === true and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
+		if($this->getSide($faces[$side])->isTransparent() and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
 			$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$below = $this->getSide(Vector3::SIDE_DOWN);
 

src/pocketmine/block/Vine.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -62,10 +61,6 @@ class Vine extends Flowable{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function canBeReplaced() : bool{
 		return true;
 	}
@@ -157,8 +152,7 @@ class Vine extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		$sides = [
 			self::FLAG_SOUTH => Vector3::SIDE_SOUTH,
 			self::FLAG_WEST => Vector3::SIDE_WEST,
@@ -185,16 +179,17 @@ class Vine extends Flowable{
 				$this->meta = $meta;
 				$this->level->setBlock($this, $this);
 			}
-
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
 		//TODO: vine growth
 	}
 
-		return false;
-	}
-
 	public function getVariantBitmask() : int{
 		return 0;
 	}

src/pocketmine/block/WallBanner.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
-
 class WallBanner extends StandingBanner{
 
 	protected $id = self::WALL_BANNER;
@@ -33,13 +31,9 @@ class WallBanner extends StandingBanner{
 		return "Wall Banner";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
 			$this->getLevel()->useBreakOn($this);
 		}
-			return Level::BLOCK_UPDATE_NORMAL;
-		}
-		return false;
 	}
 }

src/pocketmine/block/WallSign.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
-
 class WallSign extends SignPost{
 
 	protected $id = self::WALL_SIGN;
@@ -33,13 +31,9 @@ class WallSign extends SignPost{
 		return "Wall Sign";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
 			$this->getLevel()->useBreakOn($this);
 		}
-			return Level::BLOCK_UPDATE_NORMAL;
-		}
-		return false;
 	}
 }

src/pocketmine/block/WaterLily.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -69,17 +68,12 @@ class WaterLily extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
+	public function onNearbyBlockChange() : void{
 		if(!($this->getSide(Vector3::SIDE_DOWN) instanceof Water)){
 			$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
 		}
 	}
 
-		return false;
-	}
-
 	public function getVariantBitmask() : int{
 		return 0;
 	}

src/pocketmine/level/Explosion.php

@@ -236,7 +236,7 @@ class Explosion{
 				if(!isset($this->affectedBlocks[$index = Level::blockHash($sideBlock->x, $sideBlock->y, $sideBlock->z)]) and !isset($updateBlocks[$index])){
 					$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockUpdateEvent($this->level->getBlockAt($sideBlock->x, $sideBlock->y, $sideBlock->z)));
 					if(!$ev->isCancelled()){
-						$ev->getBlock()->onUpdate(Level::BLOCK_UPDATE_NORMAL);
+						$ev->getBlock()->onNearbyBlockChange();
 					}
 					$updateBlocks[$index] = true;
 				}

src/pocketmine/level/Level.php

@@ -96,12 +96,6 @@ class Level implements ChunkManager, Metadatable{
 	public const Y_MASK = 0xFF;
 	public const Y_MAX = 0x100; //256
 
-	public const BLOCK_UPDATE_NORMAL = 1;
-	public const BLOCK_UPDATE_RANDOM = 2;
-	public const BLOCK_UPDATE_SCHEDULED = 3;
-	public const BLOCK_UPDATE_WEAK = 4;
-	public const BLOCK_UPDATE_TOUCH = 5;
-
 	public const TIME_DAY = 0;
 	public const TIME_SUNSET = 12000;
 	public const TIME_NIGHT = 14000;
@@ -743,7 +737,7 @@ class Level implements ChunkManager, Metadatable{
 		while($this->scheduledBlockUpdateQueue->count() > 0 and $this->scheduledBlockUpdateQueue->current()["priority"] <= $currentTick){
 			$block = $this->getBlock($this->scheduledBlockUpdateQueue->extract()["data"]);
 			unset($this->scheduledBlockUpdateQueueIndex[Level::blockHash($block->x, $block->y, $block->z)]);
-			$block->onUpdate(self::BLOCK_UPDATE_SCHEDULED);
+			$block->onScheduledUpdate();
 		}
 
 		//Normal updates
@@ -756,7 +750,7 @@ class Level implements ChunkManager, Metadatable{
 
 			$this->server->getPluginManager()->callEvent($ev = new BlockUpdateEvent($block));
 			if(!$ev->isCancelled()){
-				$block->onUpdate(self::BLOCK_UPDATE_NORMAL);
+				$block->onNearbyBlockChange();
 			}
 		}
 
@@ -1034,7 +1028,7 @@ class Level implements ChunkManager, Metadatable{
 							$block->y = ($Y << 4) + $y;
 							$block->z = $chunkZ * 16 + $z;
 							$block->level = $this;
-							$block->onUpdate(self::BLOCK_UPDATE_RANDOM);
+							$block->onRandomTick();
 						}
 					}
 				}
@@ -1557,7 +1551,7 @@ class Level implements ChunkManager, Metadatable{
 						$entity->setForceMovementUpdate();
 						$entity->scheduleUpdate();
 					}
-					$ev->getBlock()->onUpdate(self::BLOCK_UPDATE_NORMAL);
+					$ev->getBlock()->onNearbyBlockChange();
 					$this->scheduleNeighbourBlockUpdates($pos);
 				}
 			}
@@ -1799,7 +1793,6 @@ class Level implements ChunkManager, Metadatable{
 
 			$this->server->getPluginManager()->callEvent($ev);
 			if(!$ev->isCancelled()){
-				$blockClicked->onUpdate(self::BLOCK_UPDATE_TOUCH);
 				if(!$player->isSneaking() and $blockClicked->onActivate($item, $player) === true){
 					return true;
 				}