mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7569191 Send disguised chat for vanished players PaperMC/Paper@96fd31b Fix chunk sending when the computed time overflows (#8833) PaperMC/Paper@39aef52 Fix `Tick::addTo`/`::between` causing SOE (#8824) PaperMC/Paper@0c3311c Add Entity Body Yaw API (#8822) PaperMC/Paper@0c9ace8 Add AntiXray layered obfuscation mode (#8799) PaperMC/Paper@5eca964 [ci skip] Rebuild patches
This commit is contained in:
@@ -5,12 +5,12 @@ 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 6555397148b84dba7a87cae505544b65452f1742..3aee8f29fece72485eb9ada371d6444633120a53 100644
|
||||
index 1da1c293ac8a13d22743c26d35624155bfa73a16..df181fc97e56fcde382235cb1262d65b9bb9ff85 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -1126,4 +1126,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -1142,4 +1142,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
*/
|
||||
void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
|
||||
void setBodyYaw(float bodyYaw);
|
||||
// Paper end
|
||||
+
|
||||
+ // Purpur start
|
||||
|
||||
@@ -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 3aee8f29fece72485eb9ada371d6444633120a53..7f828209e0323475ec51e44975e3b3ac10aa265b 100644
|
||||
index df181fc97e56fcde382235cb1262d65b9bb9ff85..5957c30607fdb202c5400b6b2513692126fa76b5 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -1141,5 +1141,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -1157,5 +1157,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
* @param safeFallDistance Safe fall distance
|
||||
*/
|
||||
void setSafeFallDistance(float safeFallDistance);
|
||||
|
||||
@@ -23,10 +23,10 @@ index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c
|
||||
// Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 7f828209e0323475ec51e44975e3b3ac10aa265b..ebc42a0ed4b24564a5055fef50468142529aed2f 100644
|
||||
index 5957c30607fdb202c5400b6b2513692126fa76b5..127bf9621cca12327ac06becdd921a5f843b888d 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -1148,5 +1148,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
@@ -1164,5 +1164,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