From d1d5020c5381f894ab132737efc9b141a484f517 Mon Sep 17 00:00:00 2001
From: IvanCraft623 <57236932+IvanCraft623@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:56:21 -0500
Subject: [PATCH] FallableTrait: add default implementation of tickFalling() to
 reduce Fallable pollution (#5350)

this is only used by concrete powder currently, so it doesn't make much sense to reimplement it in every implementor of Fallable.
---
 src/block/Anvil.php               | 4 ----
 src/block/DragonEgg.php           | 4 ----
 src/block/Gravel.php              | 4 ----
 src/block/Sand.php                | 4 ----
 src/block/SnowLayer.php           | 4 ----
 src/block/utils/FallableTrait.php | 4 ++++
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/block/Anvil.php b/src/block/Anvil.php
index 0472e4cc7..d9c407409 100644
--- a/src/block/Anvil.php
+++ b/src/block/Anvil.php
@@ -95,8 +95,4 @@ class Anvil extends Transparent implements Fallable{
 		}
 		return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 	}
-
-	public function tickFalling() : ?Block{
-		return null;
-	}
 }
diff --git a/src/block/DragonEgg.php b/src/block/DragonEgg.php
index 27a30a1c5..98809152d 100644
--- a/src/block/DragonEgg.php
+++ b/src/block/DragonEgg.php
@@ -44,10 +44,6 @@ class DragonEgg extends Transparent implements Fallable{
 		return 1;
 	}
 
-	public function tickFalling() : ?Block{
-		return null;
-	}
-
 	public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
 		$this->teleport();
 		return true;
diff --git a/src/block/Gravel.php b/src/block/Gravel.php
index 856449ce0..4bff2208f 100644
--- a/src/block/Gravel.php
+++ b/src/block/Gravel.php
@@ -45,8 +45,4 @@ class Gravel extends Opaque implements Fallable{
 	public function isAffectedBySilkTouch() : bool{
 		return true;
 	}
-
-	public function tickFalling() : ?Block{
-		return null;
-	}
 }
diff --git a/src/block/Sand.php b/src/block/Sand.php
index 17fc80a20..df56b7348 100644
--- a/src/block/Sand.php
+++ b/src/block/Sand.php
@@ -28,8 +28,4 @@ use pocketmine\block\utils\FallableTrait;
 
 class Sand extends Opaque implements Fallable{
 	use FallableTrait;
-
-	public function tickFalling() : ?Block{
-		return null;
-	}
 }
diff --git a/src/block/SnowLayer.php b/src/block/SnowLayer.php
index 84620ebca..e3628f98a 100644
--- a/src/block/SnowLayer.php
+++ b/src/block/SnowLayer.php
@@ -116,10 +116,6 @@ class SnowLayer extends Flowable implements Fallable{
 		}
 	}
 
-	public function tickFalling() : ?Block{
-		return null;
-	}
-
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
 			VanillaItems::SNOWBALL()->setCount(max(1, (int) floor($this->layers / 2)))
diff --git a/src/block/utils/FallableTrait.php b/src/block/utils/FallableTrait.php
index 1ed348dca..8e878b172 100644
--- a/src/block/utils/FallableTrait.php
+++ b/src/block/utils/FallableTrait.php
@@ -54,4 +54,8 @@ trait FallableTrait{
 			$fall->spawnToAll();
 		}
 	}
+
+	public function tickFalling() : ?Block{
+		return null;
+	}
 }