Add onEntityCollide function when entity are above a block

src/block/Block.php

@@ -868,6 +868,15 @@ public function onEntityInside(Entity $entity) : bool{
 		return true;
 	}
 
+	/**
+	 * Called when an entity collide on this block
+	 * 
+	 * @return bool Whether the entity has been updated
+	 */
+	public function onEntityCollide(Entity $entity, int $face) : bool{
+		return false;
+	}
+
 	/**
 	 * Returns a direction vector describing which way an entity intersecting this block should be pushed.
 	 * This is used by liquids to push entities in liquid currents.

src/block/Cactus.php

@@ -61,6 +61,16 @@ public function onEntityInside(Entity $entity) : bool{
 		return true;
 	}
 
+	public function onEntityCollide(Entity $entity, int $face) : bool{
+		if($face === Facing::UP){
+			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+			$entity->attack($ev);
+			return true;
+		}
+
+		return false;
+	}
+
 	private function canBeSupportedAt(Block $block) : bool{
 		$supportBlock = $block->getSide(Facing::DOWN);
 		if(!$supportBlock->hasSameTypeId($this) && !$supportBlock->hasTypeTag(BlockTypeTags::SAND)){

src/block/Magma.php

@@ -27,23 +27,22 @@
 use pocketmine\entity\Living;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\math\Facing;
 
 class Magma extends Opaque{
 
 	public function getLightLevel() : int{
 		return 3;
 	}
 
-	public function hasEntityCollision() : bool{
-		return true;
-	}
-
-	public function onEntityInside(Entity $entity) : bool{
-		if($entity instanceof Living && !$entity->isSneaking()){
+	public function onEntityCollide(Entity $entity, int $face) : bool{
+		if($face === Facing::UP && $entity instanceof Living && !$entity->isSneaking()){
 			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
 			$entity->attack($ev);
+			return true;
 		}
-		return true;
+
+		return false;
 	}
 
 	public function burnsForever() : bool{

src/entity/Entity.php

@@ -658,6 +658,18 @@ protected function entityBaseTick(int $tickDiff = 1) : bool{
 			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10);
 			$this->attack($ev);
 			$hasUpdate = true;
+		}else{
+			$entityBlock = $this->getWorld()->getBlock($this->getLocation());
+			$entityBox = $this->getBoundingBox()->expandedCopy(0.001, 0.1, 0.001);
+			foreach (Facing::ALL as $face) {
+				$block = $entityBlock->getSide($face);
+				foreach ($block->getCollisionBoxes() as $blockBox) {
+					if ($entityBox->intersectsWith($blockBox)) {
+						$hasUpdate = $block->onEntityCollide($this, Facing::opposite($face));
+						break;
+					}
+				}
+			}
 		}
 
 		if($this->isOnFire() && $this->doOnFireTick($tickDiff)){