diff options
| author | Nassim Jahnke <[email protected]> | 2024-06-15 18:28:18 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-06-15 18:31:58 +0200 |
| commit | 4bc15f13aa210a361e2b163dd9e901b9129f3b17 (patch) | |
| tree | 61d444ff67cb31b359b1a1c15d5f10bc6db36b96 /patches/server/0144-ensureServerConversions-API.patch | |
| parent | 5d834b1b7136de9525dfa405cf6c466c62c3abc1 (diff) | |
| download | Paper-4bc15f13aa210a361e2b163dd9e901b9129f3b17.tar.gz Paper-4bc15f13aa210a361e2b163dd9e901b9129f3b17.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:
e2160a18 Make MapCursor#type not depends on deprecated values
CraftBukkit Changes:
6ce172642 SPIGOT-7761: Ender pearl does not damage or spawn endermites
f5a63f734 SPIGOT-7759: Chunk not there when requested in ChunkUnloadEvent
28287259c Remove unused import
eb9a7dde0 SPIGOT-7757: Cannot set item in Stonecutter Inventory
f8be9d752 Move deserialized removed unhandled tags to dedicated removedTags
a7e576186 Fix potential mutability issue with CraftMetaItem copy constructor
995885452 SPIGOT-7741: Vanilla ItemComponent in commands can't remove components
9ef69aa0b PR-1284: Move ItemType <-> ItemMeta linking to a centralized place
3e82eafbe PR-1420: Fix DirectEntity and CausingEntity Damager for Creepers ignited by Player
c23daa71f SPIGOT-7751: Fix crash caused by arrows from trial spawners
Make MapCursor#type not depends on deprecated values
SPIGOT-7761: Ender pearl does not damage or spawn endermites
Diffstat (limited to 'patches/server/0144-ensureServerConversions-API.patch')
| -rw-r--r-- | patches/server/0144-ensureServerConversions-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0144-ensureServerConversions-API.patch b/patches/server/0144-ensureServerConversions-API.patch index 6d2efdb422..ba8fe15e57 100644 --- a/patches/server/0144-ensureServerConversions-API.patch +++ b/patches/server/0144-ensureServerConversions-API.patch @@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 78c96b43d611f70814b80a05dfded794858e2eda..612991750c89936790a4db64f9cc0e236d283d57 100644 +index e2daeeba1bacbb5c5ca2aa922fa67b02cd050755..07df02997d95275cbf26ab9b76eb587da7117d37 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -527,4 +527,12 @@ public final class CraftItemFactory implements ItemFactory { +@@ -223,4 +223,12 @@ public final class CraftItemFactory implements ItemFactory { return io.papermc.paper.adventure.PaperAdventure.asAdventure(CraftItemStack.asNMSCopy(itemStack).getDisplayName()); } // Paper end - Adventure |