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/0674-Freeze-Tick-Lock-API.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/0674-Freeze-Tick-Lock-API.patch')
| -rw-r--r-- | patches/server/0674-Freeze-Tick-Lock-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0674-Freeze-Tick-Lock-API.patch b/patches/server/0674-Freeze-Tick-Lock-API.patch index 4c0f4ccb90..80171b8e78 100644 --- a/patches/server/0674-Freeze-Tick-Lock-API.patch +++ b/patches/server/0674-Freeze-Tick-Lock-API.patch @@ -46,10 +46,10 @@ index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index be044167883611dde0665749d9e243b9c7b6fbd2..7f8e82a1d5fa1ca665a66d2fb1342163f7c7a733 100644 +index b73601d2903f327b4e7b82ccc6774731c832e941..9e5d1ebcec91c036ab176161b13766ef44f41d59 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3458,7 +3458,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.level().getProfiler().pop(); this.level().getProfiler().push("freezing"); |