Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c6aa61e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561)
PaperMC/Paper@93b435d [ci skip] better instructions for patch apply conflict (#11568)
PaperMC/Paper@42a1901 Correctly adopt upstream item EAR fix (#11582)
PaperMC/Paper@fcb6c72 Correctly pass velocity native compressor (#11509)
This commit is contained in:
granny
2024-11-06 18:39:37 -08:00
parent e86a1b6801
commit 962ee3064d
21 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0058-Implement-elytra-settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b19d76ddb99f67c3bff08cc22b195ab08b4e5902..66ae89ade2bb19b0a8498573f8c0c68ff0628594 100644
index e14533a047acaf4c1178f0b23427b23179334b88..585cda7afc6532196ddbd53b9d4ff3215afb67da 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3738,7 +3738,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3739,7 +3739,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
}).toList();
EquipmentSlot enumitemslot = (EquipmentSlot) Util.getRandom(list, this.random);
@@ -27,7 +27,7 @@ index b19d76ddb99f67c3bff08cc22b195ab08b4e5902..66ae89ade2bb19b0a8498573f8c0c68f
}
this.gameEvent(GameEvent.ELYTRA_GLIDE);
@@ -3747,7 +3757,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3748,7 +3758,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}