1020

2024-10-25 00:08:35 +02:00 · 2024-10-25 00:08:35 +02:00 · 6a315742d9
commit 6a315742d9
parent 7616ebccd8
21 changed files with 221 additions and 263 deletions
--- a/patches/unapplied/server/1023-fix-horse-inventories.patch
+++ b/patches/unapplied/server/1023-fix-horse-inventories.patch
@ -1,215 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 6 Jul 2024 13:57:10 -0700
-Subject: [PATCH] fix horse inventories
-
-Horse inventories now combine 2 inventories (like
-result inventories).
-
-== AT ==
-public net/minecraft/world/inventory/HorseInventoryMenu SLOT_BODY_ARMOR
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 9bcc0931510607b8fbd01233e2b3c346369b214d..467693a60786688b753cebac3b0a88898e332eee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-@@ -112,7 +112,7 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
- 
-     @Override
-     public AbstractHorseInventory getInventory() {
-        return new CraftSaddledInventory(getHandle().inventory);
-+        return new CraftSaddledInventory(getHandle().inventory, this.getHandle().getBodyArmorAccess()); // Paper - use both inventories
-     }
- 
-     // Paper start - Horse API
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
-index 4946da593713f4d11d88ac1bb68a089f2f6d5ae0..54e81472259dc13dfc7b2af6b211628c39435890 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
-@@ -6,17 +6,106 @@ import org.bukkit.inventory.ItemStack;
- 
- public class CraftInventoryAbstractHorse extends CraftInventory implements AbstractHorseInventory {
- 
-    public CraftInventoryAbstractHorse(Container inventory) {
-+    // Paper start - combine both horse inventories
-+    private final Container bodyArmor;
-+    public CraftInventoryAbstractHorse(Container inventory, final Container bodyArmor) {
-         super(inventory);
-+        this.bodyArmor = bodyArmor;
-+        // Paper end - combine both horse inventories
-     }
- 
-     @Override
-     public ItemStack getSaddle() {
-        return this.getItem(0);
-+        return this.getItem(net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE); // Paper
-     }
- 
-     @Override
-     public void setSaddle(ItemStack stack) {
-        this.setItem(0, stack);
-+        this.setItem(net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE, stack); // Paper
-     }
-+
-+    // Paper start - combine both horse inventories
-+    public Container getMainInventory() {
-+        return this.inventory;
-+    }
-+
-+    public Container getArmorInventory() {
-+        return this.bodyArmor;
-+    }
-+
-+    public ItemStack getArmor() {
-+        return this.getItem(net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR);
-+    }
-+
-+    public void setArmor(ItemStack armor) {
-+        this.setItem(net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR, armor);
-+    }
-+
-+    @Override
-+    public int getSize() {
-+        return this.getMainInventory().getContainerSize() + this.getArmorInventory().getContainerSize();
-+    }
-+
-+    @Override
-+    public boolean isEmpty() {
-+        return this.getMainInventory().isEmpty() && this.getArmorInventory().isEmpty();
-+    }
-+
-+    @Override
-+    public ItemStack[] getContents() {
-+        ItemStack[] items = new ItemStack[this.getSize()];
-+
-+        items[net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE] = this.getSaddle();
-+        items[net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR] = this.getArmor();
-+
-+        for (int i = net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR + 1; i < items.length; i++) {
-+            net.minecraft.world.item.ItemStack item = this.getMainInventory().getItem(i - 1);
-+            items[i] = item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
-+        }
-+
-+        return items;
-+    }
-+
-+    @Override
-+    public void setContents(ItemStack[] items) {
-+        com.google.common.base.Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize());
-+
-+        this.setSaddle(org.apache.commons.lang3.ArrayUtils.get(items, net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE));
-+        this.setArmor(org.apache.commons.lang3.ArrayUtils.get(items, net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR));
-+
-+        for (int i = net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR + 1; i < this.getSize(); i++) {
-+            net.minecraft.world.item.ItemStack item = i >= items.length ? net.minecraft.world.item.ItemStack.EMPTY : CraftItemStack.asNMSCopy(items[i]);
-+            this.getMainInventory().setItem(i - 1, item);
-+        }
-+    }
-+
-+    @Override
-+    public ItemStack getItem(final int index) {
-+        if (index == net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
-+            final net.minecraft.world.item.ItemStack item = this.getArmorInventory().getItem(0);
-+            return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
-+        } else {
-+            int shiftedIndex = index;
-+            if (index > net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
-+                shiftedIndex--;
-+            }
-+
-+            final net.minecraft.world.item.ItemStack item = this.getMainInventory().getItem(shiftedIndex);
-+            return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
-+        }
-+    }
-+
-+    @Override
-+    public void setItem(final int index, final ItemStack item) {
-+        if (index == net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
-+            this.getArmorInventory().setItem(0, CraftItemStack.asNMSCopy(item));
-+        } else {
-+            int shiftedIndex = index;
-+            if (index > net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
-+                shiftedIndex--;
-+            }
-+            this.getMainInventory().setItem(shiftedIndex, CraftItemStack.asNMSCopy(item));
-+        }
-+    }
-+    // Paper end - combine both horse inventories
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 07a304edc2a7b3450a55728e78a4fe37febdbadc..ebf0da48378b9376b3be2ca731315485003f6a89 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-@@ -6,21 +6,9 @@ import org.bukkit.inventory.ItemStack;
- 
- public class CraftInventoryHorse extends CraftSaddledInventory implements HorseInventory {
- 
-    private final Container bodyArmorInventory;
-
-+    // Paper start - properly combine both inventories
-     public CraftInventoryHorse(Container inventory, Container bodyArmorInventory) {
-        super(inventory);
-        this.bodyArmorInventory = bodyArmorInventory;
-    }
-
-    @Override
-    public ItemStack getArmor() {
-        net.minecraft.world.item.ItemStack item = this.bodyArmorInventory.getItem(0);
-        return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
-    }
-
-    @Override
-    public void setArmor(ItemStack stack) {
-        this.bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
-+        super(inventory, bodyArmorInventory);
-     }
-+    // Paper end - properly combine both inventories
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
-index dcbc80646ebfc384c4f6ab1beee46a4b71a67af8..0804b642d966f2cb09f4101410e2ff1d154ea594 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
-@@ -6,21 +6,19 @@ import org.bukkit.inventory.LlamaInventory;
- 
- public class CraftInventoryLlama extends CraftInventoryAbstractHorse implements LlamaInventory {
- 
-    private final Container bodyArmorInventory;
-
-+    // Paper start - properly combine both inventories
-     public CraftInventoryLlama(Container inventory, Container bodyArmorInventory) {
-        super(inventory);
-        this.bodyArmorInventory = bodyArmorInventory;
-+        super(inventory, bodyArmorInventory);
-+        // Paper end - properly combine both inventories
-     }
- 
-     @Override
-     public ItemStack getDecor() {
-        net.minecraft.world.item.ItemStack item = this.bodyArmorInventory.getItem(0);
-        return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
-+        return this.getArmor(); // Paper
-     }
- 
-     @Override
-     public void setDecor(ItemStack stack) {
-        this.bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
-+        this.setArmor(stack); // Paper
-     }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
-index 3a617c07d445bacf5a13e0e3ff6481823cfc8477..1c100c7c210485c1d3510745de7d18f58ba72557 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
-@@ -5,8 +5,10 @@ import org.bukkit.inventory.SaddledHorseInventory;
- 
- public class CraftSaddledInventory extends CraftInventoryAbstractHorse implements SaddledHorseInventory {
- 
-    public CraftSaddledInventory(Container inventory) {
-        super(inventory);
-+    // Paper start - combine both inventories
-+    public CraftSaddledInventory(Container inventory, final Container bodyArmor) {
-+        super(inventory, bodyArmor);
-+        // Paper end - combine both inventories
-     }
- 
- }
--- a/patches/unapplied/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/unapplied/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch
@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bjarne Koll <lynxplay101@gmail.com>
-Date: Mon, 8 Jul 2024 22:01:08 +0200
-Subject: [PATCH] Only call EntityDamageEvents before actuallyHurt
-
-The recent upstream update moved around the event logic for
-EntiyDamageEvent and its derivatives.
-However, the event was called on every call to #hurt as it was moved out
-of actuallyHurt.
-
-This patch moves the invocation directly before the #actuallyHurt calls,
-respective invulnerable timings.
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3b15995efc65a351da8dac009b9698494771fefb..5079775ce8f86fb061e616190513f56ff086e409 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1459,12 +1459,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             }
- 
-             // CraftBukkit start
-            EntityDamageEvent event = this.handleEntityDamage(source, amount);
-            amount = 0;
-            amount += (float) event.getDamage(DamageModifier.BASE);
-            amount += (float) event.getDamage(DamageModifier.BLOCKING);
-            amount += (float) event.getDamage(DamageModifier.FREEZING);
-            amount += (float) event.getDamage(DamageModifier.HARD_HAT);
-+            EntityDamageEvent event; // Paper - move this into the actual invuln check....
-             // CraftBukkit end
- 
-             this.walkAnimation.setSpeed(1.5F);
-@@ -1475,6 +1470,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                     return false;
-                 }
- 
-+                // Paper start - only call damage event when actuallyHurt will be called - move call logic down
-+                event = this.handleEntityDamage(source, amount);
-+                amount = computeAmountFromEntityDamageEvent(event);
-+                // Paper end - only call damage event when actuallyHurt will be called - move call logic down
-+
-                 // CraftBukkit start
-                 if (!this.actuallyHurt(source, (float) event.getFinalDamage() - this.lastHurt, event)) {
-                     return false;
-@@ -1484,6 +1484,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 this.lastHurt = amount;
-                 flag1 = false;
-             } else {
-+                // Paper start - only call damage event when actuallyHurt will be called - move call logic down
-+                event = this.handleEntityDamage(source, amount);
-+                amount = computeAmountFromEntityDamageEvent(event);
-+                // Paper end - only call damage event when actuallyHurt will be called - move call logic down
-                 // CraftBukkit start
-                 if (!this.actuallyHurt(source, (float) event.getFinalDamage(), event)) {
-                     return false;
-@@ -1615,6 +1619,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         }
-     }
- 
-+    // Paper start - only call damage event when actuallyHurt will be called - move out amount computation logic
-+    private float computeAmountFromEntityDamageEvent(final EntityDamageEvent event) {
-+        // Taken from hurt()'s craftbukkit diff.
-+        float amount = 0;
-+        amount += (float) event.getDamage(DamageModifier.BASE);
-+        amount += (float) event.getDamage(DamageModifier.BLOCKING);
-+        amount += (float) event.getDamage(DamageModifier.FREEZING);
-+        amount += (float) event.getDamage(DamageModifier.HARD_HAT);
-+        return amount;
-+    }
-+    // Paper end - only call damage event when actuallyHurt will be called - move out amount computation logic
-+
-     protected void blockUsingShield(LivingEntity attacker) {
-         attacker.blockedByShield(this);
-     }
--- a/patches/unapplied/server/1029-Add-ItemType-getItemRarity.patch
+++ b/patches/unapplied/server/1029-Add-ItemType-getItemRarity.patch
@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 9 Jul 2024 18:37:37 -0700
-Subject: [PATCH] Add ItemType#getItemRarity
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
-index bae3dd5fc67e6b3d98a5e63ffbf639c5042f8843..450c63c31d2f5d056d989aa00452231f50c8224d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemType.java
-@@ -265,4 +265,12 @@ public class CraftItemType<M extends ItemMeta> implements ItemType.Typed<M>, Han
-         return this.item.getDescriptionId();
-     }
-     // Paper end - add Translatable
-+
-+    // Paper start - expand ItemRarity API
-+    @Override
-+    public org.bukkit.inventory.ItemRarity getItemRarity() {
-+        final net.minecraft.world.item.Rarity rarity = this.item.components().get(DataComponents.RARITY);
-+        return rarity == null ? null : org.bukkit.inventory.ItemRarity.valueOf(rarity.name());
-+    }
-+    // Paper end - expand ItemRarity API
- }
--- a/patches/unapplied/server/1033-Add-plugin-info-at-startup.patch
+++ b/patches/unapplied/server/1033-Add-plugin-info-at-startup.patch
@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 18 Jul 2024 18:44:28 -0700
-Subject: [PATCH] Add plugin info at startup
-
-
-diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-index 49d8e207795997e5deaf830eb971067f84bfc791..70413fddd23ca1165cb5090cce4fddcb1bbca93f 100644
--- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-@@ -6,7 +6,10 @@ import io.papermc.paper.plugin.entrypoint.Entrypoint;
- import io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler;
- import io.papermc.paper.plugin.provider.PluginProvider;
- import io.papermc.paper.plugin.provider.type.paper.PaperPluginParent;
-+import io.papermc.paper.plugin.provider.type.spigot.SpigotPluginProvider;
- import io.papermc.paper.pluginremap.PluginRemapper;
-+import java.util.Set;
-+import java.util.TreeSet;
- import java.util.function.Function;
- import joptsimple.OptionSet;
- import net.minecraft.server.dedicated.DedicatedServer;
-@@ -101,6 +104,7 @@ public class PluginInitializerManager {
-     }
- 
-     public static void load(OptionSet optionSet) throws Exception {
-+        LOGGER.info("Initializing plugins...");
-         // We have to load the bukkit configuration inorder to get the update folder location.
-         io.papermc.paper.plugin.PluginInitializerManager pluginSystem = io.papermc.paper.plugin.PluginInitializerManager.init(optionSet);
-         if (pluginSystem.pluginRemapper != null) pluginSystem.pluginRemapper.loadingPlugins();
-@@ -112,6 +116,34 @@ public class PluginInitializerManager {
-         @SuppressWarnings("unchecked")
-         java.util.List<Path> files = ((java.util.List<File>) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList();
-         io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files);
-+
-+        final Set<String> paperPluginNames = new TreeSet<>();
-+        final Set<String> legacyPluginNames = new TreeSet<>();
-+        LaunchEntryPointHandler.INSTANCE.getStorage().forEach((entrypoint, providerStorage) -> {
-+            providerStorage.getRegisteredProviders().forEach(provider -> {
-+                if (provider instanceof final SpigotPluginProvider legacy) {
-+                    legacyPluginNames.add(String.format("%s (%s)", legacy.getMeta().getName(), legacy.getMeta().getVersion()));
-+                } else if (provider instanceof final PaperPluginParent.PaperServerPluginProvider paper) {
-+                    paperPluginNames.add(String.format("%s (%s)", provider.getMeta().getName(), provider.getMeta().getVersion()));
-+                }
-+            });
-+        });
-+        final int total = paperPluginNames.size() + legacyPluginNames.size();
-+        LOGGER.info("Initialized {} plugin{}", total, total == 1 ? "" : "s");
-+        if (!paperPluginNames.isEmpty()) {
-+            if (LOGGER.isDebugEnabled()) {
-+                LOGGER.info("Paper plugins ({}):\n - {}", paperPluginNames.size(), String.join("\n - ", paperPluginNames));
-+            } else {
-+                LOGGER.info("Paper plugins ({}):\n - {}", paperPluginNames.size(), String.join(", ", paperPluginNames));
-+            }
-+        }
-+        if (!legacyPluginNames.isEmpty()) {
-+            if (LOGGER.isDebugEnabled()) {
-+                LOGGER.info("Bukkit plugins ({}):\n - {}", legacyPluginNames.size(), String.join("\n - ", legacyPluginNames));
-+            } else {
-+                LOGGER.info("Bukkit plugins ({}):\n - {}", legacyPluginNames.size(), String.join(", ", legacyPluginNames));
-+            }
-+        }
-     }
- 
-     // This will be the end of me...
--- a/patches/unapplied/server/1034-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/unapplied/server/1034-Make-interaction-leniency-distance-configurable.patch
@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Newwind <support@newwindserver.com>
-Date: Thu, 25 Jul 2024 13:00:37 +0200
-Subject: [PATCH] Make interaction leniency distance configurable
-
-The server validates incoming interaction packets by ensuring the player
-sending them is inside their interaction range. For this, the server adds
-a magic value, by default 1.0, to the original interaction range to
-account for latency issues.
-
-This value however may be too low in high latency environments.
-The patch exposes a new configuration option to configure said value.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4c04eb531b6989f7e618d201ecaa84298eab52c4..62d5ca25104e10ca16c2005ef9272bf8329ce145 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2702,7 +2702,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-             AABB axisalignedbb = entity.getBoundingBox();
- 
-            if (this.player.canInteractWithEntity(axisalignedbb, 1.0D)) {
-+            if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(1.0D))) { // Paper - configurable lenience value for interact range
-                 packet.dispatch(new ServerboundInteractPacket.Handler() {
-                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
-                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
--- a/patches/unapplied/server/1035-Fix-PickupStatus-getting-reset.patch
+++ b/patches/unapplied/server/1035-Fix-PickupStatus-getting-reset.patch
@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <70228790+notTamion@users.noreply.github.com>
-Date: Sun, 21 Jul 2024 19:11:22 +0200
-Subject: [PATCH] Fix PickupStatus getting reset
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index ddf47dab1ab92c45e3eea09239d418a9798ed59e..9ca29b3d4bf8bca5f51f3644e12fcbec2cb5d35e 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -668,7 +668,14 @@ public abstract class AbstractArrow extends Projectile {
- 
-     @Override
-     public void setOwner(@Nullable Entity entity) {
-+        // Paper start - Fix PickupStatus getting reset
-+        this.setOwner(entity, true);
-+    }
-+
-+    public void setOwner(@Nullable Entity entity, boolean resetPickup) {
-+        // Paper end - Fix PickupStatus getting reset
-         super.setOwner(entity);
-+        if (!resetPickup) return; // Paper - Fix PickupStatus getting reset
-         Entity entity1 = entity;
-         byte b0 = 0;
- 
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index f2bdd95a6ae77400742d87bcae35c09fb8b047ba..10ade433c083851d9ea4797c6ec618db122229f9 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -240,7 +240,13 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-     public boolean deflect(ProjectileDeflection deflection, @Nullable Entity deflector, @Nullable Entity owner, boolean fromAttack) {
-         if (!this.level().isClientSide) {
-             deflection.deflect(this, deflector, this.random);
-            this.setOwner(owner);
-+            // Paper start - Fix PickupStatus getting reset
-+            if (this instanceof AbstractArrow arrow) {
-+                arrow.setOwner(owner, false);
-+            } else {
-+                this.setOwner(owner);
-+            }
-+            // Paper end - Fix PickupStatus getting reset
-             this.onDeflection(deflector, fromAttack);
-         }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
-index faa08ad912fa43e7a6c5a2359e23c04c059c5edf..501e2aa3a10dae94c4a8d9dfcdc902e434fcca62 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java
-@@ -170,4 +170,16 @@ public class CraftAbstractArrow extends AbstractProjectile implements AbstractAr
-         this.getHandle().setSoundEvent(org.bukkit.craftbukkit.CraftSound.bukkitToMinecraft(sound));
-     }
-     // Paper end
-+
-+    // Paper start - Fix PickupStatus getting reset - Copy of CraftProjectile#setShooter, calling setOwner(Entity,boolean)
-+    @Override
-+    public void setShooter(org.bukkit.projectiles.ProjectileSource shooter, boolean resetPickupStatus) {
-+        if (shooter instanceof CraftEntity craftEntity) {
-+            this.getHandle().setOwner(craftEntity.getHandle(), resetPickupStatus);
-+        } else {
-+            this.getHandle().setOwner(null, resetPickupStatus);
-+        }
-+        this.getHandle().projectileSource = shooter;
-+    }
-+    // Paper end - Fix PickupStatus getting reset
- }
--- a/patches/unapplied/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/unapplied/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Wed, 7 Aug 2024 14:33:25 +0200
-Subject: [PATCH] Check for block type in SculkSensorBlock#canActivate
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
-index b45bc43b5a59a95c50bd756a981368c7fdadbd41..8d57c68d2f20f7c0d5c1be5d5b12e6926aad8c58 100644
--- a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
-@@ -218,7 +218,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
-     }
- 
-     public static boolean canActivate(BlockState state) {
-        return SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE;
-+        return state.getBlock() instanceof SculkSensorBlock && SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE; // Paper - Check for a valid type
-     }
- 
-     public static void deactivate(Level world, BlockPos pos, BlockState state) {
--- a/patches/unapplied/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 12 Sep 2018 18:53:55 +0300
-Subject: [PATCH] Add API for CanPlaceOn and CanDestroy NBT values
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 7f6f404f5a2be7876ae239355979e8c8a7a198ce..07f31bce96e3c47bea43b5d6443070ae158430ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -2185,4 +2185,117 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     }
-     // Paper end
- 
-+    // Paper start - Add an API for can-place-on/can-break adventure mode predicates
-+    @Override
-+    public Set<Material> getCanDestroy() {
-+        return !this.hasDestroyableKeys() ? Collections.emptySet() : convertToLegacyMaterial(this.canBreakPredicates);
-+    }
-+
-+    @Override
-+    public void setCanDestroy(final Set<Material> canDestroy) {
-+        Preconditions.checkArgument(canDestroy != null, "Cannot replace with null set!");
-+        this.canBreakPredicates = convertFromLegacyMaterial(canDestroy);
-+    }
-+
-+    @Override
-+    public Set<Material> getCanPlaceOn() {
-+        return !this.hasPlaceableKeys() ? Collections.emptySet() : convertToLegacyMaterial(this.canPlaceOnPredicates);
-+    }
-+
-+    @Override
-+    public void setCanPlaceOn(final Set<Material> canPlaceOn) {
-+        Preconditions.checkArgument(canPlaceOn != null, "Cannot replace with null set!");
-+        this.canPlaceOnPredicates = convertFromLegacyMaterial(canPlaceOn);
-+    }
-+
-+    private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyMaterial(final Collection<Material> materials) {
-+        return materials.stream().map(m -> {
-+            return net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(m)).build();
-+        }).toList();
-+    }
-+
-+    private static Set<Material> convertToLegacyMaterial(final List<net.minecraft.advancements.critereon.BlockPredicate> predicates) {
-+        return predicates.stream()
-+            .flatMap(p -> p.blocks().map(net.minecraft.core.HolderSet::stream).orElse(java.util.stream.Stream.empty()))
-+            .map(holder -> CraftBlockType.minecraftToBukkit(holder.value()))
-+            .collect(java.util.stream.Collectors.toSet());
-+    }
-+
-+    @Override
-+    public Set<com.destroystokyo.paper.Namespaced> getDestroyableKeys() {
-+        return !this.hasDestroyableKeys() ? Collections.emptySet() : convertToLegacyNamespaced(this.canBreakPredicates);
-+    }
-+
-+    @Override
-+    public void setDestroyableKeys(final Collection<com.destroystokyo.paper.Namespaced> canDestroy) {
-+        Preconditions.checkArgument(canDestroy != null, "Cannot replace with null collection!");
-+        Preconditions.checkArgument(ofAcceptableType(canDestroy), "Can only use NamespacedKey or NamespacedTag objects!");
-+        this.canBreakPredicates = convertFromLegacyNamespaced(canDestroy);
-+    }
-+
-+    @Override
-+    public Set<com.destroystokyo.paper.Namespaced> getPlaceableKeys() {
-+        return !this.hasPlaceableKeys() ? Collections.emptySet() : convertToLegacyNamespaced(this.canPlaceOnPredicates);
-+    }
-+
-+    @Override
-+    public void setPlaceableKeys(final Collection<com.destroystokyo.paper.Namespaced> canPlaceOn) {
-+        Preconditions.checkArgument(canPlaceOn != null, "Cannot replace with null collection!");
-+        Preconditions.checkArgument(ofAcceptableType(canPlaceOn), "Can only use NamespacedKey or NamespacedTag objects!");
-+        this.canPlaceOnPredicates = convertFromLegacyNamespaced(canPlaceOn);
-+    }
-+
-+    private static List<net.minecraft.advancements.critereon.BlockPredicate> convertFromLegacyNamespaced(final Collection<com.destroystokyo.paper.Namespaced> namespaceds) {
-+        final List<net.minecraft.advancements.critereon.BlockPredicate> predicates = new ArrayList<>();
-+        for (final com.destroystokyo.paper.Namespaced namespaced : namespaceds) {
-+            if (namespaced instanceof final org.bukkit.NamespacedKey key) {
-+                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(CraftBlockType.bukkitToMinecraft(Objects.requireNonNull(org.bukkit.Registry.MATERIAL.get(key)))).build());
-+            } else if (namespaced instanceof final com.destroystokyo.paper.NamespacedTag tag) {
-+                predicates.add(net.minecraft.advancements.critereon.BlockPredicate.Builder.block().of(net.minecraft.tags.TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(tag.getNamespace(), tag.getKey()))).build());
-+            }
-+        }
-+        return predicates;
-+    }
-+
-+    private static Set<com.destroystokyo.paper.Namespaced> convertToLegacyNamespaced(final Collection<net.minecraft.advancements.critereon.BlockPredicate> predicates) {
-+        final Set<com.destroystokyo.paper.Namespaced> namespaceds = Sets.newHashSet();
-+        for (final net.minecraft.advancements.critereon.BlockPredicate predicate : predicates) {
-+            if (predicate.blocks().isEmpty()) {
-+                continue;
-+            }
-+            final net.minecraft.core.HolderSet<net.minecraft.world.level.block.Block> holders = predicate.blocks().get();
-+            if (holders instanceof final net.minecraft.core.HolderSet.Named<net.minecraft.world.level.block.Block> named) {
-+                namespaceds.add(new com.destroystokyo.paper.NamespacedTag(named.key().location().getNamespace(), named.key().location().getPath()));
-+            } else {
-+                holders.forEach(h -> {
-+                    h.unwrapKey().ifPresent(key -> {
-+                        namespaceds.add(new org.bukkit.NamespacedKey(key.location().getNamespace(), key.location().getPath()));
-+                    });
-+                });
-+            }
-+        }
-+        return namespaceds;
-+    }
-+
-+    @Override
-+    public boolean hasPlaceableKeys() {
-+        return this.canPlaceOnPredicates != null;
-+    }
-+
-+    @Override
-+    public boolean hasDestroyableKeys() {
-+        return this.canBreakPredicates != null;
-+    }
-+
-+    // not a fan of this
-+    private static boolean ofAcceptableType(final Collection<com.destroystokyo.paper.Namespaced> namespacedResources) {
-+        for (com.destroystokyo.paper.Namespaced resource : namespacedResources) {
-+            if (!(resource instanceof org.bukkit.NamespacedKey || resource instanceof com.destroystokyo.paper.NamespacedTag)) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+    // Paper end - Add an API for can-place-on/can-break adventure mode predicates
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-index 6930d0afb230a88aa813b02e4d55c95d3a049688..db8d8e2a07296d62c3097f02b03319e2e1ba9394 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-+++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
-@@ -690,4 +690,22 @@ public class MaterialRerouting {
-         return ItemStack.of(material, amount);
-     }
-     // Paper end
-+
-+    // Paper start - methods added post 1.13, no-op (https://github.com/PaperMC/Paper/pull/1015)
-+    public static Set<Material> getCanDestroy(final ItemMeta meta) {
-+        return meta.getCanDestroy();
-+    }
-+
-+    public static void setCanDestroy(final ItemMeta meta, final Set<Material> materials) {
-+        meta.setCanDestroy(materials);
-+    }
-+
-+    public static Set<Material> getCanPlaceOn(final ItemMeta meta) {
-+        return meta.getCanPlaceOn();
-+    }
-+
-+    public static void setCanPlaceOn(final ItemMeta meta, final Set<Material> materials) {
-+        meta.setCanPlaceOn(materials);
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/1038-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/unapplied/server/1038-Configuration-for-horizontal-only-item-merging.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Newwind <support@newwindserver.com>
-Date: Wed, 7 Aug 2024 13:25:55 +0200
-Subject: [PATCH] Configuration for horizontal-only item merging
-
-Most of the visual artifacts that result from having item merge radius above vanilla levels is from items merging vertically,
-which realistically, only happens when a player is dropping items, or items are dropping from breaking a block.
-
-Most of the scenarios where item merging makes sense involves the two item entities being on the same Y level. i.e on the ground next to each other.
-This is even more apparent since paper fixed items being able to merge through blocks.
-
-This patch allows us to configure items to only merge horizontally, which is what vanilla does.
-This allows us to have both the reduced number of item entities a high item-merge radius provides,
-without most of the visual artifacts caused by items merging vertically.
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index cbfb07bdf8d5e2e5a462835184be2d47e59d506c..03cfa29bdb426a9fb6b1b6be6e897da48d4f2f3e 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -282,7 +282,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
-         if (this.isMergable()) {
-             // Spigot start
-             double radius = this.level().spigotConfig.itemMerge;
-            List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {
-+            List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, this.level().paperConfig().entities.behavior.onlyMergeItemsHorizontally ? 0 : radius - 0.5D, radius), (entityitem) -> { // Paper - configuration to only merge items horizontally
-                 // Spigot end
-                 return entityitem != this && entityitem.isMergable();
-             });
--- a/patches/unapplied/server/1040-Add-skipping-world-symlink-scan.patch
+++ b/patches/unapplied/server/1040-Add-skipping-world-symlink-scan.patch
@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: mja00 <me@mja00.dev>
-Date: Mon, 12 Aug 2024 06:27:15 -0400
-Subject: [PATCH] Add skipping world symlink scan
-
-In worlds that are extremely large (greater than 1TB), it can take an insanely long time to walk the entire world for symlinks.
-This patch adds a system property to disable the symlink scan, which can be used to speed up world loading.
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-index 427ee4d6f12a7abd8da0c65e0b9081b25824df40..85ba843ce7e1f62971e736fa2cc028c47b274ce4 100644
--- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-+++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-@@ -420,7 +420,7 @@ public class LevelStorageSource {
- 
-     public LevelStorageSource.LevelStorageAccess validateAndCreateAccess(String s, ResourceKey<LevelStem> dimensionType) throws IOException, ContentValidationException { // CraftBukkit
-         Path path = this.getLevelPath(s);
-        List<ForbiddenSymlinkInfo> list = this.worldDirValidator.validateDirectory(path, true);
-+        List<ForbiddenSymlinkInfo> list = Boolean.getBoolean("paper.disableWorldSymlinkValidation") ? List.of() : this.worldDirValidator.validateDirectory(path, true); // Paper - add skipping of symlinks scan
- 
-         if (!list.isEmpty()) {
-             throw new ContentValidationException(path, list);
--- a/patches/unapplied/server/1041-Add-even-more-Enchantment-API.patch
+++ b/patches/unapplied/server/1041-Add-even-more-Enchantment-API.patch
@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 19 Jul 2024 08:42:45 -0700
-Subject: [PATCH] Add even more Enchantment API
-
-In a separate patch because RegistryKeySet is used
-and the previous "more enchant api" patch is before that.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 4221a1e9cba35c8dc58e51e162e7fcbd0e8b31af..34934f0dbe66ee200cd99c002c53645660041548 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-@@ -216,6 +216,34 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine
-     }
-     // Paper end - more Enchantment API
- 
-+    // Paper start - even more Enchantment API
-+    @Override
-+    public net.kyori.adventure.text.Component description() {
-+        return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.handle.value().description());
-+    }
-+
-+    @Override
-+    public io.papermc.paper.registry.set.RegistryKeySet<org.bukkit.inventory.ItemType> getSupportedItems() {
-+        return io.papermc.paper.registry.set.PaperRegistrySets.convertToApi(io.papermc.paper.registry.RegistryKey.ITEM, this.handle.value().getSupportedItems());
-+    }
-+
-+    @Override
-+    public io.papermc.paper.registry.set.RegistryKeySet<org.bukkit.inventory.ItemType> getPrimaryItems() {
-+        final java.util.Optional<net.minecraft.core.HolderSet<net.minecraft.world.item.Item>> primaryItems = this.handle.value().definition().primaryItems();
-+        return primaryItems.map(holders -> io.papermc.paper.registry.set.PaperRegistrySets.convertToApi(io.papermc.paper.registry.RegistryKey.ITEM, holders)).orElse(null);
-+    }
-+
-+    @Override
-+    public int getWeight() {
-+        return this.handle.value().getWeight();
-+    }
-+
-+    @Override
-+    public io.papermc.paper.registry.set.RegistryKeySet<org.bukkit.enchantments.Enchantment> getExclusiveWith() {
-+        return io.papermc.paper.registry.set.PaperRegistrySets.convertToApi(io.papermc.paper.registry.RegistryKey.ENCHANTMENT, this.handle.value().exclusiveSet());
-+    }
-+    // Paper end - even more Enchantment API
-+
-     @Override
-     public String getTranslationKey() {
-         return Util.makeDescriptionId("enchantment", this.handle.unwrapKey().get().location());
--- a/patches/unapplied/server/1042-Leashable-API.patch
+++ b/patches/unapplied/server/1042-Leashable-API.patch
@ -1,161 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sat, 22 Jun 2024 21:17:54 +0200
-Subject: [PATCH] Leashable API
-
-
-diff --git a/src/main/java/io/papermc/paper/entity/PaperLeashable.java b/src/main/java/io/papermc/paper/entity/PaperLeashable.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a9ddf9a4a07cd29833f38d7e5f42b2b14ec98f78
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/entity/PaperLeashable.java
-@@ -0,0 +1,50 @@
-+package io.papermc.paper.entity;
-+
-+import com.google.common.base.Preconditions;
-+import net.minecraft.world.entity.Leashable;
-+import org.bukkit.craftbukkit.entity.CraftEntity;
-+import org.bukkit.entity.Entity;
-+
-+public interface PaperLeashable extends io.papermc.paper.entity.Leashable {
-+
-+    Leashable getHandle();
-+
-+    @Override
-+    default boolean isLeashed() {
-+        return this.getHandle().getLeashHolder() != null;
-+    }
-+
-+    @Override
-+    default Entity getLeashHolder() throws IllegalStateException {
-+        Preconditions.checkState(this.isLeashed(), "Entity not leashed");
-+        return this.getHandle().getLeashHolder().getBukkitEntity();
-+    }
-+
-+    private boolean unleash() {
-+        if (!this.isLeashed()) {
-+            return false;
-+        }
-+
-+        this.getHandle().dropLeash(true, false);
-+        return true;
-+    }
-+
-+    @Override
-+    default boolean setLeashHolder(Entity holder) {
-+        if (this.getHandle() instanceof net.minecraft.world.entity.Entity entity && entity.generation) {
-+            return false;
-+        }
-+
-+        if (holder == null) {
-+            return this.unleash();
-+        }
-+
-+        if (holder.isDead()) {
-+            return false;
-+        }
-+
-+        this.unleash();
-+        this.getHandle().setLeashedTo(((CraftEntity) holder).getHandle(), true);
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-index e33b1b6fd50a4eea57500cc00dba20d6edcab75d..01a9660de65688b7c1a4f9dafcb650774ce1853b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-@@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Boat;
- import org.bukkit.entity.Entity;
- 
-public class CraftBoat extends CraftVehicle implements Boat {
-+public class CraftBoat extends CraftVehicle implements Boat, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API
- 
-     public CraftBoat(CraftServer server, net.minecraft.world.entity.vehicle.Boat entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7e280955067169f63f15162e9cad1e86e824a8e5..4750df7354ccb5afd0910efe0415f3a2eb19a546 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -777,43 +777,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- 
-     @Override
-     public boolean isLeashed() {
-        if (!(this.getHandle() instanceof Mob)) {
-            return false;
-        }
-        return ((Mob) this.getHandle()).getLeashHolder() != null;
-+        return false; // Paper - implement in CraftMob & PaperLeashable
-     }
- 
-     @Override
-     public Entity getLeashHolder() throws IllegalStateException {
-        Preconditions.checkState(this.isLeashed(), "Entity not leashed");
-        return ((Mob) this.getHandle()).getLeashHolder().getBukkitEntity();
-    }
-
-    private boolean unleash() {
-        if (!this.isLeashed()) {
-            return false;
-        }
-        ((Mob) this.getHandle()).dropLeash(true, false);
-        return true;
-+        throw new IllegalStateException("Entity not leashed"); // Paper - implement in CraftMob & PaperLeashable
-     }
- 
-     @Override
-     public boolean setLeashHolder(Entity holder) {
-        if (this.getHandle().generation || (this.getHandle() instanceof WitherBoss) || !(this.getHandle() instanceof Mob)) {
-            return false;
-        }
-
-        if (holder == null) {
-            return this.unleash();
-        }
-
-        if (holder.isDead()) {
-            return false;
-        }
-
-        this.unleash();
-        ((Mob) this.getHandle()).setLeashedTo(((CraftEntity) holder).getHandle(), true);
-        return true;
-+        return false; // Paper - implement in CraftMob & PaperLeashable
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index deb66c04abefb4a88521483db1612e494bd27164..5f9f7e325e3e0276f7a475c4a4725cc0e1b54afd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -11,7 +11,7 @@ import org.bukkit.entity.LivingEntity;
- import org.bukkit.entity.Mob;
- import org.bukkit.loot.LootTable;
- 
-public abstract class CraftMob extends CraftLivingEntity implements Mob {
-+public abstract class CraftMob extends CraftLivingEntity implements Mob, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API
-     public CraftMob(CraftServer server, net.minecraft.world.entity.Mob entity) {
-         super(server, entity);
-          paperPathfinder = new com.destroystokyo.paper.entity.PaperPathfinder(entity); // Paper - Mob Pathfinding API
-@@ -175,4 +175,21 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
-         return getHandle().getExperienceReward((ServerLevel) this.getHandle().level(), null);
-     }
-     // Paper end
-+
-+    // Paper start - Leashable API
-+    @Override
-+    public boolean isLeashed() {
-+        return io.papermc.paper.entity.PaperLeashable.super.isLeashed();
-+    }
-+
-+    @Override
-+    public org.bukkit.entity.Entity getLeashHolder() throws IllegalStateException {
-+        return io.papermc.paper.entity.PaperLeashable.super.getLeashHolder();
-+    }
-+
-+    @Override
-+    public boolean setLeashHolder(final org.bukkit.entity.Entity holder) {
-+        return io.papermc.paper.entity.PaperLeashable.super.setLeashHolder(holder);
-+    }
-+    // Paper end - Leashable API
- }
--- a/patches/unapplied/server/1043-Fix-CraftBukkit-drag-system.patch
+++ b/patches/unapplied/server/1043-Fix-CraftBukkit-drag-system.patch
@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <70228790+notTamion@users.noreply.github.com>
-Date: Sun, 26 May 2024 22:20:21 +0200
-Subject: [PATCH] Fix CraftBukkit drag system
-
-== AT ==
-public net.minecraft.world.inventory.AbstractContainerMenu quickcraftSlots
-public net.minecraft.world.inventory.AbstractContainerMenu quickcraftStatus
-public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
-public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f93edc8a6ed7c51ec6e9335f66ab146d6aeb69a0..589214abe82c2acf6bbfda54b25f9385a6b575c4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3127,6 +3127,25 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             }
-                             break;
-                         case QUICK_CRAFT:
-+                            // Paper start - Fix CraftBukkit drag system
-+                            AbstractContainerMenu containerMenu = this.player.containerMenu;
-+                            int currentStatus = this.player.containerMenu.quickcraftStatus;
-+                            int newStatus = AbstractContainerMenu.getQuickcraftHeader(packet.getButtonNum());
-+                            if ((currentStatus != 1 || newStatus != 2 && currentStatus != newStatus)) {
-+                            } else if (containerMenu.getCarried().isEmpty()) {
-+                            } else if (newStatus == 0) {
-+                            } else if (newStatus == 1) {
-+                            } else if (newStatus == 2) {
-+                                if (!this.player.containerMenu.quickcraftSlots.isEmpty()) {
-+                                    if (this.player.containerMenu.quickcraftSlots.size() == 1) {
-+                                        int index = containerMenu.quickcraftSlots.iterator().next().index;
-+                                        containerMenu.resetQuickCraft();
-+                                        this.handleContainerClick(new ServerboundContainerClickPacket(packet.getContainerId(), packet.getStateId(), index, containerMenu.quickcraftType, net.minecraft.world.inventory.ClickType.PICKUP, packet.getCarriedItem(), packet.getChangedSlots()));
-+                                        return;
-+                                    }
-+                                }
-+                            }
-+                            // Paper end - Fix CraftBukkit drag system
-                             this.player.containerMenu.clicked(packet.getSlotNum(), packet.getButtonNum(), packet.getClickType(), this.player);
-                             break;
-                         case PICKUP_ALL:
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 46159a127d910028c62ada90ff2d2dccc3b62fc3..dd4218e108f87f3305b76fbc8d88f488b447c609 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -431,7 +431,7 @@ public abstract class AbstractContainerMenu {
-                 }
-             } else if (this.quickcraftStatus == 2) {
-                 if (!this.quickcraftSlots.isEmpty()) {
-                    if (false && this.quickcraftSlots.size() == 1) { // CraftBukkit - treat everything as a drag since we are unable to easily call InventoryClickEvent instead
-+                    if (this.quickcraftSlots.size() == 1) { // Paper - Fix CraftBukkit drag system
-                         k = ((Slot) this.quickcraftSlots.iterator().next()).index;
-                         this.resetQuickCraft();
-                         this.doClick(k, this.quickcraftType, ClickType.PICKUP, player);
--- a/patches/unapplied/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/unapplied/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 19 Aug 2024 13:43:06 -0700
-Subject: [PATCH] Fix SculkBloomEvent firing for block entity loading
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
-index dbdd9cb76f9e2d0962001d9a1e82896c907d7aea..427e9bcb1fa9436543d7ff974eb8642ccce4a6a3 100644
--- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
-+++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
-@@ -125,7 +125,7 @@ public class SculkSpreader {
-             int i = Math.min(list.size(), 32);
- 
-             for (int j = 0; j < i; ++j) {
-                this.addCursor((SculkSpreader.ChargeCursor) list.get(j));
-+                this.addCursor((SculkSpreader.ChargeCursor) list.get(j), false); // Paper - don't fire event for block entity loading
-             }
-         }
- 
-@@ -145,16 +145,16 @@ public class SculkSpreader {
-         while (charge > 0) {
-             int j = Math.min(charge, 1000);
- 
-            this.addCursor(new SculkSpreader.ChargeCursor(pos, j));
-+            this.addCursor(new SculkSpreader.ChargeCursor(pos, j), true); // Paper - allow firing event for other causes
-             charge -= j;
-         }
- 
-     }
- 
-    private void addCursor(SculkSpreader.ChargeCursor cursor) {
-+    private void addCursor(SculkSpreader.ChargeCursor cursor, boolean fireEvent) { // Paper - add boolean to conditionally fire SculkBloomEvent
-         if (this.cursors.size() < 32) {
-             // CraftBukkit start
-            if (!this.isWorldGeneration()) { // CraftBukkit - SPIGOT-7475: Don't call event during world generation
-+            if (!this.isWorldGeneration() && fireEvent) { // CraftBukkit - SPIGOT-7475: Don't call event during world generation // Paper - add boolean to conditionally fire SculkBloomEvent
-                 CraftBlock bukkitBlock = CraftBlock.at(this.level, cursor.pos);
-                 SculkBloomEvent event = new SculkBloomEvent(bukkitBlock, cursor.getCharge());
-                 Bukkit.getPluginManager().callEvent(event);
--- a/patches/unapplied/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/unapplied/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch
@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Newwind <support@newwindserver.com>
-Date: Thu, 22 Aug 2024 22:55:37 +0200
-Subject: [PATCH] Remove set damage lootable item function from compasses
-
-In VanillaChestLoot, compasses accidentally have a setdamage loot
-function on them, but compasses don't take durability, resulting in a warning.
-This patch simply removes attempting to add damage to the compass item.
-
-diff --git a/src/main/java/net/minecraft/data/loot/packs/VanillaChestLoot.java b/src/main/java/net/minecraft/data/loot/packs/VanillaChestLoot.java
-index 096899338640bb8a7052db06bf55e9fe33bf1cbe..cff6b265622701266349b6cf68eb874aa6fb6321 100644
--- a/src/main/java/net/minecraft/data/loot/packs/VanillaChestLoot.java
-+++ b/src/main/java/net/minecraft/data/loot/packs/VanillaChestLoot.java
-@@ -946,7 +946,6 @@ public record VanillaChestLoot(HolderLookup.Provider registries) implements Loot
-                         .add(
-                             LootItem.lootTableItem(Items.COMPASS)
-                                 .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1.0F)))
-                                .apply(SetItemDamageFunction.setDamage(UniformGenerator.between(0.15F, 0.8F)))
-                                 .setWeight(1)
-                         )
-                         .add(LootItem.lootTableItem(Items.BUCKET).apply(SetItemCountFunction.setCount(UniformGenerator.between(1.0F, 2.0F))).setWeight(1))
-diff --git a/src/main/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json b/src/main/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json
-index b5f5415a9f8bbb9d59926dc6c09e4a12dce2e9b9..fea6273ab4fe2383101f351a13d127e615b81d71 100644
--- a/src/main/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json
-+++ b/src/main/resources/data/minecraft/loot_table/chests/trial_chambers/intersection_barrel.json
-@@ -70,15 +70,6 @@
-               "add": false,
-               "count": 1.0,
-               "function": "minecraft:set_count"
-            },
-            {
-              "add": false,
-              "damage": {
-                "type": "minecraft:uniform",
-                "max": 0.8,
-                "min": 0.15
-              },
-              "function": "minecraft:set_damage"
-             }
-           ],
-           "name": "minecraft:compass"
--- a/patches/unapplied/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch
+++ b/patches/unapplied/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch
@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DerEchtePilz <81232921+DerEchtePilz@users.noreply.github.com>
-Date: Sun, 18 Aug 2024 13:05:31 +0200
-Subject: [PATCH] Properly destroy placed blocks on the end platform
-
-The craftbukkit provided implementation of LevelAccessor,
-BlockStateListPopulator, does not support destroyBlock calls, simply
-ignoring them.
-
-This causes the destroyBlock calls during the generation of the end
-platform to be lost. The patch moves the destroy calls and executes them
-on the actual world access.
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-index ff1f151b342a1567605f92a921fc7ab01f1c4807..b92c40352e4f1af05a2f90701b3f74c235ae57cf 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/EndPlatformFeature.java
-@@ -44,7 +44,7 @@ public class EndPlatformFeature extends Feature<NoneFeatureConfiguration> {
-                     // CraftBukkit start
-                     if (!blockList.getBlockState(blockposition_mutableblockposition1).is(block)) {
-                         if (flag) {
-                            blockList.destroyBlock(blockposition_mutableblockposition1, true, (Entity) null);
-+                            // blockList.destroyBlock(blockposition_mutableblockposition1, true, (Entity) null); // Paper - moved down - cb implementation of LevelAccessor does not support destroyBlock
-                         }
- 
-                         blockList.setBlock(blockposition_mutableblockposition1, block.defaultBlockState(), 3);
--- a/patches/unapplied/server/1047-Add-enchantment-seed-update-API.patch
+++ b/patches/unapplied/server/1047-Add-enchantment-seed-update-API.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: okx-code <okx@okx.sh>
-Date: Sat, 17 Aug 2024 13:02:45 +0100
-Subject: [PATCH] Add enchantment seed update API
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index 1ef014b29645ed09ccffb898f1819428c3dc6259..9bc9b4218ffd966f43097c9e009b2926af58c810 100644
--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-@@ -411,4 +411,10 @@ public class EnchantmentMenu extends AbstractContainerMenu {
-         return this.bukkitEntity;
-     }
-     // CraftBukkit end
-+
-+    // Paper start - add enchantment seed update API
-+    public void setEnchantmentSeed(int seed) {
-+        this.enchantmentSeed.set(seed);
-+    }
-+    // Paper end - add enchantment seed update API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
-index 4d28a2e9a4bfd9adee934c3033f32a8cf66286db..3b3d2d6d23d8f3b75ec52df17b86f6639c8c349b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
-@@ -26,6 +26,13 @@ public class CraftEnchantmentView extends CraftInventoryView<EnchantmentMenu, En
-         return this.container.getEnchantmentSeed();
-     }
- 
-+    // Paper start - add enchantment seed update API
-+    @Override
-+    public void setEnchantmentSeed(int seed) {
-+        this.container.setEnchantmentSeed(seed);
-+    }
-+    // Paper end - add enchantment seed update API
-+
-     @NotNull
-     @Override
-     public EnchantmentOffer[] getOffers() {
--- a/patches/unapplied/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/unapplied/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch
@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gegy <gegy.dev@gmail.com>
-Date: Mon, 26 Aug 2024 19:45:07 +0200
-Subject: [PATCH] Fix: synchronise sending chat to client with updating message
- signature cache
-
-In the case where multiple messages from different players are being processed in parallel, there was a potential race condition where the messages would be sent to the client in a different order than the message signature cache was updated. However, the cache relies on the fact that the client and server get the exact same updates in the same order. This race condition would cause the caches to become corrupted, and any future message received by the client would fail to validate.
-
-This also applies to the last seen state of the server, which becomes inconsistent in the same way as the message signature cache and would cause any messages sent to be rejected by the server too.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 589214abe82c2acf6bbfda54b25f9385a6b575c4..fcccf989c25f0a259b160c4ff7873f7009e64d14 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2715,8 +2715,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             return;
-         }
-         // CraftBukkit end
-+        // Paper start - Ensure that client receives chat packets in the same order that we add into the message signature cache
-+        synchronized (this.messageSignatureCache) {
-         this.send(new ClientboundPlayerChatPacket(message.link().sender(), message.link().index(), message.signature(), message.signedBody().pack(this.messageSignatureCache), message.unsignedContent(), message.filterMask(), params));
-         this.addPendingMessage(message);
-+        }
-+        // Paper end - Ensure that client receives chat packets in the same order that we add into the message signature cache
-     }
- 
-     public void sendDisguisedChatMessage(Component message, ChatType.Bound params) {
--- a/patches/unapplied/server/1049-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/unapplied/server/1049-Fix-InventoryOpenEvent-cancellation.patch
@ -1,368 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <70228790+notTamion@users.noreply.github.com>
-Date: Mon, 19 Aug 2024 18:05:26 +0200
-Subject: [PATCH] Fix InventoryOpenEvent cancellation
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6c280abdef5f80b668d6090f9d35283a33e21e0c..c396580a9cfd86ff261bed439bb4662ae88010b5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1710,6 +1710,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
-                     } else if (factory instanceof ChestBlock.DoubleInventory) {
-                         // SPIGOT-5355 - double chests too :(
-                         ((ChestBlock.DoubleInventory) factory).inventorylargechest.stopOpen(this);
-+                        // Paper start - Fix InventoryOpenEvent cancellation
-+                    } else if (!this.enderChestInventory.isActiveChest(null)) {
-+                        this.enderChestInventory.stopOpen(this);
-+                        // Paper end - Fix InventoryOpenEvent cancellation
-                     }
-                     return OptionalInt.empty();
-                 }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index cc01ead133cc6859ca5d7a1d0ac3c12955e590da..ee9e4521079137d7b72194e8789810e7a89b8e75 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -566,8 +566,7 @@ public class ServerPlayerGameMode {
-         } else if (this.gameModeForPlayer == GameType.SPECTATOR) {
-             MenuProvider itileinventory = iblockdata.getMenuProvider(world, blockposition);
- 
-            if (itileinventory != null) {
-                player.openMenu(itileinventory);
-+            if (itileinventory != null && player.openMenu(itileinventory).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 return InteractionResult.SUCCESS;
-             } else {
-                 return InteractionResult.PASS;
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-index 4cdf3b54187ebcb1f5ddfa6114386127a2846f01..c14019a131c90c699b8a76bada82592b66f0fa89 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -127,8 +127,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
- 
-     @Override
-     public void openCustomInventoryScreen(Player player) {
-        player.openMenu(this);
-        if (!player.level().isClientSide) {
-+        if (!player.level().isClientSide && player.openMenu(this).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             this.gameEvent(GameEvent.CONTAINER_OPEN, player);
-             PiglinAi.angerNearbyPiglins(player, true);
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-index 845eff7401b811c179dc9dee70eca0d724be5c80..9fdeaaa67a39b7b4bd2ac8f58dd38b87c6540e3e 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-@@ -97,7 +97,11 @@ public interface ContainerEntity extends Container, MenuProvider {
-     }
- 
-     default InteractionResult interactWithContainerVehicle(Player player) {
-        player.openMenu(this);
-+        // Paper start - Fix InventoryOpenEvent cancellation
-+        if (player.openMenu(this).isEmpty()) {
-+            return InteractionResult.PASS;
-+        }
-+        // Paper end - Fix InventoryOpenEvent cancellation
-         return !player.level().isClientSide ? InteractionResult.CONSUME : InteractionResult.SUCCESS;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-index 923357251ad950ec4f893e8771fcfa99de8a60c5..c77d4adbba79ec39ab78c2a6bac1e8f94ba7fd68 100644
--- a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-@@ -63,11 +63,10 @@ public class AnvilBlock extends FallingBlock {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_ANVIL);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/level/block/BarrelBlock.java b/src/main/java/net/minecraft/world/level/block/BarrelBlock.java
-index de8cc8221fa2214d276385e3301237b40d190d5f..26dbb0c70abb91d20d552ebdd8858408d60f1c69 100644
--- a/src/main/java/net/minecraft/world/level/block/BarrelBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BarrelBlock.java
-@@ -45,8 +45,7 @@ public class BarrelBlock extends BaseEntityBlock {
-             return InteractionResult.SUCCESS;
-         } else {
-             BlockEntity blockEntity = world.getBlockEntity(pos);
-            if (blockEntity instanceof BarrelBlockEntity) {
-                player.openMenu((BarrelBlockEntity)blockEntity);
-+            if (blockEntity instanceof BarrelBlockEntity && player.openMenu((BarrelBlockEntity)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(Stats.OPEN_BARREL);
-                 PiglinAi.angerNearbyPiglins(player, true);
-             }
-diff --git a/src/main/java/net/minecraft/world/level/block/BeaconBlock.java b/src/main/java/net/minecraft/world/level/block/BeaconBlock.java
-index 2b0db1bf3669bab09d8c6881598e8e3156ca22ca..56793f1ce1a4b919b5066966abf1768bf64540c8 100644
--- a/src/main/java/net/minecraft/world/level/block/BeaconBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BeaconBlock.java
-@@ -49,8 +49,7 @@ public class BeaconBlock extends BaseEntityBlock implements BeaconBeamBlock {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-         } else {
-            if (world.getBlockEntity(pos) instanceof BeaconBlockEntity beaconBlockEntity) {
-                player.openMenu(beaconBlockEntity);
-+            if (world.getBlockEntity(pos) instanceof BeaconBlockEntity beaconBlockEntity && player.openMenu(beaconBlockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(Stats.INTERACT_WITH_BEACON);
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/BlastFurnaceBlock.java b/src/main/java/net/minecraft/world/level/block/BlastFurnaceBlock.java
-index b491cc959d4ce65a7ba16b64a7e1a56e77d0052c..03fed46291ff2236da619c941f864b8c78408450 100644
--- a/src/main/java/net/minecraft/world/level/block/BlastFurnaceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BlastFurnaceBlock.java
-@@ -45,8 +45,7 @@ public class BlastFurnaceBlock extends AbstractFurnaceBlock {
-     @Override
-     protected void openContainer(Level world, BlockPos pos, Player player) {
-         BlockEntity blockEntity = world.getBlockEntity(pos);
-        if (blockEntity instanceof BlastFurnaceBlockEntity) {
-            player.openMenu((MenuProvider)blockEntity);
-+        if (blockEntity instanceof BlastFurnaceBlockEntity && player.openMenu((MenuProvider)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE);
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/BrewingStandBlock.java b/src/main/java/net/minecraft/world/level/block/BrewingStandBlock.java
-index 76a39f16a5668747b686e6a173c0a3479ecfe724..ea83c4b3ba9ad4db28b44331f208881de554ac70 100644
--- a/src/main/java/net/minecraft/world/level/block/BrewingStandBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BrewingStandBlock.java
-@@ -77,8 +77,7 @@ public class BrewingStandBlock extends BaseEntityBlock {
-             return InteractionResult.SUCCESS;
-         } else {
-             BlockEntity blockEntity = world.getBlockEntity(pos);
-            if (blockEntity instanceof BrewingStandBlockEntity) {
-                player.openMenu((BrewingStandBlockEntity)blockEntity);
-+            if (blockEntity instanceof BrewingStandBlockEntity && player.openMenu((BrewingStandBlockEntity)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(Stats.INTERACT_WITH_BREWINGSTAND);
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/CartographyTableBlock.java b/src/main/java/net/minecraft/world/level/block/CartographyTableBlock.java
-index cdea7084da7adba7851b84a4f7b4baf2708d8083..4d07d24ec2f45a6dfdcd8574565a03b5aa34381e 100644
--- a/src/main/java/net/minecraft/world/level/block/CartographyTableBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CartographyTableBlock.java
-@@ -33,11 +33,10 @@ public class CartographyTableBlock extends Block {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_CARTOGRAPHY_TABLE);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..0b27baf10770cb3077c4e75da55209689d614513 100644
--- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -253,8 +253,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
-         } else {
-             MenuProvider itileinventory = this.getMenuProvider(state, world, pos);
- 
-            if (itileinventory != null) {
-                player.openMenu(itileinventory);
-+            if (itileinventory != null && player.openMenu(itileinventory).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(this.getOpenChestStat());
-                 PiglinAi.angerNearbyPiglins(player, true);
-             }
-diff --git a/src/main/java/net/minecraft/world/level/block/CraftingTableBlock.java b/src/main/java/net/minecraft/world/level/block/CraftingTableBlock.java
-index 2dedbda759bd5cdc96e1296583cec600bc487464..ace45e3f95940a5770531da0f702dbee51b1032e 100644
--- a/src/main/java/net/minecraft/world/level/block/CraftingTableBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CraftingTableBlock.java
-@@ -32,11 +32,10 @@ public class CraftingTableBlock extends Block {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index f6edfea463b3725d3a79aca38825e86dbf82175c..e1021d8be840f378568f28639c259182055c78ac 100644
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -78,8 +78,7 @@ public class DispenserBlock extends BaseEntityBlock {
-         } else {
-             BlockEntity tileentity = world.getBlockEntity(pos);
- 
-            if (tileentity instanceof DispenserBlockEntity) {
-                player.openMenu((DispenserBlockEntity) tileentity);
-+            if (tileentity instanceof DispenserBlockEntity && player.openMenu((DispenserBlockEntity) tileentity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 if (tileentity instanceof DropperBlockEntity) {
-                     player.awardStat(Stats.INSPECT_DROPPER);
-                 } else {
-diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index ca92d49ef2010ba00c623491671dcde8ebe697c1..491a59336899179c79820cd61541d49f7337c0f6 100644
--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -90,11 +90,14 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
-             } else {
-                 EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity;
-                 playerEnderChestContainer.setActiveChest(enderChestBlockEntity);
-                player.openMenu(
-+                // Paper start - Fix InventoryOpenEvent cancellation
-+                if (player.openMenu(
-                     new SimpleMenuProvider((i, inventory, playerx) -> ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE)
-                );
-                player.awardStat(Stats.OPEN_ENDERCHEST);
-                PiglinAi.angerNearbyPiglins(player, true);
-+                ).isPresent()) {
-+                    player.awardStat(Stats.OPEN_ENDERCHEST);
-+                    PiglinAi.angerNearbyPiglins(player, true);
-+                }
-+                // Paper end - Fix InventoryOpenEvent cancellation
-                 return InteractionResult.CONSUME;
-             }
-         } else {
-diff --git a/src/main/java/net/minecraft/world/level/block/FurnaceBlock.java b/src/main/java/net/minecraft/world/level/block/FurnaceBlock.java
-index 72a3002c291181e7d874a149a22b8004ee2a0b18..618b566f067d53f32351e13b692095ebf6402925 100644
--- a/src/main/java/net/minecraft/world/level/block/FurnaceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FurnaceBlock.java
-@@ -45,8 +45,7 @@ public class FurnaceBlock extends AbstractFurnaceBlock {
-     @Override
-     protected void openContainer(Level world, BlockPos pos, Player player) {
-         BlockEntity blockEntity = world.getBlockEntity(pos);
-        if (blockEntity instanceof FurnaceBlockEntity) {
-            player.openMenu((MenuProvider)blockEntity);
-+        if (blockEntity instanceof FurnaceBlockEntity && player.openMenu((MenuProvider)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_FURNACE);
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/GrindstoneBlock.java b/src/main/java/net/minecraft/world/level/block/GrindstoneBlock.java
-index c62c54fce864f3c28cff955f3030ceb7c3d125d9..ca57d3663afd1ebcbd80682c178344feecda3808 100644
--- a/src/main/java/net/minecraft/world/level/block/GrindstoneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/GrindstoneBlock.java
-@@ -158,11 +158,10 @@ public class GrindstoneBlock extends FaceAttachedHorizontalDirectionalBlock {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_GRINDSTONE);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/HopperBlock.java b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-index 86e5617d445ce762aa374e236a0ccdfe5901fce5..3e1c7d62c24dd48a805260d156135dc4f0c3d1fc 100644
--- a/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-@@ -128,8 +128,7 @@ public class HopperBlock extends BaseEntityBlock {
-             return InteractionResult.SUCCESS;
-         } else {
-             BlockEntity blockEntity = world.getBlockEntity(pos);
-            if (blockEntity instanceof HopperBlockEntity) {
-                player.openMenu((HopperBlockEntity)blockEntity);
-+            if (blockEntity instanceof HopperBlockEntity && player.openMenu((HopperBlockEntity)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(Stats.INSPECT_HOPPER);
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-index 0c52e1f8bc233bb66e53f4c69e1d8757382bbe81..ebb79907391fe3128d3d16fbe9d8cb0b22bcc9f7 100644
--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-@@ -295,8 +295,7 @@ public class LecternBlock extends BaseEntityBlock {
-     private void openScreen(Level world, BlockPos pos, Player player) {
-         BlockEntity tileentity = world.getBlockEntity(pos);
- 
-        if (tileentity instanceof LecternBlockEntity) {
-            player.openMenu((LecternBlockEntity) tileentity);
-+        if (tileentity instanceof LecternBlockEntity && player.openMenu((LecternBlockEntity) tileentity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_LECTERN);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/LoomBlock.java b/src/main/java/net/minecraft/world/level/block/LoomBlock.java
-index 8dd9d92c4730ec9a1cea197817e28e60f70ae3a9..d2f5228e2b0848ca79a7fe6ea79095c230a5f243 100644
--- a/src/main/java/net/minecraft/world/level/block/LoomBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LoomBlock.java
-@@ -34,11 +34,10 @@ public class LoomBlock extends HorizontalDirectionalBlock {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_LOOM);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index 6323c96d9b0cd14f89609b38da37d7fcc12d211b..6b2c3afa04a3564e435633b521d918ed795f9f65 100644
--- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-@@ -106,8 +106,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
-         } else if (player.isSpectator()) {
-             return InteractionResult.CONSUME;
-         } else if (world.getBlockEntity(pos) instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity) {
-            if (canOpen(state, world, pos, shulkerBoxBlockEntity)) {
-                player.openMenu(shulkerBoxBlockEntity);
-+            if (canOpen(state, world, pos, shulkerBoxBlockEntity) && player.openMenu(shulkerBoxBlockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-                 player.awardStat(Stats.OPEN_SHULKER_BOX);
-                 PiglinAi.angerNearbyPiglins(player, true);
-             }
-diff --git a/src/main/java/net/minecraft/world/level/block/SmithingTableBlock.java b/src/main/java/net/minecraft/world/level/block/SmithingTableBlock.java
-index cd93d0f5b2ba2d3162e14ded3db2e64b598e318f..dae5a125e90514d9eb920ff405c78eea43504698 100644
--- a/src/main/java/net/minecraft/world/level/block/SmithingTableBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SmithingTableBlock.java
-@@ -39,10 +39,9 @@ public class SmithingTableBlock extends CraftingTableBlock {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_SMITHING_TABLE);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/SmokerBlock.java b/src/main/java/net/minecraft/world/level/block/SmokerBlock.java
-index b0929942ca06ee14d2ba4f2ec2ee93743ee6233e..83669dfbfec46d319aec82ea2beaa90c9f6b81c3 100644
--- a/src/main/java/net/minecraft/world/level/block/SmokerBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SmokerBlock.java
-@@ -44,8 +44,7 @@ public class SmokerBlock extends AbstractFurnaceBlock {
-     @Override
-     protected void openContainer(Level world, BlockPos pos, Player player) {
-         BlockEntity blockEntity = world.getBlockEntity(pos);
-        if (blockEntity instanceof SmokerBlockEntity) {
-            player.openMenu((MenuProvider)blockEntity);
-+        if (blockEntity instanceof SmokerBlockEntity && player.openMenu((MenuProvider)blockEntity).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_SMOKER);
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-index c6ecb378d0cb2ac05b8f22f92fb85df060038f77..59fd521cd1e1101e2adce9830c43784e05abccdd 100644
--- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-@@ -49,11 +49,10 @@ public class StonecutterBlock extends Block {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-        } else {
-            player.openMenu(state.getMenuProvider(world, pos));
-+        } else if (player.openMenu(state.getMenuProvider(world, pos)).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
-             player.awardStat(Stats.INTERACT_WITH_STONECUTTER);
-            return InteractionResult.CONSUME;
-         }
-+        return InteractionResult.CONSUME; // Paper - Fix InventoryOpenEvent cancellation
-     }
- 
-     @Nullable
--- a/patches/unapplied/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/unapplied/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch
@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nathan <nathanmaestas21@cnm.edu>
-Date: Sat, 31 Aug 2024 18:09:55 -0600
-Subject: [PATCH] Fire BlockExpEvent on grindstone use
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 1678f6c8b2c7db761783e53043169bf12bc2cb29..138f77d13dda574def523d74fa55bc71b5bfa01b 100644
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-@@ -98,7 +98,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-             public void onTake(net.minecraft.world.entity.player.Player player, ItemStack stack) {
-                 context.execute((world, blockposition) -> {
-                     if (world instanceof ServerLevel) {
-                        ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), this.getExperienceAmount(world), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player); // Paper
-+                        // Paper start - Fire BlockExpEvent on grindstone use
-+                        org.bukkit.event.block.BlockExpEvent event = new org.bukkit.event.block.BlockExpEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition), this.getExperienceAmount(world));
-+                        event.callEvent();
-+                        ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), event.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player);
-+                        // Paper end - Fire BlockExpEvent on grindstone use
-                     }
- 
-                     world.levelEvent(1042, blockposition, 0);
--- a/patches/unapplied/server/1051-Check-dead-flag-in-isAlive.patch
+++ b/patches/unapplied/server/1051-Check-dead-flag-in-isAlive.patch
@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Newwind <support@newwindserver.com>
-Date: Mon, 26 Aug 2024 14:01:37 +0200
-Subject: [PATCH] Check dead flag in isAlive()
-
-If a plugin sets the health of a living entity above 0 after it has already died, the entity will be "revived".
-It will behave the exact same as before, except with the internal "dead" flag set, resulting in 2 behavior changes,
-A: it's completely invulnerable to all damage
-B: it's unable to pickup items
-
-isValid() for these bugged entities will return true, isDead() will return false, despite the dead flag.
-This patch checks that the mob isn't dead before saying its alive.
-
-Also, even if the plugin is responsibly checking !isDead() before modifying health, on very rare circumstances
-I am currently unable to replicate, these "revived" entities can still appear
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 13c93281f6b81e88f2f54befb8e6a3e4bdabf53d..30f4f1254fc295442d72d50479e8af635f2fe983 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2096,7 +2096,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-     @Override
-     public boolean isAlive() {
-        return !this.isRemoved() && this.getHealth() > 0.0F;
-+        return !this.isRemoved() && this.getHealth() > 0.0F && !this.dead; // Paper - Check this.dead
-     }
- 
-     @Override