diff options
| author | Jake Potrebic <[email protected]> | 2024-01-23 12:41:47 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-23 15:41:47 -0500 |
| commit | 24dc2bfc506ae1fe9b1df8b23d13a14595541e4e (patch) | |
| tree | 9856a79df16be34372d36dca54335e5d1bb3740e /patches | |
| parent | 581b101180dd71186b0f56f9967be8247a868e0c (diff) | |
| download | Paper-24dc2bfc506ae1fe9b1df8b23d13a14595541e4e.tar.gz Paper-24dc2bfc506ae1fe9b1df8b23d13a14595541e4e.zip | |
Add BlockStateMeta#clearBlockState (#10160)
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/api/0455-Add-BlockStateMeta-clearBlockState.patch | 24 | ||||
| -rw-r--r-- | patches/server/1041-Add-BlockStateMeta-clearBlockState.patch | 24 |
2 files changed, 48 insertions, 0 deletions
diff --git a/patches/api/0455-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0455-Add-BlockStateMeta-clearBlockState.patch new file mode 100644 index 0000000000..1a81132aa8 --- /dev/null +++ b/patches/api/0455-Add-BlockStateMeta-clearBlockState.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +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 e7d905b1146b2bdd2da5bdeb6bf3541fb181d59e..9f08ce5e89ecb4e335f7459a4e600e638e71f963 100644 +--- a/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/BlockStateMeta.java +@@ -14,6 +14,13 @@ 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/1041-Add-BlockStateMeta-clearBlockState.patch b/patches/server/1041-Add-BlockStateMeta-clearBlockState.patch new file mode 100644 index 0000000000..86efcbf634 --- /dev/null +++ b/patches/server/1041-Add-BlockStateMeta-clearBlockState.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +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 0cbca0c37b3e6a34157906d44357286126cfe112..671a9b92da04c22cd3e6c3fd291a343e57397e72 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +@@ -257,6 +257,13 @@ 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 |