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/0130-Cap-Entity-Collisions.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/0130-Cap-Entity-Collisions.patch')
| -rw-r--r-- | patches/server/0130-Cap-Entity-Collisions.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch index 3178a0a8f1..3fefadf5a6 100644 --- a/patches/server/0130-Cap-Entity-Collisions.patch +++ b/patches/server/0130-Cap-Entity-Collisions.patch @@ -24,10 +24,10 @@ index 10687787a5fd1a81ad5a625848db4649381eab67..9f906e51f236e84f6cee8eba4b7587ed @javax.annotation.Nullable private org.bukkit.util.Vector origin; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b51f4172b7135689fcd99b380f1a78bf8e723cfa..177ad43b62c6e1efc0ae6298e464debdf66b1055 100644 +index c6e666f57c199b4408b32e076622ba05b42fcea9..134106c7c98c87e593157a794287973327d055fc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3454,10 +3454,12 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3460,10 +3460,12 @@ public abstract class LivingEntity extends Entity implements Attackable { } Iterator iterator1 = list.iterator(); |