From b9542b49084cc57b7f5a63bf9717430d07abc5d3 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sat, 25 Jun 2022 15:52:43 +0100
Subject: [PATCH] ItemFactory: fix isRegistered() again we really need to get
 rid of the ItemFactory legacy nasties so we can burn this code

---
 src/block/utils/WallConnectionType.php | 48 ++++++++++++++++++++++++++
 src/item/ItemFactory.php               | 11 +++++-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/block/utils/WallConnectionType.php

diff --git a/src/block/utils/WallConnectionType.php b/src/block/utils/WallConnectionType.php
new file mode 100644
index 000000000..60f2d01af
--- /dev/null
+++ b/src/block/utils/WallConnectionType.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block\utils;
+
+use pocketmine\utils\EnumTrait;
+
+/**
+ * This doc-block is generated automatically, do not modify it manually.
+ * This must be regenerated whenever registry members are added, removed or changed.
+ * @see build/generate-registry-annotations.php
+ * @generate-registry-docblock
+ *
+ * @method static WallConnectionType NONE()
+ * @method static WallConnectionType SHORT()
+ * @method static WallConnectionType TALL()
+ */
+final class WallConnectionType{
+	use EnumTrait;
+
+	protected static function setup() : void{
+		self::registerAll(
+			new self("none"),
+			new self("short"),
+			new self("tall")
+		);
+	}
+}
diff --git a/src/item/ItemFactory.php b/src/item/ItemFactory.php
index 2f6c8e2d2..e8c0d7f1a 100644
--- a/src/item/ItemFactory.php
+++ b/src/item/ItemFactory.php
@@ -507,7 +507,16 @@ class ItemFactory{
 	 */
 	public function isRegistered(int $id, int $variant = 0) : bool{
 		if($id < 256){
-			return GlobalBlockStateHandlers::getUpgrader()->upgradeIntIdMeta(self::itemToBlockId($id), $variant & 0xf) !== null;
+			$blockStateData = GlobalBlockStateHandlers::getUpgrader()->upgradeIntIdMeta(self::itemToBlockId($id), $variant & 0xf);
+			if($blockStateData === null){
+				return false;
+			}
+			try{
+				GlobalBlockStateHandlers::getDeserializer()->deserialize($blockStateData);
+				return true;
+			}catch(BlockStateDeserializeException){
+				return false;
+			}
 		}
 
 		return isset($this->list[self::getListOffset($id, $variant)]);