Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 06:53:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glicz 2024-11-25 11:18:05 +01:00 committed by GitHub
parent 5b53cb404d
commit a63013cf48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0992-Registry-Modification-API.patch
View File

@ -982,10 +982,10 @@ index 0000000000000000000000000000000000000000..f9f63926a5aaf84e0d23bac3422c5800
+ +
+import org.jspecify.annotations.NullMarked; +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 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 --- a/src/main/java/io/papermc/paper/registry/legacy/DelayedRegistry.java
+++ b/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; package io.papermc.paper.registry.legacy;
+import io.papermc.paper.registry.tag.Tag; +import io.papermc.paper.registry.tag.Tag;
@ -993,7 +993,14 @@ index ca829b162d4369f845e59b62bb8779fd83fe2ef3..2de5aa3f0f17b29a6cf9d81ebda81aed
import java.util.Iterator; import java.util.Iterator;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Stream; 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) { public @Nullable NamespacedKey getKey(final T value) {
return this.delegate().getKey(value); return this.delegate().getKey(value);
} }
@ -1004,7 +1011,7 @@ index ca829b162d4369f845e59b62bb8779fd83fe2ef3..2de5aa3f0f17b29a6cf9d81ebda81aed
+ } + }
+ +
+ @Override + @Override
+ public @NotNull Tag<T> getTag(final TagKey<T> key) { + public @NonNull Tag<T> getTag(final TagKey<T> key) {
+ return this.delegate().getTag(key); + return this.delegate().getTag(key);
+ } + }
} }