3in1: Update Upstream, Remove useless patches, Fix cramming/colliding bug

2026-02-18 00:47:42 +01:00 · 2019-07-29 20:53:47 -05:00
parent 75774b7422
commit 9db1fe9d28
75 changed files with 421 additions and 1452 deletions
--- a/patches/api/0004-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0004-Implement-LivingEntity-safeFallDistance.patch
@@ -0,0 +1,37 @@
+From 79e01bbeefe94343e21159ad58547e0af028ea5b Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 5 May 2019 12:58:19 -0500
+Subject: [PATCH] Implement LivingEntity safeFallDistance
+
+---
+ .../java/org/bukkit/entity/LivingEntity.java     | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
+index a78f390d7..f47a6869f 100644
+--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
+@@ -681,4 +681,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+      */
+     boolean isHandRaised();
+     // Paper end
+
+    // Purpur start
+    /**
+     * Gets the distance (in blocks) this entity can safely fall without taking damage
+     *
+     * @return Safe fall distance
+     */
+    float getSafeFallDistance();
+
+    /**
+     * Set the distance (in blocks) this entity can safely fall without taking damage
+     *
+     * @param safeFallDistance Safe fall distance
+     */
+    void setSafeFallDistance(float safeFallDistance);
+    // Purpur end
+ }
+-- 
+2.20.1
+