mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix minor-next merge error

Browse Source
This commit is contained in:
Dylan K. Taylor
2025-09-02 19:29:08 +01:00
parent 644f73aa84
commit 86c9adca7f
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/block/CeilingEdgesHangingSign.php
View File

@ -31,7 +31,6 @@ use pocketmine\item\Item;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
final class CeilingEdgesHangingSign extends BaseSign implements HorizontalFacing{ final class CeilingEdgesHangingSign extends BaseSign implements HorizontalFacing{
@ -70,11 +69,10 @@ final class CeilingEdgesHangingSign extends BaseSign implements HorizontalFacing
protected function getFacingDegrees() : float{ protected function getFacingDegrees() : float{
return match($this->facing){ return match($this->facing){
Facing::SOUTH => 0, HorizontalFacingOption::SOUTH => 0,
Facing::WEST => 90, HorizontalFacingOption::WEST => 90,
Facing::NORTH => 180, HorizontalFacingOption::NORTH => 180,
Facing::EAST => 270, HorizontalFacingOption::EAST => 270,
default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
}; };
} }
} }

10
src/block/WallHangingSign.php
View File

@ -33,7 +33,6 @@ use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
final class WallHangingSign extends BaseSign implements HorizontalFacing{ final class WallHangingSign extends BaseSign implements HorizontalFacing{
@ -84,11 +83,10 @@ final class WallHangingSign extends BaseSign implements HorizontalFacing{
protected function getFacingDegrees() : float{ protected function getFacingDegrees() : float{
return match($this->facing){ return match($this->facing){
Facing::SOUTH => 0, HorizontalFacingOption::SOUTH => 0,
Facing::WEST => 90, HorizontalFacingOption::WEST => 90,
Facing::NORTH => 180, HorizontalFacingOption::NORTH => 180,
Facing::EAST => 270, HorizontalFacingOption::EAST => 270,
default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
}; };
} }
} }

19
src/block/WallSign.php
View File

@ -30,7 +30,6 @@ use pocketmine\item\Item;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
final class WallSign extends BaseSign implements HorizontalFacing{ final class WallSign extends BaseSign implements HorizontalFacing{
@ -51,22 +50,20 @@ final class WallSign extends BaseSign implements HorizontalFacing{
protected function getHitboxCenter() : Vector3{ protected function getHitboxCenter() : Vector3{
[$xOffset, $zOffset] = match($this->facing){ [$xOffset, $zOffset] = match($this->facing){
Facing::NORTH => [0, 15 / 16], HorizontalFacingOption::NORTH => [0, 15 / 16],
Facing::SOUTH => [0, 1 / 16], HorizontalFacingOption::SOUTH => [0, 1 / 16],
Facing::WEST => [15 / 16, 0], HorizontalFacingOption::WEST => [15 / 16, 0],
Facing::EAST => [1 / 16, 0], HorizontalFacingOption::EAST => [1 / 16, 0],
default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
}; };
return $this->position->add($xOffset, 0.5, $zOffset); return $this->position->add($xOffset, 0.5, $zOffset);
} }
protected function getFacingDegrees() : float{ protected function getFacingDegrees() : float{
return match($this->facing){ return match($this->facing){
Facing::SOUTH => 0, HorizontalFacingOption::SOUTH => 0,
Facing::WEST => 90, HorizontalFacingOption::WEST => 90,
Facing::NORTH => 180, HorizontalFacingOption::NORTH => 180,
Facing::EAST => 270, HorizontalFacingOption::EAST => 270,
default => throw new AssumptionFailedError("Invalid facing direction: " . $this->facing),
}; };
} }
} }