diff options
author | Bjarne Koll <[email protected]> | 2024-12-02 18:36:54 +0100 |
---|---|---|
committer | Bjarne Koll <[email protected]> | 2024-12-02 18:36:54 +0100 |
commit | b46007fbfa32c08c9228a604b7a66a5897114a81 (patch) | |
tree | 94535ef3645529d0471c1ea6b8b9cf1ba31bc0ef /patches/server/0401-Cache-block-data-strings.patch | |
parent | c2294d7067959d264eb8ad275557f194a3e2656f (diff) | |
download | Paper-b46007fbfa32c08c9228a604b7a66a5897114a81.tar.gz Paper-b46007fbfa32c08c9228a604b7a66a5897114a81.zip |
Updated Upstream (Bukkit/CraftBukkit/Spigot)upstream-update
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:
ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins
9db03457 SPIGOT-7964: Fix typo in Deprecation annotation
d14119af PR-1082: Add "since" to Deprecation annotations
e8a318d4 PR-1067: Add method to get Advancement requirements
CraftBukkit Changes:
40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent
fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity
b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value
2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins
fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree
f2822317c PR-1515: Add a Class reader and Class node argument provider
07abf6852 PR-1514: Add a test case for ClassTraverser
a7577cb24 Fix Inventory#addItem not respecting max stack size
066a74e74 PR-1490: Add method to get Advancement requirements
4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes
53254c56f PR-1503: Simplify CAS loop to getAndSet
e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states
dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates
e9e8ed753 SPIGOT-7960: Improve natural item drop methods
Spigot Changes:
60c9969b Rebuild patches
Diffstat (limited to 'patches/server/0401-Cache-block-data-strings.patch')
-rw-r--r-- | patches/server/0401-Cache-block-data-strings.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0401-Cache-block-data-strings.patch b/patches/server/0401-Cache-block-data-strings.patch index 3871c96541..2e9678dd02 100644 --- a/patches/server/0401-Cache-block-data-strings.patch +++ b/patches/server/0401-Cache-block-data-strings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 99b5877fc2f568929b35aa10638173bbef27503b..356b3b7649edf9289c5736638bca50e5d9670782 100644 +index 74515a58cd698ebca3ee98bd89a8f9de477736e7..19708fe528c2c2794bc26f4c789dd32dbb3ba32b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2184,6 +2184,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -17,7 +17,7 @@ index 99b5877fc2f568929b35aa10638173bbef27503b..356b3b7649edf9289c5736638bca50e5 if (this.isSameThread()) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index c53dbcfde62ae8e2f019e854c336ce4a60346dc9..f73858663162cb594db382d584b6500bb03e74b1 100644 +index b472cd2d8ca0885ca5f2c42787d796f3e27ec413..628f26e98449bf508306265d569376cae6279284 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -156,7 +156,7 @@ public class CraftBlockData implements BlockData { @@ -29,7 +29,7 @@ index c53dbcfde62ae8e2f019e854c336ce4a60346dc9..f73858663162cb594db382d584b6500b /** * Convert an NMS Enum (usually a BlockStateEnum) to its appropriate Bukkit -@@ -543,7 +543,38 @@ public class CraftBlockData implements BlockData { +@@ -547,7 +547,38 @@ public class CraftBlockData implements BlockData { Preconditions.checkState(CraftBlockData.MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit); } |