Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 892f479fb4...b077005910

2
current-paper
View File

@@ -1 +1 @@
1.15.2--7520dc06c8ea2db9ee7d326c38e146f9b5c87533 1.15.2--201c0696b7bfb6766085ea756e2003a6be088114

6
patches/api/0011-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:19 -0500 Date: Sun, 5 May 2019 12:58:19 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
1 file changed, 16 insertions(+) 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 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 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/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); void setJumping(boolean jumping);
// Paper end // Paper end

6
patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:05 -0500 Date: Sat, 19 Oct 2019 02:25:05 -0500
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
1 file changed, 17 insertions(+) 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 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 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/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 * @param safeFallDistance Safe fall distance
*/ */
void setSafeFallDistance(float safeFallDistance); void setSafeFallDistance(float safeFallDistance);

6
patches/server/0059-Implement-LivingEntity-safeFallDistance.patch
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> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500 Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -59,10 +59,10 @@ index cd45260396..60e2b4268c 100644
protected void cZ() { 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/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 // Paper end

6
patches/server/0074-Add-playPickupItemAnimation-to-LivingEntity.patch
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> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:16 -0500 Date: Sat, 19 Oct 2019 02:25:16 -0500
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
@@ -8,10 +8,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
1 file changed, 5 insertions(+) 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/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) { public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance; getHandle().safeFallDistance = safeFallDistance;
} }