Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f40a3f67 Update README version badge for 26.2 [ci/skip] (#13953)
PaperMC/Paper@c04c71b2 fix folia entity scheduler
PaperMC/Paper@fe1b210d don't break Vex#getSummoner
PaperMC/Paper@d16f5ccc Use more accurate placed sound for block item
PaperMC/Paper@03b30e07 Reset updatingMinecraft
This commit is contained in:
granny
2026-06-14 00:55:11 -07:00
parent 0c913568e6
commit 26a1e028a1
5 changed files with 8 additions and 27 deletions

View File

@@ -49,10 +49,10 @@ index b3443ff2d06af328493046e723efc11d299a2824..3c001b3810097d5cb60ad64e0727d8d9
itemStack.shrink(1); // Moved up from below
} else {
diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
index 3bbad55a7a81534a192e91ecd198f3201f65f527..d74eef5eb06f7d957941e9602f137f20c25fc3c5 100644
index 92d4a8ea07e96f84df655c63e21716549f52d8b9..abaa39135d3025a4ef066428d46af814a4854de4 100644
--- a/net/minecraft/world/item/ItemStack.java
+++ b/net/minecraft/world/item/ItemStack.java
@@ -669,6 +669,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
@@ -666,6 +666,14 @@ public final class ItemStack implements DataComponentHolder, ItemInstance {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
}
// CraftBukkit end