Skip to content

[ci skip] fix compile issues caused by 5b53cb4 #11664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennytv merged 1 commit into from
Nov 25, 2024
Merged

[ci skip] fix compile issues caused by 5b53cb4 #11664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions patches/server/0992-Registry-Modification-API.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,18 +982,25 @@ index 0000000000000000000000000000000000000000..f9f63926a5aaf84e0d23bac3422c5800
+
+import org.jspecify.annotations.NullMarked;
diff --git a/src/main/java/io/papermc/paper/registry/legacy/DelayedRegistry.java b/src/main/java/io/papermc/paper/registry/legacy/DelayedRegistry.java
index ca829b162d4369f845e59b62bb8779fd83fe2ef3..2de5aa3f0f17b29a6cf9d81ebda81aed7295c1f1 100644
index ca829b162d4369f845e59b62bb8779fd83fe2ef3..fdc475f2b112ba88ff1d89cb0c4eaa465b2d034c 100644
--- a/src/main/java/io/papermc/paper/registry/legacy/DelayedRegistry.java
+++ b/src/main/java/io/papermc/paper/registry/legacy/DelayedRegistry.java
@@ -1,5 +1,7 @@
@@ -1,11 +1,14 @@
package io.papermc.paper.registry.legacy;

+import io.papermc.paper.registry.tag.Tag;
+import io.papermc.paper.registry.tag.TagKey;
import java.util.Iterator;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -54,4 +56,14 @@ public final class DelayedRegistry<T extends Keyed, R extends Registry<T>> imple
import org.bukkit.Keyed;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
+import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;

/**
@@ -54,4 +57,14 @@ public final class DelayedRegistry<T extends Keyed, R extends Registry<T>> imple
public @Nullable NamespacedKey getKey(final T value) {
return this.delegate().getKey(value);
}
Expand All @@ -1004,7 +1011,7 @@ index ca829b162d4369f845e59b62bb8779fd83fe2ef3..2de5aa3f0f17b29a6cf9d81ebda81aed
+ }
+
+ @Override
+ public @NotNull Tag<T> getTag(final TagKey<T> key) {
+ public @NonNull Tag<T> getTag(final TagKey<T> key) {
+ return this.delegate().getTag(key);
+ }
}
Expand Down
Loading