-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8c8862f
commit a77fac6
Showing
2 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
24 changes: 24 additions & 0 deletions
24
patches/server/1060-Add-BlockStateMeta-clearBlockState.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |