aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-06-16 03:58:09 -0700
committerGitHub <[email protected]>2023-06-16 11:58:09 +0100
commitb134eb406afeee1084626a288238959ba18bb698 (patch)
tree62961ee81aa149c3a250e7806561900c8e03f604
parent41e6f20420ec09df209745fb8bd89dd2eb9c585f (diff)
downloadPaper-b134eb406afeee1084626a288238959ba18bb698.tar.gz
Paper-b134eb406afeee1084626a288238959ba18bb698.zip
Fix incorrect annotation on BrushableBlock#getItem (#9345)
-rw-r--r--patches/api/0172-Fix-Spigot-annotation-mistakes.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
index 269d0b0dbe..6176bc1f41 100644
--- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
@@ -332,6 +332,19 @@ index 631cbf2be51040eee00aa39a39c5ec4003f91843..3147e278eac674ed21d714bbe318b135
void setData(@NotNull MaterialData data);
/**
+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
++++ b/src/main/java/org/bukkit/block/BrushableBlock.java
+@@ -15,7 +15,7 @@ public interface BrushableBlock extends Lootable, TileState {
+ *
+ * @return the item
+ */
+- @Nullable
++ @org.jetbrains.annotations.NotNull // Paper
+ public ItemStack getItem();
+
+ /**
diff --git a/src/main/java/org/bukkit/block/DecoratedPot.java b/src/main/java/org/bukkit/block/DecoratedPot.java
index 210f4be510c2074db3938d604937dae0270dd994..59b98f411f62e16fafb0efb489562847a090c733 100644
--- a/src/main/java/org/bukkit/block/DecoratedPot.java