From b9b956adb829da36dd0c754a79b6fa34230a1d39 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 23 Jan 2024 12:41:47 -0800
Subject: [PATCH] Add BlockStateMeta#clearBlockState (#10160)

---
 .../Add-BlockStateMeta-clearBlockState.patch  | 24 +++++++++++++++++++
 .../Add-BlockStateMeta-clearBlockState.patch  | 24 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 patches/api/Add-BlockStateMeta-clearBlockState.patch
 create mode 100644 patches/server/Add-BlockStateMeta-clearBlockState.patch

diff --git a/patches/api/Add-BlockStateMeta-clearBlockState.patch b/patches/api/Add-BlockStateMeta-clearBlockState.patch
new file mode 100644
index 0000000000..f8ef3cc096
--- /dev/null
+++ b/patches/api/Add-BlockStateMeta-clearBlockState.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Thu, 11 Jan 2024 12:41:54 -0800
+Subject: [PATCH] Add BlockStateMeta#clearBlockState
+
+
+diff --git a/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java b/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java
+@@ -0,0 +0,0 @@ public interface BlockStateMeta extends ItemMeta {
+      */
+     boolean hasBlockState();
+ 
++    // Paper start - add method to clear block state
++    /**
++     * Clears the block state currently attached to this item.
++     */
++    void clearBlockState();
++    // Paper end - add method to clear block state
++
+     /**
+      * Returns the currently attached block state for this
+      * item or creates a new one if one doesn't exist.
diff --git a/patches/server/Add-BlockStateMeta-clearBlockState.patch b/patches/server/Add-BlockStateMeta-clearBlockState.patch
new file mode 100644
index 0000000000..f1dadbf5ef
--- /dev/null
+++ b/patches/server/Add-BlockStateMeta-clearBlockState.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Thu, 11 Jan 2024 12:41:50 -0800
+Subject: [PATCH] Add BlockStateMeta#clearBlockState
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+@@ -0,0 +0,0 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
+         return this.blockEntityTag != null;
+     }
+ 
++    // Paper start - add method to clear block state
++    @Override
++    public void clearBlockState() {
++        this.blockEntityTag = null;
++    }
++    // Paper end - add method to clear block state
++
+     @Override
+     public BlockState getBlockState() {
+         Material stateMaterial = (this.material != Material.SHIELD) ? this.material : CraftMetaBlockState.shieldToBannerHack(this.blockEntityTag); // Only actually used for jigsaws