Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01: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@f613437 Fix CraftPlayerProfile#setId regression (#9822)
PaperMC/Paper@3e9d2ac Don't call options events on login (#9834)
PaperMC/Paper@e4d184f Replace bukkit Consumers with java consumers (#9836)
PaperMC/Paper@3e1c5e3 Add BlockData setter for FallingBlock (#9829)
PaperMC/Paper@852c1c2 Add additional tags to ItemMeta obfuscation filtering (#9665)
This commit is contained in:
granny
2023-10-14 18:33:56 -07:00
parent ad03187fab
commit ff126d3257
12 changed files with 35 additions and 35 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 cb6bcd006ef482087a336747836889bb3afcb53e..1c43db48baf33b96be7dd027f3cbaedf205b5101 100644
index 48c5c63469a81ba3d671f8ea9efd815b6ebb7031..395cfab75f313be3921952bc570fd53194ad37d6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3526,7 +3526,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3533,7 +3533,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
int j = i / 10;
if (j % 2 == 0) {
@@ -54,7 +54,7 @@ index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecb
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index d375703e0ad4cc2b82d6693e15800539e0c7c9f1..c9d1e2af3afd7a9320b589ede8ff29ffbaf9297d 100644
index 25be1927304e497a6ebf9d9ec09525a5418095db..6e6f60554b36117a833949ef2f9a4b68f6518a1d 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -618,7 +618,7 @@ public final class ItemStack {