aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-09-22 20:09:41 +0200
committerGitHub <[email protected]>2024-09-22 20:09:41 +0200
commit78feecb12f30331381edfc045bc3c2cf1acc0754 (patch)
treece2ce3769db2d99ef78fac4ff1e30dc7fbfeec1e /patches/api/0166-Fix-Spigot-annotation-mistakes.patch
parent1ed64f82704c299d0f7ae9af710579be995af8de (diff)
downloadPaper-78feecb12f30331381edfc045bc3c2cf1acc0754.tar.gz
Paper-78feecb12f30331381edfc045bc3c2cf1acc0754.zip
Deprecate BlockType#isInteractable (#11427)
While BlockType is still marked as internal, it mirrors the already paper-deprecated method #isInteractable. The commit marks said method as deprecated if/when BlockType becomes experimental/non-internal.
Diffstat (limited to 'patches/api/0166-Fix-Spigot-annotation-mistakes.patch')
-rw-r--r--patches/api/0166-Fix-Spigot-annotation-mistakes.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
index 857c948a66..c82d4b4a60 100644
--- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
@@ -714,6 +714,25 @@ index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..f4a739d8022d19a7ae0ee9bf93eb5c48
void setData(@NotNull MaterialData data);
/**
+diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
+index dfd8187ef941e8afe9cb28a26bf0d2cf2e4c4bc5..d285a1df492d2155f179e8abc17d0bf7527e6d38 100644
+--- a/src/main/java/org/bukkit/block/BlockType.java
++++ b/src/main/java/org/bukkit/block/BlockType.java
+@@ -3433,9 +3433,14 @@ public interface BlockType extends Keyed, Translatable {
+ * state as well. This method will return true if there is at least one
+ * state in which additional interact handling is performed for the
+ * block type.
++ *
++ * @deprecated This method is not comprehensive and does not accurately reflect what block types are
++ * interactable. Many "interactions" are defined on the item not block, and many are conditional on some other world state
++ * checks being true.
+ *
+ * @return true if this block type can be interacted with.
+ */
++ @Deprecated // Paper
+ boolean isInteractable();
+
+ /**
diff --git a/src/main/java/org/bukkit/block/BrushableBlock.java b/src/main/java/org/bukkit/block/BrushableBlock.java
index 4bd127b3646307398e0c937c3e36ab671235b72b..f2557a87f468ee20c2d276dbfc0e9a976656c75c 100644
--- a/src/main/java/org/bukkit/block/BrushableBlock.java