Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b0770059 Updated Upstream (Bukkit/CraftBukkit)
0809d6be [CI-SKIP] fix avoid-hopper-search obfhelper hint type (#2989)
This commit is contained in:
William Blake Galbreath
2020-02-26 22:43:48 -06:00
parent 6c85726c21
commit f2690c9ecc
6 changed files with 14 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
From 90ef3ec8d0005b3e0a06484f27e5f913258d8412 Mon Sep 17 00:00:00 2001
From 4f17bcd81115b9878819976bccbffd870310ded4 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
@@ -59,10 +59,10 @@ index cd45260396..60e2b4268c 100644
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 277eb54e79..8980a12ebe 100644
index 8ffa3cb059..3dd0faea79 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 {
@@ -739,4 +739,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
// Paper end