From 5a1b975c0326b3584c256be8a01593adcea6b14e Mon Sep 17 00:00:00 2001
From: ShockedPlot7560 <no-reply@tchallon.fr>
Date: Thu, 31 Jul 2025 13:06:53 +0200
Subject: [PATCH] Simplify serializeBlock

---
 .../block/convert/BlockObjectToStateSerializer.php  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
index a11823735..fb3a1bf53 100644
--- a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@@ -189,7 +189,6 @@ use pocketmine\data\bedrock\block\convert\BlockStateWriter as Writer;
 use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 use function get_class;
-use function is_callable;
 
 final class BlockObjectToStateSerializer implements BlockStateSerializer{
 	/**
@@ -278,16 +277,10 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 		 * the type ID of the block (which never makes sense, even in a world where overriding block types is a thing).
 		 * In the future we'll need some way to guarantee that type IDs are never reused (perhaps spl_object_id()?)
 		 *
-		 * @var \Closure|string $serializer
-		 * @phpstan-var \Closure(TBlockType) : (Writer|string)|string $serializer
+		 * @var \Closure|string $locatedSerializer
+		 * @phpstan-var \Closure(TBlockType) : (Writer|string)|string $locatedSerializer
 		 */
-		$serializer = $locatedSerializer;
-		if(is_callable($serializer)){
-			/** @var Writer|string $writerOrId */
-			$writerOrId = $serializer($blockState);
-		}else{
-			$writerOrId = $serializer;
-		}
+		$writerOrId = $locatedSerializer instanceof \Closure ? $locatedSerializer($blockState) : $locatedSerializer;
 
 		return $writerOrId instanceof Writer ?
 			$writerOrId->getBlockStateData() :