Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0baf2ff [ci skip] Allow .git to be a regular file (#8631)
PaperMC/Paper@5e6ac3c Properly identify golem spawn reason (#8635)
PaperMC/Paper@ec772bb Rabbit API (#8627)
PaperMC/Paper@7e5f85e Updated Upstream (CraftBukkit)
PaperMC/Paper@075fb67 Add eating regain reason for Camels (#8638)
PaperMC/Paper@812efd3 Fix chunksnapshot biome getter (#8639)
PaperMC/Paper@be50d5b Readd BlockBehavior inlining patch
PaperMC/Paper@7ba81b1 [ci skip] Fix leaf'd patch names
PaperMC/Paper@5bd8e1c Fix MapLike Codec missing key 'selector' (#8634)
PaperMC/Paper@7d18c6b Don't show particles when splash events are canceled (#8637)
PaperMC/Paper@ecfb76a Fix empty effect clouds from lingering potions (#8641)
PaperMC/Paper@1143b63 Add Position (#7639)
PaperMC/Paper@0bdbcd9 [ci skip] Remove non-functioning patch
PaperMC/Paper@d8cf30d Deprecate isPreview method in decorate events (#8645)
PaperMC/Paper@a5ecfd6 [ci skip] Correct chat preview removal version in javadoc (#8646)
PaperMC/Paper@eeeb8d5 Add the non-flammable wood item tag (#8648)
PaperMC/Paper@d2cb347 Fix items equipped on AbstractHorse losing NBT (#8647)
This commit is contained in:
BillyGalbreath
2022-12-12 00:07:02 -06:00
parent 78e9a806d3
commit b7671eeee9
4 changed files with 12 additions and 12 deletions

View File

@@ -37,10 +37,10 @@ index 10e7c382e3e25ede3452b02af0e4d538e9403061..d45cc25d37906ba0c2e5d80936aaae1d
protected void playBlockFallSound() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 68dd5611a3d7c943541e42b57457cf24fd2ea577..e6bb70dd641bad1f7cf0b946c922b59a9a43d2f8 100644
index 5af2254b6dd380ad0822b47292940e08092f0eeb..8f27e6b495b82361d331c514c78088d358e4f5b4 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -341,7 +341,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -347,7 +347,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@Override
protected int calculateFallDamage(float fallDistance, float damageMultiplier) {