mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix NPE with enchantable (#11557)

Browse source
This commit is contained in:
Lulu13022002 2024-11-09 23:26:01 +01:00 • committed by GitHub
parent 9d1c91d083
commit 59b79c8bbb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
44 changed files with 189 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/api/0471-Registry-Modification-API.patch
View file

@ -809,10 +809,10 @@ index 0000000000000000000000000000000000000000..bf49125acc8a0508bf59674bba3ed350
+ }
+}
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
index 9ed61b649d7e7056bd9ebcbb77f17c6c5798bf2d..16bef936a9aef957a73c33e45be7573584943a6b 100644
index 67b9ab322baecf5b2453df4795106514cb073108..7cf7c6d05aa6cbf3f0c8612831404552c6a7b84a 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
@@ -386,6 +386,27 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
@@ -384,6 +384,27 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
*/
@Nullable
T get(@NotNull NamespacedKey key);
@ -840,7 +840,7 @@ index 9ed61b649d7e7056bd9ebcbb77f17c6c5798bf2d..16bef936a9aef957a73c33e45be75735
// Paper start - improve Registry
/**
@@ -460,6 +481,34 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
@@ -458,6 +479,34 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
}
// Paper end - improve Registry
@ -875,7 +875,7 @@ index 9ed61b649d7e7056bd9ebcbb77f17c6c5798bf2d..16bef936a9aef957a73c33e45be75735
/**
* Get the object by its key.
*
@@ -563,5 +612,23 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
@@ -561,5 +610,23 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
return value.getKey();
}
// Paper end - improve Registry