Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b560034 Avoid usages of RecipeChoice#getItemStack() (#8453)
PaperMC/Paper@603df98 FIx bedrock patterns (#8474)
PaperMC/Paper@ec00f99 Fix package for PlayerInventorySlotChangeEvent (#8475)
PaperMC/Paper@236a296 Add LivingEntity#swingHand(EquipmentSlot) convenience method (#8456)
PaperMC/Paper@7d64d7c Add converted Slot number to PlayerInventorySlotChangeEvent (#8482)
PaperMC/Paper@ed2c88b Add LivingEntity knockback API (#8479)
PaperMC/Paper@e1d4b26 Fix another case of missing chat headers
PaperMC/Paper@f7da209 Fix inconsistent isChunkLoaded calls
This commit is contained in:
BillyGalbreath
2022-10-18 11:18:02 -05:00
parent 8e04c6f326
commit cf6b7c3459
15 changed files with 46 additions and 46 deletions

View File

@@ -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 4af5e8d0cba6555f7615e4e809d9aff221c0dc4d..8cd72cd63695ec0b8900adaa967d8f22469b72a8 100644
index c9a44e8024f903da83181ee752c971bab22c8895..77861d44e3a0f7271f637751caaf3ffdd26ca046 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -986,4 +986,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1016,4 +1016,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setHurtDirection(float hurtDirection);
void knockback(double strength, double directionX, double directionZ);
// Paper end
+
+ // Purpur start

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 8cd72cd63695ec0b8900adaa967d8f22469b72a8..193901442dd6d5e0c85269b42083f63759120d06 100644
index 77861d44e3a0f7271f637751caaf3ffdd26ca046..dc69ce69a6cc7c2ae6023033dd445807c26bf052 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1001,5 +1001,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1031,5 +1031,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

View File

@@ -23,10 +23,10 @@ index 83c74245e75b8895404fe4b7214c686a308e00b5..28be71aa677ed8cb9a9d06b3aba7af40
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 193901442dd6d5e0c85269b42083f63759120d06..4a4606f2598b868e43c270cd3056d44549bc914e 100644
index dc69ce69a6cc7c2ae6023033dd445807c26bf052..1460f87718bdbdbde634b3e412adaa8d11e8e5fd 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1008,5 +1008,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1038,5 +1038,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);