788/1053

2024-06-13 18:30:23 -07:00
parent 4ff15b38e5
commit a0f4d303eb
141 changed files with 180 additions and 322 deletions
--- a/patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/unapplied/server/API-for-creating-command-sender-which-forwards-feedb.patch
@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 1 Feb 2022 15:51:55 -0700
-Subject: [PATCH] API for creating command sender which forwards feedback
-
-
-diff --git a/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.commands;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import java.util.UUID;
-+import java.util.function.Consumer;
-+import net.kyori.adventure.audience.MessageType;
-+import net.kyori.adventure.identity.Identity;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import net.minecraft.commands.CommandSource;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.phys.Vec2;
-+import net.minecraft.world.phys.Vec3;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.bukkit.craftbukkit.command.ServerCommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class FeedbackForwardingSender extends ServerCommandSender {
-+    private final Consumer<? super Component> feedback;
-+    private final CraftServer server;
-+
-+    public FeedbackForwardingSender(final Consumer<? super Component> feedback, final CraftServer server) {
-+        super(((ServerCommandSender) server.getConsoleSender()).perm);
-+        this.server = server;
-+        this.feedback = feedback;
-+    }
-+
-+    @Override
-+    public void sendMessage(final String message) {
-+        this.sendMessage(LegacyComponentSerializer.legacySection().deserialize(message));
-+    }
-+
-+    @Override
-+    public void sendMessage(final String... messages) {
-+        for (final String message : messages) {
-+            this.sendMessage(message);
-+        }
-+    }
-+
-+    @Override
-+    public void sendMessage(final Identity identity, final Component message, final MessageType type) {
-+        this.feedback.accept(message);
-+    }
-+
-+    @Override
-+    public String getName() {
-+        return "FeedbackForwardingSender";
-+    }
-+
-+    @Override
-+    public Component name() {
-+        return Component.text(this.getName());
-+    }
-+
-+    @Override
-+    public boolean isOp() {
-+        return true;
-+    }
-+
-+    @Override
-+    public void setOp(final boolean value) {
-+        throw new UnsupportedOperationException("Cannot change operator status of " + this.getClass().getName());
-+    }
-+
-+    public CommandSourceStack asVanilla() {
-+        final @Nullable ServerLevel overworld = this.server.getServer().overworld();
-+        return new CommandSourceStack(
-+            new Source(this),
-+            overworld == null ? Vec3.ZERO : Vec3.atLowerCornerOf(overworld.getSharedSpawnPos()),
-+            Vec2.ZERO,
-+            overworld,
-+            4,
-+            this.getName(),
-+            net.minecraft.network.chat.Component.literal(this.getName()),
-+            this.server.getServer(),
-+            null
-+        );
-+    }
-+
-+    private record Source(FeedbackForwardingSender sender) implements CommandSource {
-+        @Override
-+        public void sendSystemMessage(final net.minecraft.network.chat.Component message) {
-+            this.sender.sendMessage(Identity.nil(), PaperAdventure.asAdventure(message));
-+        }
-+
-+        @Override
-+        public boolean acceptsSuccess() {
-+            return true;
-+        }
-+
-+        @Override
-+        public boolean acceptsFailure() {
-+            return true;
-+        }
-+
-+        @Override
-+        public boolean shouldInformAdmins() {
-+            return false;
-+        }
-+
-+        @Override
-+        public CommandSender getBukkitSender(final CommandSourceStack stack) {
-+            return this.sender;
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         return this.console.console;
-     }
- 
-+    // Paper start
-+    @Override
-+    public CommandSender createCommandSender(final java.util.function.Consumer<? super net.kyori.adventure.text.Component> feedback) {
-+        return new io.papermc.paper.commands.FeedbackForwardingSender(feedback, this);
-+    }
-+    // Paper end
-+
-     public EntityMetadataStore getEntityMetadata() {
-         return this.entityMetadata;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-@@ -0,0 +0,0 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
- import org.bukkit.plugin.Plugin;
- 
- public abstract class ServerCommandSender implements CommandSender {
-    private final PermissibleBase perm;
-+    public final PermissibleBase perm; // Paper
-     private net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
- 
-     protected ServerCommandSender() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -0,0 +0,0 @@ public final class VanillaCommandWrapper extends BukkitCommand {
-         if (sender instanceof ProxiedCommandSender) {
-             return ((ProxiedNativeCommandSender) sender).getHandle();
-         }
-+        // Paper start
-+        if (sender instanceof io.papermc.paper.commands.FeedbackForwardingSender feedback) {
-+            return feedback.asVanilla();
-+        }
-+        // Paper end
- 
-         throw new IllegalArgumentException("Cannot make " + sender + " a vanilla command listener");
-     }
--- a/patches/unapplied/server/Add-API-for-item-entity-health.patch
+++ b/patches/unapplied/server/Add-API-for-item-entity-health.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 28 Aug 2021 09:00:45 -0700
-Subject: [PATCH] Add API for item entity health
-
-== AT ==
-public net.minecraft.world.entity.item.ItemEntity health
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -0,0 +0,0 @@ public class CraftItem extends CraftEntity implements Item {
-      public void setWillAge(boolean willAge) {
-         this.getHandle().age = willAge ? 0 : NO_AGE_TIME;
-      }
-+
-+    @Override
-+    public int getHealth() {
-+        return this.getHandle().health;
-+    }
-+
-+    @Override
-+    public void setHealth(int health) {
-+        if (health <= 0) {
-+            this.getHandle().getItem().onDestroyed(this.getHandle());
-+            this.getHandle().discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.PLUGIN);
-+        } else {
-+            this.getHandle().health = health;
-+        }
-+    }
-     // Paper end
- 
-     @Override
--- a/patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/unapplied/server/Add-EntityDyeEvent-and-CollarColorable-interface.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 18 Mar 2022 21:15:55 -0700
-Subject: [PATCH] Add EntityDyeEvent and CollarColorable interface
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -0,0 +0,0 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
-                     DyeColor enumcolor = itemdye.getDyeColor();
- 
-                     if (enumcolor != this.getCollarColor()) {
-+                        // Paper start - Add EntityDyeEvent and CollarColorable interface
-+                        final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
-+                        if (!event.callEvent()) {
-+                            return InteractionResult.FAIL;
-+                        }
-+                        enumcolor = DyeColor.byId(event.getColor().getWoolData());
-+                        // Paper end - Add EntityDyeEvent and CollarColorable interface
-                         if (!this.level().isClientSide()) {
-                             this.setCollarColor(enumcolor);
-                             itemstack.consume(1, player);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -0,0 +0,0 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
-                         DyeColor enumcolor = itemdye.getDyeColor();
- 
-                         if (enumcolor != this.getCollarColor()) {
-+                            // Paper start - Add EntityDyeEvent and CollarColorable interface
-+                            final io.papermc.paper.event.entity.EntityDyeEvent event = new io.papermc.paper.event.entity.EntityDyeEvent(this.getBukkitEntity(), org.bukkit.DyeColor.getByWoolData((byte) enumcolor.getId()), ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity());
-+                            if (!event.callEvent()) {
-+                                return InteractionResult.FAIL;
-+                            }
-+                            enumcolor = DyeColor.byId(event.getColor().getWoolData());
-+                            // Paper end - Add EntityDyeEvent and CollarColorable interface
-+
-                             this.setCollarColor(enumcolor);
-                             itemstack.consume(1, player);
-                             return InteractionResult.SUCCESS;
--- a/patches/unapplied/server/Add-EntityPortalReadyEvent.patch
+++ b/patches/unapplied/server/Add-EntityPortalReadyEvent.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 12 May 2021 04:30:42 -0700
-Subject: [PATCH] Add EntityPortalReadyEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                 if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
-                     this.level().getProfiler().push("portal");
-                     this.portalTime = i;
-+                    // Paper start - Add EntityPortalReadyEvent
-+                    io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
-+                    if (!event.callEvent()) {
-+                        this.portalTime = 0;
-+                    } else {
-+                        worldserver1 = event.getTargetWorld() == null ? null : ((CraftWorld) event.getTargetWorld()).getHandle();
-+                    // Paper end - Add EntityPortalReadyEvent
-                     this.setPortalCooldown();
-                     // CraftBukkit start
-                     if (this instanceof ServerPlayer) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                     } else {
-                         this.changeDimension(worldserver1);
-                     }
-+                    } // Paper - Add EntityPortalReadyEvent
-                     // CraftBukkit end
-                     this.level().getProfiler().pop();
-                 }
--- a/patches/unapplied/server/Add-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/Add-EntityToggleSitEvent.patch
@@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KyGuy2002 <IEatBeans#1165>
-Date: Fri, 11 Mar 2022 15:33:10 +0000
-Subject: [PATCH] Add EntityToggleSitEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-+++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-@@ -0,0 +0,0 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-         }
- 
-         this.orderedToSit = nbt.getBoolean("Sitting");
-        this.setInSittingPose(this.orderedToSit);
-+        this.setInSittingPose(this.orderedToSit, false); // Paper - Add EntityToggleSitEvent
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-     }
- 
-     public void setInSittingPose(boolean inSittingPose) {
-+    // Paper start - Add EntityToggleSitEvent
-+        this.setInSittingPose(inSittingPose, true);
-+    }
-+    public void setInSittingPose(boolean inSittingPose, boolean callEvent) {
-+        if (callEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), inSittingPose).callEvent()) return;
-+    // Paper end - Add EntityToggleSitEvent
-         byte b = this.entityData.get(DATA_FLAGS_ID);
-         if (inSittingPose) {
-             this.entityData.set(DATA_FLAGS_ID, (byte)(b | 1));
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -0,0 +0,0 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
- 
-         this.setSleeping(nbt.getBoolean("Sleeping"));
-         this.setVariant(Fox.Type.byName(nbt.getString("Type")));
-        this.setSitting(nbt.getBoolean("Sitting"));
-+        this.setSitting(nbt.getBoolean("Sitting"), false); // Paper - Add EntityToggleSitEvent
-         this.setIsCrouching(nbt.getBoolean("Crouching"));
-         if (this.level() instanceof ServerLevel) {
-             this.setTargetGoals();
-@@ -0,0 +0,0 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
-     }
- 
-     public void setSitting(boolean sitting) {
-+        // Paper start - Add EntityToggleSitEvent
-+        this.setSitting(sitting, true);
-+    }
-+    public void setSitting(boolean sitting, boolean fireEvent) {
-+        if (fireEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return;
-+        // Paper end - Add EntityToggleSitEvent
-         this.setFlag(1, sitting);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -0,0 +0,0 @@ public class Panda extends Animal {
-     }
- 
-     public void sit(boolean sitting) {
-+        if (!new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return; // Paper - Add EntityToggleSitEvent
-         this.setFlag(8, sitting);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -0,0 +0,0 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void sitDown() {
-        if (!this.isCamelSitting()) {
-+        if (!this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), true).callEvent()) { // Paper - Add EntityToggleSitEvent
-             this.makeSound(SoundEvents.CAMEL_SIT);
-             this.setPose(Pose.SITTING);
-             this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -0,0 +0,0 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void standUp() {
-        if (this.isCamelSitting()) {
-+        if (this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) { // Paper - Add EntityToggleSitEvent
-             this.makeSound(SoundEvents.CAMEL_STAND);
-             this.setPose(Pose.STANDING);
-             this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -0,0 +0,0 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void standUpInstantly() {
-+        if (this.isCamelSitting() && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) return; // Paper - Add EntityToggleSitEvent
-         this.setPose(Pose.STANDING);
-         this.gameEvent(GameEvent.ENTITY_ACTION);
-         this.resetLastPoseChangeTickToFullStand(this.level().getGameTime());
--- a/patches/unapplied/server/Add-GameEvent-tags.patch
+++ b/patches/unapplied/server/Add-GameEvent-tags.patch
@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 20:03:35 -0800
-Subject: [PATCH] Add GameEvent tags
-
-
-diff --git a/src/main/java/io/papermc/paper/CraftGameEventTag.java b/src/main/java/io/papermc/paper/CraftGameEventTag.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/CraftGameEventTag.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper;
-+
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.core.registries.Registries;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.tags.TagKey;
-+import org.bukkit.GameEvent;
-+import org.bukkit.craftbukkit.tag.CraftTag;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+import org.jetbrains.annotations.NotNull;
-+
-+import java.util.Collections;
-+import java.util.IdentityHashMap;
-+import java.util.Map;
-+import java.util.Objects;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+
-+public class CraftGameEventTag extends CraftTag<net.minecraft.world.level.gameevent.GameEvent, GameEvent> {
-+
-+    public CraftGameEventTag(net.minecraft.core.Registry<net.minecraft.world.level.gameevent.GameEvent> registry, TagKey<net.minecraft.world.level.gameevent.GameEvent> tag) {
-+        super(registry, tag);
-+    }
-+
-+    private static final Map<GameEvent, ResourceKey<net.minecraft.world.level.gameevent.GameEvent>> KEY_CACHE = Collections.synchronizedMap(new IdentityHashMap<>());
-+    @Override
-+    public boolean isTagged(@NotNull GameEvent gameEvent) {
-+        return registry.getHolderOrThrow(KEY_CACHE.computeIfAbsent(gameEvent, event -> ResourceKey.create(Registries.GAME_EVENT, CraftNamespacedKey.toMinecraft(event.getKey())))).is(tag);
-+    }
-+
-+    @Override
-+    public @NotNull Set<GameEvent> getValues() {
-+        return getHandle().stream().map((nms) -> Objects.requireNonNull(GameEvent.getByKey(CraftNamespacedKey.fromMinecraft(BuiltInRegistries.GAME_EVENT.getKey(nms.value()))), nms + " is not a recognized game event")).collect(Collectors.toUnmodifiableSet());
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-                     return (org.bukkit.Tag<T>) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey);
-                 }
-             }
-+            // Paper start
-+            case org.bukkit.Tag.REGISTRY_GAME_EVENTS -> {
-+                Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class, "Game Event namespace must have GameEvent type");
-+                TagKey<net.minecraft.world.level.gameevent.GameEvent> gameEventTagKey = TagKey.create(net.minecraft.core.registries.Registries.GAME_EVENT, key);
-+                if (net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT.getTag(gameEventTagKey).isPresent()) {
-+                    return (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT, gameEventTagKey);
-+                }
-+            }
-+            // Paper end
-             default -> throw new IllegalArgumentException();
-         }
- 
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-                 net.minecraft.core.Registry<EntityType<?>> entityTags = BuiltInRegistries.ENTITY_TYPE;
-                 return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
-             }
-+            // Paper start
-+            case org.bukkit.Tag.REGISTRY_GAME_EVENTS -> {
-+                Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class);
-+                net.minecraft.core.Registry<net.minecraft.world.level.gameevent.GameEvent> gameEvents = net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT;
-+                return gameEvents.getTags().map(pair -> (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(gameEvents, pair.getFirst())).collect(ImmutableList.toImmutableList());
-+            }
-+            // Paper end
-             default -> throw new IllegalArgumentException();
-         }
-     }
--- a/patches/unapplied/server/Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/Add-Moving-Piston-API.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sat, 4 Dec 2021 13:29:36 -0500
-Subject: [PATCH] Add Moving Piston API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
- import org.bukkit.Location;
- import org.bukkit.World;
- 
-public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> {
-+public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> implements io.papermc.paper.block.MovingPiston { // Paper - Add Moving Piston API
- 
-     public CraftMovingPiston(World world, PistonMovingBlockEntity tileEntity) {
-         super(world, tileEntity);
-@@ -0,0 +0,0 @@ public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEn
-     public CraftMovingPiston copy(Location location) {
-         return new CraftMovingPiston(this, location);
-     }
-+
-+    // Paper start - Add Moving Piston API
-+    @Override
-+    public org.bukkit.block.data.BlockData getMovingBlock() {
-+        return org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.getTileEntity().getMovedState());
-+    }
-+
-+    @Override
-+    public org.bukkit.block.BlockFace getDirection() {
-+        return org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(this.getTileEntity().getDirection());
-+    }
-+
-+    @Override
-+    public boolean isExtending() {
-+        return this.getTileEntity().isExtending();
-+    }
-+
-+    @Override
-+    public boolean isPistonHead() {
-+        return this.getTileEntity().isSourcePiston();
-+    }
-+    // Paper end - Add Moving Piston API
- }
--- a/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch
+++ b/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <10731363+JRoy@users.noreply.github.com>
-Date: Sun, 14 Aug 2022 12:23:11 -0400
-Subject: [PATCH] Add NamespacedKey biome methods
-
-Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     }
-     // Paper end
- 
-+    // Paper start - namespaced key biome methods
-+    @Override
-+    public org.bukkit.NamespacedKey getBiomeKey(org.bukkit.RegionAccessor accessor, int x, int y, int z) {
-+        org.bukkit.craftbukkit.CraftRegionAccessor cra = (org.bukkit.craftbukkit.CraftRegionAccessor) accessor;
-+        return org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(cra.getHandle().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getKey(cra.getHandle().getBiome(new net.minecraft.core.BlockPos(x, y, z)).value()));
-+    }
-+
-+    @Override
-+    public void setBiomeKey(org.bukkit.RegionAccessor accessor, int x, int y, int z, org.bukkit.NamespacedKey biomeKey) {
-+        org.bukkit.craftbukkit.CraftRegionAccessor cra = (org.bukkit.craftbukkit.CraftRegionAccessor) accessor;
-+        net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> biomeBase = cra.getHandle().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.BIOME, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(biomeKey)));
-+        cra.setBiome(x, y, z, biomeBase);
-+    }
-+    // Paper end - namespaced key biome methods
-+
-     @Override
-     public String get(Class<?> aClass, String s) {
-         if (aClass == Enchantment.class) {
--- a/patches/unapplied/server/Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/Add-Player-Warden-Warning-API.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dawon <dawon@dawon.eu>
-Date: Sat, 15 Oct 2022 00:46:57 +0200
-Subject: [PATCH] Add Player Warden Warning API
-
-== AT ==
-public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker ticksSinceLastWarning
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTicks
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void showElderGuardian(boolean silent) {
-         if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
-     }
-+
-+    @Override
-+    public int getWardenWarningCooldown() {
-+        return this.getHandle().wardenSpawnTracker.cooldownTicks;
-+    }
-+
-+    @Override
-+    public void setWardenWarningCooldown(int cooldown) {
-+        this.getHandle().wardenSpawnTracker.cooldownTicks = Math.max(cooldown, 0);
-+    }
-+
-+    @Override
-+    public int getWardenTimeSinceLastWarning() {
-+        return this.getHandle().wardenSpawnTracker.ticksSinceLastWarning;
-+    }
-+
-+    @Override
-+    public void setWardenTimeSinceLastWarning(int time) {
-+        this.getHandle().wardenSpawnTracker.ticksSinceLastWarning = time;
-+    }
-+
-+    @Override
-+    public int getWardenWarningLevel() {
-+        return this.getHandle().wardenSpawnTracker.getWarningLevel();
-+    }
-+
-+    @Override
-+    public void setWardenWarningLevel(int warningLevel) {
-+        this.getHandle().wardenSpawnTracker.setWarningLevel(warningLevel);
-+    }
-+
-+    @Override
-+    public void increaseWardenWarningLevel() {
-+        this.getHandle().wardenSpawnTracker.increaseWarningLevel();
-+    }
-     // Paper end
- 
-     public Player.Spigot spigot()
--- a/patches/unapplied/server/Add-Player-getFishHook.patch
+++ b/patches/unapplied/server/Add-Player-getFishHook.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: u9g <git@u9g.dev>
-Date: Tue, 14 Jun 2022 19:36:10 -0400
-Subject: [PATCH] Add Player#getFishHook
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         return new Location(worldServer.getWorld(), bed.getX(), bed.getY(), bed.getZ());
-     }
-     // Paper end
-+    // Paper start
-+    @Override
-+    public org.bukkit.entity.FishHook getFishHook() {
-+        if (getHandle().fishing == null) {
-+            return null;
-+        }
-+        return (org.bukkit.entity.FishHook) getHandle().fishing.getBukkitEntity();
-+    }
-+    // Paper end
-     @Override
-     public boolean sleep(Location location, boolean force) {
-         Preconditions.checkArgument(location != null, "Location cannot be null");
--- a/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jakub Zacek <dawon@dawon.eu>
-Date: Sun, 24 Apr 2022 22:56:59 +0200
-Subject: [PATCH] Add PlayerInventorySlotChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
- 
-                 }
-             }
-+            // Paper start - Add PlayerInventorySlotChangeEvent
-+            @Override
-+            public void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack oldStack, ItemStack stack) {
-+                Slot slot = handler.getSlot(slotId);
-+                if (!(slot instanceof ResultSlot)) {
-+                    if (slot.container == ServerPlayer.this.getInventory()) {
-+                        if (io.papermc.paper.event.player.PlayerInventorySlotChangeEvent.getHandlerList().getRegisteredListeners().length == 0) {
-+                            CriteriaTriggers.INVENTORY_CHANGED.trigger(ServerPlayer.this, ServerPlayer.this.getInventory(), stack);
-+                            return;
-+                        }
-+                        io.papermc.paper.event.player.PlayerInventorySlotChangeEvent event = new io.papermc.paper.event.player.PlayerInventorySlotChangeEvent(ServerPlayer.this.getBukkitEntity(), slotId, CraftItemStack.asBukkitCopy(oldStack), CraftItemStack.asBukkitCopy(stack));
-+                        event.callEvent();
-+                        if (event.shouldTriggerAdvancements()) {
-+                            CriteriaTriggers.INVENTORY_CHANGED.trigger(ServerPlayer.this, ServerPlayer.this.getInventory(), stack);
-+                        }
-+                    }
-+                }
-+            }
-+            // Paper end - Add PlayerInventorySlotChangeEvent
- 
-             @Override
-             public void dataChanged(AbstractContainerMenu handler, int property, int value) {}
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
-             while (iterator.hasNext()) {
-                 ContainerListener icrafting = (ContainerListener) iterator.next();
- 
-                icrafting.slotChanged(this, slot, itemstack2);
-+                icrafting.slotChanged(this, slot, itemstack1, itemstack2); // Paper - Add PlayerInventorySlotChangeEvent
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/inventory/ContainerListener.java b/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-+++ b/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.item.ItemStack;
- public interface ContainerListener {
-     void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack stack);
- 
-+    // Paper start - Add PlayerInventorySlotChangeEvent
-+    default void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack oldStack, ItemStack stack) {
-+        slotChanged(handler, slotId, stack);
-+    }
-+    // Paper end - Add PlayerInventorySlotChangeEvent
-+
-     void dataChanged(AbstractContainerMenu handler, int property, int value);
- }
--- a/patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch
+++ b/patches/unapplied/server/Add-PlayerStopUsingItemEvent.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: u9g <git@u9g.dev>
-Date: Tue, 3 May 2022 20:41:37 -0400
-Subject: [PATCH] Add PlayerStopUsingItemEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-     public void releaseUsingItem() {
-         if (!this.useItem.isEmpty()) {
-+            if (this instanceof ServerPlayer) new io.papermc.paper.event.player.PlayerStopUsingItemEvent((Player) getBukkitEntity(), useItem.asBukkitMirror(), getTicksUsingItem()).callEvent(); // Paper - Add PlayerStopUsingItemEvent
-             this.useItem.releaseUsing(this.level(), this, this.getUseItemRemainingTicks());
-             if (this.useItem.useOnRelease()) {
-                 this.updatingUsingItem();
--- a/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 18 Sep 2022 13:10:18 -0400
-Subject: [PATCH] Add PrePlayerAttackEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
-     }
- 
-     public void attack(Entity target) {
-        if (target.isAttackable()) {
-            if (!target.skipAttackInteraction(this)) {
-+        // Paper start - PlayerAttackEntityEvent
-+        boolean willAttack = target.isAttackable() && !target.skipAttackInteraction(this); // Vanilla logic
-+        io.papermc.paper.event.player.PrePlayerAttackEntityEvent playerAttackEntityEvent = new io.papermc.paper.event.player.PrePlayerAttackEntityEvent(
-+            (org.bukkit.entity.Player) this.getBukkitEntity(),
-+            target.getBukkitEntity(),
-+            willAttack
-+        );
-+
-+        if (playerAttackEntityEvent.callEvent() && willAttack) { // Logic moved to willAttack local variable.
-+            {
-+        // Paper end - PlayerAttackEntityEvent
-                 float f = (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE);
-                 float f1 = EnchantmentHelper.getDamageBonus(this.getMainHandItem(), target.getType());
-                 float f2 = this.getAttackStrengthScale(0.5F);
--- a/patches/unapplied/server/Add-TameableDeathMessageEvent.patch
+++ b/patches/unapplied/server/Add-TameableDeathMessageEvent.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Mon, 21 Jun 2021 21:24:45 -0400
-Subject: [PATCH] Add TameableDeathMessageEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-+++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-@@ -0,0 +0,0 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-     @Override
-     public void die(DamageSource damageSource) {
-         if (!this.level().isClientSide && this.level().getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES) && this.getOwner() instanceof ServerPlayer) {
-            this.getOwner().sendSystemMessage(this.getCombatTracker().getDeathMessage());
-+            // Paper start - Add TameableDeathMessageEvent
-+            io.papermc.paper.event.entity.TameableDeathMessageEvent event = new io.papermc.paper.event.entity.TameableDeathMessageEvent((org.bukkit.entity.Tameable) getBukkitEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getCombatTracker().getDeathMessage()));
-+            if (event.callEvent()) {
-+                this.getOwner().sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.deathMessage()));
-+            }
-+            // Paper end - Add TameableDeathMessageEvent
-         }
- 
-         super.die(damageSource);
--- a/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch
@@ -1,242 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Steinborn <git@steinborn.me>
-Date: Mon, 8 Oct 2018 14:36:14 -0400
-Subject: [PATCH] Add Velocity IP Forwarding Support
-
-While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users
-have a lot of problems setting up firewalls or setting up plugins like IPWhitelist.
-Further, the BungeeCord IP forwarding protocol still retains essentially its original
-form, when there is brand new support for custom login plugin messages in 1.13.
-
-Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity
-of messages, is packed into a binary format that is smaller than BungeeCord's
-forwarding, and is integrated into the Minecraft login process by using the 1.13
-login plugin message packet.
-
-diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
-@@ -0,0 +0,0 @@
-+package com.destroystokyo.paper.proxy;
-+
-+import io.papermc.paper.configuration.GlobalConfiguration;
-+import com.google.common.net.InetAddresses;
-+import com.mojang.authlib.GameProfile;
-+import com.mojang.authlib.properties.Property;
-+import java.net.InetAddress;
-+import java.security.InvalidKeyException;
-+import java.security.MessageDigest;
-+import java.security.NoSuchAlgorithmException;
-+import java.util.UUID;
-+import javax.crypto.Mac;
-+import javax.crypto.spec.SecretKeySpec;
-+import net.minecraft.network.FriendlyByteBuf;
-+import net.minecraft.network.protocol.login.custom.CustomQueryPayload;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.world.entity.player.ProfilePublicKey;
-+
-+/**
-+ * While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users
-+ * have a lot of problems setting up firewalls or setting up plugins like IPWhitelist.
-+ * Further, the BungeeCord IP forwarding protocol still retains essentially its original
-+ * form, when there is brand-new support for custom login plugin messages in 1.13.
-+ * <p>
-+ * Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity
-+ * of messages, is packed into a binary format that is smaller than BungeeCord's
-+ * forwarding, and is integrated into the Minecraft login process by using the 1.13
-+ * login plugin message packet.
-+ */
-+public class VelocityProxy {
-+    private static final int SUPPORTED_FORWARDING_VERSION = 1;
-+    public static final int MODERN_FORWARDING_WITH_KEY = 2;
-+    public static final int MODERN_FORWARDING_WITH_KEY_V2 = 3;
-+    public static final int MODERN_LAZY_SESSION = 4;
-+    public static final byte MAX_SUPPORTED_FORWARDING_VERSION = MODERN_LAZY_SESSION;
-+    public static final ResourceLocation PLAYER_INFO_CHANNEL = new ResourceLocation("velocity", "player_info");
-+
-+    public static boolean checkIntegrity(final FriendlyByteBuf buf) {
-+        final byte[] signature = new byte[32];
-+        buf.readBytes(signature);
-+
-+        final byte[] data = new byte[buf.readableBytes()];
-+        buf.getBytes(buf.readerIndex(), data);
-+
-+        try {
-+            final Mac mac = Mac.getInstance("HmacSHA256");
-+            mac.init(new SecretKeySpec(GlobalConfiguration.get().proxies.velocity.secret.getBytes(java.nio.charset.StandardCharsets.UTF_8), "HmacSHA256"));
-+            final byte[] mySignature = mac.doFinal(data);
-+            if (!MessageDigest.isEqual(signature, mySignature)) {
-+                return false;
-+            }
-+        } catch (final InvalidKeyException | NoSuchAlgorithmException e) {
-+            throw new AssertionError(e);
-+        }
-+
-+        return true;
-+    }
-+
-+    public static InetAddress readAddress(final FriendlyByteBuf buf) {
-+        return InetAddresses.forString(buf.readUtf(Short.MAX_VALUE));
-+    }
-+
-+    public static GameProfile createProfile(final FriendlyByteBuf buf) {
-+        final GameProfile profile = new GameProfile(buf.readUUID(), buf.readUtf(16));
-+        readProperties(buf, profile);
-+        return profile;
-+    }
-+
-+    private static void readProperties(final FriendlyByteBuf buf, final GameProfile profile) {
-+        final int properties = buf.readVarInt();
-+        for (int i1 = 0; i1 < properties; i1++) {
-+            final String name = buf.readUtf(Short.MAX_VALUE);
-+            final String value = buf.readUtf(Short.MAX_VALUE);
-+            final String signature = buf.readBoolean() ? buf.readUtf(Short.MAX_VALUE) : null;
-+            profile.getProperties().put(name, new Property(name, value, signature));
-+        }
-+    }
-+
-+    public static ProfilePublicKey.Data readForwardedKey(FriendlyByteBuf buf) {
-+        return new ProfilePublicKey.Data(buf);
-+    }
-+
-+    public static UUID readSignerUuidOrElse(FriendlyByteBuf buf, UUID orElse) {
-+        return buf.readBoolean() ? buf.readUUID() : orElse;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
-         // CraftBukkit end
- 
-+        // Paper start - Add Velocity IP Forwarding Support
-+        boolean usingProxy = org.spigotmc.SpigotConfig.bungee || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled;
-+        String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
-+        String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
-+        // Paper end - Add Velocity IP Forwarding Support
-         if (!this.usesAuthentication()) {
-             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
-             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-             // Spigot start
-            if (org.spigotmc.SpigotConfig.bungee) {
-                DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose.");
-                DedicatedServer.LOGGER.warn("Please see http://www.spigotmc.org/wiki/firewall-guide/ for further information.");
-+            // Paper start - Add Velocity IP Forwarding Support
-+            if (usingProxy) {
-+                DedicatedServer.LOGGER.warn("Whilst this makes it possible to use " + proxyFlavor + ", unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose.");
-+                DedicatedServer.LOGGER.warn("Please see " + proxyLink + " for further information.");
-+            // Paper end - Add Velocity IP Forwarding Support
-             } else {
-                 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
-             }
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-     private final boolean transferred;
-     private ServerPlayer player; // CraftBukkit
-     public boolean iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation = false; // Paper - username validation overriding
-+    private int velocityLoginMessageId = -1; // Paper - Add Velocity IP Forwarding Support
- 
-     public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection, boolean transferred) {
-         this.state = ServerLoginPacketListenerImpl.State.HELLO;
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-                 this.state = ServerLoginPacketListenerImpl.State.KEY;
-                 this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.challenge, true));
-             } else {
-+                // Paper start - Add Velocity IP Forwarding Support
-+                if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) {
-+                    this.velocityLoginMessageId = java.util.concurrent.ThreadLocalRandom.current().nextInt();
-+                    net.minecraft.network.FriendlyByteBuf buf = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.buffer());
-+                    buf.writeByte(com.destroystokyo.paper.proxy.VelocityProxy.MAX_SUPPORTED_FORWARDING_VERSION);
-+                    net.minecraft.network.protocol.login.ClientboundCustomQueryPacket packet1 = new net.minecraft.network.protocol.login.ClientboundCustomQueryPacket(this.velocityLoginMessageId, new net.minecraft.network.protocol.login.ClientboundCustomQueryPacket.PlayerInfoChannelPayload(com.destroystokyo.paper.proxy.VelocityProxy.PLAYER_INFO_CHANNEL, buf));
-+                    this.connection.send(packet1);
-+                    return;
-+                }
-+                // Paper end - Add Velocity IP Forwarding Support
-                 // CraftBukkit start
-                 // Paper start - Cache authenticator threads
-                 authenticatorPool.execute(new Runnable() {
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
- 
-     // CraftBukkit start
-     private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent
-+        // Paper start - Add Velocity IP Forwarding Support
-+        if (ServerLoginPacketListenerImpl.this.velocityLoginMessageId == -1 && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) {
-+            disconnect("This server requires you to connect with Velocity.");
-+            return gameprofile;
-+        }
-+        // Paper end - Add Velocity IP Forwarding Support
-         String playerName = gameprofile.getName();
-         java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
-         java.util.UUID uniqueId = gameprofile.getId();
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
- 
-     @Override
-     public void handleCustomQueryPacket(ServerboundCustomQueryAnswerPacket packet) {
-+        // Paper start - Add Velocity IP Forwarding Support
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled && packet.transactionId() == this.velocityLoginMessageId) {
-+            ServerboundCustomQueryAnswerPacket.QueryAnswerPayload payload = (ServerboundCustomQueryAnswerPacket.QueryAnswerPayload)packet.payload();
-+            if (payload == null) {
-+                this.disconnect("This server requires you to connect with Velocity.");
-+                return;
-+            }
-+
-+            net.minecraft.network.FriendlyByteBuf buf = payload.buffer;
-+
-+            if (!com.destroystokyo.paper.proxy.VelocityProxy.checkIntegrity(buf)) {
-+                this.disconnect("Unable to verify player details");
-+                return;
-+            }
-+
-+            int version = buf.readVarInt();
-+            if (version > com.destroystokyo.paper.proxy.VelocityProxy.MAX_SUPPORTED_FORWARDING_VERSION) {
-+                throw new IllegalStateException("Unsupported forwarding version " + version + ", wanted upto " + com.destroystokyo.paper.proxy.VelocityProxy.MAX_SUPPORTED_FORWARDING_VERSION);
-+            }
-+
-+            java.net.SocketAddress listening = this.connection.getRemoteAddress();
-+            int port = 0;
-+            if (listening instanceof java.net.InetSocketAddress) {
-+                port = ((java.net.InetSocketAddress) listening).getPort();
-+            }
-+            this.connection.address = new java.net.InetSocketAddress(com.destroystokyo.paper.proxy.VelocityProxy.readAddress(buf), port);
-+
-+            this.authenticatedProfile = com.destroystokyo.paper.proxy.VelocityProxy.createProfile(buf);
-+
-+            //TODO Update handling for lazy sessions, might not even have to do anything?
-+
-+            // Proceed with login
-+            authenticatorPool.execute(() -> {
-+                try {
-+                    final GameProfile gameprofile = this.callPlayerPreLoginEvents(this.authenticatedProfile);
-+                    ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId());
-+                    ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile);
-+                } catch (Exception ex) {
-+                    disconnect("Failed to verify username!");
-+                    server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + this.authenticatedProfile.getName(), ex);
-+                }
-+            });
-+            return;
-+        }
-+        // Paper end - Add Velocity IP Forwarding Support
-         this.disconnect(ServerCommonPacketListenerImpl.DISCONNECT_UNEXPECTED_QUERY);
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     @Override
-     public long getConnectionThrottle() {
-         // Spigot Start - Automatically set connection throttle for bungee configurations
-        if (org.spigotmc.SpigotConfig.bungee) {
-+        if (org.spigotmc.SpigotConfig.bungee || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) { // Paper - Add Velocity IP Forwarding Support
-             return -1;
-         } else {
-             return this.configuration.getInt("settings.connection-throttle");
--- a/patches/unapplied/server/Add-WardenAngerChangeEvent.patch
+++ b/patches/unapplied/server/Add-WardenAngerChangeEvent.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: nopjar <code.nopjar@gmail.com>
-Date: Sun, 12 Jun 2022 02:26:04 +0200
-Subject: [PATCH] Add WardenAngerChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-@@ -0,0 +0,0 @@ public class AngerManagement {
- 
-     public int increaseAnger(Entity entity, int amount) {
-         boolean bl = !this.angerBySuspect.containsKey(entity);
-        int i = this.angerBySuspect.computeInt(entity, (suspect, anger) -> Math.min(150, (anger == null ? 0 : anger) + amount));
-+        int i = this.angerBySuspect.computeInt(entity, (suspect, anger) -> Math.min(150, (anger == null ? 0 : anger) + amount)); // Paper - diff on change (Warden#increaseAngerAt WardenAngerChangeEvent)
-         if (bl) {
-             int j = this.angerByUuid.removeInt(entity.getUUID());
-             i += j;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -0,0 +0,0 @@ public class Warden extends Monster implements VibrationSystem {
-     @VisibleForTesting
-     public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
-         if (!this.isNoAi() && this.canTargetEntity(entity)) {
-+            // Paper start - Add WardenAngerChangeEvent
-+            int activeAnger = this.angerManagement.getActiveAnger(entity);
-+            io.papermc.paper.event.entity.WardenAngerChangeEvent event = new io.papermc.paper.event.entity.WardenAngerChangeEvent((org.bukkit.entity.Warden) this.getBukkitEntity(), entity.getBukkitEntity(), activeAnger, Math.min(150, activeAnger + amount));
-+            this.level().getCraftServer().getPluginManager().callEvent(event);
-+            if (event.isCancelled()) {
-+                return;
-+            }
-+            amount = event.getNewAnger() - activeAnger;
-+            // Paper end - Add WardenAngerChangeEvent
-             WardenAi.setDigCooldown(this);
-             boolean flag1 = !(this.getTarget() instanceof Player);
-             int j = this.angerManagement.increaseAnger(entity, amount);
--- a/patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/unapplied/server/Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Mon, 19 Sep 2022 14:16:10 -0700
-Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     }
- 
-     @Override
-    @SuppressWarnings("unchecked")
-     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+        // Paper start - launchProjectile consumer
-+        return this.launchProjectile(projectile, velocity, null);
-+    }
-+
-+    @Override
-+    @SuppressWarnings("unchecked")
-+    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+        // Paper end - launchProjectile consumer
-         Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
- 
-         net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle();
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         if (velocity != null) {
-             ((T) launch.getBukkitEntity()).setVelocity(velocity);
-         }
-+        // Paper start - launchProjectile consumer
-+        if (function != null) {
-+            function.accept((T) launch.getBukkitEntity());
-+        }
-+        // Paper end - launchProjectile consumer
- 
-         world.addFreshEntity(launch);
-         return (T) launch.getBukkitEntity();
-diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-+++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-@@ -0,0 +0,0 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
- 
-     @Override
-     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+        // Paper start - launchProjectile consumer
-+        return this.launchProjectile(projectile, velocity, null);
-+    }
-+
-+    @Override
-+    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+        // Paper end - launchProjectile consumer
-         Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser");
-         // Copied from BlockDispenser.dispense()
-         BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock);
-@@ -0,0 +0,0 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
-         if (velocity != null) {
-             ((T) launch.getBukkitEntity()).setVelocity(velocity);
-         }
-+        // Paper start
-+        if (function != null) {
-+            function.accept((T) launch.getBukkitEntity());
-+        }
-+        // Paper end
- 
-         world.addFreshEntity(launch);
-         return (T) launch.getBukkitEntity();
--- a/patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Thu, 21 Jul 2022 12:07:54 -0400
-Subject: [PATCH] Add and fix missing BlockFadeEvents
-
-Beyond calling the BlockFadeEvent in more places, this patch also aims
-to pass the proper replacement state to the event, specifically for
-potentially waterlogged block states fading.
-
-Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
-@@ -0,0 +0,0 @@ public class FrogspawnBlock extends Block {
-     }
- 
-     private void hatchFrogspawn(ServerLevel world, BlockPos pos, RandomSource random) {
-+        // Paper start - Call BlockFadeEvent
-+        if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.AIR.defaultBlockState()).isCancelled()) {
-+            return;
-+        }
-+        // Paper end - Call BlockFadeEvent
-         this.destroyBlock(world, pos);
-         world.playSound(null, pos, SoundEvents.FROGSPAWN_HATCH, SoundSource.BLOCKS, 1.0F, 1.0F);
-         this.spawnTadpoles(world, pos, random);
-diff --git a/src/main/java/net/minecraft/world/level/block/ScaffoldingBlock.java b/src/main/java/net/minecraft/world/level/block/ScaffoldingBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/ScaffoldingBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ScaffoldingBlock.java
-@@ -0,0 +0,0 @@ public class ScaffoldingBlock extends Block implements SimpleWaterloggedBlock {
-         int i = ScaffoldingBlock.getDistance(world, pos);
-         BlockState iblockdata1 = (BlockState) ((BlockState) state.setValue(ScaffoldingBlock.DISTANCE, i)).setValue(ScaffoldingBlock.BOTTOM, this.isBottom(world, pos, i));
- 
-        if ((Integer) iblockdata1.getValue(ScaffoldingBlock.DISTANCE) == 7 && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.AIR.defaultBlockState()).isCancelled()) { // CraftBukkit - BlockFadeEvent
-+        if ((Integer) iblockdata1.getValue(ScaffoldingBlock.DISTANCE) == 7 && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, iblockdata1.getFluidState().createLegacyBlock()).isCancelled()) { // CraftBukkit - BlockFadeEvent // Paper - fix wrong block state
-             if ((Integer) state.getValue(ScaffoldingBlock.DISTANCE) == 7) {
-                 FallingBlockEntity.fall(world, pos, iblockdata1);
-             } else {
-diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
-@@ -0,0 +0,0 @@ public class SnifferEggBlock extends Block {
-         return this.getHatchLevel(state) == 2;
-     }
- 
-+    // Paper start - Call BlockFadeEvent
-+    private void rescheduleTick(ServerLevel world, BlockPos pos) {
-+        int baseDelay = hatchBoost(world, pos) ? BOOSTED_HATCH_TIME_TICKS : REGULAR_HATCH_TIME_TICKS;
-+        world.scheduleTick(pos, this, (baseDelay / 3) + world.random.nextInt(RANDOM_HATCH_OFFSET_TICKS));
-+        // reschedule to avoid being stuck here and behave like the other calls (see #onPlace)
-+    }
-+    // Paper end - Call BlockFadeEvent
-+
-     @Override
-     public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-         if (!this.isReadyToHatch(state)) {
-             world.playSound(null, pos, SoundEvents.SNIFFER_EGG_CRACK, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
-             world.setBlock(pos, state.setValue(HATCH, Integer.valueOf(this.getHatchLevel(state) + 1)), 2);
-         } else {
-+            // Paper start - Call BlockFadeEvent
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, state.getFluidState().createLegacyBlock()).isCancelled()) {
-+                this.rescheduleTick(world, pos);
-+                return;
-+            }
-+            // Paper end - Call BlockFadeEvent
-             world.playSound(null, pos, SoundEvents.SNIFFER_EGG_HATCH, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
-             world.destroyBlock(pos, false);
-             Sniffer sniffer = EntityType.SNIFFER.create(world);
--- a/patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/unapplied/server/Add-config-option-for-worlds-affected-by-time-cmd.patch
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 2 Jan 2022 22:34:51 -0800
-Subject: [PATCH] Add config option for worlds affected by time cmd
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/TimeCommand.java b/src/main/java/net/minecraft/server/commands/TimeCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/TimeCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/TimeCommand.java
-@@ -0,0 +0,0 @@ public class TimeCommand {
-     }
- 
-     public static int setTime(CommandSourceStack source, int time) {
-        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
-+        Iterator iterator = io.papermc.paper.configuration.GlobalConfiguration.get().commands.timeCommandAffectsAllWorlds ? source.getServer().getAllLevels().iterator() : com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in // Paper - add config option for spigot's change
- 
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
-@@ -0,0 +0,0 @@ public class TimeCommand {
-     }
- 
-     public static int addTime(CommandSourceStack source, int time) {
-        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
-+        Iterator iterator = io.papermc.paper.configuration.GlobalConfiguration.get().commands.timeCommandAffectsAllWorlds ? source.getServer().getAllLevels().iterator() : com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in // Paper - add config option for spigot's change
- 
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
--- a/patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch
+++ b/patches/unapplied/server/Add-configurable-height-for-slime-spawn.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Doc <nachito94@msn.com>
-Date: Mon, 2 Aug 2021 11:24:39 -0400
-Subject: [PATCH] Add configurable height for slime spawn
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -0,0 +0,0 @@ public class Slime extends Mob implements Enemy {
-                     return checkMobSpawnRules(type, world, spawnReason, pos, random);
-                 }
- 
-                if (world.getBiome(pos).is(BiomeTags.ALLOWS_SURFACE_SLIME_SPAWNS) && pos.getY() > 50 && pos.getY() < 70 && random.nextFloat() < 0.5F && random.nextFloat() < world.getMoonBrightness() && world.getMaxLocalRawBrightness(pos) <= random.nextInt(8)) {
-+                // Paper start - Replace rules for Height in Swamp Biome
-+                final double maxHeightSwamp = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.surfaceBiome.maximum;
-+                final double minHeightSwamp = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.surfaceBiome.minimum;
-+                if (world.getBiome(pos).is(BiomeTags.ALLOWS_SURFACE_SLIME_SPAWNS) && pos.getY() > minHeightSwamp && pos.getY() < maxHeightSwamp && random.nextFloat() < 0.5F && random.nextFloat() < world.getMoonBrightness() && world.getMaxLocalRawBrightness(pos) <= random.nextInt(8)) {
-+                // Paper end - Replace rules for Height in Swamp Biome
-                     return checkMobSpawnRules(type, world, spawnReason, pos, random);
-                 }
- 
-@@ -0,0 +0,0 @@ public class Slime extends Mob implements Enemy {
-                 ChunkPos chunkcoordintpair = new ChunkPos(pos);
-                 boolean flag = world.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
- 
-                if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
-+                // Paper start - Replace rules for Height in Slime Chunks
-+                final double maxHeightSlimeChunk = world.getMinecraftWorld().paperConfig().entities.spawning.slimeSpawnHeight.slimeChunk.maximum;
-+                if (random.nextInt(10) == 0 && flag && pos.getY() < maxHeightSlimeChunk) {
-+                // Paper end - Replace rules for Height in Slime Chunks
-                     return checkMobSpawnRules(type, world, spawnReason, pos, random);
-                 }
-             }
--- a/patches/unapplied/server/Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/Add-entity-knockback-API.patch
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Sun, 16 Oct 2022 12:10:17 -0700
-Subject: [PATCH] Add entity knockback API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
-     }
-     // Paper end - hurt direction API
-+
-+    // Paper start - knockback API
-+    @Override
-+    public void knockback(final double strength, final double directionX, final double directionZ) {
-+        Preconditions.checkArgument(strength > 0, "Knockback strength must be > 0");
-+        this.getHandle().knockback(strength, directionX, directionZ);
-+    };
-+    // Paper end - knockback API
- }
--- a/patches/unapplied/server/Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/Add-fire-tick-delay-option.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VytskaLT <VytskaLT@protonmail.com>
-Date: Wed, 22 Jun 2022 14:34:28 +0300
-Subject: [PATCH] Add fire-tick-delay option
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-@@ -0,0 +0,0 @@ public class FireBlock extends BaseFireBlock {
- 
-     @Override
-     protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-        world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
-+        world.scheduleTick(pos, this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
-         if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
-             if (!state.canSurvive(world, pos)) {
-                 this.fireExtinguished(world, pos); // CraftBukkit - invalid place location
-@@ -0,0 +0,0 @@ public class FireBlock extends BaseFireBlock {
-     protected void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify, net.minecraft.world.item.context.UseOnContext context) {
-         super.onPlace(state, world, pos, oldState, notify, context);
-     // Paper end - UseOnContext param
-        world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
-+        world.scheduleTick(pos, this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
-     }
- 
-    private static int getFireTickDelay(RandomSource random) {
-        return 30 + random.nextInt(10);
-+    private static int getFireTickDelay(Level world) { // Paper - Add fire-tick-delay option
-+        return world.paperConfig().environment.fireTickDelay + world.random.nextInt(10); // Paper - Add fire-tick-delay option
-     }
- 
-     @Override
--- a/patches/unapplied/server/Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/Add-getDrops-to-BlockState.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Fri, 12 Aug 2022 23:24:37 -0700
-Subject: [PATCH] Add getDrops to BlockState
-
-Originally added isPreferredTool to BlockData but
-upstream added that.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-@@ -0,0 +0,0 @@ public class CraftBlockState implements BlockState {
-     public boolean isCollidable() {
-         return this.data.getBlock().hasCollision;
-     }
-+
-+    @Override
-+    public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) {
-+        this.requirePlaced();
-+        net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item);
-+
-+        // Modelled off EntityHuman#hasBlock
-+        if (item == null || !data.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(data)) {
-+            return net.minecraft.world.level.block.Block.getDrops(
-+                data,
-+                world.getHandle(),
-+                position,
-+                world.getHandle().getBlockEntity(position), entity == null ? null :
-+                    ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle(), nms
-+            ).stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asBukkitCopy).toList();
-+        } else {
-+            return java.util.Collections.emptyList();
-+        }
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/unapplied/server/Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: u9g <winworkswow@gmail.com>
-Date: Mon, 3 Jan 2022 23:32:42 -0500
-Subject: [PATCH] Add missing IAE check for PersistentDataContainer#has
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-@@ -0,0 +0,0 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
- 
-     @Override
-     public boolean has(NamespacedKey key) {
-+        Preconditions.checkArgument(key != null, "The provided key for the custom value was null"); // Paper
-         return this.customDataTags.get(key.toString()) != null;
-     }
- 
--- a/patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/unapplied/server/Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Sat, 12 Feb 2022 12:40:50 -0700
-Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
-
-Copies appropriate checks from CraftWorld#getSpawnLimit
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     @Override
-     public int getSpawnLimit(SpawnCategory spawnCategory) {
-         // Paper start - Add mobcaps commands
-+        Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
-+        Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " does not have a spawn limit.");
-         return this.getSpawnLimitUnsafe(spawnCategory);
-     }
-     public int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
--- a/patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/unapplied/server/Add-missing-block-data-mins-and-maxes.patch
@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 16 Oct 2021 22:57:31 -0700
-Subject: [PATCH] Add missing block data mins and maxes
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
-@@ -0,0 +0,0 @@ public final class CraftCandle extends org.bukkit.craftbukkit.block.data.CraftBl
-     public int getMaximumCandles() {
-         return getMax(CraftCandle.CANDLES);
-     }
-+    // Paper start
-+    @Override
-+    public int getMinimumCandles() {
-+        return getMin(CraftCandle.CANDLES);
-+    }
-+    // Paper end
- 
-     // org.bukkit.craftbukkit.block.data.CraftLightable
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCherryLeaves.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCherryLeaves.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCherryLeaves.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCherryLeaves.java
-@@ -0,0 +0,0 @@ public final class CraftCherryLeaves extends org.bukkit.craftbukkit.block.data.C
-     public void setWaterlogged(boolean waterlogged) {
-         this.set(CraftCherryLeaves.WATERLOGGED, waterlogged);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMaximumDistance() {
-+        return getMax(DISTANCE);
-+    }
-+
-+    @Override
-+    public int getMinimumDistance() {
-+        return getMin(DISTANCE);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftComposter.java
-@@ -0,0 +0,0 @@ public final class CraftComposter extends org.bukkit.craftbukkit.block.data.Craf
-     public int getMaximumLevel() {
-         return getMax(CraftComposter.LEVEL);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMinimumLevel() {
-+        return getMin(CraftComposter.LEVEL);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
-@@ -0,0 +0,0 @@ public final class CraftFluids extends org.bukkit.craftbukkit.block.data.CraftBl
-     public int getMaximumLevel() {
-         return getMax(CraftFluids.LEVEL);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMinimumLevel() {
-+        return getMin(CraftFluids.LEVEL);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLayeredCauldron.java
-@@ -0,0 +0,0 @@ public final class CraftLayeredCauldron extends org.bukkit.craftbukkit.block.dat
-     public int getMaximumLevel() {
-         return getMax(CraftLayeredCauldron.LEVEL);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMinimumLevel() {
-+        return getMin(CraftLayeredCauldron.LEVEL);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLeaves.java
-@@ -0,0 +0,0 @@ public final class CraftLeaves extends org.bukkit.craftbukkit.block.data.CraftBl
-     public void setWaterlogged(boolean waterlogged) {
-         this.set(CraftLeaves.WATERLOGGED, waterlogged);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMaximumDistance() {
-+        return getMax(CraftLeaves.DISTANCE);
-+    }
-+
-+    @Override
-+    public int getMinimumDistance() {
-+        return getMin(CraftLeaves.DISTANCE);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftLight.java
-@@ -0,0 +0,0 @@ public final class CraftLight extends org.bukkit.craftbukkit.block.data.CraftBlo
-         return getMax(CraftLight.LEVEL);
-     }
- 
-+    // Paper start
-+    @Override
-+    public int getMinimumLevel() {
-+        return getMin(CraftLight.LEVEL);
-+    }
-+    // Paper end
-+
-     // org.bukkit.craftbukkit.block.data.CraftWaterlogged
- 
-     private static final net.minecraft.world.level.block.state.properties.BooleanProperty WATERLOGGED = getBoolean(net.minecraft.world.level.block.LightBlock.class, "waterlogged");
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftMangroveLeaves.java
-@@ -0,0 +0,0 @@ public final class CraftMangroveLeaves extends org.bukkit.craftbukkit.block.data
-     public void setWaterlogged(boolean waterlogged) {
-         this.set(CraftMangroveLeaves.WATERLOGGED, waterlogged);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getMinimumDistance() {
-+        return getMin(CraftMangroveLeaves.DISTANCE);
-+    }
-+
-+    @Override
-+    public int getMaximumDistance() {
-+        return getMax(CraftMangroveLeaves.DISTANCE);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
-@@ -0,0 +0,0 @@ public final class CraftPinkPetals extends org.bukkit.craftbukkit.block.data.Cra
-         this.set(CraftPinkPetals.FLOWER_AMOUNT, flower_amount);
-     }
- 
-+    // Paper start
-+    @Override
-+    public int getMinimumFlowerAmount() {
-+        return getMin(CraftPinkPetals.FLOWER_AMOUNT);
-+    }
-+    // Paper end
-+
-     @Override
-     public int getMaximumFlowerAmount() {
-         return getMax(CraftPinkPetals.FLOWER_AMOUNT);
--- a/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 12 Jun 2022 13:25:52 -0400
-Subject: [PATCH] Add missing important BlockStateListPopulator methods
-
-Without these methods it causes exceptions due to these being used by certain feature generators.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-@@ -0,0 +0,0 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
- 
-     @Override
-     public boolean isFluidAtPosition(BlockPos pos, Predicate<FluidState> state) {
-        return this.world.isFluidAtPosition(pos, state);
-+        return state.test(this.getFluidState(pos)); // Paper - fix
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
-     public long nextSubTickCount() {
-         return this.world.nextSubTickCount();
-     }
-+
-+    // Paper start
-+    @Override
-+    public <T extends BlockEntity> java.util.Optional<T> getBlockEntity(BlockPos pos, net.minecraft.world.level.block.entity.BlockEntityType<T> type) {
-+        BlockEntity tileentity = this.getBlockEntity(pos);
-+
-+        return tileentity != null && tileentity.getType() == type ? (java.util.Optional<T>) java.util.Optional.of(tileentity) : java.util.Optional.empty();
-+    }
-+
-+    @Override
-+    public BlockPos getHeightmapPos(net.minecraft.world.level.levelgen.Heightmap.Types heightmap, BlockPos pos) {
-+        return world.getHeightmapPos(heightmap, pos);
-+    }
-+
-+    @Override
-+    public int getHeight(net.minecraft.world.level.levelgen.Heightmap.Types heightmap, int x, int z) {
-+        return world.getHeight(heightmap, x, z);
-+    }
-+
-+    @Override
-+    public int getRawBrightness(BlockPos pos, int ambientDarkness) {
-+        return world.getRawBrightness(pos, ambientDarkness);
-+    }
-+
-+    @Override
-+    public int getBrightness(net.minecraft.world.level.LightLayer type, BlockPos pos) {
-+        return world.getBrightness(type, pos);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -0,0 +0,0 @@ public class DummyGeneratorAccess implements WorldGenLevel {
-     public boolean destroyBlock(BlockPos pos, boolean drop, Entity breakingEntity, int maxUpdateDepth) {
-         return false; // SPIGOT-6515
-     }
-+
-+    // Paper start - add more methods
-+    public void scheduleTick(BlockPos pos, Fluid fluid, int delay) {}
-+
-+    @Override
-+    public void scheduleTick(BlockPos pos, Block block, int delay, net.minecraft.world.ticks.TickPriority priority) {}
-+
-+    @Override
-+    public void scheduleTick(BlockPos pos, Fluid fluid, int delay, net.minecraft.world.ticks.TickPriority priority) {}
-+    // Paper end - add more methods
- }
--- a/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch
@@ -1,397 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 13 Jan 2022 23:05:53 -0800
-Subject: [PATCH] Add missing structure set seed configs
-
-The 4 missing structure set seed configs are strongholds, mineshafts,
-buried treasure, and ancient cities.
-
-Strongholds use a ring placement scheme which isn't random so they
-utilize the world seed by default, this adds a config to override it
-for just generating the ring positions.
-
-Mineshafts and Buried Treasure structure sets are special cases
-where the "salt" that can be defined for them via datapacks has 0
-effect because the difference between the spacing and separation is 1
-which is used as the upper bound in the random with salt. So the random
-always returns the same int (0) so the salt has no effect. This adds
-seeds/salts to the frequency reducer which has a similar effect.
-
-Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -0,0 +0,0 @@ public abstract class ChunkGenerator {
-                 }
-             }
- 
-            if (structureplacement.isStructureChunk(placementCalculator, chunkcoordintpair.x, chunkcoordintpair.z)) {
-+            if (structureplacement.isStructureChunk(placementCalculator, chunkcoordintpair.x, chunkcoordintpair.z, structureplacement instanceof net.minecraft.world.level.chunk.ChunkGeneratorStructureState.KeyedRandomSpreadStructurePlacement keyed ? keyed.key : null)) { // Paper - Add missing structure set seed configs
-                 if (list.size() == 1) {
-                     this.tryGenerateStructure((StructureSet.StructureSelectionEntry) list.get(0), structureAccessor, registryManager, randomstate, structureTemplateManager, placementCalculator.getLevelSeed(), chunk, chunkcoordintpair, sectionposition);
-                 } else {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
-     private final Map<ConcentricRingsStructurePlacement, CompletableFuture<List<ChunkPos>>> ringPositions = new Object2ObjectArrayMap();
-     private boolean hasGeneratedPositions;
-     private final List<Holder<StructureSet>> possibleStructureSets;
-+    public final SpigotWorldConfig conf; // Paper - Add missing structure set seed configs
- 
-     public static ChunkGeneratorStructureState createForFlat(RandomState randomstate, long i, BiomeSource worldchunkmanager, Stream<Holder<StructureSet>> stream, SpigotWorldConfig conf) { // Spigot
-         List<Holder<StructureSet>> list = stream.filter((holder) -> {
-             return ChunkGeneratorStructureState.hasBiomesForStructureSet((StructureSet) holder.value(), worldchunkmanager);
-         }).toList();
- 
-        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, 0L, ChunkGeneratorStructureState.injectSpigot(list, conf)); // Spigot
-+        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, 0L, ChunkGeneratorStructureState.injectSpigot(list, conf), conf); // Spigot
-     }
- 
-     public static ChunkGeneratorStructureState createForNormal(RandomState randomstate, long i, BiomeSource worldchunkmanager, HolderLookup<StructureSet> holderlookup, SpigotWorldConfig conf) { // Spigot
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
-             return ChunkGeneratorStructureState.hasBiomesForStructureSet((StructureSet) holder_c.value(), worldchunkmanager);
-         }).collect(Collectors.toUnmodifiableList());
- 
-        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, i, ChunkGeneratorStructureState.injectSpigot(list, conf)); // Spigot
-+        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, i, ChunkGeneratorStructureState.injectSpigot(list, conf), conf); // Spigot
-     }
-+    // Paper start - Add missing structure set seed configs; horrible hack because spigot creates a ton of direct Holders which lose track of the identifying key
-+    public static final class KeyedRandomSpreadStructurePlacement extends RandomSpreadStructurePlacement {
-+        public final net.minecraft.resources.ResourceKey<StructureSet> key;
-+        public KeyedRandomSpreadStructurePlacement(net.minecraft.resources.ResourceKey<StructureSet> key, net.minecraft.core.Vec3i locateOffset, FrequencyReductionMethod frequencyReductionMethod, float frequency, int salt, java.util.Optional<StructurePlacement.ExclusionZone> exclusionZone, int spacing, int separation, net.minecraft.world.level.levelgen.structure.placement.RandomSpreadType spreadType) {
-+            super(locateOffset, frequencyReductionMethod, frequency, salt, exclusionZone, spacing, separation, spreadType);
-+            this.key = key;
-+        }
-+    }
-+    // Paper end - Add missing structure set seed configs
- 
-     // Spigot start
-     private static List<Holder<StructureSet>> injectSpigot(List<Holder<StructureSet>> list, SpigotWorldConfig conf) {
-         return list.stream().map((holder) -> {
-             StructureSet structureset = holder.value();
-            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig) {
-+            final Holder<StructureSet> newHolder; // Paper - Add missing structure set seed configs
-+            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig && holder.unwrapKey().orElseThrow().location().getNamespace().equals(net.minecraft.resources.ResourceLocation.DEFAULT_NAMESPACE)) { // Paper - Add missing structure set seed configs; check namespace cause datapacks could add structure sets with the same path
-                 String name = holder.unwrapKey().orElseThrow().location().getPath();
-                 int seed = randomConfig.salt;
- 
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
-                     case "villages":
-                         seed = conf.villageSeed;
-                         break;
-+                    // Paper start - Add missing structure set seed configs
-+                    case "ancient_cities":
-+                        seed = conf.ancientCitySeed;
-+                        break;
-+                    case "trail_ruins":
-+                        seed = conf.trailRuinsSeed;
-+                        break;
-+                    case "trial_chambers":
-+                        seed = conf.trialChambersSeed;
-+                        break;
-+                    // Paper end - Add missing structure set seed configs
-                 }
- 
-                structureset = new StructureSet(structureset.structures(), new RandomSpreadStructurePlacement(randomConfig.locateOffset, randomConfig.frequencyReductionMethod, randomConfig.frequency, seed, randomConfig.exclusionZone, randomConfig.spacing(), randomConfig.separation(), randomConfig.spreadType()));
-+            // Paper start - Add missing structure set seed configs
-+                structureset = new StructureSet(structureset.structures(), new KeyedRandomSpreadStructurePlacement(holder.unwrapKey().orElseThrow(), randomConfig.locateOffset, randomConfig.frequencyReductionMethod, randomConfig.frequency, seed, randomConfig.exclusionZone, randomConfig.spacing(), randomConfig.separation(), randomConfig.spreadType()));
-+                newHolder = Holder.direct(structureset); // I really wish we didn't have to do this here
-+            } else {
-+                newHolder = holder;
-             }
-            return Holder.direct(structureset);
-+            return newHolder;
-+            // Paper end - Add missing structure set seed configs
-         }).collect(Collectors.toUnmodifiableList());
-     }
-     // Spigot end
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
-         return stream.anyMatch(set::contains);
-     }
- 
-    private ChunkGeneratorStructureState(RandomState noiseConfig, BiomeSource biomeSource, long structureSeed, long concentricRingSeed, List<Holder<StructureSet>> structureSets) {
-+    private ChunkGeneratorStructureState(RandomState noiseConfig, BiomeSource biomeSource, long structureSeed, long concentricRingSeed, List<Holder<StructureSet>> structureSets, SpigotWorldConfig conf) { // Paper - Add missing structure set seed configs
-         this.randomState = noiseConfig;
-         this.levelSeed = structureSeed;
-         this.biomeSource = biomeSource;
-         this.concentricRingsSeed = concentricRingSeed;
-         this.possibleStructureSets = structureSets;
-+        this.conf = conf; // Paper - Add missing structure set seed configs
-     }
- 
-     public List<Holder<StructureSet>> possibleStructureSets() {
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
-             HolderSet<Biome> holderset = placement.preferredBiomes();
-             RandomSource randomsource = RandomSource.create();
- 
-+            // Paper start - Add missing structure set seed configs
-+            if (this.conf.strongholdSeed != null && structureSetEntry.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) {
-+                randomsource.setSeed(this.conf.strongholdSeed);
-+            } else {
-+            // Paper end - Add missing structure set seed configs
-             randomsource.setSeed(this.concentricRingsSeed);
-+            } // Paper - Add missing structure set seed configs
-             double d0 = randomsource.nextDouble() * Math.PI * 2.0D;
-             int l = 0;
-             int i1 = 0;
-@@ -0,0 +0,0 @@ public class ChunkGeneratorStructureState {
- 
-         for (int l = centerChunkX - chunkCount; l <= centerChunkX + chunkCount; ++l) {
-             for (int i1 = centerChunkZ - chunkCount; i1 <= centerChunkZ + chunkCount; ++i1) {
-                if (structureplacement.isStructureChunk(this, l, i1)) {
-+                if (structureplacement.isStructureChunk(this, l, i1, structureplacement instanceof KeyedRandomSpreadStructurePlacement keyed ? keyed.key : null)) { // Paper - Add missing structure set seed configs
-                     return true;
-                 }
-             }
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-@@ -0,0 +0,0 @@ public class StructureCheck {
-         this.fixerUpper = dataFixer;
-     }
- 
-+    // Paper start - add missing structure salt configs
-+    @Nullable
-+    private Integer getSaltOverride(Structure type) {
-+        if (this.heightAccessor instanceof net.minecraft.server.level.ServerLevel serverLevel) {
-+            if (type instanceof net.minecraft.world.level.levelgen.structure.structures.MineshaftStructure) {
-+                return serverLevel.spigotConfig.mineshaftSeed;
-+            } else if (type instanceof net.minecraft.world.level.levelgen.structure.structures.BuriedTreasureStructure) {
-+                return serverLevel.spigotConfig.buriedTreasureSeed;
-+            }
-+        }
-+        return null;
-+    }
-+    // Paper end - add missing structure seed configs
-+
-     public StructureCheckResult checkStart(ChunkPos pos, Structure type, StructurePlacement placement, boolean skipReferencedStructures) {
-         long l = pos.toLong();
-         Object2IntMap<Structure> object2IntMap = this.loadedChunks.get(l);
-@@ -0,0 +0,0 @@ public class StructureCheck {
-             StructureCheckResult structureCheckResult = this.tryLoadFromStorage(pos, type, skipReferencedStructures, l);
-             if (structureCheckResult != null) {
-                 return structureCheckResult;
-            } else if (!placement.applyAdditionalChunkRestrictions(pos.x, pos.z, this.seed)) {
-+            } else if (!placement.applyAdditionalChunkRestrictions(pos.x, pos.z, this.seed, this.getSaltOverride(type))) { // Paper - add missing structure seed configs
-                 return StructureCheckResult.START_NOT_PRESENT;
-             } else {
-                 boolean bl = this.featureChecks
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-@@ -0,0 +0,0 @@ public abstract class StructurePlacement {
-         return this.exclusionZone;
-     }
- 
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - Add missing structure set seed configs
-     public boolean isStructureChunk(ChunkGeneratorStructureState calculator, int chunkX, int chunkZ) {
-+        // Paper start - Add missing structure set seed configs
-+        return this.isStructureChunk(calculator, chunkX, chunkZ, null);
-+    }
-+    public boolean isStructureChunk(ChunkGeneratorStructureState calculator, int chunkX, int chunkZ, @org.jetbrains.annotations.Nullable net.minecraft.resources.ResourceKey<StructureSet> structureSetKey) {
-+        Integer saltOverride = null;
-+        if (structureSetKey != null) {
-+            if (structureSetKey == net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.MINESHAFTS) {
-+                saltOverride = calculator.conf.mineshaftSeed;
-+            } else if (structureSetKey == net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.BURIED_TREASURES) {
-+                saltOverride = calculator.conf.buriedTreasureSeed;
-+            }
-+        }
-+        // Paper end - Add missing structure set seed configs
-         return this.isPlacementChunk(calculator, chunkX, chunkZ)
-            && this.applyAdditionalChunkRestrictions(chunkX, chunkZ, calculator.getLevelSeed())
-+            && this.applyAdditionalChunkRestrictions(chunkX, chunkZ, calculator.getLevelSeed(), saltOverride) // Paper - Add missing structure set seed configs
-             && this.applyInteractionsWithOtherStructures(calculator, chunkX, chunkZ);
-     }
- 
-    public boolean applyAdditionalChunkRestrictions(int chunkX, int chunkZ, long seed) {
-        return !(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency);
-+    // Paper start - Add missing structure set seed configs
-+    public boolean applyAdditionalChunkRestrictions(int chunkX, int chunkZ, long seed, @org.jetbrains.annotations.Nullable Integer saltOverride) {
-+        return !(this.frequency < 1.0F) || this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency, saltOverride);
-+        // Paper end - Add missing structure set seed configs
-     }
- 
-     public boolean applyInteractionsWithOtherStructures(ChunkGeneratorStructureState calculator, int centerChunkX, int centerChunkZ) {
-@@ -0,0 +0,0 @@ public abstract class StructurePlacement {
- 
-     public abstract StructurePlacementType<?> type();
- 
-    private static boolean probabilityReducer(long seed, int salt, int chunkX, int chunkZ, float frequency) {
-+    private static boolean probabilityReducer(long seed, int salt, int chunkX, int chunkZ, float frequency, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs; ignore here
-         WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-         worldgenRandom.setLargeFeatureWithSalt(seed, salt, chunkX, chunkZ);
-         return worldgenRandom.nextFloat() < frequency;
-     }
- 
-    private static boolean legacyProbabilityReducerWithDouble(long seed, int salt, int chunkX, int chunkZ, float frequency) {
-+    private static boolean legacyProbabilityReducerWithDouble(long seed, int salt, int chunkX, int chunkZ, float frequency, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs
-         WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-+        if (saltOverride == null) { // Paper - Add missing structure set seed configs
-         worldgenRandom.setLargeFeatureSeed(seed, chunkX, chunkZ);
-+        // Paper start - Add missing structure set seed configs
-+        } else {
-+            worldgenRandom.setLargeFeatureWithSalt(seed, chunkX, chunkZ, saltOverride);
-+        }
-+        // Paper end - Add missing structure set seed configs
-         return worldgenRandom.nextDouble() < (double)frequency;
-     }
- 
-    private static boolean legacyArbitrarySaltProbabilityReducer(long seed, int salt, int chunkX, int chunkZ, float frequency) {
-+    private static boolean legacyArbitrarySaltProbabilityReducer(long seed, int salt, int chunkX, int chunkZ, float frequency, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs
-         WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-        worldgenRandom.setLargeFeatureWithSalt(seed, chunkX, chunkZ, 10387320);
-+        worldgenRandom.setLargeFeatureWithSalt(seed, chunkX, chunkZ, saltOverride != null ? saltOverride : HIGHLY_ARBITRARY_RANDOM_SALT); // Paper - Add missing structure set seed configs
-         return worldgenRandom.nextFloat() < frequency;
-     }
- 
-    private static boolean legacyPillagerOutpostReducer(long seed, int salt, int chunkX, int chunkZ, float frequency) {
-+    private static boolean legacyPillagerOutpostReducer(long seed, int salt, int chunkX, int chunkZ, float frequency, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs; ignore here
-         int i = chunkX >> 4;
-         int j = chunkZ >> 4;
-         WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-@@ -0,0 +0,0 @@ public abstract class StructurePlacement {
- 
-     @FunctionalInterface
-     public interface FrequencyReducer {
-        boolean shouldGenerate(long seed, int salt, int chunkX, int chunkZ, float chance);
-+        boolean shouldGenerate(long seed, int salt, int chunkX, int chunkZ, float chance, @org.jetbrains.annotations.Nullable Integer saltOverride); // Paper - Add missing structure set seed configs
-     }
- 
-     public static enum FrequencyReductionMethod implements StringRepresentable {
-@@ -0,0 +0,0 @@ public abstract class StructurePlacement {
-             this.reducer = generationPredicate;
-         }
- 
-        public boolean shouldGenerate(long seed, int salt, int chunkX, int chunkZ, float chance) {
-            return this.reducer.shouldGenerate(seed, salt, chunkX, chunkZ, chance);
-+        public boolean shouldGenerate(long seed, int salt, int chunkX, int chunkZ, float chance, @org.jetbrains.annotations.Nullable Integer saltOverride) { // Paper - Add missing structure set seed configs
-+            return this.reducer.shouldGenerate(seed, salt, chunkX, chunkZ, chance, saltOverride); // Paper - Add missing structure set seed configs
-         }
- 
-         @Override
-diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -0,0 +0,0 @@ public class SpigotWorldConfig
-     public int mansionSeed;
-     public int fossilSeed;
-     public int portalSeed;
-+    // Paper start - add missing structure set configs
-+    public int ancientCitySeed;
-+    public int trailRuinsSeed;
-+    public int trialChambersSeed;
-+    public int buriedTreasureSeed;
-+    public Integer mineshaftSeed;
-+    public Long strongholdSeed;
-+    private <N extends Number> N getSeed(String path, java.util.function.Function<String, N> toNumberFunc) {
-+        final String value = this.getString(path, "default");
-+        return org.apache.commons.lang3.math.NumberUtils.isParsable(value) ? toNumberFunc.apply(value) : null;
-+    }
-+    // Paper end
-     private void initWorldGenSeeds()
-     {
-         this.villageSeed = this.getInt( "seed-village", 10387312 );
-@@ -0,0 +0,0 @@ public class SpigotWorldConfig
-         this.mansionSeed = this.getInt( "seed-mansion", 10387319 );
-         this.fossilSeed = this.getInt( "seed-fossil", 14357921 );
-         this.portalSeed = this.getInt( "seed-portal", 34222645 );
-+        // Paper start - add missing structure set configs
-+        this.ancientCitySeed = this.getInt("seed-ancientcity", 20083232);
-+        this.trailRuinsSeed = this.getInt("seed-trailruins", 83469867);
-+        this.trialChambersSeed = this.getInt("seed-trialchambers", 94251327);
-+        this.buriedTreasureSeed = this.getInt("seed-buriedtreasure", 10387320); // StructurePlacement#HIGHLY_ARBITRARY_RANDOM_SALT
-+        this.mineshaftSeed = this.getSeed("seed-mineshaft", Integer::parseInt);
-+        this.strongholdSeed = this.getSeed("seed-stronghold", Long::parseLong);
-+        // Paper end
-         this.log( "Custom Map Seeds:  Village: " + this.villageSeed + " Desert: " + this.desertSeed + " Igloo: " + this.iglooSeed + " Jungle: " + this.jungleSeed + " Swamp: " + this.swampSeed + " Monument: " + this.monumentSeed
-                 + " Ocean: " + this.oceanSeed + " Shipwreck: " + this.shipwreckSeed + " End City: " + this.endCitySeed + " Slime: " + this.slimeSeed + " Nether: " + this.netherSeed + " Mansion: " + this.mansionSeed + " Fossil: " + this.fossilSeed + " Portal: " + this.portalSeed );
-     }
-diff --git a/src/test/java/io/papermc/paper/world/structure/StructureSeedConfigTest.java b/src/test/java/io/papermc/paper/world/structure/StructureSeedConfigTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/world/structure/StructureSeedConfigTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.world.structure;
-+
-+import io.papermc.paper.configuration.PaperConfigurations;
-+import java.io.File;
-+import java.lang.reflect.Field;
-+import net.minecraft.core.Registry;
-+import net.minecraft.core.registries.Registries;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.world.level.levelgen.structure.BuiltinStructureSets;
-+import net.minecraft.world.level.levelgen.structure.StructureSet;
-+import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement;
-+import org.bukkit.configuration.file.YamlConfiguration;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.jetbrains.annotations.NotNull;
-+import org.junit.jupiter.api.Test;
-+import org.spigotmc.SpigotConfig;
-+import org.spigotmc.SpigotWorldConfig;
-+
-+import static org.junit.jupiter.api.Assertions.assertEquals;
-+
-+public class StructureSeedConfigTest extends AbstractTestingBase {
-+
-+    @Test
-+    public void checkStructureSeedDefaults() throws ReflectiveOperationException {
-+        SpigotConfig.config = new YamlConfiguration() {
-+            @Override
-+            public void save(final @NotNull File file) {
-+                // no-op
-+            }
-+        };
-+        final SpigotWorldConfig config = PaperConfigurations.SPIGOT_WORLD_DEFAULTS.get();
-+
-+
-+        final Registry<StructureSet> structureSets = AbstractTestingBase.REGISTRY_CUSTOM.registryOrThrow(Registries.STRUCTURE_SET);
-+        for (final ResourceKey<StructureSet> setKey : structureSets.registryKeySet()) {
-+            assertEquals(ResourceLocation.DEFAULT_NAMESPACE, setKey.location().getNamespace());
-+            final StructureSet set = structureSets.getOrThrow(setKey);
-+            if (setKey == BuiltinStructureSets.STRONGHOLDS) { // special case due to seed matching world seed
-+                assertEquals(0, set.placement().salt);
-+                continue;
-+            }
-+            int salt = switch (setKey.location().getPath()) {
-+                case "villages" -> config.villageSeed;
-+                case "desert_pyramids" -> config.desertSeed;
-+                case "igloos" -> config.iglooSeed;
-+                case "jungle_temples" -> config.jungleSeed;
-+                case "swamp_huts" -> config.swampSeed;
-+                case "pillager_outposts" -> config.outpostSeed;
-+                case "ocean_monuments" -> config.monumentSeed;
-+                case "woodland_mansions" -> config.mansionSeed;
-+                case "buried_treasures" -> config.buriedTreasureSeed;
-+                case "mineshafts" -> config.mineshaftSeed == null ? 0 : config.mineshaftSeed; // mineshaft seed is set differently
-+                case "ruined_portals" -> config.portalSeed;
-+                case "shipwrecks" -> config.shipwreckSeed;
-+                case "ocean_ruins" -> config.oceanSeed;
-+                case "nether_complexes" -> config.netherSeed;
-+                case "nether_fossils" -> config.fossilSeed;
-+                case "end_cities" -> config.endCitySeed;
-+                case "ancient_cities" -> config.ancientCitySeed;
-+                case "trail_ruins" -> config.trailRuinsSeed;
-+                case "trial_chambers" -> config.trialChambersSeed;
-+                default -> throw new AssertionError("Missing structure set seed in SpigotWorldConfig for " + setKey);
-+            };
-+            if (setKey == BuiltinStructureSets.BURIED_TREASURES) {
-+                final Field field = StructurePlacement.class.getDeclaredField("HIGHLY_ARBITRARY_RANDOM_SALT");
-+                field.trySetAccessible();
-+                assertEquals(0, set.placement().salt);
-+                assertEquals(field.get(null), salt, "Mismatched default seed for " + setKey + ". Should be " + field.get(null));
-+                continue;
-+            }
-+            assertEquals(set.placement().salt, salt, "Mismatched default seed for " + setKey + ". Should be " + set.placement().salt);
-+        }
-+    }
-+}
--- a/patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 12 Jun 2022 11:47:24 -0700
-Subject: [PATCH] Add option for strict advancement dimension checks
-
-Craftbukkit attempts to translate worlds that use the
-same generation as the Overworld, The Nether, or The End
-to use those dimensions when checking the `changed_dimension`
-criteria trigger, or whether to trigger the `NETHER_TRAVEL`
-distance trigger. This adds a config option to ignore that
-and use the exact dimension key of the worlds involved.
-
-diff --git a/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java b/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
-+++ b/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
-@@ -0,0 +0,0 @@ public record LocationPredicate(
-     public boolean matches(ServerLevel world, double x, double y, double z) {
-         if (this.position.isPresent() && !this.position.get().matches(x, y, z)) {
-             return false;
-        } else if (this.dimension.isPresent() && this.dimension.get() != world.dimension()) {
-+        } else if (this.dimension.isPresent() && this.dimension.get() != (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck ? world.dimension() : org.bukkit.craftbukkit.util.CraftDimensionUtil.getMainDimensionKey(world))) { // Paper - Add option for strict advancement dimension checks
-             return false;
-         } else {
-             BlockPos blockPos = BlockPos.containing(x, y, z);
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
-         ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
-         ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level());
- 
-+        // Paper start - Add option for strict advancement dimension checks
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck) {
-+            maindimensionkey = resourcekey;
-+            maindimensionkey1 = resourcekey1;
-+        }
-+        // Paper end - Add option for strict advancement dimension checks
-         CriteriaTriggers.CHANGED_DIMENSION.trigger(this, maindimensionkey, maindimensionkey1);
-         if (maindimensionkey != resourcekey || maindimensionkey1 != resourcekey1) {
-             CriteriaTriggers.CHANGED_DIMENSION.trigger(this, resourcekey, resourcekey1);
--- a/patches/unapplied/server/Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/Add-paper-dumplisteners-command.patch
@@ -1,197 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
-Date: Tue, 25 Oct 2022 21:15:37 +0200
-Subject: [PATCH] Add /paper dumplisteners command
-
-Co-authored-by: TwoLeggedCat <80929284+TwoLeggedCat@users.noreply.github.com>
-
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/command/PaperCommand.java
-+++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -0,0 +0,0 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
-         commands.put(Set.of("dumpitem"), new DumpItemCommand());
-         commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
-+        commands.put(Set.of("dumplisteners"), new DumpListenersCommand());
- 
-         return commands.entrySet().stream()
-             .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java b/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.PrintWriter;
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.reflect.Field;
-+import java.time.LocalDateTime;
-+import java.time.format.DateTimeFormatter;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Set;
-+import net.kyori.adventure.text.Component;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.plugin.Plugin;
-+import org.bukkit.plugin.RegisteredListener;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.newline;
-+import static net.kyori.adventure.text.Component.space;
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class DumpListenersCommand implements PaperSubcommand {
-+    private static final MethodHandle EVENT_TYPES_HANDLE;
-+
-+    static {
-+        try {
-+            final Field eventTypesField = HandlerList.class.getDeclaredField("EVENT_TYPES");
-+            eventTypesField.setAccessible(true);
-+            EVENT_TYPES_HANDLE = MethodHandles.lookup().unreflectGetter(eventTypesField);
-+        } catch (final ReflectiveOperationException e) {
-+            throw new RuntimeException(e);
-+        }
-+    }
-+
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        if (args.length >= 1 && args[0].equals("tofile")) {
-+            this.dumpToFile(sender);
-+            return true;
-+        }
-+        this.doDumpListeners(sender, args);
-+        return true;
-+    }
-+
-+    private void dumpToFile(final CommandSender sender) {
-+        final File file = new File("debug/listeners-"
-+            + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
-+        file.getParentFile().mkdirs();
-+        try (final PrintWriter writer = new PrintWriter(file)) {
-+            for (final String eventClass : eventClassNames()) {
-+                final HandlerList handlers;
-+                try {
-+                    handlers = (HandlerList) findClass(eventClass).getMethod("getHandlerList").invoke(null);
-+                } catch (final ReflectiveOperationException e) {
-+                    continue;
-+                }
-+                if (handlers.getRegisteredListeners().length != 0) {
-+                    writer.println(eventClass);
-+                }
-+                for (final RegisteredListener registeredListener : handlers.getRegisteredListeners()) {
-+                    writer.println(" - " + registeredListener);
-+                }
-+            }
-+        } catch (final IOException ex) {
-+            throw new RuntimeException(ex);
-+        }
-+        sender.sendMessage(text("Dumped listeners to " + file, GREEN));
-+    }
-+
-+    private void doDumpListeners(final CommandSender sender, final String[] args) {
-+        if (args.length == 0) {
-+            sender.sendMessage(text("Usage: /paper dumplisteners tofile|<className>", RED));
-+            return;
-+        }
-+
-+        try {
-+            final HandlerList handlers = (HandlerList) findClass(args[0]).getMethod("getHandlerList").invoke(null);
-+
-+            if (handlers.getRegisteredListeners().length == 0) {
-+                sender.sendMessage(text(args[0] + " does not have any registered listeners."));
-+                return;
-+            }
-+
-+            sender.sendMessage(text("Listeners for " + args[0] + ":"));
-+
-+            for (final RegisteredListener listener : handlers.getRegisteredListeners()) {
-+                final Component hoverText = text("Priority: " + listener.getPriority().name() + " (" + listener.getPriority().getSlot() + ")", WHITE)
-+                    .append(newline())
-+                    .append(text("Listener: " + listener.getListener()))
-+                    .append(newline())
-+                    .append(text("Executor: " + listener.getExecutor()))
-+                    .append(newline())
-+                    .append(text("Ignoring cancelled: " + listener.isIgnoringCancelled()));
-+
-+                sender.sendMessage(text(listener.getPlugin().getName(), GREEN)
-+                    .append(space())
-+                    .append(text("(" + listener.getListener().getClass().getName() + ")", GRAY).hoverEvent(hoverText)));
-+            }
-+
-+            sender.sendMessage(text("Total listeners: " + handlers.getRegisteredListeners().length));
-+
-+        } catch (final ClassNotFoundException e) {
-+            sender.sendMessage(text("Unable to find a class named '" + args[0] + "'. Make sure to use the fully qualified name.", RED));
-+        } catch (final NoSuchMethodException e) {
-+            sender.sendMessage(text("Class '" + args[0] + "' does not have a valid getHandlerList method.", RED));
-+        } catch (final ReflectiveOperationException e) {
-+            sender.sendMessage(text("Something went wrong, see the console for more details.", RED));
-+            MinecraftServer.LOGGER.warn("Error occurred while dumping listeners for class " + args[0], e);
-+        }
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        return switch (args.length) {
-+            case 0 -> suggestions();
-+            case 1 -> suggestions().stream()
-+                .filter(clazz -> clazz.toLowerCase(Locale.ROOT).contains(args[0].toLowerCase(Locale.ROOT)))
-+                .toList();
-+            default -> Collections.emptyList();
-+        };
-+    }
-+
-+    private static List<String> suggestions() {
-+        final List<String> ret = new ArrayList<>();
-+        ret.add("tofile");
-+        ret.addAll(eventClassNames());
-+        return ret;
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    private static Set<String> eventClassNames() {
-+        try {
-+            return (Set<String>) EVENT_TYPES_HANDLE.invokeExact();
-+        } catch (final Throwable e) {
-+            SneakyThrow.sneaky(e);
-+            return Collections.emptySet(); // Unreachable
-+        }
-+    }
-+
-+    private static Class<?> findClass(final String className) throws ClassNotFoundException {
-+        try {
-+            return Class.forName(className);
-+        } catch (final ClassNotFoundException ignore) {
-+            for (final Plugin plugin : Bukkit.getServer().getPluginManager().getPlugins()) {
-+                if (!plugin.isEnabled()) {
-+                    continue;
-+                }
-+
-+                try {
-+                    return Class.forName(className, false, plugin.getClass().getClassLoader());
-+                } catch (final ClassNotFoundException ignore0) {
-+                }
-+            }
-+        }
-+        throw new ClassNotFoundException(className);
-+    }
-+}
--- a/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: PanSzelescik <panszelescik@gmail.com>
-Date: Thu, 7 Apr 2022 16:13:39 +0200
-Subject: [PATCH] Add support for Proxy Protocol
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -0,0 +0,0 @@ dependencies {
-     log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
-     runtimeOnly(log4jPlugins.output)
-     alsoShade(log4jPlugins.output)
-+    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
-     // Paper end
-     implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm-commons:9.7")
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-                     Connection object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND); // CraftBukkit - decompile error
- 
-                     //ServerConnectionListener.this.connections.add(object); // Paper
-+                    // Paper start - Add support for Proxy Protocol
-+                    if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.proxyProtocol) {
-+                        channel.pipeline().addAfter("timeout", "haproxy-decoder", new io.netty.handler.codec.haproxy.HAProxyMessageDecoder());
-+                        channel.pipeline().addAfter("haproxy-decoder", "haproxy-handler", new ChannelInboundHandlerAdapter() {
-+                            @Override
-+                            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-+                                if (msg instanceof io.netty.handler.codec.haproxy.HAProxyMessage message) {
-+                                    if (message.command() == io.netty.handler.codec.haproxy.HAProxyCommand.PROXY) {
-+                                        String realaddress = message.sourceAddress();
-+                                        int realport = message.sourcePort();
-+
-+                                        SocketAddress socketaddr = new java.net.InetSocketAddress(realaddress, realport);
-+
-+                                        Connection connection = (Connection) channel.pipeline().get("packet_handler");
-+                                        connection.address = socketaddr;
-+                                    }
-+                                } else {
-+                                    super.channelRead(ctx, msg);
-+                                }
-+                            }
-+                        });
-+                    }
-+                    // Paper end - Add support for proxy protocol
-                     pending.add(object); // Paper - prevent blocking on adding a new connection while the server is ticking
-                     ((Connection) object).configurePacketHandler(channelpipeline);
-                     ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
--- a/patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 20 Jul 2021 21:35:47 -0700
-Subject: [PATCH] Add various missing EntityDropItemEvent calls
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
- 
-             entityitem.setDefaultPickUpDelay();
-+            // Paper start - Call EntityDropItemEvent
-+            return this.spawnAtLocation(entityitem);
-+        }
-+    }
-+    @Nullable
-+    public ItemEntity spawnAtLocation(ItemEntity entityitem) {
-+        {
-+            // Paper end - Call EntityDropItemEvent
-             // CraftBukkit start
-             EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
-             Bukkit.getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -0,0 +0,0 @@ public class Dolphin extends WaterAnimal {
-                 float f2 = 0.02F * Dolphin.this.random.nextFloat();
- 
-                 entityitem.setDeltaMovement((double) (0.3F * -Mth.sin(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.cos(f1) * f2), (double) (0.3F * Mth.sin(Dolphin.this.getXRot() * 0.017453292F) * 1.5F), (double) (0.3F * Mth.cos(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.sin(f1) * f2));
-                Dolphin.this.level().addFreshEntity(entityitem);
-+                Dolphin.this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
-             }
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -0,0 +0,0 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
-             entityitem.setPickUpDelay(40);
-             entityitem.setThrower(this);
-             this.playSound(SoundEvents.FOX_SPIT, 1.0F, 1.0F);
-            this.level().addFreshEntity(entityitem);
-+            this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
-         }
-     }
- 
-     private void dropItemStack(ItemStack stack) {
-         ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), stack);
- 
-        this.level().addFreshEntity(entityitem);
-+        this.spawnAtLocation(entityitem); // Paper - Call EntityDropItemEvent
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -0,0 +0,0 @@ public class Goat extends Animal {
-             double d2 = (double) Mth.randomBetween(this.random, -0.2F, 0.2F);
-             ItemEntity entityitem = new ItemEntity(this.level(), vec3d.x(), vec3d.y(), vec3d.z(), itemstack, d0, d1, d2);
- 
-            this.level().addFreshEntity(entityitem);
-            return true;
-+            return this.spawnAtLocation(entityitem) != null; // Paper - Call EntityDropItemEvent
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -0,0 +0,0 @@ public class Sniffer extends Animal {
- 
-         entityitem.setDefaultPickUpDelay();
-         this.finalizeSpawnChildFromBreeding(world, other, (AgeableMob) null);
-+        if (this.spawnAtLocation(entityitem) != null) { // Paper - Call EntityDropItemEvent
-         this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
-        world.addFreshEntity(entityitem);
-+        } // Paper - Call EntityDropItemEvent
-     }
- 
-     @Override
--- a/patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nex <nex@bits.team>
-Date: Thu, 24 Feb 2022 16:28:07 +0100
-Subject: [PATCH] Added byte array serialization/deserialization for
- PersistentDataContainers
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-@@ -0,0 +0,0 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
-         this.customDataTags.clear();
-     }
-     // Paper end
-+
-+    // Paper start - byte array serialization
-+    @Override
-+    public byte[] serializeToBytes() throws java.io.IOException {
-+        final net.minecraft.nbt.CompoundTag root = this.toTagCompound();
-+        final java.io.ByteArrayOutputStream byteArrayOutput = new java.io.ByteArrayOutputStream();
-+        try (final java.io.DataOutputStream dataOutput = new java.io.DataOutputStream(byteArrayOutput)) {
-+            net.minecraft.nbt.NbtIo.write(root, dataOutput);
-+            return byteArrayOutput.toByteArray();
-+        }
-+    }
-+
-+    @Override
-+    public void readFromBytes(final byte[] bytes, final boolean clear) throws java.io.IOException {
-+        if (clear) {
-+            this.clear();
-+        }
-+        try (final java.io.DataInputStream dataInput = new java.io.DataInputStream(new java.io.ByteArrayInputStream(bytes))) {
-+            final net.minecraft.nbt.CompoundTag compound = net.minecraft.nbt.NbtIo.read(dataInput);
-+            this.putAll(compound);
-+        }
-+    }
-+    // Paper end - byte array serialization
- }
--- a/patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch
+++ b/patches/unapplied/server/Allow-changing-bed-s-occupied-property.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Wed, 12 Oct 2022 00:36:55 +0300
-Subject: [PATCH] Allow changing bed's 'occupied' property
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-@@ -0,0 +0,0 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
-     public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
-         return this.getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
-     }
-+
-+    // Paper start
-+    @Override
-+    public void setOccupied(boolean occupied) {
-+        set(CraftBed.OCCUPIED, occupied);
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch
@@ -1,151 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Doc <nachito94@msn.com>
-Date: Sun, 3 Apr 2022 11:31:42 -0400
-Subject: [PATCH] Allow changing the EnderDragon podium
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
-     private final int[] nodeAdjacency;
-     private final BinaryHeap openSet;
-     private final Explosion explosionSource; // CraftBukkit - reusable source for CraftTNTPrimed.getSource()
-+    // Paper start - Allow changing the EnderDragon podium
-+    @Nullable
-+    private BlockPos podium;
-+    // Paper end - Allow changing the EnderDragon podium
- 
-     public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
-         super(EntityType.ENDER_DRAGON, world);
-@@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
-         return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
-     }
- 
-+    // Paper start - Allow changing the EnderDragon podium
-+    public BlockPos getPodium() {
-+        if (this.podium == null) {
-+            return EndPodiumFeature.getLocation(this.getFightOrigin());
-+        }
-+        return this.podium;
-+    }
-+
-+    public void setPodium(@Nullable BlockPos blockPos) {
-+        this.podium = blockPos;
-+    }
-+    // Paper end - Allow changing the EnderDragon podium
-+
-     @Override
-     public boolean isFlapping() {
-         float f = Mth.cos(this.flapTime * 6.2831855F);
-@@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
-                 d0 = segment2[1] - segment1[1];
-             }
-         } else {
-            BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.fightOrigin));
-+            BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - Allow changing the EnderDragon podium
-             double d1 = Math.max(Math.sqrt(blockposition.distToCenterSqr(this.position())) / 4.0D, 1.0D);
- 
-             d0 = (double) segmentOffset / d1;
-@@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
-                 vec3d = this.getViewVector(tickDelta);
-             }
-         } else {
-            BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.fightOrigin));
-+            BlockPos blockposition = this.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.getPodium()); // Paper - Allow changing the EnderDragon podium
- 
-             f1 = Math.max((float) Math.sqrt(blockposition.distToCenterSqr(this.position())) / 4.0F, 1.0F);
-             float f3 = 6.0F / f1;
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.java
-@@ -0,0 +0,0 @@ public class DragonDeathPhase extends AbstractDragonPhaseInstance {
-         if (this.targetLocation == null) {
-             BlockPos blockPos = this.dragon
-                 .level()
-                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
-             this.targetLocation = Vec3.atBottomCenterOf(blockPos);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.java
-@@ -0,0 +0,0 @@ public class DragonHoldingPatternPhase extends AbstractDragonPhaseInstance {
-         if (this.currentPath != null && this.currentPath.isDone()) {
-             BlockPos blockPos = this.dragon
-                 .level()
-                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(EndPodiumFeature.getLocation(this.dragon.getFightOrigin())));
-+                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, new BlockPos(this.dragon.getPodium())); // Paper - Allow changing the EnderDragon podium
-             int i = this.dragon.getDragonFight() == null ? 0 : this.dragon.getDragonFight().getCrystalsAlive();
-             if (this.dragon.getRandom().nextInt(i + 3) == 0) {
-                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.LANDING_APPROACH);
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.java
-@@ -0,0 +0,0 @@ public class DragonLandingApproachPhase extends AbstractDragonPhaseInstance {
-             int i = this.dragon.findClosestNode();
-             BlockPos blockPos = this.dragon
-                 .level()
-                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
-             Player player = this.dragon
-                 .level()
-                 .getNearestPlayer(NEAR_EGG_TARGETING, this.dragon, (double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.java
-@@ -0,0 +0,0 @@ public class DragonLandingPhase extends AbstractDragonPhaseInstance {
-     public void doServerTick() {
-         if (this.targetLocation == null) {
-             this.targetLocation = Vec3.atBottomCenterOf(
-                this.dragon.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()))
-+                this.dragon.level().getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()) // Paper - Allow changing the EnderDragon podium
-             );
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.java
-@@ -0,0 +0,0 @@ public class DragonTakeoffPhase extends AbstractDragonPhaseInstance {
-         if (!this.firstTick && this.currentPath != null) {
-             BlockPos blockPos = this.dragon
-                 .level()
-                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+                .getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
-             if (!blockPos.closerToCenterThan(this.dragon.position(), 10.0)) {
-                 this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
-@@ -0,0 +0,0 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
-     public int getDeathAnimationTicks() {
-         return this.getHandle().dragonDeathTime;
-     }
-+
-+    // Paper start - Allow changing the EnderDragon podium
-+    @Override
-+    public org.bukkit.Location getPodium() {
-+        net.minecraft.core.BlockPos blockPosOrigin = this.getHandle().getPodium();
-+        return new org.bukkit.Location(getWorld(), blockPosOrigin.getX(), blockPosOrigin.getY(), blockPosOrigin.getZ());
-+    }
-+
-+    @Override
-+    public void setPodium(org.bukkit.Location location) {
-+        if (location == null) {
-+            this.getHandle().setPodium(null);
-+        } else {
-+            org.apache.commons.lang.Validate.isTrue(location.getWorld() == null || location.getWorld().equals(getWorld()), "You cannot set a podium in a different world to where the dragon is");
-+            this.getHandle().setPodium(io.papermc.paper.util.MCUtil.toBlockPos(location));
-+        }
-+    }
-+    // Paper end - Allow changing the EnderDragon podium
- }
--- a/patches/unapplied/server/Block-Ticking-API.patch
+++ b/patches/unapplied/server/Block-Ticking-API.patch
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 26 Dec 2021 13:23:46 -0500
-Subject: [PATCH] Block Ticking API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-         return this.world.getBlockState(this.position);
-     }
- 
-+    // Paper start
-+    public net.minecraft.world.level.material.FluidState getNMSFluid() {
-+        return this.world.getFluidState(this.position);
-+    }
-+    // Paper end
-+
-     public BlockPos getPosition() {
-         return this.position;
-     }
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-     public boolean isValidTool(ItemStack itemStack) {
-         return getDrops(itemStack).size() != 0;
-     }
-+
-+    @Override
-+    public void tick() {
-+        final ServerLevel level = this.world.getMinecraftWorld();
-+        this.getNMS().tick(level, this.position, level.random);
-+    }
-+
-+
-+    @Override
-+    public void fluidTick() {
-+        this.getNMSFluid().tick(this.world.getMinecraftWorld(), this.position);
-+    }
-+
-+    @Override
-+    public void randomTick() {
-+        final ServerLevel level = this.world.getMinecraftWorld();
-+        this.getNMS().randomTick(level, this.position, level.random);
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -0,0 +0,0 @@ public class CraftBlockData implements BlockData {
-         return speed;
-     }
-     // Paper end - destroy speed API
-+
-+    // Paper start - Block tick API
-+    @Override
-+    public boolean isRandomlyTicked() {
-+        return this.state.isRandomlyTicking();
-+    }
-+    // Paper end - Block tick API
- }
--- a/patches/unapplied/server/Bucketable-API.patch
+++ b/patches/unapplied/server/Bucketable-API.patch
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 26 Dec 2021 14:03:17 -0500
-Subject: [PATCH] Bucketable API
-
-
-diff --git a/src/main/java/io/papermc/paper/entity/PaperBucketable.java b/src/main/java/io/papermc/paper/entity/PaperBucketable.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/entity/PaperBucketable.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.entity;
-+
-+import org.bukkit.Sound;
-+import org.bukkit.craftbukkit.CraftSound;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.inventory.ItemStack;
-+
-+public interface PaperBucketable extends Bucketable {
-+
-+    net.minecraft.world.entity.animal.Bucketable getHandle();
-+
-+    @Override
-+    default boolean isFromBucket() {
-+        return this.getHandle().fromBucket();
-+    }
-+
-+    @Override
-+    default void setFromBucket(boolean fromBucket) {
-+        this.getHandle().setFromBucket(fromBucket);
-+    }
-+
-+    @Override
-+    default ItemStack getBaseBucketItem() {
-+        return CraftItemStack.asBukkitCopy(this.getHandle().getBucketItemStack());
-+    }
-+
-+    @Override
-+    default Sound getPickupSound() {
-+        return CraftSound.minecraftToBukkit(this.getHandle().getPickupSound());
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
-@@ -0,0 +0,0 @@ import com.google.common.base.Preconditions;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Axolotl;
- 
-public class CraftAxolotl extends CraftAnimals implements Axolotl {
-+public class CraftAxolotl extends CraftAnimals implements Axolotl, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API
- 
-     public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolotl.Axolotl entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.entity.animal.AbstractFish;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Fish;
- 
-public class CraftFish extends CraftWaterMob implements Fish {
-+public class CraftFish extends CraftWaterMob implements Fish, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API
- 
-     public CraftFish(CraftServer server, AbstractFish entity) {
-         super(server, entity);
--- a/patches/unapplied/server/Buffer-OOB-setBlock-calls.patch
+++ b/patches/unapplied/server/Buffer-OOB-setBlock-calls.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 19 Mar 2022 12:12:22 +0000
-Subject: [PATCH] Buffer OOB setBlock calls
-
-lets debug mode throw a trace in order to potentially see where
-such calls are cascading from easier, but, generally, if you see one setBlock
-call, you're gonna see more, and this just potentially causes a flood of logs
-which can cause issues for slower terminals, etc.
-
-We can limit the flood by just allowing one for a single gen region,
-we'll also only gen a trace for the first one, I see no real pressing need
-to generate more, given that that would *massively* negate this patch otherwise
-
-diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-+++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -0,0 +0,0 @@ public class WorldGenRegion implements WorldGenLevel {
-         }
-     }
- 
-+    private boolean hasSetFarWarned = false; // Paper - Buffer OOB setBlock calls
-     @Override
-     public boolean ensureCanWrite(BlockPos pos) {
-         int i = SectionPos.blockToSectionCoord(pos.getX());
-@@ -0,0 +0,0 @@ public class WorldGenRegion implements WorldGenLevel {
- 
-             return true;
-         } else {
-+            // Paper start - Buffer OOB setBlock calls
-+            if (!hasSetFarWarned) {
-             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStatus) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
-+                hasSetFarWarned = true;
-+                if (this.getServer() != null && this.getServer().isDebugging()) {
-+                    io.papermc.paper.util.TraceUtil.dumpTraceForThread("far setBlock call");
-+                }
-+            }
-+            // Paper end - Buffer OOB setBlock calls
-             return false;
-         }
-     }
--- a/patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/Call-BlockPhysicsEvent-more-often.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sun, 7 Aug 2022 22:16:36 +0200
-Subject: [PATCH] Call BlockPhysicsEvent more often
-
-
-diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-@@ -0,0 +0,0 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
-         public boolean runNext(Level world) {
-             BlockPos blockPos = this.sourcePos.relative(NeighborUpdater.UPDATE_ORDER[this.idx++]);
-             BlockState blockState = world.getBlockState(blockPos);
-            NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
-+            // Paper start - Call BlockPhysicsEvent
-+            try {
-+                org.bukkit.event.block.BlockPhysicsEvent event = new org.bukkit.event.block.BlockPhysicsEvent(
-+                    org.bukkit.craftbukkit.block.CraftBlock.at(world, blockPos),
-+                    org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState),
-+                    org.bukkit.craftbukkit.block.CraftBlock.at(world, this.sourcePos));
-+
-+                if (event.callEvent()) { // continue to check for adjacent block (increase idx)
-+                    NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
-+                }
-+            } catch (StackOverflowError ex) {
-+                world.lastPhysicsProblem = blockPos;
-+            }
-+            // Paper end - Call BlockPhysicsEvent
-             if (this.idx < NeighborUpdater.UPDATE_ORDER.length && NeighborUpdater.UPDATE_ORDER[this.idx] == this.skipDirection) {
-                 this.idx++;
-             }
--- a/patches/unapplied/server/Collision-API.patch
+++ b/patches/unapplied/server/Collision-API.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Wed, 6 Oct 2021 20:10:44 -0400
-Subject: [PATCH] Collision API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
- 
-         return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, net.minecraft.world.phys.shapes.CollisionContext.empty())).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
-     }
-+
-+    @Override
-+    public boolean hasCollisionsIn(@org.jetbrains.annotations.NotNull org.bukkit.util.BoundingBox boundingBox) {
-+        net.minecraft.world.phys.AABB aabb = new net.minecraft.world.phys.AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
-+
-+        return !this.getHandle().noCollision(aabb);
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.getHandle().noPhysics;
-     }
-     // Paper end - missing entity api
-+
-+    // Paper start - Collision API
-+    @Override
-+    public boolean collidesAt(@org.jetbrains.annotations.NotNull Location location) {
-+        net.minecraft.world.phys.AABB aabb = this.getHandle().getBoundingBoxAt(location.getX(), location.getY(), location.getZ());
-+
-+        return !this.getHandle().level().noCollision(this.getHandle(), aabb);
-+    }
-+
-+    @Override
-+    public boolean wouldCollideUsing(@org.jetbrains.annotations.NotNull BoundingBox boundingBox) {
-+        net.minecraft.world.phys.AABB aabb = new AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
-+
-+        return !this.getHandle().level().noCollision(this.getHandle(), aabb);
-+    }
-+    // Paper end - Collision API
- }
--- a/patches/unapplied/server/Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/Configurable-chat-thread-limit.patch
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Sep 2022 06:33:17 +0100
-Subject: [PATCH] Configurable chat thread limit
-
-By default, spigot shifts chat over to an unbounded thread pool,
-on a normal server, this really offers no gains, the creation of a thread
-on submitting to the pool on these servers eats more time vs just running it in
-the netty pipeline, however, on servers using plugins which do work in here, there
-could be some overall benefits to moving this stuff outside of the pipeline.
-
-In general, this patch does two things:
-1) Exposes the core size for the pool, this allows for ensuring that a number of threads
-sit around in the pool, mitigating the need for creating new threads; This IS however
-caveated, the ThreadPoolExecutor will ONLY create core threads as they're needed, it
-just won't allow for us to dip back under the # of core threads, this can potentially
-be mitigated by calling prestartCoreThread, however, I'm not sure if there is much justification
-for this
-2) Exposes a max size for the pool, as stated, by default this is unbounded, for most
-servers limiting the size of the pool is going to have 0 effects given how fast chat
-is actually processed, this is honestly really just exposed for the misnomers or people
-who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
-
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -0,0 +0,0 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-             @PostProcess
-             private void postProcess() {
-                // TODO: fill in separate patch
-+                //noinspection ConstantConditions
-+                if (net.minecraft.server.MinecraftServer.getServer() == null) return; // In testing env, this will be null here
-+                int _chatExecutorMaxSize = (this.chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : this.chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?;
-+                int _chatExecutorCoreSize = Math.max(this.chatExecutorCoreSize, 0);
-+
-+                if (_chatExecutorMaxSize < _chatExecutorCoreSize) {
-+                    _chatExecutorMaxSize = _chatExecutorCoreSize;
-+                }
-+
-+                java.util.concurrent.ThreadPoolExecutor executor = (java.util.concurrent.ThreadPoolExecutor) net.minecraft.server.MinecraftServer.getServer().chatExecutor;
-+                executor.setCorePoolSize(_chatExecutorCoreSize);
-+                executor.setMaximumPoolSize(_chatExecutorMaxSize);
-             }
-         }
-         public int maxJoinsPerTick = 5;
--- a/patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/unapplied/server/Configurable-max-block-light-for-monster-spawning.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Thu, 16 Dec 2021 09:40:39 +0100
-Subject: [PATCH] Configurable max block light for monster spawning
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-@@ -0,0 +0,0 @@ public abstract class Monster extends PathfinderMob implements Enemy {
-             return false;
-         } else {
-             DimensionType dimensionType = world.dimensionType();
-            int i = dimensionType.monsterSpawnBlockLightLimit();
-+            int i = world.getLevel().paperConfig().entities.spawning.monsterSpawnMaxLightLevel.or(dimensionType.monsterSpawnBlockLightLimit()); // Paper - Configurable max block light for monster spawning
-             if (i < 15 && world.getBrightness(LightLayer.BLOCK, pos) > i) {
-                 return false;
-             } else {
--- a/patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch
+++ b/patches/unapplied/server/Configurable-sculk-sensor-listener-range.patch
@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 19 Aug 2021 18:45:42 -0700
-Subject: [PATCH] Configurable sculk sensor listener range
-
-== AT ==
-public-f net.minecraft.world.level.gameevent.vibrations.VibrationListener listenerRange
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/CalibratedSculkSensorBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CalibratedSculkSensorBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/CalibratedSculkSensorBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/CalibratedSculkSensorBlockEntity.java
-@@ -0,0 +0,0 @@ public class CalibratedSculkSensorBlockEntity extends SculkSensorBlockEntity {
-     public VibrationSystem.User createVibrationUser() {
-         return new CalibratedSculkSensorBlockEntity.VibrationUser(this.getBlockPos());
-     }
-+    // Paper start - Configurable sculk sensor listener range
-+    @Override
-+    protected void saveRangeOverride(final net.minecraft.nbt.CompoundTag nbt) {
-+        if (this.rangeOverride != null && this.rangeOverride != 16) nbt.putInt(PAPER_LISTENER_RANGE_NBT_KEY, this.rangeOverride); // only save if it's different from the default
-+    }
-+    // Paper end - Configurable sculk sensor listener range
- 
-     protected class VibrationUser extends SculkSensorBlockEntity.VibrationUser {
-         public VibrationUser(final BlockPos pos) {
-@@ -0,0 +0,0 @@ public class CalibratedSculkSensorBlockEntity extends SculkSensorBlockEntity {
- 
-         @Override
-         public int getListenerRadius() {
-+            if (CalibratedSculkSensorBlockEntity.this.rangeOverride != null) return CalibratedSculkSensorBlockEntity.this.rangeOverride; // Paper - Configurable sculk sensor listener range
-             return 16;
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java
-@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
-     private final VibrationSystem.Listener vibrationListener;
-     private final VibrationSystem.User vibrationUser = this.createVibrationUser();
-     public int lastVibrationFrequency;
-+    @Nullable public Integer rangeOverride = null; // Paper - Configurable sculk sensor listener range
- 
-     protected SculkSensorBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
-         super(type, pos, state);
-@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
-                 .resultOrPartial(LOGGER::error)
-                 .ifPresent(listener -> this.vibrationData = listener);
-         }
-+        // Paper start - Configurable sculk sensor listener range
-+        if (nbt.contains(PAPER_LISTENER_RANGE_NBT_KEY)) {
-+            this.rangeOverride = nbt.getInt(PAPER_LISTENER_RANGE_NBT_KEY);
-+        } else {
-+            this.rangeOverride = null;
-+        }
-+        // Paper end - Configurable sculk sensor listener range
-     }
- 
-+    protected static final String PAPER_LISTENER_RANGE_NBT_KEY = "Paper.ListenerRange"; // Paper - Configurable sculk sensor listener range
-     @Override
-     protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
-         super.saveAdditional(nbt, registryLookup);
-@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
-             .encodeStart(NbtOps.INSTANCE, this.vibrationData)
-             .resultOrPartial(LOGGER::error)
-             .ifPresent(listenerNbt -> nbt.put("listener", listenerNbt));
-+        this.saveRangeOverride(nbt); // Paper - Configurable sculk sensor listener range
-+    }
-+    // Paper start - Configurable sculk sensor listener range
-+    protected void saveRangeOverride(CompoundTag nbt) {
-+        if (this.rangeOverride != null && this.rangeOverride != VibrationUser.LISTENER_RANGE) nbt.putInt(PAPER_LISTENER_RANGE_NBT_KEY, this.rangeOverride); // only save if it's different from the default
-     }
-+    // Paper end - Configurable sculk sensor listener range
- 
-     @Override
-     public VibrationSystem.Data getVibrationData() {
-@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
- 
-         @Override
-         public int getListenerRadius() {
-+            if (SculkSensorBlockEntity.this.rangeOverride != null) return SculkSensorBlockEntity.this.rangeOverride; // Paper - Configurable sculk sensor listener range
-             return 8;
-         }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
-@@ -0,0 +0,0 @@ public class CraftSculkSensor<T extends SculkSensorBlockEntity> extends CraftBlo
-     public CraftSculkSensor<T> copy(Location location) {
-         return new CraftSculkSensor<>(this, location);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getListenerRange() {
-+        return this.getSnapshot().getListener().getListenerRadius();
-+    }
-+
-+    @Override
-+    public void setListenerRange(int range) {
-+        Preconditions.checkArgument(range > 0, "Vibration listener range must be greater than 0");
-+        this.getSnapshot().rangeOverride = range;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 16 Jun 2022 21:57:02 -0700
-Subject: [PATCH] Correctly handle interactions with items on cooldown
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
-         BlockPos blockposition = hitResult.getBlockPos();
-         BlockState iblockdata = world.getBlockState(blockposition);
-         boolean cancelledBlock = false;
-+        boolean cancelledItem = false; // Paper - correctly handle items on cooldown
- 
-         if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
-             return InteractionResult.FAIL;
-@@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
-         }
- 
-         if (player.getCooldowns().isOnCooldown(stack.getItem())) {
-            cancelledBlock = true;
-+            cancelledItem = true; // Paper - correctly handle items on cooldown
-         }
- 
-        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation());
-+        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper - correctly handle items on cooldown
-         this.firedInteract = true;
-         this.interactResult = event.useItemInHand() == Event.Result.DENY;
-         this.interactPosition = blockposition.immutable();
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-     }
- 
-     public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 targetPos) {
-+        // Paper start - cancelledItem param
-+        return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, false, hand, targetPos);
-+    }
-+
-+    public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, boolean cancelledItem, InteractionHand hand, Vec3 targetPos) {
-+        // Paper end - cancelledItem param
-         Player player = (who == null) ? null : (Player) who.getBukkitEntity();
-         CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
- 
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         if (cancelledBlock) {
-             event.setUseInteractedBlock(Event.Result.DENY);
-         }
-+        // Paper start
-+        if (cancelledItem) {
-+            event.setUseItemInHand(Result.DENY);
-+        }
-+        // Paper end
-         craftServer.getPluginManager().callEvent(event);
- 
-         return event;
--- a/patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sat, 30 Jul 2022 11:23:05 -0400
-Subject: [PATCH] Custom Chat Completion Suggestions API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
-     // Paper end - Add sendOpLevel API
- 
-+    // Paper start - custom chat completions API
-+    @Override
-+    public void addAdditionalChatCompletions(@NotNull Collection<String> completions) {
-+        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket(
-+            net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket.Action.ADD,
-+            new ArrayList<>(completions)
-+        ));
-+    }
-+
-+    @Override
-+    public void removeAdditionalChatCompletions(@NotNull Collection<String> completions) {
-+        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket(
-+            net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket.Action.REMOVE,
-+            new ArrayList<>(completions)
-+        ));
-+    }
-+    // Paper end - custom chat completions API
-+
-     @Override
-     public void setCompassTarget(Location loc) {
-         Preconditions.checkArgument(loc != null, "Location cannot be null");
--- a/patches/unapplied/server/Custom-Potion-Mixes.patch
+++ b/patches/unapplied/server/Custom-Potion-Mixes.patch
@@ -1,329 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 7 Oct 2021 14:34:55 -0700
-Subject: [PATCH] Custom Potion Mixes
-
-== AT ==
-public-f net.minecraft.server.MinecraftServer potionBrewing
-
-diff --git a/src/main/java/io/papermc/paper/potion/PaperPotionBrewer.java b/src/main/java/io/papermc/paper/potion/PaperPotionBrewer.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/potion/PaperPotionBrewer.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.potion;
-+
-+import com.google.common.base.Preconditions;
-+import java.util.Collection;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.potion.PotionBrewer;
-+import org.bukkit.potion.PotionEffect;
-+import org.bukkit.potion.PotionType;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public class PaperPotionBrewer implements PotionBrewer {
-+
-+    private final MinecraftServer minecraftServer;
-+
-+    public PaperPotionBrewer(final MinecraftServer minecraftServer) {
-+        this.minecraftServer = minecraftServer;
-+    }
-+
-+    @Override
-+    @Deprecated(forRemoval = true)
-+    public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended) {
-+        final org.bukkit.NamespacedKey key = type.getKey();
-+
-+        Preconditions.checkArgument(!key.getKey().startsWith("strong_"), "Strong potion type cannot be used directly, got %s", key);
-+        Preconditions.checkArgument(!key.getKey().startsWith("long_"), "Extended potion type cannot be used directly, got %s", key);
-+
-+        org.bukkit.NamespacedKey effectiveKey = key;
-+        if (upgraded) {
-+            effectiveKey = new org.bukkit.NamespacedKey(key.namespace(), "strong_" + key.key());
-+        } else if (extended) {
-+            effectiveKey = new org.bukkit.NamespacedKey(key.namespace(), "long_" + key.key());
-+        }
-+
-+        final org.bukkit.potion.PotionType effectivePotionType = org.bukkit.Registry.POTION.get(effectiveKey);
-+        Preconditions.checkNotNull(type, "Unknown potion type from data " + effectiveKey.asMinimalString()); // Legacy error message in 1.20.4
-+        return effectivePotionType.getPotionEffects();
-+    }
-+
-+    @Override
-+    public void addPotionMix(final PotionMix potionMix) {
-+        this.minecraftServer.potionBrewing().addPotionMix(potionMix);
-+    }
-+
-+    @Override
-+    public void removePotionMix(final NamespacedKey key) {
-+        this.minecraftServer.potionBrewing.removePotionMix(key);
-+    }
-+
-+    @Override
-+    public void resetPotionMixes() {
-+        this.minecraftServer.potionBrewing = this.minecraftServer.potionBrewing().reload(this.minecraftServer.getWorldData().enabledFeatures());
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/potion/PaperPotionMix.java b/src/main/java/io/papermc/paper/potion/PaperPotionMix.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/potion/PaperPotionMix.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.potion;
-+
-+import java.util.function.Predicate;
-+import net.minecraft.world.item.ItemStack;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.craftbukkit.inventory.CraftRecipe;
-+import org.bukkit.inventory.RecipeChoice;
-+
-+public record PaperPotionMix(ItemStack result, Predicate<ItemStack> input, Predicate<ItemStack> ingredient) {
-+
-+    public PaperPotionMix(PotionMix potionMix) {
-+        this(CraftItemStack.asNMSCopy(potionMix.getResult()), convert(potionMix.getInput()), convert(potionMix.getIngredient()));
-+    }
-+
-+    static Predicate<ItemStack> convert(final RecipeChoice choice) {
-+        if (choice instanceof PredicateRecipeChoice predicateRecipeChoice) {
-+            return stack -> predicateRecipeChoice.test(CraftItemStack.asBukkitCopy(stack));
-+        }
-+        return CraftRecipe.toIngredient(choice, true);
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-             this.worldData.setDataConfiguration(worlddataconfiguration);
-             this.resources.managers.updateRegistryTags();
-+            this.potionBrewing = this.potionBrewing.reload(this.worldData.enabledFeatures()); // Paper - Custom Potion Mixes
-             this.getPlayerList().saveAll();
-             this.getPlayerList().reloadResources();
-             this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
-diff --git a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
-@@ -0,0 +0,0 @@ public class BrewingStandMenu extends AbstractContainerMenu {
-         this.brewingStandData = propertyDelegate;
-         PotionBrewing potionbrewer = playerInventory.player.level().potionBrewing();
- 
-        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 0, 56, 51));
-        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 1, 79, 58));
-        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 2, 102, 51));
-+        // Paper start - custom potion mixes
-+        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 0, 56, 51, potionbrewer));
-+        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 1, 79, 58, potionbrewer));
-+        this.addSlot(new BrewingStandMenu.PotionSlot(inventory, 2, 102, 51, potionbrewer));
-+        // Paper end - custom potion mixes
-         this.ingredientSlot = this.addSlot(new BrewingStandMenu.IngredientsSlot(potionbrewer, inventory, 3, 79, 17));
-         this.addSlot(new BrewingStandMenu.FuelSlot(inventory, 4, 17, 17));
-         this.addDataSlots(propertyDelegate);
-@@ -0,0 +0,0 @@ public class BrewingStandMenu extends AbstractContainerMenu {
-                     if (!this.moveItemStackTo(itemstack1, 3, 4, false)) {
-                         return ItemStack.EMPTY;
-                     }
-                } else if (BrewingStandMenu.PotionSlot.mayPlaceItem(itemstack)) {
-+                } else if (BrewingStandMenu.PotionSlot.mayPlaceItem(itemstack, this.player.player.level().potionBrewing())) { // Paper - custom potion mixes
-                     if (!this.moveItemStackTo(itemstack1, 0, 3, false)) {
-                         return ItemStack.EMPTY;
-                     }
-@@ -0,0 +0,0 @@ public class BrewingStandMenu extends AbstractContainerMenu {
- 
-     private static class PotionSlot extends Slot {
- 
-        public PotionSlot(Container inventory, int index, int x, int y) {
-+        private final PotionBrewing potionBrewing; // Paper - custom potion mixes
-+        public PotionSlot(Container inventory, int index, int x, int y, PotionBrewing potionBrewing) { // Paper - custom potion mixes
-             super(inventory, index, x, y);
-+            this.potionBrewing = potionBrewing; // Paper - custom potion mixes
-         }
- 
-         @Override
-         public boolean mayPlace(ItemStack stack) {
-            return PotionSlot.mayPlaceItem(stack);
-+            return PotionSlot.mayPlaceItem(stack, this.potionBrewing); // Paper - custom potion mixes
-         }
- 
-         @Override
-@@ -0,0 +0,0 @@ public class BrewingStandMenu extends AbstractContainerMenu {
-             super.onTake(player, stack);
-         }
- 
-        public static boolean mayPlaceItem(ItemStack stack) {
-            return stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE);
-+        public static boolean mayPlaceItem(ItemStack stack, PotionBrewing potionBrewing) { // Paper - custom potion mixes
-+            return stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || potionBrewing.isCustomInput(stack); // Paper - Custom Potion Mixes
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java b/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
-+++ b/src/main/java/net/minecraft/world/item/alchemy/PotionBrewing.java
-@@ -0,0 +0,0 @@ public class PotionBrewing {
-     private final List<Ingredient> containers;
-     private final List<PotionBrewing.Mix<Potion>> potionMixes;
-     private final List<PotionBrewing.Mix<Item>> containerMixes;
-+    private final it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<org.bukkit.NamespacedKey, io.papermc.paper.potion.PaperPotionMix> customMixes = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>(); // Paper - Custom Potion Mixes
- 
-     PotionBrewing(List<Ingredient> potionTypes, List<PotionBrewing.Mix<Potion>> potionRecipes, List<PotionBrewing.Mix<Item>> itemRecipes) {
-         this.containers = potionTypes;
-@@ -0,0 +0,0 @@ public class PotionBrewing {
-     }
- 
-     public boolean isIngredient(ItemStack stack) {
-        return this.isContainerIngredient(stack) || this.isPotionIngredient(stack);
-+        return this.isContainerIngredient(stack) || this.isPotionIngredient(stack) || this.isCustomIngredient(stack); // Paper - Custom Potion Mixes
-     }
- 
-     private boolean isContainer(ItemStack stack) {
-@@ -0,0 +0,0 @@ public class PotionBrewing {
-     }
- 
-     public boolean hasMix(ItemStack input, ItemStack ingredient) {
-+        // Paper start - Custom Potion Mixes
-+        if (this.hasCustomMix(input, ingredient)) {
-+            return true;
-+        }
-+        // Paper end - Custom Potion Mixes
-         return this.isContainer(input) && (this.hasContainerMix(input, ingredient) || this.hasPotionMix(input, ingredient));
-     }
- 
-@@ -0,0 +0,0 @@ public class PotionBrewing {
-         if (input.isEmpty()) {
-             return input;
-         } else {
-+            // Paper start - Custom Potion Mixes
-+            for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
-+                if (mix.input().test(input) && mix.ingredient().test(ingredient)) {
-+                    return mix.result().copy();
-+                }
-+            }
-+            // Paper end - Custom Potion Mixes
-             Optional<Holder<Potion>> optional = input.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).potion();
-             if (optional.isEmpty()) {
-                 return input;
-@@ -0,0 +0,0 @@ public class PotionBrewing {
-         builder.addMix(Potions.SLOW_FALLING, Items.REDSTONE, Potions.LONG_SLOW_FALLING);
-     }
- 
-+    // Paper start - Custom Potion Mixes
-+    public boolean isCustomIngredient(ItemStack stack) {
-+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
-+            if (mix.ingredient().test(stack)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-+    public boolean isCustomInput(ItemStack stack) {
-+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
-+            if (mix.input().test(stack)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-+    private boolean hasCustomMix(ItemStack input, ItemStack ingredient) {
-+        for (io.papermc.paper.potion.PaperPotionMix mix : this.customMixes.values()) {
-+            if (mix.input().test(input) && mix.ingredient().test(ingredient)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-+    public void addPotionMix(io.papermc.paper.potion.PotionMix mix) {
-+        if (this.customMixes.containsKey(mix.getKey())) {
-+            throw new IllegalArgumentException("Duplicate recipe ignored with ID " + mix.getKey());
-+        }
-+        this.customMixes.putAndMoveToFirst(mix.getKey(), new io.papermc.paper.potion.PaperPotionMix(mix));
-+    }
-+
-+    public boolean removePotionMix(org.bukkit.NamespacedKey key) {
-+        return this.customMixes.remove(key) != null;
-+    }
-+
-+    public PotionBrewing reload(FeatureFlagSet flags) {
-+        return bootstrap(flags);
-+    }
-+    // Paper end - Custom Potion Mixes
-+
-     public static class Builder {
-         private final List<Ingredient> containers = new ArrayList<>();
-         private final List<PotionBrewing.Mix<Potion>> potionMixes = new ArrayList<>();
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-@@ -0,0 +0,0 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
- 
-     @Override
-     public boolean canPlaceItem(int slot, ItemStack stack) {
-+        PotionBrewing potionbrewer = this.level != null ? this.level.potionBrewing() : PotionBrewing.EMPTY; // Paper - move up
-         if (slot == 3) {
-            PotionBrewing potionbrewer = this.level != null ? this.level.potionBrewing() : PotionBrewing.EMPTY;
- 
-             return potionbrewer.isIngredient(stack);
-         } else {
-            return slot == 4 ? stack.is(Items.BLAZE_POWDER) : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE)) && this.getItem(slot).isEmpty();
-+            return slot == 4 ? stack.is(Items.BLAZE_POWDER) : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || potionbrewer.isCustomInput(stack)) && this.getItem(slot).isEmpty(); // Paper - Custom Potion Mixes
-         }
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
-     public static Exception excessiveVelEx; // Paper - Velocity warnings
-     private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
-+    private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
- 
-     static {
-         ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         if (this.configuration.getBoolean("settings.use-map-color-cache")) {
-             MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
-         }
-+        this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
-         datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
-     }
- 
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         return datapackManager;
-     }
- 
-+    @Override
-+    public io.papermc.paper.potion.PaperPotionBrewer getPotionBrewer() {
-+        return this.potionBrewer;
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-@@ -0,0 +0,0 @@ public interface CraftRecipe extends Recipe {
-     void addToCraftingManager();
- 
-     default Ingredient toNMS(RecipeChoice bukkit, boolean requireNotEmpty) {
-+        // Paper start
-+        return toIngredient(bukkit, requireNotEmpty);
-+    }
-+    static Ingredient toIngredient(RecipeChoice bukkit, boolean requireNotEmpty) {
-+        // Paper end
-         Ingredient stack;
- 
-         if (bukkit == null) {
--- a/patches/unapplied/server/Detect-headless-JREs.patch
+++ b/patches/unapplied/server/Detect-headless-JREs.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Noah van der Aa <ndvdaa@gmail.com>
-Date: Sat, 22 Oct 2022 14:47:45 +0200
-Subject: [PATCH] Detect headless JREs
-
-Crashes caused by the missing AWT dependency come up in the support channels fairly often.
-This patch detects the missing dependency and stops the server with a clear error message,
-containing a link to instructions on how to install a non-headless JRE.
-
-diff --git a/src/main/java/io/papermc/paper/util/ServerEnvironment.java b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-+++ b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-@@ -0,0 +0,0 @@ public class ServerEnvironment {
-     public static boolean userIsRootOrAdmin() {
-         return RUNNING_AS_ROOT_OR_ADMIN;
-     }
-+
-+    public static String awtDependencyCheck() {
-+        try {
-+            new java.awt.Color(0);
-+        } catch (UnsatisfiedLinkError e) {
-+            return e.getClass().getName() + ": " + e.getMessage();
-+        }
-+
-+        return null;
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -0,0 +0,0 @@ public class Main {
-                 return;
-             }
- 
-+            // Paper start - Detect headless JRE
-+            String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
-+            if (awtException != null) {
-+                Main.LOGGER.error("You are using a headless JRE distribution.");
-+                Main.LOGGER.error("This distribution is missing certain graphic libraries that the Minecraft server needs to function.");
-+                Main.LOGGER.error("For instructions on how to install the non-headless JRE, see https://docs.papermc.io/misc/java-install");
-+                Main.LOGGER.error("");
-+                Main.LOGGER.error(awtException);
-+                return;
-+            }
-+            // Paper end - Detect headless JRE
-+
-             org.spigotmc.SpigotConfig.disabledAdvancements = spigotConfiguration.getStringList("advancements.disabled"); // Paper - fix SPIGOT-5885, must be set early in init
-             // Paper start - fix SPIGOT-5824
-             File file;
--- a/patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Thu, 2 Jun 2022 20:35:58 +0200
-Subject: [PATCH] Disable component selector resolving in books by default
-
-
-diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java
-+++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
-@@ -0,0 +0,0 @@ public class WrittenBookItem extends Item {
- 
-     public static boolean resolveBookComponents(ItemStack book, CommandSourceStack commandSource, @Nullable Player player) {
-         WrittenBookContent writtenBookContent = book.get(DataComponents.WRITTEN_BOOK_CONTENT);
-        if (writtenBookContent != null && !writtenBookContent.resolved()) {
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.resolveSelectorsInBooks && writtenBookContent != null && !writtenBookContent.resolved()) { // Paper - Disable component selector resolving in books by default
-             WrittenBookContent writtenBookContent2 = writtenBookContent.resolve(commandSource, player);
-             if (writtenBookContent2 != null) {
-                 book.set(DataComponents.WRITTEN_BOOK_CONTENT, writtenBookContent2);
--- a/patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 3 Jul 2022 22:31:37 -0700
-Subject: [PATCH] Do not sync load chunk for dynamic game event listener
- registration
-
-These can be called while an entity is being added to the world,
-and if the entity is being added from a chunk load context the
-sync load will block indefinitely (because the chunk load context
-is for completing the chunk to FULL).
-
-This does raise questions about the current system for these
-dynamic registrations, as it looks like there is _zero_ logic
-to account for the case where the chunk is _not_ currently loaded
-and then later loaded.
-
-diff --git a/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java b/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java
-+++ b/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java
-@@ -0,0 +0,0 @@ public class DynamicGameEventListener<T extends GameEventListener> {
- 
-     private static void ifChunkExists(LevelReader world, @Nullable SectionPos sectionPos, Consumer<GameEventListenerRegistry> dispatcherConsumer) {
-         if (sectionPos != null) {
-            ChunkAccess chunkAccess = world.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.FULL, false);
-+            ChunkAccess chunkAccess = world.getChunkIfLoadedImmediately(sectionPos.getX(), sectionPos.getZ()); // Paper - Perf: can cause sync loads while completing a chunk, resulting in deadlock
-             if (chunkAccess != null) {
-                 dispatcherConsumer.accept(chunkAccess.getListenerRegistry(sectionPos.y()));
-             }
--- a/patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/unapplied/server/Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Mon, 14 Mar 2022 12:35:37 -0700
-Subject: [PATCH] Don't allow vehicle movement from players while teleporting
-
-Bring the vehicle move packet behavior in line with the
-regular player move packet.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             this.disconnect(Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT); // Paper - kick event cause
-         } else {
-             Entity entity = this.player.getRootVehicle();
-+            // Paper start - Don't allow vehicle movement from players while teleporting
-+            if (this.awaitingPositionFromClient != null || this.player.isImmobile() || entity.isRemoved()) {
-+                return;
-+            }
-+            // Paper end - Don't allow vehicle movement from players while teleporting
- 
-             if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
-                 ServerLevel worldserver = this.player.serverLevel();
--- a/patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 16 Jun 2022 14:22:56 -0700
-Subject: [PATCH] Don't broadcast messages to command blocks
-
-Previously the broadcast method would update the last output
-in command blocks, and if called asynchronously, would throw
-an error
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-+++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-@@ -0,0 +0,0 @@ public abstract class BaseCommandBlock implements CommandSource {
-     @Override
-     public void sendSystemMessage(Component message) {
-         if (this.trackOutput) {
-+            org.spigotmc.AsyncCatcher.catchOp("sendSystemMessage to a command block"); // Paper - Don't broadcast messages to command blocks
-             SimpleDateFormat simpledateformat = BaseCommandBlock.TIME_FORMAT;
-             Date date = new Date();
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         // Paper end
-         Set<CommandSender> recipients = new HashSet<>();
-         for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
-            if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
-+            if (permissible instanceof CommandSender && !(permissible instanceof org.bukkit.command.BlockCommandSender) && permissible.hasPermission(permission)) { // Paper - Don't broadcast messages to command blocks
-                 recipients.add((CommandSender) permissible);
-             }
-         }
--- a/patches/unapplied/server/Don-t-tick-markers.patch
+++ b/patches/unapplied/server/Don-t-tick-markers.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Noah van der Aa <ndvdaa@gmail.com>
-Date: Fri, 7 Jan 2022 11:58:26 +0100
-Subject: [PATCH] Don't tick markers
-
-Fixes https://github.com/PaperMC/Paper/issues/7276 and https://github.com/PaperMC/Paper/issues/8118
-by using a config option that, when set to false, does not add markers to the entity
-tick list at all and ignores them in Spigot's activation range checks. The entity tick
-list is only used in the tick and tickPassenger methods, so we can safely not add the
-markers to it. When the config option is set to true, markers are ticked as normal.
-
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-@@ -0,0 +0,0 @@ public final class EntityCommand implements PaperSubcommand {
-                 ChunkPos chunk = e.chunkPosition();
-                 info.left++;
-                 info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
-                if (!chunkProviderServer.isPositionTicking(e)) {
-+                if (!chunkProviderServer.isPositionTicking(e) || (e instanceof net.minecraft.world.entity.Marker && !world.paperConfig().entities.markers.tick)) { // Paper - Configurable marker ticking
-                     nonEntityTicking.merge(key, 1, Integer::sum);
-                 }
-             });
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         }
- 
-         public void onTickingStart(Entity entity) {
-+            if (entity instanceof net.minecraft.world.entity.Marker && !paperConfig().entities.markers.tick) return; // Paper - Configurable marker ticking
-             ServerLevel.this.entityTickList.add(entity);
-         }
- 
--- a/patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 10 Jul 2022 14:13:22 -0700
-Subject: [PATCH] Don't use level random in entity constructors
-
-Paper makes the entity random thread-safe
-and constructing an entity off the main thread
-should be supported. Some entities (for whatever
-reason) use the level's random in some places.
-
-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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -0,0 +0,0 @@ public class ItemEntity extends Entity implements TraceableEntity {
-     }
- 
-     public ItemEntity(Level world, double x, double y, double z, ItemStack stack) {
-        this(world, x, y, z, stack, world.random.nextDouble() * 0.2D - 0.1D, 0.2D, world.random.nextDouble() * 0.2D - 0.1D);
-+        // Paper start - Don't use level random in entity constructors (to make them thread-safe)
-+        this(EntityType.ITEM, world);
-+        this.setPos(x, y, z);
-+        this.setDeltaMovement(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D);
-+        this.setItem(stack);
-+        // Paper end - Don't use level random in entity constructors
-     }
- 
-     public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -0,0 +0,0 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-     public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
-         this(EntityType.TNT, world);
-         this.setPos(x, y, z);
-        double d3 = world.random.nextDouble() * 6.2831854820251465D;
-+        double d3 = this.random.nextDouble() * 6.2831854820251465D; // Paper - Don't use level random in entity constructors
- 
-         this.setDeltaMovement(-Math.sin(d3) * 0.02D, 0.20000000298023224D, -Math.cos(d3) * 0.02D);
-         this.setFuse(80);
--- a/patches/unapplied/server/Dont-resent-entity-on-art-update.patch
+++ b/patches/unapplied/server/Dont-resent-entity-on-art-update.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Wed, 8 Jun 2022 11:04:47 -0400
-Subject: [PATCH] Dont resent entity on art update
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
-@@ -0,0 +0,0 @@ public class CraftPainting extends CraftHanging implements Painting {
-             painting.setDirection(painting.getDirection());
-             return false;
-         }
-        this.update();
-+        //this.update(); Paper - Don't resent entity on art update
-         return true;
-     }
- 
--- a/patches/unapplied/server/Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/Elder-Guardian-appearance-API.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Tue, 11 Oct 2022 20:38:47 +0300
-Subject: [PATCH] Elder Guardian appearance API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
-     // Paper end
- 
-+    // Paper start
-+    @Override
-+    public void showElderGuardian(boolean silent) {
-+        if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
-+    }
-+    // Paper end
-+
-     public Player.Spigot spigot()
-     {
-         return this.spigot;
--- a/patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/unapplied/server/Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 31 Mar 2022 05:11:37 -0700
-Subject: [PATCH] Ensure entity passenger world matches ridden entity
-
-Bad plugins doing this would cause some obvious problems...
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public boolean startRiding(Entity entity, boolean force) {
-        if (entity == this.vehicle) {
-+        if (entity == this.vehicle || entity.level != this.level) { // Paper - Ensure entity passenger world matches ridden entity (bad plugins)
-             return false;
-         } else if (!entity.couldAcceptPassenger()) {
-             return false;
--- a/patches/unapplied/server/Entity-powdered-snow-API.patch
+++ b/patches/unapplied/server/Entity-powdered-snow-API.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 24 Oct 2021 20:58:43 -0700
-Subject: [PATCH] Entity powdered snow API
-
-== AT ==
-public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     }
-     // Paper end - raw entity serialization API
- 
-+    // Paper start - entity powdered snow API
-+    @Override
-+    public boolean isInPowderedSnow() {
-+        return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
-+    }
-+    // Paper end - entity powdered snow API
-+
-     // Paper start - missing entity api
-     @Override
-     public boolean isInvisible() {  // Paper - moved up from LivingEntity
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-@@ -0,0 +0,0 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
-     public SkeletonType getSkeletonType() {
-        return SkeletonType.NORMAL;
-     }
-+
-+    // Paper start
-+    @Override
-+    public int inPowderedSnowTime() {
-+        return getHandle().inPowderSnowTime;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/EntityPickupItemEvent-fixes.patch
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jul 2022 21:45:36 -0700
-Subject: [PATCH] EntityPickupItemEvent fixes
-
-Fixes double firing of the event in PiglinAi
-
-Fixes cancelling the event for piglins still triggering the
-advancement trigger
-
-Fires the event when a Raider tries to pick up a raid banner
-to become raid leader.
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -0,0 +0,0 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
- 
-     @Override
-     protected void pickUpItem(ItemEntity item) {
-        this.onItemPickup(item);
-+        // this.onItemPickup(item); // Paper - EntityPickupItemEvent fixes; call in PiglinAi#pickUpItem after EntityPickupItemEvent is fired
-         PiglinAi.pickUpItem(this, item);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -0,0 +0,0 @@ public class PiglinAi {
-         ItemStack itemstack;
- 
-         // CraftBukkit start
-        if (drop.getItem().is(Items.GOLD_NUGGET) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled()) {
-+        // Paper start - EntityPickupItemEvent fixes; fix event firing twice
-+        if (drop.getItem().is(Items.GOLD_NUGGET) /* && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled() */) {
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled()) return;
-+            piglin.onItemPickup(drop); // Paper - moved from Piglin#pickUpItem - call prior to item entity modification
-+            // Paper end - EntityPickupItemEvent fixes
-             piglin.take(drop, drop.getItem().getCount());
-             itemstack = drop.getItem();
-             drop.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
-         } else if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, drop.getItem().getCount() - 1, false).isCancelled()) {
-+            piglin.onItemPickup(drop); // Paper - EntityPickupItemEvent fixes; moved from Piglin#pickUpItem - call prior to item entity modification
-             piglin.take(drop, 1);
-             itemstack = PiglinAi.removeOneItemFromItemEntity(drop);
-         } else {
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-@@ -0,0 +0,0 @@ public abstract class Raider extends PatrollingMonster {
-         boolean flag = this.hasActiveRaid() && this.getCurrentRaid().getLeader(this.getWave()) != null;
- 
-         if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getLeaderBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) {
-+            // Paper start - EntityPickupItemEvent fixes
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, item, 0, false).isCancelled()) {
-+                return;
-+            }
-+            // Paper end - EntityPickupItemEvent fixes
-             EquipmentSlot enumitemslot = EquipmentSlot.HEAD;
-             ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
-             double d0 = (double) this.getEquipmentDropChance(enumitemslot);
--- a/patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Tue, 28 Dec 2021 07:19:01 -0800
-Subject: [PATCH] Execute chunk tasks fairly for worlds while waiting for next
- tick
-
-Currently, only the first world would have had tasks executed.
-This might result in chunks loading far slower in the nether,
-for example.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         if (super.pollTask()) {
-             return true;
-         } else {
-+            boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-             if (this.tickRateManager.isSprinting() || this.haveTime()) {
-                 Iterator iterator = this.getAllLevels().iterator();
- 
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     ServerLevel worldserver = (ServerLevel) iterator.next();
- 
-                     if (worldserver.getChunkSource().pollTask()) {
-                        return true;
-+                        ret = true; // Paper - force execution of all worlds, do not just bias the first
-                     }
-                 }
-             }
- 
-            return false;
-+            return ret; // Paper - force execution of all worlds, do not just bias the first
-         }
-     }
- 
--- a/patches/unapplied/server/Expand-FallingBlock-API.patch
+++ b/patches/unapplied/server/Expand-FallingBlock-API.patch
@@ -1,107 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 5 Dec 2021 14:58:17 -0500
-Subject: [PATCH] Expand FallingBlock API
-
- add auto expire setting
- add setter for block data
- add accessors for block state
-
-== AT ==
-public net.minecraft.world.entity.item.FallingBlockEntity blockState
-
-Co-authored-by: Lukas Planz <lukas.planz@web.de>
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -0,0 +0,0 @@ public class FallingBlockEntity extends Entity {
-     @Nullable
-     public CompoundTag blockData;
-     protected static final EntityDataAccessor<BlockPos> DATA_START_POS = SynchedEntityData.defineId(FallingBlockEntity.class, EntityDataSerializers.BLOCK_POS);
-+    public boolean autoExpire = true; // Paper - Expand FallingBlock API
- 
-     public FallingBlockEntity(EntityType<? extends FallingBlockEntity> type, Level world) {
-         super(type, world);
-@@ -0,0 +0,0 @@ public class FallingBlockEntity extends Entity {
-                 }
- 
-                 if (!this.onGround() && !flag1) {
-                    if (!this.level().isClientSide && (this.time > 100 && (blockposition.getY() <= this.level().getMinBuildHeight() || blockposition.getY() > this.level().getMaxBuildHeight()) || this.time > 600)) {
-+                    if (!this.level().isClientSide && ((this.time > 100 && autoExpire) && (blockposition.getY() <= this.level().getMinBuildHeight() || blockposition.getY() > this.level().getMaxBuildHeight()) || (this.time > 600 && autoExpire))) { // Paper - Expand FallingBlock API
-                         if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-                             this.spawnAtLocation((ItemLike) block);
-                         }
-@@ -0,0 +0,0 @@ public class FallingBlockEntity extends Entity {
-         }
- 
-         nbt.putBoolean("CancelDrop", this.cancelDrop);
-+        if (!autoExpire) {nbt.putBoolean("Paper.AutoExpire", false);} // Paper - Expand FallingBlock API
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class FallingBlockEntity extends Entity {
-             this.blockState = Blocks.SAND.defaultBlockState();
-         }
- 
-+        // Paper start - Expand FallingBlock API
-+         if (nbt.contains("Paper.AutoExpire")) {
-+            this.autoExpire = nbt.getBoolean("Paper.AutoExpire");
-+         }
-+        // Paper end - Expand FallingBlock API
-     }
- 
-     public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-@@ -0,0 +0,0 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
-     public BlockData getBlockData() {
-         return CraftBlockData.fromData(this.getHandle().getBlockState());
-     }
-+    // Paper start - Expand FallingBlock API
-+    @Override
-+    public void setBlockData(final BlockData blockData) {
-+        Preconditions.checkArgument(blockData != null, "blockData");
-+        final net.minecraft.world.level.block.state.BlockState oldState = this.getHandle().blockState, newState = ((CraftBlockData) blockData).getState();
-+        this.getHandle().blockState = newState;
-+        this.getHandle().blockData = null;
-+
-+        if (oldState != newState) this.update();
-+    }
-+
-+    @Override
-+    public org.bukkit.block.BlockState getBlockState() {
-+        return org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(this.getHandle().blockState, this.getHandle().blockData);
-+    }
-+
-+    @Override
-+    public void setBlockState(final org.bukkit.block.BlockState blockState) {
-+        Preconditions.checkArgument(blockState != null, "blockState");
-+        // Calls #update if needed, the block data compound tag is not synced with the client and hence can be mutated after the sync with clients.
-+        // The call also clears any potential old block data.
-+        this.setBlockData(blockState.getBlockData());
-+        if (blockState instanceof final org.bukkit.craftbukkit.block.CraftBlockEntityState<?> tileEntity) this.getHandle().blockData = tileEntity.getSnapshotNBT();
-+    }
-+    // Paper end - Expand FallingBlock API
- 
-     @Override
-     public boolean getDropItem() {
-@@ -0,0 +0,0 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
-             this.setHurtEntities(true);
-         }
-     }
-+    // Paper start - Expand FallingBlock API
-+    @Override
-+    public boolean doesAutoExpire() {
-+        return this.getHandle().autoExpire;
-+    }
-+
-+    @Override
-+    public void shouldAutoExpire(boolean autoExpires) {
-+        this.getHandle().autoExpire = autoExpires;
-+    }
-+    // Paper end - Expand FallingBlock API
- }
--- a/patches/unapplied/server/Expand-PlayerItemDamageEvent.patch
+++ b/patches/unapplied/server/Expand-PlayerItemDamageEvent.patch
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Sun, 10 Apr 2022 06:26:32 +0100
-Subject: [PATCH] Expand PlayerItemDamageEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-                     }
-                 }
- 
-+                int originalDamage = amount; // Paper - Expand PlayerItemDamageEvent
-                 amount -= k;
-                 // CraftBukkit start
-                 if (player instanceof ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
-                    PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper - Add EntityDamageItemEvent
-+                    PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount, originalDamage); // Paper - Add EntityDamageItemEvent & Expand PlayerItemDamageEvent
-                     event.getPlayer().getServer().getPluginManager().callEvent(event);
- 
-                     if (amount != event.getDamage() || event.isCancelled()) {
--- a/patches/unapplied/server/Expose-furnace-minecart-push-values.patch
+++ b/patches/unapplied/server/Expose-furnace-minecart-push-values.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: EpicKnarvik97 <kristian.knarvik@knett.no>
-Date: Sat, 5 Mar 2022 20:58:46 +0100
-Subject: [PATCH] Expose furnace minecart push values
-
-Adds methods for getting and setting a furnace minecart's push values
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java
-@@ -0,0 +0,0 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
-         this.getHandle().fuel = fuel;
-     }
- 
-+    // Paper start
-+    @Override
-+    public double getPushX() {
-+        return getHandle().xPush;
-+    }
-+
-+    @Override
-+    public double getPushZ() {
-+        return getHandle().zPush;
-+    }
-+
-+    @Override
-+    public void setPushX(double xPush) {
-+        getHandle().xPush = xPush;
-+    }
-+
-+    @Override
-+    public void setPushZ(double zPush) {
-+        getHandle().zPush = zPush;
-+    }
-+    // Paper end
-+
-     @Override
-     public String toString() {
-         return "CraftMinecartFurnace";
--- a/patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/unapplied/server/Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Thu, 23 Dec 2021 15:32:50 -0600
-Subject: [PATCH] Expose isFuel and canSmelt methods to FurnaceInventory
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryFurnace.java
-@@ -0,0 +0,0 @@ public class CraftInventoryFurnace extends CraftInventory implements FurnaceInve
-         this.setItem(0, stack);
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean isFuel(ItemStack stack) {
-+        return stack != null && !stack.getType().isEmpty() && AbstractFurnaceBlockEntity.isFuel(CraftItemStack.asNMSCopy(stack));
-+    }
-+
-+    @Override
-+    public boolean canSmelt(ItemStack stack) {
-+        // data packs are always loaded in the main world
-+        net.minecraft.server.level.ServerLevel world = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorlds().get(0)).getHandle();
-+        return stack != null && !stack.getType().isEmpty() && world.getRecipeManager().getRecipeFor(((AbstractFurnaceBlockEntity) this.inventory).recipeType, new net.minecraft.world.SimpleContainer(CraftItemStack.asNMSCopy(stack)), world).isPresent();
-+    }
-+    // Paper end
-+
-     @Override
-     public Furnace getHolder() {
-         return (Furnace) this.inventory.getOwner();
--- a/patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -1,137 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 6 Jan 2022 15:59:06 -0800
-Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
-             LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey);
- 
-            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.type().value());
-+            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.type().value(), worlddimension.generator(), this.registryAccess()); // Paper - Expose vanilla BiomeProvider from WorldInfo
-             if (biomeProvider == null && gen != null) {
-                 biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
-         LevelStem worlddimension = iregistry.get(actualDimension);
- 
-        WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value());
-+        WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess()); // Paper - Expose vanilla BiomeProvider from WorldInfo
-         if (biomeProvider == null && generator != null) {
-             biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     public int getPlayerCount() {
-         return world.players().size();
-     }
-+
-+    @Override
-+    public BiomeProvider vanillaBiomeProvider() {
-+        net.minecraft.server.level.ServerChunkCache serverCache = this.getHandle().chunkSource;
-+
-+        final net.minecraft.world.level.biome.BiomeSource biomeSource = serverCache.getGenerator().getBiomeSource();
-+        final net.minecraft.world.level.biome.Climate.Sampler sampler = serverCache.randomState().sampler();
-+
-+        final List<Biome> possibleBiomes = biomeSource.possibleBiomes().stream()
-+            .map(biome -> org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(biome))
-+            .toList();
-+        return new BiomeProvider() {
-+            @Override
-+            public Biome getBiome(final org.bukkit.generator.WorldInfo worldInfo, final int x, final int y, final int z) {
-+                return org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(biomeSource.getNoiseBiome(x >> 2, y >> 2, z >> 2, sampler));
-+            }
-+
-+            @Override
-+            public List<Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
-+                return possibleBiomes;
-+            }
-+        };
-+    }
-     // Paper end
- 
-     private static final Random rand = new Random();
-diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
-+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java
-@@ -0,0 +0,0 @@ public class CraftWorldInfo implements WorldInfo {
-     private final long seed;
-     private final int minHeight;
-     private final int maxHeight;
-+    // Paper start
-+    private final net.minecraft.world.level.chunk.ChunkGenerator vanillaChunkGenerator;
-+    private final net.minecraft.core.RegistryAccess.Frozen registryAccess;
- 
-    public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager) {
-+    public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager, net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator, net.minecraft.core.RegistryAccess.Frozen registryAccess) {
-+        this.registryAccess = registryAccess;
-+        this.vanillaChunkGenerator = chunkGenerator;
-+        // Paper end
-         this.name = worldDataServer.getLevelName();
-         this.uuid = WorldUUID.getUUID(session.levelDirectory.path().toFile());
-         this.environment = environment;
-@@ -0,0 +0,0 @@ public class CraftWorldInfo implements WorldInfo {
-         this.maxHeight = dimensionManager.minY() + dimensionManager.height();
-     }
- 
-    public CraftWorldInfo(String name, UUID uuid, World.Environment environment, long seed, int minHeight, int maxHeight) {
-        this.name = name;
-        this.uuid = uuid;
-        this.environment = environment;
-        this.seed = seed;
-        this.minHeight = minHeight;
-        this.maxHeight = maxHeight;
-    }
-
-     @Override
-     public String getName() {
-         return this.name;
-@@ -0,0 +0,0 @@ public class CraftWorldInfo implements WorldInfo {
-     public int getMaxHeight() {
-         return this.maxHeight;
-     }
-+
-+    // Paper start
-+    @Override
-+    public org.bukkit.generator.BiomeProvider vanillaBiomeProvider() {
-+        final net.minecraft.world.level.levelgen.RandomState randomState;
-+        if (vanillaChunkGenerator instanceof net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator noiseBasedChunkGenerator) {
-+            randomState = net.minecraft.world.level.levelgen.RandomState.create(noiseBasedChunkGenerator.generatorSettings().value(),
-+                registryAccess.lookupOrThrow(net.minecraft.core.registries.Registries.NOISE), getSeed());
-+        } else {
-+            randomState = net.minecraft.world.level.levelgen.RandomState.create(net.minecraft.world.level.levelgen.NoiseGeneratorSettings.dummy(),
-+                registryAccess.lookupOrThrow(net.minecraft.core.registries.Registries.NOISE), getSeed());
-+        }
-+
-+        final java.util.List<org.bukkit.block.Biome> possibleBiomes = CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().possibleBiomes().stream()
-+            .map(biome -> org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(biome))
-+            .toList();
-+        return new org.bukkit.generator.BiomeProvider() {
-+            @Override
-+            public org.bukkit.block.Biome getBiome(final WorldInfo worldInfo, final int x, final int y, final int z) {
-+                return org.bukkit.craftbukkit.block.CraftBiome.minecraftHolderToBukkit(
-+                    CraftWorldInfo.this.vanillaChunkGenerator.getBiomeSource().getNoiseBiome(x >> 2, y >> 2, z >> 2, randomState.sampler()));
-+            }
-+
-+            @Override
-+            public java.util.List<org.bukkit.block.Biome> getBiomes(final org.bukkit.generator.WorldInfo worldInfo) {
-+                return possibleBiomes;
-+            }
-+        };
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/unapplied/server/Fire-CauldronLevelChange-on-initial-fill.patch
@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 29 Mar 2022 13:46:23 -0700
-Subject: [PATCH] Fire CauldronLevelChange on initial fill
-
-Also don't fire level events or game events if stalactite
-drip is cancelled
-
-diff --git a/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java b/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
-+++ b/src/main/java/net/minecraft/core/cauldron/CauldronInteraction.java
-@@ -0,0 +0,0 @@ public interface CauldronInteraction {
-             if (potioncontents != null && potioncontents.is(Potions.WATER)) {
-                 if (!world.isClientSide) {
-                     // CraftBukkit start
-                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY, false)) { // Paper - Call CauldronLevelChangeEvent
-                         return ItemInteractionResult.SUCCESS;
-                     }
-                     // CraftBukkit end
-@@ -0,0 +0,0 @@ public interface CauldronInteraction {
-                 if (potioncontents != null && potioncontents.is(Potions.WATER)) {
-                     if (!world.isClientSide) {
-                         // CraftBukkit start
-                        if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                        if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY, false)) { // Paper - Call CauldronLevelChangeEvent
-                             return ItemInteractionResult.SUCCESS;
-                         }
-                         // CraftBukkit end
-@@ -0,0 +0,0 @@ public interface CauldronInteraction {
-         } else {
-             if (!world.isClientSide) {
-                 // CraftBukkit start
-                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.CAULDRON.defaultBlockState(), player, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL)) {
-+                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.CAULDRON.defaultBlockState(), player, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL, false)) { // Paper - Call CauldronLevelChangeEvent
-                     return ItemInteractionResult.SUCCESS;
-                 }
-                 // CraftBukkit end
-@@ -0,0 +0,0 @@ public interface CauldronInteraction {
-     static ItemInteractionResult emptyBucket(Level world, BlockPos pos, Player player, InteractionHand hand, ItemStack stack, BlockState state, SoundEvent soundEvent) {
-         if (!world.isClientSide) {
-             // CraftBukkit start
-            if (!LayeredCauldronBlock.changeLevel(state, world, pos, state, player, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY)) {
-+            if (!LayeredCauldronBlock.changeLevel(state, world, pos, state, player, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY, false)) { // Paper - Call CauldronLevelChangeEvent
-                 return ItemInteractionResult.SUCCESS;
-             }
-             // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-@@ -0,0 +0,0 @@ public class CauldronBlock extends AbstractCauldronBlock {
-     public void handlePrecipitation(BlockState state, Level world, BlockPos pos, Biome.Precipitation precipitation) {
-         if (CauldronBlock.shouldHandlePrecipitation(world, precipitation)) {
-             if (precipitation == Biome.Precipitation.RAIN) {
-+                // Paper start - Call CauldronLevelChangeEvent
-+                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.WATER_CAULDRON.defaultBlockState(), null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL, false)) { // avoid duplicate game event
-+                    return;
-+                }
-+                // Paper end - Call CauldronLevelChangeEvent
-                 world.setBlockAndUpdate(pos, Blocks.WATER_CAULDRON.defaultBlockState());
-                 world.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_CHANGE, pos);
-             } else if (precipitation == Biome.Precipitation.SNOW) {
-+                // Paper start - Call CauldronLevelChangeEvent
-+                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.POWDER_SNOW_CAULDRON.defaultBlockState(), null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL, false)) { // avoid duplicate game event
-+                    return;
-+                }
-+                // Paper end - Call CauldronLevelChangeEvent
-                 world.setBlockAndUpdate(pos, Blocks.POWDER_SNOW_CAULDRON.defaultBlockState());
-                 world.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_CHANGE, pos);
-             }
-@@ -0,0 +0,0 @@ public class CauldronBlock extends AbstractCauldronBlock {
- 
-         if (fluid == Fluids.WATER) {
-             iblockdata1 = Blocks.WATER_CAULDRON.defaultBlockState();
-            LayeredCauldronBlock.changeLevel(state, world, pos, iblockdata1, null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL); // CraftBukkit
-+            // Paper start - Call CauldronLevelChangeEvent; don't send level event or game event if cancelled
-+            if (!LayeredCauldronBlock.changeLevel(state, world, pos, iblockdata1, null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL)) { // CraftBukkit
-+                return;
-+            }
-+            // Paper end - Call CauldronLevelChangeEvent
-             world.levelEvent(1047, pos, 0);
-         } else if (fluid == Fluids.LAVA) {
-             iblockdata1 = Blocks.LAVA_CAULDRON.defaultBlockState();
-            LayeredCauldronBlock.changeLevel(state, world, pos, iblockdata1, null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL); // CraftBukkit
-+            // Paper start - Call CauldronLevelChangeEvent; don't send level event or game event if cancelled
-+            if (!LayeredCauldronBlock.changeLevel(state, world, pos, iblockdata1, null, CauldronLevelChangeEvent.ChangeReason.NATURAL_FILL)) { // CraftBukkit
-+                return;
-+            }
-+            // Paper end - Call CauldronLevelChangeEvent
-             world.levelEvent(1046, pos, 0);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-@@ -0,0 +0,0 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
-     }
- 
-     // CraftBukkit start
-    public static boolean changeLevel(BlockState iblockdata, Level world, BlockPos blockposition, BlockState newBlock, Entity entity, CauldronLevelChangeEvent.ChangeReason reason) {
-+    // Paper start - Call CauldronLevelChangeEvent
-+    public static boolean changeLevel(BlockState iblockdata, Level world, BlockPos blockposition, BlockState newBlock, @javax.annotation.Nullable Entity entity, CauldronLevelChangeEvent.ChangeReason reason) { // Paper - entity is nullable
-+        return changeLevel(iblockdata, world, blockposition, newBlock, entity, reason, true);
-+    }
-+
-+    public static boolean changeLevel(BlockState iblockdata, Level world, BlockPos blockposition, BlockState newBlock, @javax.annotation.Nullable Entity entity, CauldronLevelChangeEvent.ChangeReason reason, boolean sendGameEvent) { // Paper - entity is nullable
-+    // Paper end - Call CauldronLevelChangeEvent
-         CraftBlockState newState = CraftBlockStates.getBlockState(world, blockposition);
-         newState.setData(newBlock);
- 
-@@ -0,0 +0,0 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
-             return false;
-         }
-         newState.update(true);
-        world.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(newBlock));
-+        if (sendGameEvent) world.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(newBlock)); // Paper - Call CauldronLevelChangeEvent
-         return true;
-     }
-     // CraftBukkit end
--- a/patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch
@@ -1,319 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 9 Aug 2021 20:45:46 -0700
-Subject: [PATCH] Fire EntityChangeBlockEvent in more places
-
-Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com>
-Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
-+++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-@@ -0,0 +0,0 @@ public class LightningBolt extends Entity {
-                 }
- 
-                 this.powerLightningRod();
-                LightningBolt.clearCopperOnLightningStrike(this.level(), this.getStrikePosition());
-+                LightningBolt.clearCopperOnLightningStrike(this.level(), this.getStrikePosition(), this); // Paper - Call EntityChangeBlockEvent
-                 this.gameEvent(GameEvent.LIGHTNING_STRIKE);
-             }
-         }
-@@ -0,0 +0,0 @@ public class LightningBolt extends Entity {
-         }
-     }
- 
-    private static void clearCopperOnLightningStrike(Level world, BlockPos pos) {
-+    private static void clearCopperOnLightningStrike(Level world, BlockPos pos, Entity lightning) { // Paper - Call EntityChangeBlockEvent
-         BlockState iblockdata = world.getBlockState(pos);
-         BlockPos blockposition1;
-         BlockState iblockdata1;
-@@ -0,0 +0,0 @@ public class LightningBolt extends Entity {
-         }
- 
-         if (iblockdata1.getBlock() instanceof WeatheringCopper) {
-            world.setBlockAndUpdate(blockposition1, WeatheringCopper.getFirst(world.getBlockState(blockposition1)));
-+            // Paper start - Call EntityChangeBlockEvent
-+            BlockState newBlock = WeatheringCopper.getFirst(world.getBlockState(blockposition1));
-+            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1, newBlock)) {
-+                world.setBlockAndUpdate(blockposition1, newBlock);
-+            }
-+            // Paper end - Call EntityChangeBlockEvent
-             BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
-             int i = world.random.nextInt(3) + 3;
- 
-             for (int j = 0; j < i; ++j) {
-                 int k = world.random.nextInt(8) + 1;
- 
-                LightningBolt.randomWalkCleaningCopper(world, blockposition1, blockposition_mutableblockposition, k);
-+                LightningBolt.randomWalkCleaningCopper(world, blockposition1, blockposition_mutableblockposition, k, lightning); // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-             }
- 
-         }
-     }
- 
-    private static void randomWalkCleaningCopper(Level world, BlockPos pos, BlockPos.MutableBlockPos mutablePos, int count) {
-+    private static void randomWalkCleaningCopper(Level world, BlockPos pos, BlockPos.MutableBlockPos mutablePos, int count, Entity lightning) { // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-         mutablePos.set(pos);
- 
-         for (int j = 0; j < count; ++j) {
-            Optional<BlockPos> optional = LightningBolt.randomStepCleaningCopper(world, mutablePos);
-+            Optional<BlockPos> optional = LightningBolt.randomStepCleaningCopper(world, mutablePos, lightning); // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
- 
-             if (optional.isEmpty()) {
-                 break;
-@@ -0,0 +0,0 @@ public class LightningBolt extends Entity {
- 
-     }
- 
-    private static Optional<BlockPos> randomStepCleaningCopper(Level world, BlockPos pos) {
-+    private static Optional<BlockPos> randomStepCleaningCopper(Level world, BlockPos pos, Entity lightning) { // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-         Iterator iterator = BlockPos.randomInCube(world.random, 10, pos, 1).iterator();
- 
-         BlockPos blockposition1;
-@@ -0,0 +0,0 @@ public class LightningBolt extends Entity {
- 
-         BlockPos blockposition1Final = blockposition1; // CraftBukkit - decompile error
-         WeatheringCopper.getPrevious(iblockdata).ifPresent((iblockdata1) -> {
-+            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1Final, iblockdata1)) // Paper - call EntityChangeBlockEvent
-             world.setBlockAndUpdate(blockposition1Final, iblockdata1); // CraftBukkit - decompile error
-         });
-         world.levelEvent(3002, blockposition1, -1);
-diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/AxeItem.java
-+++ b/src/main/java/net/minecraft/world/item/AxeItem.java
-@@ -0,0 +0,0 @@ public class AxeItem extends DiggerItem {
-             return InteractionResult.PASS;
-         } else {
-             ItemStack itemStack = context.getItemInHand();
-+            // Paper start - EntityChangeBlockEvent
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional.get())) {
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
-             }
-diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-@@ -0,0 +0,0 @@ public class EnderEyeItem extends Item {
-                 return InteractionResult.SUCCESS;
-             } else {
-                 BlockState iblockdata1 = (BlockState) iblockdata.setValue(EndPortalFrameBlock.HAS_EYE, true);
-+                // Paper start
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockposition, iblockdata1)) {
-+                    return InteractionResult.PASS;
-+                }
-+                // Paper end
- 
-                 Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition);
-                 world.setBlock(blockposition, iblockdata1, 2);
-diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/HoneycombItem.java
-+++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java
-@@ -0,0 +0,0 @@ public class HoneycombItem extends Item implements SignApplicator {
-         return getWaxed(blockState).map(state -> {
-             Player player = context.getPlayer();
-             ItemStack itemStack = context.getItemInHand();
-+            // Paper start - EntityChangeBlockEvent
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state)) {
-+                if (!player.isCreative()) {
-+                    player.containerMenu.sendAllDataToRemote();
-+                }
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
-             }
-diff --git a/src/main/java/net/minecraft/world/item/PotionItem.java b/src/main/java/net/minecraft/world/item/PotionItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/PotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/PotionItem.java
-@@ -0,0 +0,0 @@ public class PotionItem extends Item {
-         BlockState iblockdata = world.getBlockState(blockposition);
- 
-         if (context.getClickedFace() != Direction.DOWN && iblockdata.is(BlockTags.CONVERTABLE_TO_MUD) && potioncontents.is(Potions.WATER)) {
-+            // Paper start
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityhuman, blockposition, Blocks.MUD.defaultBlockState())) {
-+                entityhuman.containerMenu.sendAllDataToRemote();
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             world.playSound((Player) null, blockposition, SoundEvents.GENERIC_SPLASH, SoundSource.BLOCKS, 1.0F, 1.0F);
-             entityhuman.setItemInHand(context.getHand(), ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
-             entityhuman.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
-diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/ShovelItem.java
-+++ b/src/main/java/net/minecraft/world/item/ShovelItem.java
-@@ -0,0 +0,0 @@ public class ShovelItem extends DiggerItem {
-             Player player = context.getPlayer();
-             BlockState blockState2 = FLATTENABLES.get(blockState.getBlock());
-             BlockState blockState3 = null;
-+            Runnable afterAction = null; // Paper
-             if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
-                level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
-+                afterAction = () -> level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F); // Paper
-                 blockState3 = blockState2;
-             } else if (blockState.getBlock() instanceof CampfireBlock && blockState.getValue(CampfireBlock.LIT)) {
-+                afterAction = () -> { // Paper
-                 if (!level.isClientSide()) {
-                     level.levelEvent(null, 1009, blockPos, 0);
-                 }
- 
-                 CampfireBlock.dowse(context.getPlayer(), level, blockPos, blockState);
-+                }; // Paper
-                 blockState3 = blockState.setValue(CampfireBlock.LIT, Boolean.valueOf(false));
-             }
- 
-             if (blockState3 != null) {
-                 if (!level.isClientSide) {
-+                    // Paper start
-+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockPos, blockState3)) {
-+                        return InteractionResult.PASS;
-+                    }
-+                    afterAction.run();
-+                    // Paper end
-                     level.setBlock(blockPos, blockState3, 11);
-                     level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, blockState3));
-                     if (player != null) {
-diff --git a/src/main/java/net/minecraft/world/level/block/CakeBlock.java b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-@@ -0,0 +0,0 @@ public class CakeBlock extends Block {
- 
-             if (block instanceof CandleBlock) {
-                 CandleBlock candleblock = (CandleBlock) block;
-
-+                // Paper start - call change block event
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, CandleCakeBlock.byCandle(candleblock))) {
-+                    player.containerMenu.sendAllDataToRemote(); // update inv because candle could decrease
-+                    return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
-+                }
-+                // Paper end - call change block event
-                 if (!player.isCreative()) {
-                     stack.shrink(1);
-                 }
-@@ -0,0 +0,0 @@ public class CakeBlock extends Block {
-         if (!player.canEat(false)) {
-             return InteractionResult.PASS;
-         } else {
-+            // Paper start - call change block event
-+            int i = state.getValue(CakeBlock.BITES);
-+            final BlockState newState = i < MAX_BITES ? state.setValue(CakeBlock.BITES, i + 1) : world.getFluidState(pos).createLegacyBlock();
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, newState)) {
-+                ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
-+                return InteractionResult.PASS; // return a non-consume result to cake blocks don't drop their candles
-+            }
-+            // Paper end - call change block event
-             player.awardStat(Stats.EAT_CAKE_SLICE);
-             // CraftBukkit start
-             // entityhuman.getFoodData().eat(2, 0.1F);
-@@ -0,0 +0,0 @@ public class CakeBlock extends Block {
- 
-             ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
-             // CraftBukkit end
-            int i = (Integer) state.getValue(CakeBlock.BITES);
-+            // Paper - move up
- 
-             world.gameEvent((Entity) player, (Holder) GameEvent.EAT, pos);
-             if (i < 6) {
-diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -0,0 +0,0 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
-             if (i < 7 && !world.isClientSide) {
-                 BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
-+                // Paper start - handle cancelled events
-+                if (iblockdata1 == null) {
-+                    return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
-+                }
-+                // Paper end
- 
-                 world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
-                 player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
-@@ -0,0 +0,0 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         if (i < 7 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
-             // CraftBukkit start
-             double rand = world.getRandom().nextDouble();
-            BlockState iblockdata1 = ComposterBlock.addItem(user, state, DummyGeneratorAccess.INSTANCE, pos, stack, rand);
-            if (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1)) {
-+            BlockState iblockdata1 = null; // Paper
-+            if (false && (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1))) { // Paper - move event call into addItem
-                 return state;
-             }
-             iblockdata1 = ComposterBlock.addItem(user, state, world, pos, stack, rand);
-+            // Paper start - handle cancelled events
-+            if (iblockdata1 == null) {
-+                return state;
-+            }
-+            // Paper end
-             // CraftBukkit end
- 
-             stack.shrink(1);
-@@ -0,0 +0,0 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         return iblockdata1;
-     }
- 
-+    @Nullable // Paper
-     static BlockState addItem(@Nullable Entity user, BlockState state, LevelAccessor world, BlockPos pos, ItemStack stack) {
-         // CraftBukkit start
-         return ComposterBlock.addItem(user, state, world, pos, stack, world.getRandom().nextDouble());
-     }
- 
-+    @Nullable // Paper - make it nullable
-     static BlockState addItem(@Nullable Entity entity, BlockState iblockdata, LevelAccessor generatoraccess, BlockPos blockposition, ItemStack itemstack, double rand) {
-         // CraftBukkit end
-         int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
-@@ -0,0 +0,0 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         } else {
-             int j = i + 1;
-             BlockState iblockdata1 = (BlockState) iblockdata.setValue(ComposterBlock.LEVEL, j);
-+            // Paper start - move the EntityChangeBlockEvent here to avoid conflict later for the compost events
-+            if (entity != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata1)) {
-+                return null;
-+            }
-+            // Paper end
- 
-             generatoraccess.setBlock(blockposition, iblockdata1, 3);
-             generatoraccess.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entity, iblockdata1));
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -0,0 +0,0 @@ public class BeehiveBlockEntity extends BlockEntity {
-                                         --j;
-                                     }
- 
-                                    world.setBlockAndUpdate(blockposition, (BlockState) iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
-+                                    // Paper start - Fire EntityChangeBlockEvent in more places
-+                                    BlockState newBlockState = iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j);
-+
-+                                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entitybee, blockposition, newBlockState)) {
-+                                        world.setBlockAndUpdate(blockposition, newBlockState);
-+                                    }
-+                                    // Paper end - Fire EntityChangeBlockEvent in more places
-                                 }
-                             }
-                         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -0,0 +0,0 @@ public class DummyGeneratorAccess implements WorldGenLevel {
- 
-     @Override
-     public void gameEvent(Holder<GameEvent> event, Vec3 emitterPos, GameEvent.Context emitter) {
-        // Used by BlockComposter
-+        // Used by ComposterBlock
-     }
- 
-     @Override
--- a/patches/unapplied/server/Fix-Bee-flower-NPE.patch
+++ b/patches/unapplied/server/Fix-Bee-flower-NPE.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 6 Jul 2022 14:59:38 -0700
-Subject: [PATCH] Fix Bee flower NPE
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -0,0 +0,0 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
-             ++this.pollinatingTicks;
-             if (this.pollinatingTicks > 600) {
-                 Bee.this.savedFlowerPos = null;
-            } else {
-+            } else if (Bee.this.savedFlowerPos != null) { // Paper - add null check since API can manipulate this
-                 Vec3 vec3d = Vec3.atBottomCenterOf(Bee.this.savedFlowerPos).add(0.0D, 0.6000000238418579D, 0.0D);
- 
-                 if (vec3d.distanceTo(Bee.this.position()) > 1.0D) {
--- a/patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 21 Apr 2022 18:18:02 -0700
-Subject: [PATCH] Fix CCE for SplashPotion and LingeringPotion spawning
-
-Remove in 1.19 along with the SplashPotion and
-LingeringPotion interfaces
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-@@ -0,0 +0,0 @@ import org.bukkit.entity.ThrownPotion;
- import org.bukkit.inventory.ItemStack;
- import org.bukkit.potion.PotionEffect;
- 
-public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion {
-+public class CraftThrownPotion extends CraftThrowableProjectile implements ThrownPotion, org.bukkit.entity.SplashPotion, org.bukkit.entity.LingeringPotion { // Paper - implement other classes to avoid violating spawn method generic contracts
-     public CraftThrownPotion(CraftServer server, net.minecraft.world.entity.projectile.ThrownPotion entity) {
-         super(server, entity);
-     }
--- a/patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/unapplied/server/Fix-CME-in-CraftPersistentDataTypeRegistry.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gero <gecam59@gmail.com>
-Date: Sat, 2 Oct 2021 20:08:30 +0200
-Subject: [PATCH] Fix CME in CraftPersistentDataTypeRegistry
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
-+++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataTypeRegistry.java
-@@ -0,0 +0,0 @@ public final class CraftPersistentDataTypeRegistry {
-         }
-     }
- 
-    private final Map<Class, TagAdapter> adapters = new HashMap<>();
-+    private final Map<Class, TagAdapter> adapters = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - Replace HashMap with ConcurrentHashMap to avoid CME
- 
-     /**
-      * Creates a suitable adapter instance for the primitive class type.
--- a/patches/unapplied/server/Fix-Entity-Position-Desync.patch
+++ b/patches/unapplied/server/Fix-Entity-Position-Desync.patch
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Thu, 23 Dec 2021 23:59:12 -0500
-Subject: [PATCH] Fix Entity Position Desync
-
-If entities were teleported in the first tick it would not be send to the client.
-
-This excludes hanging entities, as this fix caused problematic behavior due to them having their own
-position field.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -0,0 +0,0 @@ public class ServerEntity {
-                 boolean flag4 = false;
-                 boolean flag5 = false;
- 
-                if (this.tickCount > 0 || this.entity instanceof AbstractArrow) {
-+                if (!(this.entity instanceof net.minecraft.world.entity.decoration.HangingEntity) || this.tickCount > 0 || this.entity instanceof AbstractArrow) { // Paper - Always update position to fix first-tick teleports
-                     long k = this.positionCodec.encodeX(vec3d);
-                     long l = this.positionCodec.encodeY(vec3d);
-                     long i1 = this.positionCodec.encodeZ(vec3d);
--- a/patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/unapplied/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 26 Oct 2022 13:13:12 -0700
-Subject: [PATCH] Fix EntityArgument suggestion permissions to align with
- EntitySelector#checkPermissions
-
-Fixes where the user has permission for selectors but not their
-suggestions, which especially matters when we force suggestions to
-the server for this type
-
-diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-+++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-@@ -0,0 +0,0 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
-             StringReader stringreader = new StringReader(suggestionsbuilder.getInput());
- 
-             stringreader.setCursor(suggestionsbuilder.getStart());
-            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, icompletionprovider.hasPermission(2));
-+            // Paper start - Fix EntityArgument suggestion permissions
-+            final boolean permission = object instanceof CommandSourceStack stack
-+                    ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector")
-+                    : icompletionprovider.hasPermission(2);
-+            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, permission);
-+            // Paper end - Fix EntityArgument suggestion permissions
- 
-             try {
-                 argumentparserselector.parse();
--- a/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Denery <dorofeevij@gmail.com>
-Date: Mon, 31 Oct 2022 14:20:52 +0300
-Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
- entities from being set on fire
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             pluginManager.callEvent(entityCombustEvent);
-             if (!entityCombustEvent.isCancelled()) {
-                 this.igniteForSeconds(entityCombustEvent.getDuration(), false);
-+            // Paper start - fix EntityCombustEvent cancellation
-+            } else {
-+                this.setRemainingFireTicks(this.remainingFireTicks - 1);
-+            // Paper end - fix EntityCombustEvent cancellation
-             }
-             // CraftBukkit end
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-@@ -0,0 +0,0 @@ public abstract class BaseFireBlock extends Block {
- 
-                 if (!event.isCancelled()) {
-                     entity.igniteForSeconds(event.getDuration(), false);
-+                    // Paper start - fix EntityCombustEvent cancellation
-+                } else {
-+                    entity.setRemainingFireTicks(entity.getRemainingFireTicks() - 1);
-+                    // Paper end - fix EntityCombustEvent cancellation
-                 }
-                 // CraftBukkit end
-             }
--- a/patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/unapplied/server/Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 1 Jan 2022 23:11:26 -0800
-Subject: [PATCH] Fix FurnaceInventory for smokers and blast furnaces
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
-@@ -0,0 +0,0 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
-         return new CraftInventory(tileEntity);
-     }
- 
-    public static class Furnace extends CraftTileInventoryConverter {
-+    public static class Furnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
- 
-         @Override
-         public Container getTileEntity() {
-@@ -0,0 +0,0 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
-             return furnace;
-         }
- 
-+    // Paper start - abstract furnace converter to apply to all 3 furnaces
-+    }
-+
-+    public static abstract class AbstractFurnaceInventoryConverter extends CraftTileInventoryConverter {
-+    // Paper end - abstract furnace converter to apply to all 3 furnaces
-         // Paper start
-         @Override
-         public Inventory createInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) {
-@@ -0,0 +0,0 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
-         }
-     }
- 
-    public static class BlastFurnace extends CraftTileInventoryConverter {
-+    public static class BlastFurnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
- 
-         @Override
-         public Container getTileEntity() {
-@@ -0,0 +0,0 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
-         }
-     }
- 
-    public static class Smoker extends CraftTileInventoryConverter {
-+    public static class Smoker extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
- 
-         @Override
-         public Container getTileEntity() {
--- a/patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/unapplied/server/Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: etil2jz <blanchot.arthur@protonmail.ch>
-Date: Sat, 2 Apr 2022 23:29:24 +0200
-Subject: [PATCH] Fix NBT pieces overriding a block entity during worldgen
- deadlock
-
-By checking if the world passed into StructureTemplate's placeInWorld
-is not a WorldGenRegion, we can bypass the deadlock entirely.
-See https://bugs.mojang.com/browse/MC-246262
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-@@ -0,0 +0,0 @@ public class StructureTemplate {
- 
-                         if (definedstructure_blockinfo.nbt != null) {
-                             tileentity = world.getBlockEntity(blockposition2);
-                            Clearable.tryClear(tileentity);
-+                            // Paper start - Fix NBT pieces overriding a block entity during worldgen deadlock
-+                            if (!(world instanceof net.minecraft.world.level.WorldGenLevel)) {
-+                                Clearable.tryClear(tileentity);
-+                            }
-+                            // Paper end - Fix NBT pieces overriding a block entity during worldgen deadlock
-                             world.setBlock(blockposition2, Blocks.BARRIER.defaultBlockState(), 20);
-                         }
-                         // CraftBukkit start
-@@ -0,0 +0,0 @@ public class StructureTemplate {
-                         if (pair1.getSecond() != null) {
-                             tileentity = world.getBlockEntity(blockposition6);
-                             if (tileentity != null) {
-                                tileentity.setChanged();
-+                                // Paper start - Fix NBT pieces overriding a block entity during worldgen deadlock
-+                                if (!(world instanceof net.minecraft.world.level.WorldGenLevel)) {
-+                                    tileentity.setChanged();
-+                                }
-+                                // Paper end - Fix NBT pieces overriding a block entity during worldgen deadlock
-                             }
-                         }
-                     }
--- a/patches/unapplied/server/Fix-NotePlayEvent.patch
+++ b/patches/unapplied/server/Fix-NotePlayEvent.patch
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
-Date: Mon, 21 Jun 2021 14:23:50 +0100
-Subject: [PATCH] Fix NotePlayEvent
-
-== AT ==
-public org.bukkit.craftbukkit.block.data.CraftBlockData toNMS(Ljava/lang/Enum;Ljava/lang/Class;)Ljava/lang/Enum;
-
-diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-@@ -0,0 +0,0 @@ public class NoteBlock extends Block {
-     private void playNote(@Nullable Entity entity, BlockState state, Level world, BlockPos pos) {
-         if (((NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT)).worksAboveNoteBlock() || world.getBlockState(pos.above()).isAir()) {
-             // CraftBukkit start
-            org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
-            if (event.isCancelled()) {
-                return;
-            }
-+            // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
-+            // if (event.isCancelled()) {
-+            //     return;
-+            // }
-             // CraftBukkit end
-+            // Paper - move NotePlayEvent call to fix instrument/note changes; TODO any way to cancel the game event?
-             world.blockEvent(pos, this, 0, 0);
-             world.gameEvent(entity, (Holder) GameEvent.NOTE_BLOCK_PLAY, pos);
-         }
-@@ -0,0 +0,0 @@ public class NoteBlock extends Block {
-     @Override
-     protected boolean triggerEvent(BlockState state, Level world, BlockPos pos, int type, int data) {
-         NoteBlockInstrument blockpropertyinstrument = (NoteBlockInstrument) state.getValue(NoteBlock.INSTRUMENT);
-+        // Paper start - move NotePlayEvent call to fix instrument/note changes
-+        org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, blockpropertyinstrument, state.getValue(NOTE));
-+        if (event.isCancelled()) return false;
-+        // Paper end - move NotePlayEvent call to fix instrument/note changes
-         float f;
- 
-         if (blockpropertyinstrument.isTunable()) {
-            int k = (Integer) state.getValue(NoteBlock.NOTE);
-+            int k = event.getNote().getId(); // Paper - move NotePlayEvent call to fix instrument/note changes
- 
-             f = NoteBlock.getPitchFromNote(k);
-             world.addParticle(ParticleTypes.NOTE, (double) pos.getX() + 0.5D, (double) pos.getY() + 1.2D, (double) pos.getZ() + 0.5D, (double) k / 24.0D, 0.0D, 0.0D);
-@@ -0,0 +0,0 @@ public class NoteBlock extends Block {
- 
-             holder = Holder.direct(SoundEvent.createVariableRangeEvent(minecraftkey));
-         } else {
-            holder = blockpropertyinstrument.getSoundEvent();
-+            holder = org.bukkit.craftbukkit.block.data.CraftBlockData.toNMS(event.getInstrument(), NoteBlockInstrument.class).getSoundEvent(); // Paper - move NotePlayEvent call to fix instrument/note changes
-         }
- 
-         world.playSeededSound((Player) null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, holder, SoundSource.RECORDS, 3.0F, f, world.random.nextLong());
--- a/patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/unapplied/server/Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 30 May 2022 16:03:36 -0700
-Subject: [PATCH] Fix OfflinePlayer#getBedSpawnLocation
-
-When calling getBedSpawnLocation on an
-instance of CraftOfflinePlayer the world was incorrect
-due to the logic for reading the NBT not being up-to-date.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -0,0 +0,0 @@ import org.bukkit.profile.PlayerProfile;
- 
- @SerializableAs("Player")
- public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializable {
-+    private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper
-     private final GameProfile profile;
-     private final CraftServer server;
-     private final PlayerDataStorage storage;
-@@ -0,0 +0,0 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
-         if (data == null) return null;
- 
-         if (data.contains("SpawnX") && data.contains("SpawnY") && data.contains("SpawnZ")) {
-            String spawnWorld = data.getString("SpawnWorld");
-            if (spawnWorld.equals("")) {
-                spawnWorld = this.server.getWorlds().get(0).getName();
-+            // Paper start - fix wrong world
-+            final float respawnAngle = data.getFloat("SpawnAngle");
-+            org.bukkit.World spawnWorld = this.server.getWorld(data.getString("SpawnWorld")); // legacy
-+            if (data.contains("SpawnDimension")) {
-+                com.mojang.serialization.DataResult<net.minecraft.resources.ResourceKey<net.minecraft.world.level.Level>> result = net.minecraft.world.level.Level.RESOURCE_KEY_CODEC.parse(net.minecraft.nbt.NbtOps.INSTANCE, data.get("SpawnDimension"));
-+                net.minecraft.resources.ResourceKey<net.minecraft.world.level.Level> levelKey = result.resultOrPartial(LOGGER::error).orElse(net.minecraft.world.level.Level.OVERWORLD);
-+                net.minecraft.server.level.ServerLevel level = this.server.console.getLevel(levelKey);
-+                spawnWorld = level != null ? level.getWorld() : spawnWorld;
-             }
-            return new Location(this.server.getWorld(spawnWorld), data.getInt("SpawnX"), data.getInt("SpawnY"), data.getInt("SpawnZ"));
-+            if (spawnWorld == null) {
-+                return null;
-+            }
-+            return new Location(spawnWorld, data.getInt("SpawnX"), data.getInt("SpawnY"), data.getInt("SpawnZ"), respawnAngle, 0);
-+            // Paper end
-         }
-         return null;
-     }
--- a/patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/unapplied/server/Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Doc <nachito94@msn.com>
-Date: Sun, 17 Jul 2022 11:49:43 -0400
-Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-         // Spigot end
-         // this.chatSpamTickCount += 20;
-        if (this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
-+        if (counted && this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper - exclude from SpigotConfig.spamExclusions
-             // CraftBukkit end
-             this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
-         }
--- a/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch
@@ -1,425 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 11 Jul 2022 11:56:41 -0700
-Subject: [PATCH] Fix a bunch of vanilla bugs
-
-https://bugs.mojang.com/browse/MC-253721
-  wrong msg for opping multiple players
-
-https://bugs.mojang.com/browse/MC-248588
-  respect mob griefing gamerule for draining water cauldrons
-
-https://bugs.mojang.com/browse/MC-244739
-  play goat eating sound for last item in stack
-
-https://bugs.mojang.com/browse/MC-243057
-  ignore furnace fuel slot in recipe book click
-
-https://bugs.mojang.com/browse/MC-147659
-  Some witch huts spawn the incorrect cat
-  Note: Marked as Won't Fix, makes 0 sense
-
-https://bugs.mojang.com/browse/MC-179072
-  Creepers do not defuse when switching from Survival to Creative/Spectator
-
-https://bugs.mojang.com/browse/MC-191591
-  Fix items equipped on AbstractHorse losing NBT
-
-https://bugs.mojang.com/browse/MC-259571
-  Fix changeGameModeForPlayer to use gameModeForPlayer
-
-https://bugs.mojang.com/browse/MC-262422
-  Fix lightning being able to hit spectators
-
-https://bugs.mojang.com/browse/MC-224454
-  Fix mobs attempting to pathfind through azalea blocks
-
-https://bugs.mojang.com/browse/MC-263999
-  Fix mobs breaking doors not spawning block break particles
-
-https://bugs.mojang.com/browse/MC-210802
-  Fixes sheep eating blocks outside of ticking range
-
-https://bugs.mojang.com/browse/MC-123848
-  Fixes item frames dropping items above when pointing down
-
-https://bugs.mojang.com/browse/MC-84789
-  Fix wild wolves not considering bones interesting
-
-https://bugs.mojang.com/browse/MC-174630
-  Fix secondary beacon effect remaining after switching effect
-
-https://bugs.mojang.com/browse/MC-153086
-  Fix the beacon deactivation sound always playing when broken
-
-https://bugs.mojang.com/browse/MC-200092
-  Fix yaw being ignored for a player's first spawn pos
-
-https://bugs.mojang.com/browse/MC-158900
-  Fix error when joining after tempban expired
-
-== AT ==
-public net/minecraft/world/entity/Mob leashInfoTag
-
-Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
-Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -0,0 +0,0 @@ public interface DispenseItemBehavior {
-                         }
-                     }
-                     // CraftBukkit end
-                    ((Saddleable) list.get(0)).equipSaddle(SoundSource.BLOCKS);
-+                    ((Saddleable) list.get(0)).equipSaddle(SoundSource.BLOCKS, CraftItemStack.asNMSCopy(event.getItem())); // Paper - Fix saddles losing nbt data - MC-191591
-                     // itemstack.shrink(1); // CraftBukkit - handled above
-                     this.setSuccess(true);
-                     return stack;
-diff --git a/src/main/java/net/minecraft/server/commands/DeOpCommands.java b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-+++ b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-@@ -0,0 +0,0 @@ public class DeOpCommands {
-             if (playerList.isOp(gameProfile)) {
-                 playerList.deop(gameProfile);
-                 i++;
-                source.sendSuccess(() -> Component.translatable("commands.deop.success", targets.iterator().next().getName()), true);
-+                source.sendSuccess(() -> Component.translatable("commands.deop.success", gameProfile.getName()), true); // Paper - fixes MC-253721
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/commands/OpCommand.java b/src/main/java/net/minecraft/server/commands/OpCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/OpCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/OpCommand.java
-@@ -0,0 +0,0 @@ public class OpCommand {
-             if (!playerList.isOp(gameProfile)) {
-                 playerList.op(gameProfile);
-                 i++;
-                source.sendSuccess(() -> Component.translatable("commands.op.success", targets.iterator().next().getName()), true);
-+                source.sendSuccess(() -> Component.translatable("commands.op.success", gameProfile.getName()), true); // Paper - fixes MC-253721
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         // CraftBukkit end
-     }
- 
-    boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) {
-+    public boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) { // Paper - public
-         // Spigot start
-         return this.anyPlayerCloseEnoughForSpawning(pos, false);
-     }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         } else {
-             AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, new BlockPos(blockposition1.atY(this.getMaxBuildHeight()))).inflate(3.0D);
-             List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
-                return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition());
-+                return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition()) && !entityliving.isSpectator(); // Paper - Fix lightning being able to hit spectators (MC-262422)
-             });
- 
-             if (!list.isEmpty()) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
-                 BlockPos blockposition1 = PlayerRespawnLogic.getOverworldRespawnPos(world, blockposition.getX() + j2 - i, blockposition.getZ() + k2 - i);
- 
-                 if (blockposition1 != null) {
-                    this.moveTo(blockposition1, 0.0F, 0.0F);
-+                    this.moveTo(blockposition1, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
-                     if (world.noCollision((Entity) this)) {
-                         break;
-                     }
-                 }
-             }
-         } else {
-            this.moveTo(blockposition, 0.0F, 0.0F);
-+            this.moveTo(blockposition, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
- 
-             while (!world.noCollision((Entity) this) && this.getY() < (double) (world.getMaxBuildHeight() - 1)) {
-                 this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
-                 return event; // Paper - Expand PlayerGameModeChangeEvent
-             }
-             // CraftBukkit end
-            this.setGameModeForPlayer(gameMode, this.previousGameModeForPlayer);
-+            this.setGameModeForPlayer(gameMode, this.gameModeForPlayer); // Paper - Fix MC-259571
-             this.player.onUpdateAbilities();
-             this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
-             this.level.updateSleepingPlayerList();
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-         Player player = entity.getBukkitEntity();
-         PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.channel.remoteAddress()).getAddress());
- 
-        if (this.bans.isBanned(gameprofile)) {
-            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
-+        // Paper start - Fix MC-158900
-+        UserBanListEntry gameprofilebanentry;
-+        if (this.bans.isBanned(gameprofile) && (gameprofilebanentry = this.bans.get(gameprofile)) != null) {
-+            // Paper end - Fix MC-158900
- 
-             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
-             if (gameprofilebanentry.getExpires() != null) {
-diff --git a/src/main/java/net/minecraft/world/entity/Saddleable.java b/src/main/java/net/minecraft/world/entity/Saddleable.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Saddleable.java
-+++ b/src/main/java/net/minecraft/world/entity/Saddleable.java
-@@ -0,0 +0,0 @@ public interface Saddleable {
-     boolean isSaddleable();
- 
-     void equipSaddle(@Nullable SoundSource sound);
-+    // Paper start - Fix saddles losing nbt data - MC-191591
-+    default void equipSaddle(final @Nullable SoundSource sound, final @Nullable net.minecraft.world.item.ItemStack stack) {
-+        this.equipSaddle(sound);
-+    }
-+    // Paper end
- 
-     default SoundEvent getSaddleSoundEvent() {
-         return SoundEvents.HORSE_SADDLE;
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java
-@@ -0,0 +0,0 @@ public class BegGoal extends Goal {
-     private boolean playerHoldingInteresting(Player player) {
-         for (InteractionHand interactionHand : InteractionHand.values()) {
-             ItemStack itemStack = player.getItemInHand(interactionHand);
-            if (this.wolf.isTame() && itemStack.is(Items.BONE)) {
-+            if (!this.wolf.isTame() && itemStack.is(Items.BONE)) { // Paper - Fix MC-84789
-                 return true;
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -0,0 +0,0 @@ public class BreakDoorGoal extends DoorInteractGoal {
-                 return;
-             }
-             // CraftBukkit end
-+            final net.minecraft.world.level.block.state.BlockState oldState = this.mob.level().getBlockState(this.doorPos); // Paper - fix MC-263999
-             this.mob.level().removeBlock(this.doorPos, false);
-             this.mob.level().levelEvent(1021, this.doorPos, 0);
-            this.mob.level().levelEvent(2001, this.doorPos, Block.getId(this.mob.level().getBlockState(this.doorPos)));
-+            this.mob.level().levelEvent(2001, this.doorPos, Block.getId(oldState)); // Paper - fix MC-263999
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-@@ -0,0 +0,0 @@ public class EatBlockGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
-+        // Paper start - Fix MC-210802
-+        if (!((net.minecraft.server.level.ServerLevel) this.level).chunkSource.chunkMap.anyPlayerCloseEnoughForSpawning(this.mob.chunkPosition())) {
-+            return false;
-+        }
-+        // Paper end
-         if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) {
-             return false;
-         } else {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-@@ -0,0 +0,0 @@ public class SwellGoal extends Goal {
-         return this.creeper.getSwellDir() > 0 || livingEntity != null && this.creeper.distanceToSqr(livingEntity) < 9.0;
-     }
- 
-+    // Paper start - Fix MC-179072
-+    @Override
-+    public boolean canContinueToUse() {
-+        return !net.minecraft.world.entity.EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(this.creeper.getTarget()) && canUse();
-+    }
-+    // Paper end
-+
-     @Override
-     public void start() {
-         this.creeper.getNavigation().stop();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -0,0 +0,0 @@ public class Goat extends Animal {
-             player.setItemInHand(hand, itemstack1);
-             return InteractionResult.sidedSuccess(this.level().isClientSide);
-         } else {
-+            boolean isFood = this.isFood(itemstack); // Paper - track before stack is possibly decreased to 0 (Fixes MC-244739)
-             InteractionResult enuminteractionresult = super.mobInteract(player, hand);
- 
-            if (enuminteractionresult.consumesAction() && this.isFood(itemstack)) {
-+            if (enuminteractionresult.consumesAction() && isFood) { // Paper
-                 this.level().playSound((Player) null, (Entity) this, this.getEatingSound(itemstack), SoundSource.NEUTRAL, 1.0F, Mth.randomBetween(this.level().random, 0.8F, 1.2F));
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -0,0 +0,0 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
- 
-     @Override
-     public void equipSaddle(@Nullable SoundSource sound) {
-        this.inventory.setItem(0, new ItemStack(Items.SADDLE));
-+        // Paper start - Fix saddles losing nbt data - MC-191591
-+        this.equipSaddle(sound, null);
-+    }
-+    @Override
-+    public void equipSaddle(@Nullable SoundSource sound, @Nullable ItemStack stack) {
-+        this.inventory.setItem(0, stack != null ? stack : new ItemStack(Items.SADDLE));
-+        // Paper end
-     }
- 
-     public void equipBodyArmor(Player player, ItemStack stack) {
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity {
-         return (ItemStack) this.getEntityData().get(ItemFrame.DATA_ITEM);
-     }
- 
-+    // Paper start - Fix MC-123848 (spawn item frame drops above block)
-+    @Nullable
-+    @Override
-+    public net.minecraft.world.entity.item.ItemEntity spawnAtLocation(ItemStack stack) {
-+        return this.spawnAtLocation(stack, getDirection().equals(Direction.DOWN) ? -0.6F : 0.0F);
-+    }
-+    // Paper end
-+
-     @Nullable
-     public MapId getFramedMapId() {
-         return (MapId) this.getItem().get(DataComponents.MAP_ID);
-diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -0,0 +0,0 @@ public class CatSpawner implements CustomSpawner {
-         if (cat == null) {
-             return 0;
-         } else {
-+            cat.moveTo(pos, 0.0F, 0.0F); // Paper - move up - Fix MC-147659
-             cat.finalizeSpawn(world, world.getCurrentDifficultyAt(pos), MobSpawnType.NATURAL, null);
-            cat.moveTo(pos, 0.0F, 0.0F);
-             world.addFreshEntityWithPassengers(cat);
-             return 1;
-         }
-diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-@@ -0,0 +0,0 @@ public class BeaconMenu extends AbstractContainerMenu {
-     // Paper end - Add PlayerChangeBeaconEffectEvent
- 
-     public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) {
-+        // Paper start - fix MC-174630 - validate secondary power
-+        if (secondary.isPresent() && secondary.get() != net.minecraft.world.effect.MobEffects.REGENERATION && (primary.isPresent() && secondary.get() != primary.get())) {
-+            secondary = Optional.empty();
-+        }
-+        // Paper end
-         if (this.paymentSlot.hasItem()) {
-             // Paper start - Add PlayerChangeBeaconEffectEvent
-             io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), convert(primary), convert(secondary), this.access.getLocation().getBlock());
-diff --git a/src/main/java/net/minecraft/world/item/SaddleItem.java b/src/main/java/net/minecraft/world/item/SaddleItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/SaddleItem.java
-+++ b/src/main/java/net/minecraft/world/item/SaddleItem.java
-@@ -0,0 +0,0 @@ public class SaddleItem extends Item {
-     public InteractionResult interactLivingEntity(ItemStack stack, Player user, LivingEntity entity, InteractionHand hand) {
-         if (entity instanceof Saddleable saddleable && entity.isAlive() && !saddleable.isSaddled() && saddleable.isSaddleable()) {
-             if (!user.level().isClientSide) {
-                saddleable.equipSaddle(SoundSource.NEUTRAL);
-+                saddleable.equipSaddle(SoundSource.NEUTRAL, stack.copyWithCount(1)); // Paper - Fix saddles losing nbt data - MC-191591
-                 entity.level().gameEvent(entity, GameEvent.EQUIP, entity.position());
-                 stack.shrink(1);
-             }
-diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-@@ -0,0 +0,0 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock {
-     public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
-         TreeGrower.AZALEA.growTree(world, world.getChunkSource().getGenerator(), pos, state, random);
-     }
-+
-+    // Paper start - Fix MC-224454
-+    @Override
-+    public boolean isPathfindable(BlockState state, net.minecraft.world.level.pathfinder.PathComputationType type) {
-+        return false;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-@@ -0,0 +0,0 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (!world.isClientSide && entity.isOnFire() && this.isEntityInsideContent(state, pos, entity)) {
-             // CraftBukkit start
-            if (entity.mayInteract(world, pos)) {
-+            if ((entity instanceof net.minecraft.world.entity.player.Player || world.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING)) && entity.mayInteract(world, pos)) { // Paper - Fixes MC-248588
-                 if (!this.handleEntityOnFireInsideWithEvent(state, world, pos, entity)) { // Paper - fix powdered snow cauldron extinguishing entities
-                     return;
-                 }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
- 
-     @Override
-     public void fillStackedContents(StackedContents finder) {
-        Iterator iterator = this.items.iterator();
-
-        while (iterator.hasNext()) {
-            ItemStack itemstack = (ItemStack) iterator.next();
-
-            finder.accountStack(itemstack);
-        }
-+        // Paper start - don't account fuel stack (fixes MC-243057)
-+        finder.accountStack(this.items.get(SLOT_INPUT));
-+        finder.accountStack(this.items.get(SLOT_RESULT));
-+        // Paper end
- 
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-         org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
-         new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-         // Paper end - beacon activation/deactivation events
-+        // Paper start - fix MC-153086
-+        if (this.levels > 0 && !this.beamSections.isEmpty()) {
-         BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
-+        }
-+        // Paper end
-         super.setRemoved();
-     }
- 
--- a/patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 18 Mar 2022 21:30:00 -0700
-Subject: [PATCH] Fix async entity add due to fungus trees
-
-
-diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-+++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -0,0 +0,0 @@ public class WorldGenRegion implements WorldGenLevel {
-         if (iblockdata.isAir()) {
-             return false;
-         } else {
-+            if (drop) LOGGER.warn("Potential async entity add during worldgen", new Throwable()); // Paper - Fix async entity add due to fungus trees; log when this happens
-             if (false) { // CraftBukkit - SPIGOT-6833: Do not drop during world generation
-                 BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 ((ChorusFlowerBlock) Blocks.CHORUS_FLOWER).generatePlant(access, pos, random, 8);
-                 return true;
-             case CRIMSON_FUNGUS:
-                gen = TreeFeatures.CRIMSON_FUNGUS_PLANTED;
-+                gen = this.isNormalWorld() ? TreeFeatures.CRIMSON_FUNGUS_PLANTED : TreeFeatures.CRIMSON_FUNGUS; // Paper - Fix async entity add due to fungus trees; if world gen, don't use planted version
-                 break;
-             case WARPED_FUNGUS:
-                gen = TreeFeatures.WARPED_FUNGUS_PLANTED;
-+                gen = this.isNormalWorld() ? TreeFeatures.WARPED_FUNGUS_PLANTED : TreeFeatures.WARPED_FUNGUS; // Paper - Fix async entity add due to fungus trees; if world gen, don't use planted version
-                 break;
-             case AZALEA:
-                 gen = TreeFeatures.AZALEA_TREE;
--- a/patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/unapplied/server/Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 8 Oct 2021 13:12:58 -0700
-Subject: [PATCH] Fix cancelled powdered snow bucket placement
-
-Cancelling the placement of powdered snow from the powdered
-snow bucket didn't revert grass that became snowy because of the
-placement.
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-             int oldCount = this.getCount();
-             ServerLevel world = (ServerLevel) context.getLevel();
- 
-            if (!(item instanceof BucketItem || item instanceof SolidBucketItem)) { // if not bucket
-+            if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - Fix cancelled powdered snow bucket placement
-                 world.captureBlockStates = true;
-                 // special case bonemeal
-                 if (item == Items.BONE_MEAL) {
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-                 world.capturedBlockStates.clear();
-                 if (blocks.size() > 1) {
-                     placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
-                } else if (blocks.size() == 1) {
-+                } else if (blocks.size() == 1 && item != Items.POWDER_SNOW_BUCKET) { // Paper - Fix cancelled powdered snow bucket placement
-                     placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, enumhand, blocks.get(0), blockposition.getX(), blockposition.getY(), blockposition.getZ());
-                 }
- 
--- a/patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/unapplied/server/Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 19 Feb 2022 19:05:59 -0800
-Subject: [PATCH] Fix cancelling ProjectileHitEvent for piercing arrows
-
-Piercing arrows search for multiple entities inside a while
-loop that is checking the projectile entity's removed state.
-If the hit event is cancelled on the first entity, the event will
-be called over and over again inside that while loop until the event
-is not cancelled. The solution here, is to make use of an
-already-existing field on AbstractArrow for tracking entities hit by
-piercing arrows to avoid duplicate damage being applied.
-
-== AT ==
-protected net.minecraft.world.entity.projectile.Projectile hitCancelled
-
-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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -0,0 +0,0 @@ public abstract class AbstractArrow extends Projectile {
-         }
-     }
- 
-+    // Paper start - Fix cancelling ProjectileHitEvent for piercing arrows
-+    @Override
-+    public ProjectileDeflection preHitTargetOrDeflectSelf(HitResult hitResult) {
-+        if (hitResult instanceof EntityHitResult entityHitResult && this.hitCancelled && this.getPierceLevel() > 0) {
-+            if (this.piercingIgnoreEntityIds == null) {
-+                this.piercingIgnoreEntityIds = new IntOpenHashSet(5);
-+            }
-+            this.piercingIgnoreEntityIds.add(entityHitResult.getEntity().getId());
-+        }
-+        return super.preHitTargetOrDeflectSelf(hitResult);
-+    }
-+    // Paper end - Fix cancelling ProjectileHitEvent for piercing arrows
-+
-     @Override
-     protected double getDefaultGravity() {
-         return 0.05D;
--- a/patches/unapplied/server/Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/Fix-custom-piglin-loved-items.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jul 2022 21:50:44 -0700
-Subject: [PATCH] Fix custom piglin loved items
-
-Upstream didn't modify the isLovedItem check in wantsToPickup
-so piglins never actually tried to pickup interestItems
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -0,0 +0,0 @@ public class PiglinAi {
-         } else {
-             boolean flag = piglin.canAddToInventory(stack);
- 
-            return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag));
-+            return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack, piglin) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag)); // Paper - upstream missed isLovedItem check
-         }
-     }
- 
--- a/patches/unapplied/server/Fix-falling-block-spawn-methods.patch
+++ b/patches/unapplied/server/Fix-falling-block-spawn-methods.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Fri, 4 Mar 2022 20:35:19 +0100
-Subject: [PATCH] Fix falling block spawn methods
-
-Restores the API behavior from previous versions of the server
- Do not call API events
- Do not replace the existing block in the world
-
-== AT ==
-public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         Preconditions.checkArgument(material != null, "Material cannot be null");
-         Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material);
- 
-        FallingBlockEntity entity = FallingBlockEntity.fall(this.world, BlockPos.containing(location.getX(), location.getY(), location.getZ()), CraftBlockType.bukkitToMinecraft(material).defaultBlockState(), SpawnReason.CUSTOM);
-+        // Paper start - restore API behavior for spawning falling blocks
-+        FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), CraftBlockType.bukkitToMinecraft(material).defaultBlockState()); // Paper
-+        entity.time = 1;
-+
-+        this.world.addFreshEntity(entity, SpawnReason.CUSTOM);
-+        // Paper end - restore API behavior for spawning falling blocks
-         return (FallingBlock) entity.getBukkitEntity();
-     }
- 
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         Preconditions.checkArgument(location != null, "Location cannot be null");
-         Preconditions.checkArgument(data != null, "BlockData cannot be null");
- 
-        FallingBlockEntity entity = FallingBlockEntity.fall(this.world, BlockPos.containing(location.getX(), location.getY(), location.getZ()), ((CraftBlockData) data).getState(), SpawnReason.CUSTOM);
-+        // Paper start - restore API behavior for spawning falling blocks
-+        FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), ((CraftBlockData) data).getState());
-+        entity.time = 1;
-+
-+        this.world.addFreshEntity(entity, SpawnReason.CUSTOM);
-+        // Paper end - restore API behavior for spawning falling blocks
-         return (FallingBlock) entity.getBukkitEntity();
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java
-@@ -0,0 +0,0 @@ public final class CraftEntityTypes {
-         register(new EntityTypeData<>(EntityType.TNT, TNTPrimed.class, CraftTNTPrimed::new, spawnData -> new PrimedTnt(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), null)));
-         register(new EntityTypeData<>(EntityType.FALLING_BLOCK, FallingBlock.class, CraftFallingBlock::new, spawnData -> {
-             BlockPos pos = BlockPos.containing(spawnData.x(), spawnData.y(), spawnData.z());
-            return FallingBlockEntity.fall(spawnData.minecraftWorld(), pos, spawnData.world().getBlockState(pos));
-+            return new FallingBlockEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), spawnData.world().getBlockState(pos)); // Paper - create falling block entities correctly
-         }));
-         register(new EntityTypeData<>(EntityType.FIREWORK_ROCKET, Firework.class, CraftFirework::new, spawnData -> new FireworkRocketEntity(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), net.minecraft.world.item.ItemStack.EMPTY)));
-         register(new EntityTypeData<>(EntityType.EVOKER_FANGS, EvokerFangs.class, CraftEvokerFangs::new, spawnData -> new net.minecraft.world.entity.projectile.EvokerFangs(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), (float) Math.toRadians(spawnData.yaw()), 0, null)));
--- a/patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/unapplied/server/Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -1,215 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Mon, 21 Mar 2022 20:00:53 +0200
-Subject: [PATCH] Fix new block data for EntityChangeBlockEvent
-
-Also standardizes how to handle EntityChangeBlockEvent before a removeBlock or destroyBlock
-call. Always use 'state.getFluidState().createLegacyBlock()' to get the new state instead of
-just using the 'air' state.
-
-Also fixes the new block data for EntityBreakDoorEvent (a sub-event from
-EntityChangeBlockEvent)
-
-Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-@@ -0,0 +0,0 @@ public class HarvestFarmland extends Behavior<Villager> {
-                 Block block1 = world.getBlockState(this.aboveFarmlandPos.below()).getBlock();
- 
-                 if (block instanceof CropBlock && ((CropBlock) block).isMaxAge(iblockdata)) {
-                    if (CraftEventFactory.callEntityChangeBlockEvent(entity, this.aboveFarmlandPos, Blocks.AIR.defaultBlockState())) { // CraftBukkit
-+                    if (CraftEventFactory.callEntityChangeBlockEvent(entity, this.aboveFarmlandPos, iblockdata.getFluidState().createLegacyBlock())) { // CraftBukkit // Paper - fix wrong block state
-                     world.destroyBlock(this.aboveFarmlandPos, true, entity);
-                     } // CraftBukkit
-                 }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -0,0 +0,0 @@ public class BreakDoorGoal extends DoorInteractGoal {
- 
-         if (this.breakTime == this.getDoorBreakTime() && this.isValidDifficulty(this.mob.level().getDifficulty())) {
-             // CraftBukkit start
-            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreakDoorEvent(this.mob, this.doorPos).isCancelled()) {
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreakDoorEvent(this.mob, this.doorPos, this.mob.level().getFluidState(this.doorPos).createLegacyBlock()).isCancelled()) { // Paper - fix wrong block state
-                 this.start();
-                 return;
-             }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-@@ -0,0 +0,0 @@ public class EatBlockGoal extends Goal {
-         if (this.eatAnimationTick == this.adjustedTickDelay(4)) {
-             BlockPos blockposition = this.mob.blockPosition();
- 
-            if (EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition))) {
-                if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition, Blocks.AIR.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
-+            final BlockState blockState = this.level.getBlockState(blockposition); // Paper - fix wrong block state
-+            if (EatBlockGoal.IS_TALL_GRASS.test(blockState)) { // Paper - fix wrong block state
-+                if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition, blockState.getFluidState().createLegacyBlock(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit // Paper - fix wrong block state
-                     this.level.destroyBlock(blockposition, false);
-                 }
- 
-@@ -0,0 +0,0 @@ public class EatBlockGoal extends Goal {
-                 BlockPos blockposition1 = blockposition.below();
- 
-                 if (this.level.getBlockState(blockposition1).is(Blocks.GRASS_BLOCK)) {
-                    if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.AIR.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
-+                    if (CraftEventFactory.callEntityChangeBlockEvent(this.mob, blockposition1, Blocks.DIRT.defaultBlockState(), !this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit // Paper - Fix wrong block state
-                         this.level.levelEvent(2001, blockposition1, Block.getId(Blocks.GRASS_BLOCK.defaultBlockState()));
-                         this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
-                     }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -0,0 +0,0 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
- 
-                     if (i == 0) {
-                         // CraftBukkit start
-                        if (!CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockposition, Blocks.AIR.defaultBlockState())) {
-+                        if (!CraftEventFactory.callEntityChangeBlockEvent(this.rabbit, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                             return;
-                         }
-                         // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -0,0 +0,0 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- 
-                         if (WitherBoss.canDestroy(iblockdata)) {
-                             // CraftBukkit start
-                            if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.defaultBlockState())) {
-+                            if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                                 continue;
-                             }
-                             // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob {
-             boolean flag = movingobjectpositionblock.getBlockPos().equals(blockposition);
- 
-             if (iblockdata.is(BlockTags.ENDERMAN_HOLDABLE) && flag) {
-                if (CraftEventFactory.callEntityChangeBlockEvent(this.enderman, blockposition, Blocks.AIR.defaultBlockState())) { // CraftBukkit - Place event
-+                if (CraftEventFactory.callEntityChangeBlockEvent(this.enderman, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // CraftBukkit - Place event // Paper - fix wrong block state
-                 world.removeBlock(blockposition, false);
-                 world.gameEvent((Holder) GameEvent.BLOCK_DESTROY, blockposition, GameEvent.Context.of(this.enderman, iblockdata));
-                 this.enderman.setCarriedBlock(iblockdata.getBlock().defaultBlockState());
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -0,0 +0,0 @@ public class Ravager extends Raider {
- 
-                     if (block instanceof LeavesBlock) {
-                         // CraftBukkit start
-                        if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState())) {
-+                        if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                             continue;
-                         }
-                         // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -0,0 +0,0 @@ public class Silverfish extends Monster {
- 
-                             if (block instanceof InfestedBlock) {
-                                 // CraftBukkit start
-                                if (!CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState())) {
-+                                BlockState afterState = world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? iblockdata.getFluidState().createLegacyBlock() : ((InfestedBlock) block).hostStateByInfested(world.getBlockState(blockposition1)); // Paper - fix wrong block state
-+                                if (!CraftEventFactory.callEntityChangeBlockEvent(this.silverfish, blockposition1, afterState)) { // Paper - fix wrong block state
-                                     continue;
-                                 }
-                                 // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-@@ -0,0 +0,0 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
- 
-         if (iblockdata.is(BlockTags.FIRE)) {
-             // CraftBukkit start
-            if (CraftEventFactory.callEntityChangeBlockEvent(this, pos, Blocks.AIR.defaultBlockState())) {
-+            if (CraftEventFactory.callEntityChangeBlockEvent(this, pos, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                 this.level().destroyBlock(pos, false, this);
-             }
-             // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/ChorusFlowerBlock.java b/src/main/java/net/minecraft/world/level/block/ChorusFlowerBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/ChorusFlowerBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChorusFlowerBlock.java
-@@ -0,0 +0,0 @@ public class ChorusFlowerBlock extends Block {
- 
-         if (!world.isClientSide && projectile.mayInteract(world, blockposition) && projectile.mayBreak(world)) {
-             // CraftBukkit
-            if (!CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, Blocks.AIR.defaultBlockState())) {
-+            if (!CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, state.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                 return;
-             }
-             // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -0,0 +0,0 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
- 
-             if (projectile.mayInteract(world, blockposition) && projectile.mayBreak(world) && projectile instanceof ThrownTrident && projectile.getDeltaMovement().length() > 0.6D) {
-                 // CraftBukkit start
-                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, Blocks.AIR.defaultBlockState())) {
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, state.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                     return;
-                 }
-                 // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/TntBlock.java b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/TntBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-@@ -0,0 +0,0 @@ public class TntBlock extends Block {
- 
-             if (projectile.isOnFire() && projectile.mayInteract(world, blockposition)) {
-                 // CraftBukkit start
-                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, Blocks.AIR.defaultBlockState()) || !CraftEventFactory.callTNTPrimeEvent(world, blockposition, PrimeCause.PROJECTILE, projectile, null)) {
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(projectile, blockposition, state.getFluidState().createLegacyBlock()) || !CraftEventFactory.callTNTPrimeEvent(world, blockposition, PrimeCause.PROJECTILE, projectile, null)) { // Paper - fix wrong block state
-                     return;
-                 }
-                 // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java b/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WaterlilyBlock.java
-@@ -0,0 +0,0 @@ public class WaterlilyBlock extends BushBlock {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (world instanceof ServerLevel && entity instanceof Boat) {
-             // CraftBukkit start
-            if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState())) {
-+            if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, state.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
-                 return;
-             }
-             // CraftBukkit end
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         return event;
-     }
- 
-    public static EntityBreakDoorEvent callEntityBreakDoorEvent(Entity entity, BlockPos pos) {
-+    public static EntityBreakDoorEvent callEntityBreakDoorEvent(Entity entity, BlockPos pos, net.minecraft.world.level.block.state.BlockState newState) { // Paper
-         org.bukkit.entity.Entity entity1 = entity.getBukkitEntity();
-         Block block = CraftBlock.at(entity.level(), pos);
- 
-        EntityBreakDoorEvent event = new EntityBreakDoorEvent((LivingEntity) entity1, block);
-+        EntityBreakDoorEvent event = new EntityBreakDoorEvent((LivingEntity) entity1, block, newState.createCraftBlockData()); // Paper
-         entity1.getServer().getPluginManager().callEvent(event);
- 
-         return event;
--- a/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Miguel=20Moreno?= <josemmo@pm.me>
-Date: Sat, 5 Jun 2021 13:45:15 +0200
-Subject: [PATCH] Fix plugin loggers on server shutdown
-
-
-diff --git a/src/main/java/io/papermc/paper/log/CustomLogManager.java b/src/main/java/io/papermc/paper/log/CustomLogManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/log/CustomLogManager.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.log;
-+
-+import java.util.logging.LogManager;
-+
-+public class CustomLogManager extends LogManager {
-+    private static CustomLogManager instance;
-+
-+    public CustomLogManager() {
-+        instance = this;
-+    }
-+
-+    @Override
-+    public void reset() {
-+        // Ignore calls to this method
-+    }
-+
-+    private void superReset() {
-+        super.reset();
-+    }
-+
-+    public static void forceReset() {
-+        if (instance != null) {
-+            instance.superReset();
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 } catch (Exception ignored) {
-                 }
-                 // CraftBukkit end
-+                io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
-                 this.onServerExit();
-             }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -0,0 +0,0 @@ public class Main {
-     public static boolean useJline = true;
-     public static boolean useConsole = true;
- 
-+    // Paper start - Reset loggers after shutdown
-+    static {
-+        System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager");
-+    }
-+    // Paper end - Reset loggers after shutdown
-+
-     public static void main(String[] args) {
-         // Paper start
-         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
--- a/patches/unapplied/server/Fix-saving-in-unloadWorld.patch
+++ b/patches/unapplied/server/Fix-saving-in-unloadWorld.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Philip Kelley <philip@thoriumcube.org>
-Date: Wed, 16 Mar 2022 12:05:59 +0000
-Subject: [PATCH] Fix saving in unloadWorld
-
-Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
- 
-         try {
-             if (save) {
-                handle.save(null, true, true);
-+                handle.save(null, true, false); // Paper - Fix saving in unloadWorld
-             }
- 
-             handle.getChunkSource().close(save);
--- a/patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/unapplied/server/Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 22 Dec 2021 09:51:48 -0800
-Subject: [PATCH] Fix sticky pistons and BlockPistonRetractEvent
-
-There is an explicit check in the handling code for empty pistons that
-prevents sticky pistons from firing the event. However when we look back
-at the history we see that this check was originally added so that ONLY
-sticky pistons would fire the retract event. I'm not sure why.
-https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1092acbddf07edfa4100bc6824504ac75088e913
-
-Over the course of several updates, the meaning of that field appears to
-have changed from "is NOT sticky" to "is sticky". So now its having the
-opposite effect. Only normal pistons fire the retraction event. And like
-all things in CB, it's just been carried around since.
-
-If we are to believe the history, the correct fix for this issue is to
-flip it so it only fires for sticky pistons, but that puts us in a
-bind. It's already firing for non-sticky pistons, changing it now would
-likely result in breakage. Furthermore, there is little documentation as
-to WHY that was ever intended to be the case.
-
-Instead we opt to remove the check entirely so that the event fires for
-all piston types.
-
-Co-authored-by: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Co-authored-by: Madeline Miller <mnmiller1@me.com>
-
-diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -0,0 +0,0 @@ public class PistonBaseBlock extends DirectionalBlock {
-             }
- 
-             // CraftBukkit start
-            if (!this.isSticky) {
-                org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-                BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
-                world.getCraftServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return;
-                }
-            }
-+            // if (!this.isSticky) { // Paper - Fix sticky pistons and BlockPistonRetractEvent; Move further down
-+            //     org.bukkit.block.Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+            //     BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
-+            //     world.getCraftServer().getPluginManager().callEvent(event);
-+            //
-+            //     if (event.isCancelled()) {
-+            //         return;
-+            //     }
-+            // }
-             // PAIL: checkME - what happened to setTypeAndData?
-             // CraftBukkit end
-             world.blockEvent(pos, this, b0, enumdirection.get3DDataValue());
-@@ -0,0 +0,0 @@ public class PistonBaseBlock extends DirectionalBlock {
- 
-             BlockState iblockdata2 = (BlockState) ((BlockState) Blocks.MOVING_PISTON.defaultBlockState().setValue(MovingPistonBlock.FACING, enumdirection)).setValue(MovingPistonBlock.TYPE, this.isSticky ? PistonType.STICKY : PistonType.DEFAULT);
- 
-+            // Paper start - Fix sticky pistons and BlockPistonRetractEvent; Move empty piston retract call to fix multiple event fires
-+            if (!this.isSticky) {
-+                if (!new BlockPistonRetractEvent(CraftBlock.at(world, pos), java.util.Collections.emptyList(), CraftBlock.notchToBlockFace(enumdirection)).callEvent()) {
-+                    return false;
-+                }
-+            }
-+            // Paper end - Fix sticky pistons and BlockPistonRetractEvent
-             world.setBlock(pos, iblockdata2, 20);
-             world.setBlockEntity(MovingPistonBlock.newMovingBlockEntity(pos, iblockdata2, (BlockState) this.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.from3DDataValue(data & 7)), enumdirection, false, true));
-             world.blockUpdated(pos, iblockdata2.getBlock());
-@@ -0,0 +0,0 @@ public class PistonBaseBlock extends DirectionalBlock {
-                     if (type == 1 && !iblockdata3.isAir() && PistonBaseBlock.isPushable(iblockdata3, world, blockposition1, enumdirection.getOpposite(), false, enumdirection) && (iblockdata3.getPistonPushReaction() == PushReaction.NORMAL || iblockdata3.is(Blocks.PISTON) || iblockdata3.is(Blocks.STICKY_PISTON))) {
-                         this.moveBlocks(world, pos, enumdirection, false);
-                     } else {
-+                        // Paper start - Fix sticky pistons and BlockPistonRetractEvent; fire BlockPistonRetractEvent for sticky pistons retracting nothing (air)
-+                        if (type == TRIGGER_CONTRACT && iblockdata2.isAir()) {
-+                            if (!new BlockPistonRetractEvent(CraftBlock.at(world, pos), java.util.Collections.emptyList(), CraftBlock.notchToBlockFace(enumdirection)).callEvent()) {
-+                                return false;
-+                            }
-+                        }
-+                        // Paper end - Fix sticky pistons and BlockPistonRetractEvent
-                         world.removeBlock(pos.relative(enumdirection), false);
-                     }
-                 }
--- a/patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Mon, 1 Aug 2022 20:13:02 -0500
-Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
-
-This is a bug accidentally introduced in upstream CB
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -0,0 +0,0 @@ public class Commands {
-             if (commandsyntaxexception.getInput() != null && commandsyntaxexception.getCursor() >= 0) {
-                 int i = Math.min(commandsyntaxexception.getInput().length(), commandsyntaxexception.getCursor());
-                 MutableComponent ichatmutablecomponent = Component.empty().withStyle(ChatFormatting.GRAY).withStyle((chatmodifier) -> {
-                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, label)); // CraftBukkit
-+                    return chatmodifier.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + label)); // CraftBukkit // Paper
-                 });
- 
-                 if (i > 10) {
--- a/patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/unapplied/server/Fix-swamp-hut-cat-generation-deadlock.patch
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sat, 12 Mar 2022 06:31:13 -0800
-Subject: [PATCH] Fix swamp hut cat generation deadlock
-
-The worldgen thread will attempt to get structure references
-via the world's getChunkAt method, which is fine if the gen is
-not cancelled - but if the chunk was unloaded, the call will block
-indefinitely. Instead of using the world state, we use the already
-supplied ServerLevelAccessor which will always have the chunk available.
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -0,0 +0,0 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
-         BuiltInRegistries.CAT_VARIANT.getRandomElementOf(tagkey, world.getRandom()).ifPresent(this::setVariant);
-         ServerLevel worldserver = world.getLevel();
- 
-        if (worldserver.structureManager().getStructureWithPieceAt(this.blockPosition(), StructureTags.CATS_SPAWN_AS_BLACK).isValid()) {
-+        if (worldserver.structureManager().getStructureWithPieceAt(this.blockPosition(), StructureTags.CATS_SPAWN_AS_BLACK, world).isValid()) { // Paper - Fix swamp hut cat generation deadlock
-             this.setVariant((Holder) BuiltInRegistries.CAT_VARIANT.getHolderOrThrow(CatVariant.ALL_BLACK));
-             this.setPersistenceRequired();
-         }
-diff --git a/src/main/java/net/minecraft/world/level/StructureManager.java b/src/main/java/net/minecraft/world/level/StructureManager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/StructureManager.java
-+++ b/src/main/java/net/minecraft/world/level/StructureManager.java
-@@ -0,0 +0,0 @@ public class StructureManager {
-     }
- 
-     public List<StructureStart> startsForStructure(ChunkPos pos, Predicate<Structure> predicate) {
-        Map<Structure, LongSet> map = this.level.getChunk(pos.x, pos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();
-+        // Paper start - Fix swamp hut cat generation deadlock
-+        return this.startsForStructure(pos, predicate, null);
-+    }
-+    public List<StructureStart> startsForStructure(ChunkPos pos, Predicate<Structure> predicate, @Nullable ServerLevelAccessor levelAccessor) {
-+        Map<Structure, LongSet> map = (levelAccessor == null ? this.level : levelAccessor).getChunk(pos.x, pos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();
-+        // Paper end - Fix swamp hut cat generation deadlock
-         Builder<StructureStart> builder = ImmutableList.builder();
- 
-         for (Entry<Structure, LongSet> entry : map.entrySet()) {
-@@ -0,0 +0,0 @@ public class StructureManager {
-     }
- 
-     public StructureStart getStructureWithPieceAt(BlockPos pos, Predicate<Holder<Structure>> predicate) {
-+        // Paper start - Fix swamp hut cat generation deadlock
-+        return this.getStructureWithPieceAt(pos, predicate, null);
-+    }
-+
-+    public StructureStart getStructureWithPieceAt(BlockPos pos, TagKey<Structure> tag, @Nullable ServerLevelAccessor levelAccessor) {
-+        return this.getStructureWithPieceAt(pos, structure -> structure.is(tag), levelAccessor);
-+    }
-+
-+    public StructureStart getStructureWithPieceAt(BlockPos pos, Predicate<Holder<Structure>> predicate, @Nullable ServerLevelAccessor levelAccessor) {
-+        // Paper end - Fix swamp hut cat generation deadlock
-         Registry<Structure> registry = this.registryAccess().registryOrThrow(Registries.STRUCTURE);
- 
-         for (StructureStart structureStart : this.startsForStructure(
-            new ChunkPos(pos), structure -> registry.getHolder(registry.getId(structure)).map(predicate::test).orElse(false)
-+            new ChunkPos(pos), structure -> registry.getHolder(registry.getId(structure)).map(predicate::test).orElse(false), levelAccessor // Paper - Fix swamp hut cat generation deadlock
-         )) {
-             if (this.structureHasPieceAt(pos, structureStart)) {
-                 return structureStart;
--- a/patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/unapplied/server/Fix-xp-reward-for-baby-zombies.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 16 Jan 2022 10:34:02 -0800
-Subject: [PATCH] Fix xp reward for baby zombies
-
-The field that tracks the xpReward was not
-getting reset if the death was cancelled
-so this resets it after each call to
-Zombie#getExperienceReward
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -0,0 +0,0 @@ public class Zombie extends Monster {
- 
-     @Override
-     public int getExperienceReward() {
-+        final int previousReward = this.xpReward; // Paper - store previous value to reset after calculating XP reward
-         if (this.isBaby()) {
-             this.xpReward = (int) ((double) this.xpReward * 2.5D);
-         }
- 
-        return super.getExperienceReward();
-+        // Paper start - store previous value to reset after calculating XP reward
-+        int reward = super.getExperienceReward();
-+        this.xpReward = previousReward;
-+        return reward;
-+        // Paper end - store previous value to reset after calculating XP reward
-     }
- 
-     @Override
--- a/patches/unapplied/server/Force-close-world-loading-screen.patch
+++ b/patches/unapplied/server/Force-close-world-loading-screen.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Wed, 2 Mar 2022 09:45:56 +0100
-Subject: [PATCH] Force close world loading screen
-
-Dead players would be stuck in the world loading screen and other players may
-miss messages and similar sent in the join event if chunk loading is slow.
-Paper already circumvents falling through the world before chunks are loaded,
-so we do not need that. The client only needs the chunk it is currently in to
-be loaded to close the loading screen, so we just send an empty one.
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-         }
-         // Paper start - Fire PlayerJoinEvent when Player is actually ready; move vehicle into method so it can be called above - short circuit around that code
-         this.onPlayerJoinFinish(player, worldserver1, s1);
-+        // Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
-+        if (player.isDeadOrDying()) {
-+            net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = worldserver1.registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME)
-+                .getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
-+            player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
-+                new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
-+                worldserver1.getLightEngine(), (java.util.BitSet)null, (java.util.BitSet) null)
-+            );
-+        }
-+        // Paper end - Send empty chunk
-     }
-     private void mountSavedVehicle(ServerPlayer player, ServerLevel worldserver1, Optional<CompoundTag> optional) {
-         // Paper end - Fire PlayerJoinEvent when Player is actually ready
--- a/patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/unapplied/server/Forward-CraftEntity-in-teleport-command.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 4 Dec 2021 17:04:47 -0800
-Subject: [PATCH] Forward CraftEntity in teleport command
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public void restoreFrom(Entity original) {
-+        // Paper start - Forward CraftEntity in teleport command
-+        CraftEntity bukkitEntity = original.bukkitEntity;
-+        if (bukkitEntity != null) {
-+            bukkitEntity.setHandle(this);
-+            this.bukkitEntity = bukkitEntity;
-+        }
-+        // Paper end - Forward CraftEntity in teleport command
-         CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
- 
-         nbttagcompound.remove("Dimension");
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                         }
-                     }
-                     // CraftBukkit end
-                    // CraftBukkit start - Forward the CraftEntity to the new entity
-                    this.getBukkitEntity().setHandle(entity);
-                    entity.bukkitEntity = this.getBukkitEntity();
-                    // CraftBukkit end
-+                    // // CraftBukkit start - Forward the CraftEntity to the new entity // Paper - Forward CraftEntity in teleport command; moved to Entity#restoreFrom
-+                    // this.getBukkitEntity().setHandle(entity);
-+                    // entity.bukkitEntity = this.getBukkitEntity();
-+                    // // CraftBukkit end
-                 }
- 
-                 this.removeAfterChangingDimensions();
--- a/patches/unapplied/server/Freeze-Tick-Lock-API.patch
+++ b/patches/unapplied/server/Freeze-Tick-Lock-API.patch
@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 26 Dec 2021 20:27:43 -0500
-Subject: [PATCH] Freeze Tick Lock API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     private org.bukkit.util.Vector origin;
-     @javax.annotation.Nullable
-     private UUID originWorld;
-+    public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
- 
-     public void setOrigin(@javax.annotation.Nonnull Location location) {
-         this.origin = location.toVector();
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                 this.setRemainingFireTicks(this.remainingFireTicks - 1);
-             }
- 
-            if (this.getTicksFrozen() > 0) {
-+            if (this.getTicksFrozen() > 0 && !freezeLocked) { // Paper - Freeze Tick Lock API
-                 this.setTicksFrozen(0);
-                 this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
-             }
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             if (fromNetherPortal) {
-                 nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
-             }
-+            if (freezeLocked) {
-+                nbttagcompound.putBoolean("Paper.FreezeLock", true);
-+            }
-             // Paper end
-             return nbttagcompound;
-         } catch (Throwable throwable) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             if (spawnReason == null) {
-                 spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
-             }
-+            if (nbt.contains("Paper.FreezeLock")) {
-+                freezeLocked = nbt.getBoolean("Paper.FreezeLock");
-+            }
-             // Paper end
- 
-         } catch (Throwable throwable) {
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-         this.level().getProfiler().pop();
-         this.level().getProfiler().push("freezing");
-        if (!this.level().isClientSide && !this.isDeadOrDying()) {
-+        if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
-             int i = this.getTicksFrozen();
- 
-             if (this.isInPowderSnow && this.canFreeze()) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.getHandle().isFullyFrozen();
-     }
- 
-+    // Paper start - Freeze Tick Lock API
-+    @Override
-+    public boolean isFreezeTickingLocked() {
-+        return this.entity.freezeLocked;
-+    }
-+
-+    @Override
-+    public void lockFreezeTicks(boolean locked) {
-+        this.entity.freezeLocked = locked;
-+    }
-+    // Paper end - Freeze Tick Lock API
-     @Override
-     public void remove() {
-         this.entity.pluginRemoved = true;
--- a/patches/unapplied/server/Furnace-RecipesUsed-API.patch
+++ b/patches/unapplied/server/Furnace-RecipesUsed-API.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 13 Jan 2022 15:20:47 -0800
-Subject: [PATCH] Furnace RecipesUsed API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-@@ -0,0 +0,0 @@ public abstract class CraftFurnace<T extends AbstractFurnaceBlockEntity> extends
-         snapshot.cookSpeedMultiplier = multiplier;
-         snapshot.cookingTotalTime = AbstractFurnaceBlockEntity.getTotalCookTime(this.isPlaced() ? this.world.getHandle() : null, snapshot.recipeType, snapshot, snapshot.cookSpeedMultiplier); // Update the snapshot's current total cook time to scale with the newly set multiplier
-     }
-+
-+    @Override
-+    public int getRecipeUsedCount(org.bukkit.NamespacedKey furnaceRecipe) {
-+        return this.getSnapshot().getRecipesUsed().getInt(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe));
-+    }
-+
-+    @Override
-+    public boolean hasRecipeUsedCount(org.bukkit.NamespacedKey furnaceRecipe) {
-+        return this.getSnapshot().getRecipesUsed().containsKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe));
-+    }
-+
-+    @Override
-+    public void setRecipeUsedCount(org.bukkit.inventory.CookingRecipe<?> furnaceRecipe, int count) {
-+        final net.minecraft.resources.ResourceLocation location = org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(furnaceRecipe.getKey());
-+        java.util.Optional<net.minecraft.world.item.crafting.RecipeHolder<?>> nmsRecipe = (this.isPlaced() ? this.world.getHandle().getRecipeManager() : net.minecraft.server.MinecraftServer.getServer().getRecipeManager()).byKey(location);
-+        com.google.common.base.Preconditions.checkArgument(nmsRecipe.isPresent() && nmsRecipe.get().value() instanceof net.minecraft.world.item.crafting.AbstractCookingRecipe, furnaceRecipe.getKey() + " is not recognized as a valid and registered furnace recipe");
-+        if (count > 0) {
-+            this.getSnapshot().getRecipesUsed().put(location, count);
-+        } else {
-+            this.getSnapshot().getRecipesUsed().removeInt(location);
-+        }
-+    }
-+
-+    @Override
-+    public void setRecipesUsed(java.util.Map<org.bukkit.inventory.CookingRecipe<?>, Integer> recipesUsed) {
-+        this.getSnapshot().getRecipesUsed().clear();
-+        recipesUsed.forEach((recipe, integer) -> {
-+            if (integer != null) {
-+                this.setRecipeUsedCount(recipe, integer);
-+            }
-+        });
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/Ignore-impossible-spawn-tick.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dannyball710 <dannyball710@gmail.com>
-Date: Sat, 12 Feb 2022 23:42:48 +0800
-Subject: [PATCH] Ignore impossible spawn tick
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -0,0 +0,0 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
-         // Paper start - Configurable mob spawner tick rate
-         if (spawnDelay > 0 && --tickDelay > 0) return;
-         tickDelay = world.paperConfig().tickRates.mobSpawner;
--- a/patches/unapplied/server/Implement-enchantWithLevels-API.patch
+++ b/patches/unapplied/server/Implement-enchantWithLevels-API.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 16 Mar 2022 20:35:21 -0700
-Subject: [PATCH] Implement enchantWithLevels API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
-         return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
-     }
-     // Paper end - old getSpawnEgg API
-+    // Paper start - enchantWithLevels API
-+    @Override
-+    public ItemStack enchantWithLevels(ItemStack itemStack, int levels, boolean allowTreasure, java.util.Random random) {
-+        Preconditions.checkArgument(itemStack != null, "Argument 'itemStack' must not be null");
-+        Preconditions.checkArgument(itemStack.getType() != Material.AIR, "Argument 'itemStack' must not be of type AIR");
-+        Preconditions.checkArgument(itemStack.getAmount() > 0, "Argument 'itemStack' amount must be greater than 0");
-+        Preconditions.checkArgument(levels > 0 && levels <= 30, "Argument 'levels' must be in range [1, 30] (attempted " + levels + ")");
-+        Preconditions.checkArgument(random != null, "Argument 'random' must not be null");
-+        final net.minecraft.world.item.ItemStack internalStack = CraftItemStack.asNMSCopy(itemStack);
-+        if (internalStack.isEnchanted()) {
-+            internalStack.set(net.minecraft.core.component.DataComponents.ENCHANTMENTS, null);
-+        }
-+        final net.minecraft.world.item.ItemStack enchanted = net.minecraft.world.item.enchantment.EnchantmentHelper.enchantItem(
-+            MinecraftServer.getServer().getWorldData().enabledFeatures(),
-+            new org.bukkit.craftbukkit.util.RandomSourceWrapper(random),
-+            internalStack,
-+            levels,
-+            allowTreasure
-+        );
-+        return CraftItemStack.asCraftMirror(enchanted);
-+    }
-+    // Paper end - enchantWithLevels API
- }
--- a/patches/unapplied/server/Implement-getComputedBiome-API.patch
+++ b/patches/unapplied/server/Implement-getComputedBiome-API.patch
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 14 Mar 2022 22:46:05 -0700
-Subject: [PATCH] Implement getComputedBiome API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-         return CraftBiome.minecraftHolderToBukkit(this.getHandle().getNoiseBiome(x >> 2, y >> 2, z >> 2));
-     }
- 
-+    // Paper start
-+    @Override
-+    public Biome getComputedBiome(int x, int y, int z) {
-+        return CraftBiome.minecraftHolderToBukkit(this.getHandle().getBiome(new BlockPos(x, y, z)));
-+    }
-+    // Paper end
-+
-     @Override
-     public void setBiome(Location location, Biome biome) {
-         this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-         return this.getWorld().getBiome(this.getX(), this.getY(), this.getZ());
-     }
- 
-+    // Paper start
-+    @Override
-+    public Biome getComputedBiome() {
-+        return this.getWorld().getComputedBiome(this.getX(), this.getY(), this.getZ());
-+    }
-+    // Paper end
-+
-     @Override
-     public void setBiome(Biome bio) {
-         this.getWorld().setBiome(this.getX(), this.getY(), this.getZ(), bio);
-diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
-+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
-@@ -0,0 +0,0 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
-         return super.getBiome(x, y, z);
-     }
- 
-+    // Paper start
-+    @Override
-+    public Biome getComputedBiome(int x, int y, int z) {
-+        Preconditions.checkArgument(this.isInRegion(x, y, z), "Coordinates %s, %s, %s are not in the region", x, y, z);
-+        return super.getComputedBiome(x, y, z);
-+    }
-+    // Paper end
-+
-     @Override
-     public void setBiome(int x, int y, int z, Holder<net.minecraft.world.level.biome.Biome> biomeBase) {
-         Preconditions.checkArgument(this.isInRegion(x, y, z), "Coordinates %s, %s, %s are not in the region", x, y, z);
--- a/patches/unapplied/server/Implement-regenerateChunk.patch
+++ b/patches/unapplied/server/Implement-regenerateChunk.patch
@@ -1,104 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Mon, 31 Jan 2022 11:21:50 +0100
-Subject: [PATCH] Implement regenerateChunk
-
-Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
- public class CraftWorld extends CraftRegionAccessor implements World {
-     public static final int CUSTOM_DIMENSION_OFFSET = 10;
-     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
-+    private static final ChunkStatus[] REGEN_CHUNK_STATUSES = {ChunkStatus.BIOMES, ChunkStatus.NOISE, ChunkStatus.SURFACE, ChunkStatus.CARVERS, ChunkStatus.FEATURES, ChunkStatus.INITIALIZE_LIGHT}; // Paper - implement regenerate chunk method
- 
-     private final ServerLevel world;
-     private WorldBorder worldBorder;
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     @Override
-     public boolean regenerateChunk(int x, int z) {
-         org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
-        throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
-        /*
-        if (!unloadChunk0(x, z, false)) {
-            return false;
-+        // Paper start - implement regenerateChunk method
-+        final ServerLevel serverLevel = this.world;
-+        final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
-+        final ChunkPos chunkPos = new ChunkPos(x, z);
-+        final net.minecraft.world.level.chunk.LevelChunk levelChunk = serverChunkCache.getChunk(chunkPos.x, chunkPos.z, true);
-+        for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
-+            levelChunk.removeBlockEntity(blockPos);
-+            serverLevel.setBlock(blockPos, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(), 16);
-+        }
-+
-+        for (final ChunkStatus chunkStatus : REGEN_CHUNK_STATUSES) {
-+            final List<ChunkAccess> list = new ArrayList<>();
-+            final int range = Math.max(1, chunkStatus.getRange());
-+            for (int chunkX = chunkPos.z - range; chunkX <= chunkPos.z + range; chunkX++) {
-+                for (int chunkZ = chunkPos.x - range; chunkZ <= chunkPos.x + range; chunkZ++) {
-+                    ChunkAccess chunkAccess = serverChunkCache.getChunk(chunkZ, chunkX, chunkStatus.getParent(), true);
-+                    if (chunkAccess instanceof ImposterProtoChunk accessProtoChunk) {
-+                        chunkAccess = new ImposterProtoChunk(accessProtoChunk.getWrapped(), true);
-+                    } else if (chunkAccess instanceof net.minecraft.world.level.chunk.LevelChunk accessLevelChunk) {
-+                        chunkAccess = new ImposterProtoChunk(accessLevelChunk, true);
-+                    }
-+                    list.add(chunkAccess);
-+                }
-+            }
-+
-+            final java.util.concurrent.CompletableFuture<ChunkAccess> future = chunkStatus.generate(
-+                new net.minecraft.world.level.chunk.status.WorldGenContext(
-+                    serverLevel,
-+                    serverChunkCache.getGenerator(),
-+                    serverLevel.getStructureManager(),
-+                    serverChunkCache.getLightEngine()
-+                ),
-+                Runnable::run,
-+                chunk -> {
-+                    throw new UnsupportedOperationException("Not creating full chunks here");
-+                },
-+                list
-+            );
-+            serverChunkCache.mainThreadProcessor.managedBlock(future::isDone);
-+            if (chunkStatus == ChunkStatus.NOISE) {
-+                net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(future.join(), ChunkStatus.POST_FEATURES);
-+            }
-         }
- 
-        final long chunkKey = ChunkCoordIntPair.pair(x, z);
-        world.getChunkProvider().unloadQueue.remove(chunkKey);
-+        for (final BlockPos blockPos : BlockPos.betweenClosed(chunkPos.getMinBlockX(), serverLevel.getMinBuildHeight(), chunkPos.getMinBlockZ(), chunkPos.getMaxBlockX(), serverLevel.getMaxBuildHeight() - 1, chunkPos.getMaxBlockZ())) {
-+            serverChunkCache.blockChanged(blockPos);
-+        }
- 
-        net.minecraft.server.Chunk chunk = world.getChunkProvider().generateChunk(x, z);
-        PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z);
-        if (playerChunk != null) {
-            playerChunk.chunk = chunk;
-+        final Set<ChunkPos> chunksToRelight = new HashSet<>(9);
-+        for (int chunkX = chunkPos.x - 1; chunkX <= chunkPos.x + 1 ; chunkX++) {
-+            for (int chunkZ = chunkPos.z - 1; chunkZ <= chunkPos.z + 1 ; chunkZ++) {
-+                chunksToRelight.add(new ChunkPos(chunkX, chunkZ));
-+            }
-         }
- 
-        if (chunk != null) {
-            refreshChunk(x, z);
-+        for (final ChunkPos pos : chunksToRelight) {
-+            final ChunkAccess chunk = serverChunkCache.getChunk(pos.x, pos.z, false);
-+            if (chunk != null) {
-+                serverChunkCache.getLightEngine().lightChunk(chunk, false);
-+            }
-         }
- 
-        return chunk != null;
-        */
-+        return true;
-+        // Paper end - implement regenerate chunk method
-     }
- 
-     @Override
--- a/patches/unapplied/server/Improve-scoreboard-entries.patch
+++ b/patches/unapplied/server/Improve-scoreboard-entries.patch
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 4 Nov 2021 12:31:24 -0700
-Subject: [PATCH] Improve scoreboard entries
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
-@@ -0,0 +0,0 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
-         return new CraftScore(this, CraftScoreboard.getScoreHolder(entry));
-     }
- 
-+    // Paper start
-+    @Override
-+    public Score getScoreFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException, IllegalStateException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        this.checkState();
-+        return new CraftScore(this, ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle());
-+    }
-+    // Paper end
-+
-     @Override
-     public void unregister() {
-         CraftScoreboard scoreboard = this.checkState();
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-@@ -0,0 +0,0 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
-         this.board.setDisplayObjective(CraftScoreboardTranslations.fromBukkitSlot(slot), null);
-     }
- 
-+    // Paper start
-+    @Override
-+    public ImmutableSet<Score> getScoresFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        return this.getScores(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle());
-+    }
-+
-+    @Override
-+    public void resetScoresFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        this.resetScores(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle());
-+    }
-+
-+    @Override
-+    public Team getEntityTeam(org.bukkit.entity.Entity entity) throws IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        return this.getEntryTeam(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName());
-+    }
-+    // Paper end
-+
-     // CraftBukkit method
-     public Scoreboard getHandle() {
-         return this.board;
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public void addEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        this.addEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName());
-+    }
-+
-+    @Override
-+    public boolean removeEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        return this.removeEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName());
-+    }
-+
-+    @Override
-+    public boolean hasEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException {
-+        Preconditions.checkArgument(entity != null, "Entity cannot be null");
-+        return this.hasEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName());
-+    }
-+    // Paper end
-+
-     public static Visibility bukkitToNotch(NameTagVisibility visibility) {
-         switch (visibility) {
-             case ALWAYS:
--- a/patches/unapplied/server/ItemStack-damage-API.patch
+++ b/patches/unapplied/server/ItemStack-damage-API.patch
@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 8 May 2022 13:35:45 -0700
-Subject: [PATCH] ItemStack damage API
-
-Adds methods notify clients about item breaks and
-to simulate damage done to an itemstack and all
-the logic associated with damaging them
-
-== AT ==
-public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-                     return;
-                 }
-             }
-+    // Paper start - ItemStack damage API - split hurtAndBreak to skip pre-checks like creative mode
-+            this.hurtAndBreakWithoutChecks(amount, entity, slot);
-+        }
-+    }
- 
-+    public void hurtAndBreakWithoutChecks(int amount, LivingEntity entity, @org.checkerframework.checker.nullness.qual.Nullable EquipmentSlot slot) {
-+        {
-+    // Paper end - ItemStack damage API - split hurtAndBreak to skip pre-checks like creative mode
-             RandomSource randomsource = entity.getRandom();
-             ServerPlayer entityplayer;
- 
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-             }
- 
-             this.hurtAndBreak(amount, randomsource, entity, () -> { // Paper - Add EntityDamageItemEvent
-                entity.broadcastBreakEvent(slot);
-+                if (slot != null) entity.broadcastBreakEvent(slot); // Paper - ItemStack damage API - slot is nullable
-                 Item item = this.getItem();
-                 // CraftBukkit start - Check for item breaking
-                 if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         this.getHandle().knockback(strength, directionX, directionZ);
-     };
-     // Paper end - knockback API
-+
-+    // Paper start - ItemStack damage API
-+    public void broadcastSlotBreak(final org.bukkit.inventory.EquipmentSlot slot) {
-+        this.getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
-+    }
-+
-+    @Override
-+    public void broadcastSlotBreak(final org.bukkit.inventory.EquipmentSlot slot, final Collection<org.bukkit.entity.Player> players) {
-+        if (players.isEmpty()) {
-+            return;
-+        }
-+        final net.minecraft.network.protocol.game.ClientboundEntityEventPacket packet = new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(
-+            this.getHandle(),
-+            net.minecraft.world.entity.LivingEntity.entityEventForEquipmentBreak(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot))
-+        );
-+        players.forEach(player -> ((CraftPlayer) player).getHandle().connection.send(packet));
-+    }
-+
-+    @Override
-+    public ItemStack damageItemStack(ItemStack stack, final int amount) {
-+        final net.minecraft.world.item.ItemStack nmsStack;
-+        if (stack instanceof final CraftItemStack craftItemStack) {
-+            if (craftItemStack.handle == null || craftItemStack.handle.isEmpty()) {
-+                return stack;
-+            }
-+            nmsStack = craftItemStack.handle;
-+        } else {
-+            nmsStack = CraftItemStack.asNMSCopy(stack);
-+            stack = CraftItemStack.asCraftMirror(nmsStack); // mirror to capture changes in hurt logic & events
-+        }
-+        this.damageItemStack0(nmsStack, amount, null);
-+        return stack;
-+    }
-+
-+    @Override
-+    public void damageItemStack(final org.bukkit.inventory.EquipmentSlot slot, final int amount) {
-+        final net.minecraft.world.entity.EquipmentSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
-+        this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
-+    }
-+
-+    private void damageItemStack0(final net.minecraft.world.item.ItemStack nmsStack, final int amount, final net.minecraft.world.entity.EquipmentSlot slot) {
-+        nmsStack.hurtAndBreakWithoutChecks(amount, this.getHandle(), slot);
-+    }
-+    // Paper end - ItemStack damage API
- }
--- a/Show More
+++ b/Show More