diff options
| author | Jake Potrebic <[email protected]> | 2024-04-27 18:00:01 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-04-27 18:00:01 -0700 |
| commit | 3e90a1918392a435cbfe40eea6f077076faf275a (patch) | |
| tree | 38708c74d12698274d2632efd230ab024e4d77de /patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch | |
| parent | d964c15e15bff629b4999fbf3df09c5b1e6e2049 (diff) | |
| download | Paper-3e90a1918392a435cbfe40eea6f077076faf275a.tar.gz Paper-3e90a1918392a435cbfe40eea6f077076faf275a.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:
304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize
e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency
79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots
CraftBukkit Changes:
91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString
4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead
996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled
f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed
7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge
080c8711e SPIGOT-7639: Incoming plugin channels not working
ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable
38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
Diffstat (limited to 'patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch')
| -rw-r--r-- | patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch index d4dc43a7c7..aa171312b3 100644 --- a/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,10 +22,10 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6ac6848fe27336a96a813c84d7d797cc9bc4c297..810e94674acff08eda6d98e91546a2338706ef42 100644 +index c5ebe3aec4f7ba484194c75f94600ba926b10abb..6ba7a7dd04e7a896f99ec6f7ff3749989d31bc0b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1638,7 +1638,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1644,7 +1644,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.level().getCraftServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { |