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 2db845f1ded6f0925f81688c7bbf8dae2af8e39b Mon Sep 17 00:00:00 2001
From e2129a5737e688dd127166e15369d927aa9767c4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:16 -0500
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 8980a12ebe..de1b72afa5 100644
index 3dd0faea79..48f66b0c1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -738,5 +738,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -750,5 +750,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance;
}