Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@848a396 Add mob goal generator (#9980)
PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments
PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges
This commit is contained in:
granny
2024-01-16 15:33:16 -08:00
parent 486515bc3c
commit 3d52f066c1
67 changed files with 194 additions and 189 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3b7897cc4e282b682e83109a639b987a2c78fa07..6dc269ad7e5c84d5c87c11a7f6c0dcee7c13d66e 100644
index e81bed7121b4f4bef5d7b5bd98979b790b2b92d7..5d55704235ba54ada99dc6107d0da25c80ad4172 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -252,6 +252,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -34,7 +34,7 @@ index 3b7897cc4e282b682e83109a639b987a2c78fa07..6dc269ad7e5c84d5c87c11a7f6c0dcee
double d7 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
int i = (int) (150.0D * d7);
@@ -2094,7 +2095,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2095,7 +2096,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);