aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0287-Missing-Entity-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api/0287-Missing-Entity-API.patch')
-rw-r--r--patches/api/0287-Missing-Entity-API.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/api/0287-Missing-Entity-API.patch b/patches/api/0287-Missing-Entity-API.patch
index 928fcd36a5..cb796c7184 100644
--- a/patches/api/0287-Missing-Entity-API.patch
+++ b/patches/api/0287-Missing-Entity-API.patch
@@ -16,19 +16,20 @@ Co-authored-by: TotalledZebra <[email protected]>
diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java
new file mode 100644
-index 0000000000000000000000000000000000000000..39ad7d283609d7e427a2ab35b6fad839e032fe92
+index 0000000000000000000000000000000000000000..a16329a8d08c74ce58960ff9dcc0af098b8543e9
--- /dev/null
+++ b/src/main/java/io/papermc/paper/entity/SchoolableFish.java
@@ -0,0 +1,47 @@
+package io.papermc.paper.entity;
+
+import org.bukkit.entity.Fish;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
++import org.jspecify.annotations.NullMarked;
++import org.jspecify.annotations.Nullable;
+
+/**
+ * Represents a fish that can school with other fish.
+ */
++@NullMarked
+public interface SchoolableFish extends Fish {
+
+ /**
@@ -36,7 +37,7 @@ index 0000000000000000000000000000000000000000..39ad7d283609d7e427a2ab35b6fad839
+ *
+ * @param leader fish to follow
+ */
-+ void startFollowing(@NotNull SchoolableFish leader);
++ void startFollowing(SchoolableFish leader);
+
+ /**
+ * Causes the fish to stop following their current
@@ -63,8 +64,7 @@ index 0000000000000000000000000000000000000000..39ad7d283609d7e427a2ab35b6fad839
+ *
+ * @return following fish
+ */
-+ @Nullable
-+ SchoolableFish getSchoolLeader();
++ @Nullable SchoolableFish getSchoolLeader();
+
+}
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java