From f2690c9ecc3b9507cc03014899c8e12dc8139d22 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 26 Feb 2020 22:43:48 -0600 Subject: [PATCH] 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) --- Paper | 2 +- current-paper | 2 +- .../api/0011-Implement-LivingEntity-safeFallDistance.patch | 6 +++--- .../0026-Add-playPickupItemAnimation-to-LivingEntity.patch | 6 +++--- .../0059-Implement-LivingEntity-safeFallDistance.patch | 6 +++--- .../0074-Add-playPickupItemAnimation-to-LivingEntity.patch | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Paper b/Paper index 892f479fb..b07700591 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 892f479fb4ef849ba834cbedd0069395cc1bef14 +Subproject commit b0770059105835549820062e3e700a3fc3be9da8 diff --git a/current-paper b/current-paper index ea7261de7..1d9ca90a4 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--7520dc06c8ea2db9ee7d326c38e146f9b5c87533 +1.15.2--201c0696b7bfb6766085ea756e2003a6be088114 diff --git a/patches/api/0011-Implement-LivingEntity-safeFallDistance.patch b/patches/api/0011-Implement-LivingEntity-safeFallDistance.patch index fb6827b7d..cbdc77731 100644 --- a/patches/api/0011-Implement-LivingEntity-safeFallDistance.patch +++ b/patches/api/0011-Implement-LivingEntity-safeFallDistance.patch @@ -1,4 +1,4 @@ -From 2691e239f821ea12194519be18f52dc3cd2cf239 Mon Sep 17 00:00:00 2001 +From 1797a7519f80bf7356430fe1c8e9444942ba35db Mon Sep 17 00:00:00 2001 From: William Blake Galbreath 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 e69702e6f..9c4af8a9b 100644 +index 7f73e4b92..1192fef87 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -705,4 +705,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -732,4 +732,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ void setJumping(boolean jumping); // Paper end diff --git a/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch index d180928fc..221c509e3 100644 --- a/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 2a524b7c61b666f93a27174acbf847a1b0b9959c Mon Sep 17 00:00:00 2001 +From c6a7136fcdf483a98edb1d05c4f04622d4f57c87 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:05 -0500 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity @@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 9c4af8a9b..aaad2da41 100644 +index 1192fef87..2a713adb5 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -720,5 +720,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -747,5 +747,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param safeFallDistance Safe fall distance */ void setSafeFallDistance(float safeFallDistance); diff --git a/patches/server/0059-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0059-Implement-LivingEntity-safeFallDistance.patch index a085c7194..b10995b55 100644 --- a/patches/server/0059-Implement-LivingEntity-safeFallDistance.patch +++ b/patches/server/0059-Implement-LivingEntity-safeFallDistance.patch @@ -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 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 diff --git a/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch index 52828d6bc..5d0a68d0d 100644 --- a/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -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 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; }