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] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 131f6aa7678d026c3ea64006693439a45019be95..c0e0725408bf0a3937e19e28b2c05c2b23c9cdf7 100644
index bfb6f5b07ac201cd99eb39bcdbd02353dd4b810c..13d29b9c6f683f716cbeb965bab96bc257b9e9e0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1635,6 +1635,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1652,6 +1652,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}