Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2e7bb166 Deprecate dyes custom tag in favour of vanilla tag (#13855)
PaperMC/Paper@6048c2d9 Fix LivingEntity#knockback ignored when its Player (#13842)
PaperMC/Paper@b80b6046 fix: Attack strength ticker cooldown incorrectly reset (#13856)
PaperMC/Paper@1835b046 Call AsyncPlayerPreLoginEvent/AsyncPlayerConnectionConfigureEvent on virtual threads (#13816)
PaperMC/Paper@afea65c2 Fix leash event for boats and elytra (#13697)
PaperMC/Paper@39bd1bac [ci/skip] Rebuild patches
PaperMC/Paper@11dbf110 Call BlockRedstoneEvent for more interactions (#12206)
PaperMC/Paper@b8b4a1c7 Update Player#getClientViewDistance (#13530)
PaperMC/Paper@b685281d [ci/skip] Mention documenting new config options in CONTRIBUTING.md (#13664)
This commit is contained in:
granny
2026-05-03 22:54:21 -07:00
parent dc46f46d28
commit 348027faef
10 changed files with 22 additions and 22 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index a20626d0b750ba89836d806bef61528758849311..fd20156ba4319778323756485557b3dbc32b09c1 100644
index 8f536177aabda1387d3562912b48ae8fce1dd278..fbb288020b0526d44312610782f41ab443a42ad9 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3945,7 +3945,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3937,7 +3937,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
if (freeFallInterval % 2 == 0) {
List<EquipmentSlot> slotsWithGliders = EquipmentSlot.VALUES.stream().filter(slot -> canGlideUsing(this.getItemBySlot(slot), slot)).toList();
EquipmentSlot slotToDamage = Util.getRandom(slotsWithGliders, this.random);
@@ -27,11 +27,11 @@ index a20626d0b750ba89836d806bef61528758849311..fd20156ba4319778323756485557b3db
this.gameEvent(GameEvent.ELYTRA_GLIDE);
diff --git a/net/minecraft/world/item/FireworkRocketItem.java b/net/minecraft/world/item/FireworkRocketItem.java
index c17607cb1fd5403f17a64b4218571e669b840a2e..6545145e1f83b333fd1d05ab714c9869c5d2d7fe 100644
index 0afc0916e358d4b9c9c360358a6c1aebe1ac723b..ce4380f76c89008b5fa8cd5fd666a0c22e93b26b 100644
--- a/net/minecraft/world/item/FireworkRocketItem.java
+++ b/net/minecraft/world/item/FireworkRocketItem.java
@@ -73,6 +73,17 @@ public class FireworkRocketItem extends Item implements ProjectileItem {
if (player.dropAllLeashConnections(null)) {
if (player.dropAllLeashConnections(player, hand)) { // Paper - PlayerUnleashEntityEvent
level.playSound(null, player, SoundEvents.LEAD_BREAK, SoundSource.NEUTRAL, 1.0F, 1.0F);
}
+ // Purpur start - Implement elytra settings