Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: df0d7b0d Update upstream CB 6ea3c2cf [CI-SKIP] Rebuild patches d7bed4cb Heavily optimise random block ticking (#2914) b66d9ff8 Update upstream CB ba71c5d6 Stop stripping private use block Unicode from signs 28d9dcfc Entity Jump API (#1587) 9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion 054e20da Clean up imports on ThrownEggHatchEvent a8984ccb Add ThrownEggHatchEvent (#1982) 9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
2026-02-18 17:07:43 +01:00 · 2020-02-12 21:21:34 -06:00
parent e52e23265f
commit 4757060211
159 changed files with 6166 additions and 4642 deletions
--- a/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
@@ -0,0 +1,84 @@
+From 21ed5c312c292d6c47951c675a4a4ee133cecb92 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 5 May 2019 12:58:45 -0500
+Subject: [PATCH] Implement LivingEntity safeFallDistance
+
+---
+ .../java/net/minecraft/server/EntityGiantZombie.java |  3 +++
+ .../net/minecraft/server/EntityHorseAbstract.java    |  2 +-
+ src/main/java/net/minecraft/server/EntityLiving.java |  3 ++-
+ .../bukkit/craftbukkit/entity/CraftLivingEntity.java | 12 ++++++++++++
+ 4 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
+index d132a6105..0b200c725 100644
+--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
+@@ -5,6 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
+     public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) {
+         super(entitytypes, world);
+         setStepHeight(world.purpurConfig.giantStepHeight); // Purpur
+        // Purpur start
+        this.safeFallDistance = 10.0F;
+        // Purpur end
+     }
+ 
+     // Purpur start
+diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+index 55e18e4c7..b14f67b3a 100644
+--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+@@ -229,7 +229,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
+ 
+     @Override
+     protected int e(float f, float f1) {
+-        return MathHelper.f((f * 0.5F - 3.0F) * f1);
+        return MathHelper.f((f * 0.5F - this.safeFallDistance) * f1); // Purpur
+     }
+ 
+     protected int getChestSlots() {
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+index cd4526039..60e2b4268 100644
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
+@@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {
+     // CraftBukkit start
+     public int expToDrop;
+     public int maxAirTicks = 300;
+    public float safeFallDistance = 3.0F; // Purpur
+     boolean forceDrops;
+     ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
+     public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
+@@ -1546,7 +1547,7 @@ public abstract class EntityLiving extends Entity {
+         MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
+         float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
+ 
+-        return MathHelper.f((f - 3.0F - f2) * f1);
+        return MathHelper.f((f - this.safeFallDistance - f2) * f1); // Purpur
+     }
+ 
+     protected void cZ() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 277eb54e7..8980a12eb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -727,4 +727,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+     }
+ 
+     // Paper end
+
+    // Purpur start
+    @Override
+    public float getSafeFallDistance() {
+        return getHandle().safeFallDistance;
+    }
+
+    @Override
+    public void setSafeFallDistance(float safeFallDistance) {
+        getHandle().safeFallDistance = safeFallDistance;
+    }
+    // Purpur end
+ }
+-- 
+2.24.0
+