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/0257-Add-LivingEntity-getTargetEntity.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/0257-Add-LivingEntity-getTargetEntity.patch')
-rw-r--r-- | patches/server/0257-Add-LivingEntity-getTargetEntity.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch b/patches/server/0257-Add-LivingEntity-getTargetEntity.patch index 44504af9dc..8f82d5749b 100644 --- a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch +++ b/patches/server/0257-Add-LivingEntity-getTargetEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a770d2bda45cee739a5371119018e6f6e4cbb2cb..9f97c1c18d7f7e084897f584be77b128c5cbfa13 100644 +index 21d2c43a97122025edd91662e39d44cc867593a3..bac78415e34d41e3a5de482b86185f2202ecf068 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -121,6 +121,7 @@ import net.minecraft.world.level.storage.loot.LootTable; @@ -16,7 +16,7 @@ index a770d2bda45cee739a5371119018e6f6e4cbb2cb..9f97c1c18d7f7e084897f584be77b128 import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.PlayerTeam; -@@ -3996,6 +3997,38 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4002,6 +4003,38 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.level().clip(raytrace); } |