diff options
| author | Jake Potrebic <[email protected]> | 2023-12-08 11:00:39 -0800 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2023-12-08 11:00:39 -0800 |
| commit | 2f92d4e00ecc4be92089a1494097aaba0ce82fff (patch) | |
| tree | f7db33ffd937bff789a9a24f3f45631f836ce38b /patches/api/0173-Fix-Spigot-annotation-mistakes.patch | |
| parent | f9edc4b1cd667da4f597b94fd1f25f9df69944b3 (diff) | |
| download | Paper-2f92d4e00ecc4be92089a1494097aaba0ce82fff.tar.gz Paper-2f92d4e00ecc4be92089a1494097aaba0ce82fff.zip | |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs
bc145b90 PR-940: Create registry for banner pattern and cat type
CraftBukkit Changes:
cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways
4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs
b483a20db PR-1303: Create registry for banner pattern and cat type
4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
Diffstat (limited to 'patches/api/0173-Fix-Spigot-annotation-mistakes.patch')
| -rw-r--r-- | patches/api/0173-Fix-Spigot-annotation-mistakes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch index 4ac9ae8650..c86fa5a295 100644 --- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch @@ -474,10 +474,10 @@ index 26d02aa5da444112f8fa84c07e3080bb669983a1..0cb15350704955f4a1aeff184a8b60d9 private final NamespacedKey key; diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 3be4214348e72e90f8b59225b3e31db0e6ba7e09..79d1ed1750d9ed843da128a0d047ae455f12ae38 100644 +index 6455163261082c444985bc58b188d224517d4529..613cd9c2e91a851c86e339d2be86981b57669311 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -184,14 +184,14 @@ public interface Registry<T extends Keyed> extends Iterable<T> { +@@ -198,14 +198,14 @@ public interface Registry<T extends Keyed> extends Iterable<T> { * * @see TrimMaterial */ @@ -494,7 +494,7 @@ index 3be4214348e72e90f8b59225b3e31db0e6ba7e09..79d1ed1750d9ed843da128a0d047ae45 Registry<TrimPattern> TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class); /** * Villager profession. -@@ -273,8 +273,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> { +@@ -287,8 +287,11 @@ public interface Registry<T extends Keyed> extends Iterable<T> { * * @param input non-null input * @return registered object or null if does not exist |