mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: df0d7b0d Update upstream CB 6ea3c2cf [CI-SKIP] Rebuild patches d7bed4cb Heavily optimise random block ticking (#2914) b66d9ff8 Update upstream CB ba71c5d6 Stop stripping private use block Unicode from signs 28d9dcfc Entity Jump API (#1587) 9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion 054e20da Clean up imports on ThrownEggHatchEvent a8984ccb Add ThrownEggHatchEvent (#1982) 9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 5e6941ddcd9149cf40509ad0d63795411de96112 Mon Sep 17 00:00:00 2001
|
||||
From ab693decd5209d531220f77d401c926ce77bfaa1 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,12 +8,12 @@ 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 e408c89220..572d21b349 100644
|
||||
index 8980a12eb..de1b72afa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -747,5 +747,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
((EntityInsentient) getHandle()).getControllerJump().jump();
|
||||
}
|
||||
@@ -738,5 +738,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
public void setSafeFallDistance(float safeFallDistance) {
|
||||
getHandle().safeFallDistance = safeFallDistance;
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
@@ -23,5 +23,5 @@ index e408c89220..572d21b349 100644
|
||||
// Purpur end
|
||||
}
|
||||
--
|
||||
2.24.0.rc1
|
||||
2.24.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user