diff options
| author | Jake Potrebic <[email protected]> | 2024-11-04 09:42:38 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-04 18:42:38 +0100 |
| commit | c6aa61ee18f0b3db83a4ef4bb25dc6b1761f2e3b (patch) | |
| tree | 7c452c6f7a2649aacb372152a8ea66bf0b9ce9dc /patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch | |
| parent | ce0a0419476d1072ca739a0e8f22d8a358c1c1a2 (diff) | |
| download | Paper-c6aa61ee18f0b3db83a4ef4bb25dc6b1761f2e3b.tar.gz Paper-c6aa61ee18f0b3db83a4ef4bb25dc6b1761f2e3b.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561)
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
b9df8e9f SPIGOT-7933: Improve custom Minecart max speed
fc496179 Fix InstrumentTest
7c0ec598 PR-1075: Make Art an interface
c389f5a4 PR-1074: Make Sound an interface
CraftBukkit Changes:
df1efc0bb SPIGOT-7945: `Bukkit#dispatchCommand` throws `UnsupportedOperationException`
285df6e85 SPIGOT-7933: Improve custom Minecart max speed
a0f3d4e50 SPIGOT-7940: Recipe book errors after reload
9e0618ec2 SPIGOT-7937: Cannot spawn minecart during world generation with minecart_improvements enabled
1eb4d28da SPIGOT-7941: Fix resistance over 4 amplify causing issues in damage
52b99158a PR-1504: Make Art an interface
e18ae35f1 PR-1502: Make Sound an interface
Spigot Changes:
e65d67a7 SPIGOT-7934: Item entities start "bouncing" under certain conditions
Diffstat (limited to 'patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch')
| -rw-r--r-- | patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch index 4ad440ffa3..e9b2e45d29 100644 --- a/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cfff596d720efe5f5ee4ad1990c3ee0fd6e4e836..5b8e0931be2acb1eb4ac6f399ecc0a5ebc5db586 100644 +index 61124dfec84792fa23ce1b0f03cbd97b1a6bde5b..30343efb680edf3dc355498b04c5db9ebecbf270 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -4112,6 +4112,19 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4113,6 +4113,19 @@ public abstract class LivingEntity extends Entity implements Attackable { } // Paper start - Make shield blocking delay configurable |