From 86c9adca7f87731cf879dda4906ee4b960e1bda3 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 2 Sep 2025 19:29:08 +0100
Subject: [PATCH] Fix minor-next merge error

---
 src/block/CeilingEdgesHangingSign.php | 10 ++++------
 src/block/WallHangingSign.php         | 10 ++++------
 src/block/WallSign.php                | 19 ++++++++-----------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/block/CeilingEdgesHangingSign.php b/src/block/CeilingEdgesHangingSign.php
index 0265e2722..5b63dfa3c 100644
--- a/src/block/CeilingEdgesHangingSign.php
+++ b/src/block/CeilingEdgesHangingSign.php
@@ -31,7 +31,6 @@ use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
 
 final class CeilingEdgesHangingSign extends BaseSign implements HorizontalFacing{
@@ -70,11 +69,10 @@ final class CeilingEdgesHangingSign extends BaseSign implements HorizontalFacing
 
 	protected function getFacingDegrees() : float{
 		return match($this->facing){
-			Facing::SOUTH => 0,
-			Facing::WEST => 90,
-			Facing::NORTH => 180,
-			Facing::EAST => 270,
-			default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
+			HorizontalFacingOption::SOUTH => 0,
+			HorizontalFacingOption::WEST => 90,
+			HorizontalFacingOption::NORTH => 180,
+			HorizontalFacingOption::EAST => 270,
 		};
 	}
 }
diff --git a/src/block/WallHangingSign.php b/src/block/WallHangingSign.php
index 55a99f4e6..4708fef70 100644
--- a/src/block/WallHangingSign.php
+++ b/src/block/WallHangingSign.php
@@ -33,7 +33,6 @@ use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
 
 final class WallHangingSign extends BaseSign implements HorizontalFacing{
@@ -84,11 +83,10 @@ final class WallHangingSign extends BaseSign implements HorizontalFacing{
 
 	protected function getFacingDegrees() : float{
 		return match($this->facing){
-			Facing::SOUTH => 0,
-			Facing::WEST => 90,
-			Facing::NORTH => 180,
-			Facing::EAST => 270,
-			default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
+			HorizontalFacingOption::SOUTH => 0,
+			HorizontalFacingOption::WEST => 90,
+			HorizontalFacingOption::NORTH => 180,
+			HorizontalFacingOption::EAST => 270,
 		};
 	}
 }
diff --git a/src/block/WallSign.php b/src/block/WallSign.php
index de63c5645..2c0b9b3aa 100644
--- a/src/block/WallSign.php
+++ b/src/block/WallSign.php
@@ -30,7 +30,6 @@ use pocketmine\item\Item;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
 
 final class WallSign extends BaseSign implements HorizontalFacing{
@@ -51,22 +50,20 @@ final class WallSign extends BaseSign implements HorizontalFacing{
 
 	protected function getHitboxCenter() : Vector3{
 		[$xOffset, $zOffset] = match($this->facing){
-			Facing::NORTH => [0, 15 / 16],
-			Facing::SOUTH => [0, 1 / 16],
-			Facing::WEST => [15 / 16, 0],
-			Facing::EAST => [1 / 16, 0],
-			default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
+			HorizontalFacingOption::NORTH => [0, 15 / 16],
+			HorizontalFacingOption::SOUTH => [0, 1 / 16],
+			HorizontalFacingOption::WEST => [15 / 16, 0],
+			HorizontalFacingOption::EAST => [1 / 16, 0],
 		};
 		return $this->position->add($xOffset, 0.5, $zOffset);
 	}
 
 	protected function getFacingDegrees() : float{
 		return match($this->facing){
-			Facing::SOUTH => 0,
-			Facing::WEST => 90,
-			Facing::NORTH => 180,
-			Facing::EAST => 270,
-			default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
+			HorizontalFacingOption::SOUTH => 0,
+			HorizontalFacingOption::WEST => 90,
+			HorizontalFacingOption::NORTH => 180,
+			HorizontalFacingOption::EAST => 270,
 		};
 	}
 }