Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4c9317c Use non-deprecated super ctor in PaperServerListPingEventImpl (#8029)
PaperMC/Paper@147a2b7 Parse MOTD as legacy sectioned string (Fixes #8036)
PaperMC/Paper@e52499e Fix Player#loadData and Player#saveData javadocs (#8039)
PaperMC/Paper@bdb6816 Update Alternate Current to v1.4.0 (#8028)
PaperMC/Paper@5593f4e Cleanup LivingEntity Hand Raised/Item Use API (#7995)
PaperMC/Paper@04d080e [ci skip] Fix tiny mistake in adventure javadocs (#8046)
This commit is contained in:
Ben Kerllenevich
2022-06-24 13:13:38 -04:00
parent 4f47e9c368
commit ccbf80d813
4 changed files with 7 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = fb2c24b36dfd74ccabf9083f774bb4b96f58e061
paperCommit = 04d080ed82e7e2cf859bcec98b76a51fc7274893
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -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 31353bd20404a8c2acf6bf0df524dc3cae324272..e532430b7444cef4e383b3afb637cc6060d8686a 100644
index 8fa8922ad2fb0ea8f770368faff61e56e9761df9..68444273a026d2fa88e3853f4303fb2dee52b227 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -910,4 +910,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -909,4 +909,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setHurtDirection(float hurtDirection);
// Paper end

View File

@@ -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 e532430b7444cef4e383b3afb637cc6060d8686a..0f9dbacb6851b27b2e5b1aa1cf994ccb313f0f45 100644
index 68444273a026d2fa88e3853f4303fb2dee52b227..dc62e8498fa7a18605bc5e6844746c1c66ea9e96 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -925,5 +925,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -924,5 +924,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

View File

@@ -23,10 +23,10 @@ index db83f87af0cb75b275bba306dea38b66907bbb56..3fa4f583c8d38c8cb62065f7f18986c9
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 0f9dbacb6851b27b2e5b1aa1cf994ccb313f0f45..bbae010cedf30d0e3336a8f03ee00a0a824cb08d 100644
index dc62e8498fa7a18605bc5e6844746c1c66ea9e96..6c46107e13a5fd648d64844ffa5b326d4909d702 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -932,5 +932,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -931,5 +931,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);