Update to 1.18.2

This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions

View File

@@ -5,10 +5,10 @@ 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 8f8fc60f33176362c26aa0730e24e850929df618..456341b5ed16e72927a9fb8cb452de6369ed112e 100644
index 0b671716ed700d735c76798f61abd0f5b509c2fc..86d3e06aa27357240c9c24672dc8430d8b02dd3a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -250,6 +250,7 @@ public abstract class LivingEntity extends Entity {
@@ -253,6 +253,7 @@ public abstract class LivingEntity extends Entity {
protected Brain<?> brain;
// CraftBukkit start
public int expToDrop;
@@ -16,7 +16,7 @@ index 8f8fc60f33176362c26aa0730e24e850929df618..456341b5ed16e72927a9fb8cb452de63
public boolean forceDrops;
public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
@@ -349,8 +350,8 @@ public abstract class LivingEntity extends Entity {
@@ -352,8 +353,8 @@ public abstract class LivingEntity extends Entity {
this.tryAddSoulSpeed();
}
@@ -27,7 +27,7 @@ index 8f8fc60f33176362c26aa0730e24e850929df618..456341b5ed16e72927a9fb8cb452de63
if (!landedState.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1933,7 +1934,7 @@ public abstract class LivingEntity extends Entity {
@@ -1936,7 +1937,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);