Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4e0ed1f8 Backport fix for MC-167561 (Fixes #2886, closes#2960)
9946cef8 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-21 14:15:01 -06:00
parent c5ae95f138
commit a098378494
14 changed files with 66 additions and 57 deletions

View File

@@ -1,4 +1,4 @@
From 5e09c1746e3db13c3230138414436cd08abd08c2 Mon Sep 17 00:00:00 2001
From 2691e239f821ea12194519be18f52dc3cd2cf239 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
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 77f4246d7..2e1e27b05 100644
index e69702e6f..9c4af8a9b 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -701,4 +701,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -705,4 +705,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setJumping(boolean jumping);
// Paper end