Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4d20922 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11024)
PaperMC/Paper@2fa5e0e Fix horse inventories (#11028)
PaperMC/Paper@62ed302 Fix entity distance check when applying knockback

closes #1553
This commit is contained in:
granny
2024-07-07 17:53:09 -07:00
parent de2e7a7967
commit cb0f04bd77
59 changed files with 260 additions and 205 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Dispenser curse of binding protection
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c8e31fd851026123e2938052cad3c5d227aa12cf..cfd22afaf82b1f88d3d67e11b69ae82af41231cf 100644
index 515bb0229516da288699af5296273571e8a1aa8b..c34aa707c306c52c28e6168218ef0177fc9ef624 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -4502,6 +4502,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -4537,6 +4537,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
return EquipmentSlot.MAINHAND;
}