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/0298-Prevent-consuming-the-wrong-itemstack.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/0298-Prevent-consuming-the-wrong-itemstack.patch')
| -rw-r--r-- | patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch index 82cf04e36c..de0a5f77d5 100644 --- a/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch +++ b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d73f3ca9ff9584628ab9b0434d76368a20bca51e..545d4c481a785dc7f795ee0fa41d6343f2967d44 100644 +index 1ac5e457257748261088f582ed26b94e0e18eced..94492da51fe2a6343ab3c41d26ca2a195e14bc62 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3827,9 +3827,14 @@ public abstract class LivingEntity extends Entity implements Attackable { |