From a63013cf48e46e2ec056c7ace60e018ec9be208e Mon Sep 17 00:00:00 2001
From: Glicz <67753196+GliczDev@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:18:05 +0100
Subject: [PATCH] [ci skip] fix compile issues caused by 5b53cb4 (#11664)

---
 .../server/0992-Registry-Modification-API.patch   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/patches/server/0992-Registry-Modification-API.patch b/patches/server/0992-Registry-Modification-API.patch
index f498936e5f..aa674ef8dc 100644
--- a/patches/server/0992-Registry-Modification-API.patch
+++ b/patches/server/0992-Registry-Modification-API.patch
@@ -982,10 +982,10 @@ 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;
@@ -993,7 +993,14 @@ index ca829b162d4369f845e59b62bb8779fd83fe2ef3..2de5aa3f0f17b29a6cf9d81ebda81aed
  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);
      }
@@ -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);
 +    }
  }