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 appear to apply and compile correctly Paper Changes: PaperMC/Paper@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347) PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 8fa8922ad2fb0ea8f770368faff61e56e9761df9..68444273a026d2fa88e3853f4303fb2dee52b227 100644
|
||||
index a1dba2bcc2a636718a6f377907afc82add617fa2..4f74fb77fb516ff99e04ec2cf2a00c7acbb00c44 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -909,4 +909,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -917,4 +917,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
*/
|
||||
void setHurtDirection(float hurtDirection);
|
||||
// Paper end
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 68444273a026d2fa88e3853f4303fb2dee52b227..dc62e8498fa7a18605bc5e6844746c1c66ea9e96 100644
|
||||
index 4f74fb77fb516ff99e04ec2cf2a00c7acbb00c44..c0d725cdf0699162347f817e1f7187baa53ab037 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -924,5 +924,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -932,5 +932,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param safeFallDistance Safe fall distance
|
||||
*/
|
||||
void setSafeFallDistance(float safeFallDistance);
|
||||
|
||||
@@ -23,10 +23,10 @@ index dd7df647f98fe72694fb7615e5cd1192724b7812..1f116f33e6dbce8d8d67d799beeedecf
|
||||
// Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index dc62e8498fa7a18605bc5e6844746c1c66ea9e96..6c46107e13a5fd648d64844ffa5b326d4909d702 100644
|
||||
index c0d725cdf0699162347f817e1f7187baa53ab037..a9b79beb8d16ed74c953ff46ad61945327d685e8 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -931,5 +931,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -939,5 +939,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param slot Equipment slot to play break animation for
|
||||
*/
|
||||
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
|
||||
|
||||
Reference in New Issue
Block a user