More more more work

2024-12-03 19:54:10 +01:00
parent 3af13e34fb
commit 39c2c1d5f7
252 changed files with 177 additions and 194 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-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/Add-API-for-resetting-a-single-score.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: booky10 <boooky10@gmail.com>
-Date: Fri, 5 Nov 2021 21:01:36 +0100
-Subject: [PATCH] Add API for resetting a single score
-
-It was only possible to reset all scores for a specific entry, instead of resetting only specific scores.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
-@@ -0,0 +0,0 @@ final class CraftScore implements Score {
-     public CraftScoreboard getScoreboard() {
-         return this.objective.getScoreboard();
-     }
-+
-+    // Paper start
-+    @Override
-+    public void resetScore() {
-+        Scoreboard board = this.objective.checkState().board;
-+        board.resetSinglePlayerScore(entry, this.objective.getHandle());
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alvinn8 <42838560+Alvinn8@users.noreply.github.com>
-Date: Fri, 8 Jan 2021 20:31:13 +0100
-Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -0,0 +0,0 @@ public class PlayerAdvancements {
-             this.progressChanged.add(advancement);
-             flag = true;
-             if (!flag1 && advancementprogress.isDone()) {
-                this.player.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.toBukkit())); // CraftBukkit
-+                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-+                final net.kyori.adventure.text.Component message = advancement.value().display().flatMap(info -> {
-+                    return java.util.Optional.ofNullable(
-+                        info.shouldAnnounceChat() ? io.papermc.paper.adventure.PaperAdventure.asAdventure(info.getType().createAnnouncement(advancement, this.player)) : null
-+                    );
-+                }).orElse(null);
-+                final org.bukkit.event.player.PlayerAdvancementDoneEvent event = new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.toBukkit(), message);
-+                this.player.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                // Paper end
-                 advancement.value().rewards().grant(this.player);
-                 advancement.value().display().ifPresent((advancementdisplay) -> {
-                    if (advancementdisplay.shouldAnnounceChat() && this.player.serverLevel().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-                        this.playerList.broadcastSystemMessage(advancementdisplay.getType().createAnnouncement(advancement, this.player), false);
-+                    // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-+                    if (event.message() != null && this.player.serverLevel().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                        this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
-+                        // Paper end
-                     }
- 
-                 });
--- a/patches/unapplied/server/Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/Add-BellRevealRaiderEvent.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Wed, 26 May 2021 17:09:07 -0400
-Subject: [PATCH] Add BellRevealRaiderEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
-@@ -0,0 +0,0 @@ public class BellBlockEntity extends BlockEntity {
-             return BellBlockEntity.isRaiderWithinRange(pos, entityliving);
-         }).map((entity) -> (org.bukkit.entity.LivingEntity) entity.getBukkitEntity()).collect(java.util.stream.Collectors.toCollection(java.util.ArrayList::new)); // CraftBukkit
- 
-        org.bukkit.craftbukkit.event.CraftEventFactory.handleBellResonateEvent(world, pos, entities).forEach(BellBlockEntity::glow);
-+        org.bukkit.craftbukkit.event.CraftEventFactory.handleBellResonateEvent(world, pos, entities).forEach(entity -> glow(entity, pos)); // Paper - Add BellRevealRaiderEvent
-         // CraftBukkit end
-     }
- 
-@@ -0,0 +0,0 @@ public class BellBlockEntity extends BlockEntity {
-     }
- 
-     private static void glow(LivingEntity entity) {
-+        // Paper start - Add BellRevealRaiderEvent
-+        glow(entity, null);
-+    }
-+
-+    private static void glow(LivingEntity entity, @javax.annotation.Nullable BlockPos pos) {
-+        if (pos != null && !new io.papermc.paper.event.block.BellRevealRaiderEvent(org.bukkit.craftbukkit.block.CraftBlock.at(entity.level(), pos), (org.bukkit.entity.Raider) entity.getBukkitEntity()).callEvent()) return;
-+        // Paper end - Add BellRevealRaiderEvent
-         entity.addEffect(new MobEffectInstance(MobEffects.GLOWING, 60));
-     }
- 
--- a/patches/unapplied/server/Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/Add-Block-isValidTool.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 6 Jul 2020 12:44:31 -0700
-Subject: [PATCH] Add Block#isValidTool
-
-
-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 {
-     public String translationKey() {
-         return this.getNMS().getBlock().getDescriptionId();
-     }
-+
-+    public boolean isValidTool(ItemStack itemStack) {
-+        return getDrops(itemStack).size() != 0;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/Add-BlockBreakBlockEvent.patch
@@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 17:58:11 -0800
-Subject: [PATCH] Add BlockBreakBlockEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -0,0 +0,0 @@ public class Block extends BlockBehaviour implements ItemLike {
- 
-     }
- 
-+    // Paper start - Add BlockBreakBlockEvent
-+    public static boolean dropResources(BlockState state, LevelAccessor levelAccessor, BlockPos pos, @Nullable BlockEntity blockEntity, BlockPos source) {
-+        if (levelAccessor instanceof ServerLevel serverLevel) {
-+            List<org.bukkit.inventory.ItemStack> items = new java.util.ArrayList<>();
-+            for (ItemStack drop : Block.getDrops(state, serverLevel, pos, blockEntity)) {
-+                items.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(drop));
-+            }
-+            io.papermc.paper.event.block.BlockBreakBlockEvent event = new io.papermc.paper.event.block.BlockBreakBlockEvent(org.bukkit.craftbukkit.block.CraftBlock.at(levelAccessor, pos), org.bukkit.craftbukkit.block.CraftBlock.at(levelAccessor, source), items);
-+            event.callEvent();
-+            for (org.bukkit.inventory.ItemStack drop : event.getDrops()) {
-+                popResource(serverLevel, pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
-+            }
-+            state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, true);
-+        }
-+        return true;
-+    }
-+    // Paper end - Add BlockBreakBlockEvent
-+
-     public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
-         if (world instanceof ServerLevel) {
-             Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, tool).forEach((itemstack1) -> {
-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 {
-                 iblockdata1 = world.getBlockState(blockposition3);
-                 BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
- 
-                dropResources(iblockdata1, world, blockposition3, tileentity);
-+                dropResources(iblockdata1, world, blockposition3, tileentity, pos); // Paper - Add BlockBreakBlockEvent
-                 world.setBlock(blockposition3, Blocks.AIR.defaultBlockState(), 18);
-                 world.gameEvent((Holder) GameEvent.BLOCK_DESTROY, blockposition3, GameEvent.Context.of(iblockdata1));
-                 if (!iblockdata1.is(BlockTags.FIRE)) {
-diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-@@ -0,0 +0,0 @@ public abstract class FlowingFluid extends Fluid {
-             ifluidcontainer.placeLiquid(world, pos, state, fluidState);
-         } else {
-             if (!state.isAir()) {
-                this.beforeDestroyingBlock(world, pos, state);
-+                this.beforeDestroyingBlock(world, pos, state, pos.relative(direction.getOpposite())); // Paper - Add BlockBreakBlockEvent
-             }
- 
-             world.setBlock(pos, fluidState.createLegacyBlock(), 3);
-@@ -0,0 +0,0 @@ public abstract class FlowingFluid extends Fluid {
- 
-     }
- 
-+    protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { beforeDestroyingBlock(world, pos, state); } // Paper - Add BlockBreakBlockEvent
-     protected abstract void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state);
- 
-     protected int getSlopeDistance(LevelReader world, BlockPos pos, int i, Direction direction, BlockState state, FlowingFluid.SpreadContext spreadCache) {
-diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -0,0 +0,0 @@ public abstract class WaterFluid extends FlowingFluid {
-         return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
-     }
- 
-+    // Paper start - Add BlockBreakBlockEvent
-+    @Override
-+    protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
-+        BlockEntity tileentity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
-+        Block.dropResources(state, world, pos, tileentity, source);
-+    }
-+    // Paper end - Add BlockBreakBlockEvent
-     @Override
-     protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state) {
-         BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
--- a/patches/unapplied/server/Add-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/Add-BlockFailedDispenseEvent.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TheViperShow <29604693+TheViperShow@users.noreply.github.com>
-Date: Wed, 22 Apr 2020 09:40:38 +0200
-Subject: [PATCH] Add BlockFailedDispenseEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -0,0 +0,0 @@ public class DispenserBlock extends BaseEntityBlock {
-             int i = tileentitydispenser.getRandomSlot(world.random);
- 
-             if (i < 0) {
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) { // Paper - Add BlockFailedDispenseEvent
-                 world.levelEvent(1001, pos, 0);
-                 world.gameEvent((Holder) GameEvent.BLOCK_ACTIVATE, pos, GameEvent.Context.of(tileentitydispenser.getBlockState()));
-+                } // Paper - Add BlockFailedDispenseEvent
-             } else {
-                 ItemStack itemstack = tileentitydispenser.getItem(i);
-                 DispenseItemBehavior idispensebehavior = this.getDispenseMethod(world, itemstack);
-diff --git a/src/main/java/net/minecraft/world/level/block/DropperBlock.java b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-@@ -0,0 +0,0 @@ public class DropperBlock extends DispenserBlock {
-             int i = tileentitydispenser.getRandomSlot(world.random);
- 
-             if (i < 0) {
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) // Paper - Add BlockFailedDispenseEvent
-                 world.levelEvent(1001, pos, 0);
-             } else {
-                 ItemStack itemstack = tileentitydispenser.getItem(i);
-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 org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
-     }
-     // Paper end - WitchReadyPotionEvent
-+
-+    // Paper start
-+    public static boolean handleBlockFailedDispenseEvent(ServerLevel serverLevel, BlockPos pos) {
-+        org.bukkit.block.Block block = CraftBlock.at(serverLevel, pos);
-+        io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
-+        return event.callEvent();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/Add-BlockPreDispenseEvent.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <mnmiller1@me.com>
-Date: Sun, 17 Jan 2021 13:16:09 +1000
-Subject: [PATCH] Add BlockPreDispenseEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -0,0 +0,0 @@ public class DispenserBlock extends BaseEntityBlock {
-                 DispenseItemBehavior idispensebehavior = this.getDispenseMethod(world, itemstack);
- 
-                 if (idispensebehavior != DispenseItemBehavior.NOOP) {
-+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - Add BlockPreDispenseEvent
-                     DispenserBlock.eventFired = false; // CraftBukkit - reset event status
-                     tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
-                 }
-diff --git a/src/main/java/net/minecraft/world/level/block/DropperBlock.java b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-@@ -0,0 +0,0 @@ public class DropperBlock extends DispenserBlock {
-                     ItemStack itemstack1;
- 
-                     if (iinventory == null) {
-+                        if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - Add BlockPreDispenseEvent
-                         itemstack1 = DropperBlock.DISPENSE_BEHAVIOUR.dispense(sourceblock, itemstack);
-                     } else {
-                         // CraftBukkit start - Fire event when pushing items into other inventories
-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 {
-         io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
-         return event.callEvent();
-     }
-+
-+    public static boolean handleBlockPreDispenseEvent(ServerLevel serverLevel, BlockPos pos, ItemStack itemStack, int slot) {
-+        org.bukkit.block.Block block = CraftBlock.at(serverLevel, pos);
-+        io.papermc.paper.event.block.BlockPreDispenseEvent event = new io.papermc.paper.event.block.BlockPreDispenseEvent(block, org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), slot);
-+        return event.callEvent();
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/Add-Channel-initialization-listeners.patch
@@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Thu, 29 Apr 2021 21:19:33 +0200
-Subject: [PATCH] Add Channel initialization listeners
-
-
-diff --git a/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java b/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+import io.netty.channel.Channel;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+
-+/**
-+ * Internal API to register channel initialization listeners.
-+ * <p>
-+ * This is not officially supported API and we make no guarantees to the existence or state of this interface.
-+ */
-+@FunctionalInterface
-+public interface ChannelInitializeListener {
-+
-+    void afterInitChannel(@NonNull Channel channel);
-+}
-diff --git a/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java b/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+import io.netty.channel.Channel;
-+import net.kyori.adventure.key.Key;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+/**
-+ * Internal API to register channel initialization listeners.
-+ * <p>
-+ * This is not officially supported API and we make no guarantees to the existence or state of this class.
-+ */
-+public final class ChannelInitializeListenerHolder {
-+
-+    private static final Map<Key, ChannelInitializeListener> LISTENERS = new HashMap<>();
-+    private static final Map<Key, ChannelInitializeListener> IMMUTABLE_VIEW = Collections.unmodifiableMap(LISTENERS);
-+
-+    private ChannelInitializeListenerHolder() {
-+    }
-+
-+    /**
-+     * Registers whether an initialization listener is registered under the given key.
-+     *
-+     * @param key key
-+     * @return whether an initialization listener is registered under the given key
-+     */
-+    public static boolean hasListener(@NonNull Key key) {
-+        return LISTENERS.containsKey(key);
-+    }
-+
-+    /**
-+     * Registers a channel initialization listener called after ServerConnection is initialized.
-+     *
-+     * @param key      key
-+     * @param listener initialization listeners
-+     */
-+    public static void addListener(@NonNull Key key, @NonNull ChannelInitializeListener listener) {
-+        LISTENERS.put(key, listener);
-+    }
-+
-+    /**
-+     * Removes and returns an initialization listener registered by the given key if present.
-+     *
-+     * @param key key
-+     * @return removed initialization listener if present
-+     */
-+    public static @Nullable ChannelInitializeListener removeListener(@NonNull Key key) {
-+        return LISTENERS.remove(key);
-+    }
-+
-+    /**
-+     * Returns an immutable map of registered initialization listeners.
-+     *
-+     * @return immutable map of registered initialization listeners
-+     */
-+    public static @NonNull Map<Key, ChannelInitializeListener> getListeners() {
-+        return IMMUTABLE_VIEW;
-+    }
-+
-+    /**
-+     * Calls the registered listeners with the given channel.
-+     *
-+     * @param channel channel
-+     */
-+    public static void callListeners(@NonNull Channel channel) {
-+        for (ChannelInitializeListener listener : LISTENERS.values()) {
-+            listener.afterInitChannel(channel);
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/network/ConnectionEvent.java b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+/**
-+ * Internal connection pipeline events.
-+ */
-+public enum ConnectionEvent {
-+
-+    COMPRESSION_THRESHOLD_SET,
-+    COMPRESSION_DISABLED
-+}
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             } else {
-                 this.channel.pipeline().addAfter("prepender", "compress", new CompressionEncoder(compressionThreshold));
-             }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper - Add Channel initialization listeners
-         } else {
-             if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
-                 this.channel.pipeline().remove("decompress");
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
-                 this.channel.pipeline().remove("compress");
-             }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_DISABLED); // Paper - Add Channel initialization listeners
-         }
- 
-     }
-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 {
-                     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));
-+                    io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper - Add Channel initialization listeners
-                 }
-             }).group(eventloopgroup).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
-         }
--- a/patches/unapplied/server/Add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/Add-DragonEggFormEvent.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <trigary0@gmail.com>
-Date: Mon, 25 Jan 2021 14:53:57 +0100
-Subject: [PATCH] Add DragonEggFormEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -0,0 +0,0 @@ public class EndDragonFight {
-             this.dragonEvent.setVisible(false);
-             this.spawnExitPortal(true);
-             this.spawnNewGateway();
-+            // Paper start - Add DragonEggFormEvent
-+            BlockPos eggPosition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.origin));
-+            org.bukkit.craftbukkit.block.CraftBlockState eggState = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(this.level, eggPosition);
-+            eggState.setData(Blocks.DRAGON_EGG.defaultBlockState());
-+            io.papermc.paper.event.block.DragonEggFormEvent eggEvent = new io.papermc.paper.event.block.DragonEggFormEvent(org.bukkit.craftbukkit.block.CraftBlock.at(this.level, eggPosition), eggState,
-+                new org.bukkit.craftbukkit.boss.CraftDragonBattle(this));
-+            // Paper end - Add DragonEggFormEvent
-             if (this.level.paperConfig().entities.behavior.enderDragonsDeathAlwaysPlacesDragonEgg || !this.previouslyKilled) { // Paper - Add toggle for always placing the dragon egg
-                this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.origin)), Blocks.DRAGON_EGG.defaultBlockState());
-+                // Paper start - Add DragonEggFormEvent
-+                // this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.origin)), Blocks.DRAGON_EGG.defaultBlockState());
-+            } else {
-+                eggEvent.setCancelled(true);
-+            }
-+            if (eggEvent.callEvent()) {
-+                eggEvent.getNewState().update(true);
-+                // Paper end - Add DragonEggFormEvent
-             }
- 
-             this.previouslyKilled = true;
--- a/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/Add-ElderGuardianAppearanceEvent.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Fri, 19 Mar 2021 23:39:09 -0400
-Subject: [PATCH] Add ElderGuardianAppearanceEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/effect/MobEffectUtil.java b/src/main/java/net/minecraft/world/effect/MobEffectUtil.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/effect/MobEffectUtil.java
-+++ b/src/main/java/net/minecraft/world/effect/MobEffectUtil.java
-@@ -0,0 +0,0 @@ public final class MobEffectUtil {
-     }
- 
-     public static List<ServerPlayer> addEffectToPlayersAround(ServerLevel worldserver, @Nullable Entity entity, Vec3 vec3d, double d0, MobEffectInstance mobeffect, int i, org.bukkit.event.entity.EntityPotionEffectEvent.Cause cause) {
-+        // Paper start - Add ElderGuardianAppearanceEvent
-+        return addEffectToPlayersAround(worldserver, entity, vec3d, d0, mobeffect, i, cause, null);
-+    }
-+
-+    public static List<ServerPlayer> addEffectToPlayersAround(ServerLevel worldserver, @Nullable Entity entity, Vec3 vec3d, double d0, MobEffectInstance mobeffect, int i, org.bukkit.event.entity.EntityPotionEffectEvent.Cause cause, @Nullable java.util.function.Predicate<ServerPlayer> playerPredicate) {
-+        // Paper end - Add ElderGuardianAppearanceEvent
-         // CraftBukkit end
-         Holder<MobEffect> holder = mobeffect.getEffect();
-         List<ServerPlayer> list = worldserver.getPlayers((entityplayer) -> {
-            return entityplayer.gameMode.isSurvival() && (entity == null || !entity.isAlliedTo((Entity) entityplayer)) && vec3d.closerThan(entityplayer.position(), d0) && (!entityplayer.hasEffect(holder) || entityplayer.getEffect(holder).getAmplifier() < mobeffect.getAmplifier() || entityplayer.getEffect(holder).endsWithin(i - 1));
-+            // Paper start - Add ElderGuardianAppearanceEvent
-+            boolean condition = entityplayer.gameMode.isSurvival() && (entity == null || !entity.isAlliedTo((Entity) entityplayer)) && vec3d.closerThan(entityplayer.position(), d0) && (!entityplayer.hasEffect(holder) || entityplayer.getEffect(holder).getAmplifier() < mobeffect.getAmplifier() || entityplayer.getEffect(holder).endsWithin(i - 1));
-+            if (condition) {
-+                return playerPredicate == null || playerPredicate.test(entityplayer); // Only test the player AFTER it is true
-+            } else {
-+                return false;
-+            }
-+            // Paper ned - Add ElderGuardianAppearanceEvent
-         });
- 
-         list.forEach((entityplayer) -> {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-@@ -0,0 +0,0 @@ public class ElderGuardian extends Guardian {
-         super.customServerAiStep(world);
-         if ((this.tickCount + this.getId()) % 1200 == 0) {
-             MobEffectInstance mobeffect = new MobEffectInstance(MobEffects.DIG_SLOWDOWN, 6000, 2);
-            List<ServerPlayer> list = MobEffectUtil.addEffectToPlayersAround(world, this, this.position(), 50.0D, mobeffect, 1200, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
-+            List<ServerPlayer> list = MobEffectUtil.addEffectToPlayersAround(world, this, this.position(), 50.0D, mobeffect, 1200, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK, (player) -> new io.papermc.paper.event.entity.ElderGuardianAppearanceEvent((org.bukkit.entity.ElderGuardian) this.getBukkitEntity(), player.getBukkitEntity()).callEvent()); // CraftBukkit // Paper - Add ElderGuardianAppearanceEvent
- 
-             list.forEach((entityplayer) -> {
-                 entityplayer.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, this.isSilent() ? 0.0F : 1.0F));
--- a/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Mon, 5 Apr 2021 18:12:29 -0400
-Subject: [PATCH] Add EntityBlockStorage#clearEntities()
-
-
-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 {
-         return this.stored.size();
-     }
- 
-+    // Paper start - Add EntityBlockStorage clearEntities
-+    public void clearBees() {
-+        this.stored.clear();
-+    }
-+    // Paper end - Add EntityBlockStorage clearEntities
-     public static int getHoneyLevel(BlockState state) {
-         return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-@@ -0,0 +0,0 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
-     public CraftBeehive copy(Location location) {
-         return new CraftBeehive(this, location);
-     }
-+
-+    // Paper start - Add EntityBlockStorage clearEntities
-+    @Override
-+    public void clearEntities() {
-+        getSnapshot().clearBees();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/Add-EntityDamageItemEvent.patch
@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 22 Dec 2020 13:52:48 -0800
-Subject: [PATCH] Add EntityDamageItemEvent
-
-
-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 this.isDamageableItem() && this.getDamageValue() >= this.getMaxDamage() - 1;
-     }
- 
-    public void hurtAndBreak(int amount, ServerLevel world, @Nullable ServerPlayer player, Consumer<Item> breakCallback) {
-+    public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer<Item> breakCallback) {  // Paper - Add EntityDamageItemEvent
-         int j = this.processDurabilityChange(amount, world, player);
-         // CraftBukkit start
-        if (player != null) {
-            PlayerItemDamageEvent event = new PlayerItemDamageEvent(player.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j);
-+        if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
-+            PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j); // Paper - Add EntityDamageItemEvent
-             event.getPlayer().getServer().getPluginManager().callEvent(event);
- 
-             if (j != event.getDamage() || event.isCancelled()) {
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-             }
- 
-             j = event.getDamage();
-+            // Paper start - Add EntityDamageItemEvent
-+        } else if (player != null) {
-+            io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
-+            if (!event.callEvent()) {
-+                return;
-+            }
-+            j = event.getDamage();
-+            // Paper end - Add EntityDamageItemEvent
-         }
-         // CraftBukkit end
- 
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
- 
-     }
- 
-    private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable ServerPlayer player) {
-        return !this.isDamageableItem() ? 0 : (player != null && player.hasInfiniteMaterials() ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage));
-+    private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player) {  // Paper - Add EntityDamageItemEvent
-+        return !this.isDamageableItem() ? 0 : (player instanceof ServerPlayer && player.hasInfiniteMaterials() ? 0 : (baseDamage > 0 ? EnchantmentHelper.processDurabilityChange(world, this, baseDamage) : baseDamage));  // Paper - Add EntityDamageItemEvent
-     }
- 
-    private void applyDamage(int damage, @Nullable ServerPlayer player, Consumer<Item> breakCallback) {
-        if (player != null) {
-            CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(player, this, damage);
-+    private void applyDamage(int damage, @Nullable LivingEntity player, Consumer<Item> breakCallback) { // Paper - Add EntityDamageItemEvent
-+        if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
-+            CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, damage); // Paper - Add EntityDamageItemEvent
-         }
- 
-         this.setDamageValue(damage);
-         if (this.isBroken()) {
-             Item item = this.getItem();
-             // CraftBukkit start - Check for item breaking
-            if (this.count == 1 && player != null) {
-                org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(player, this);
-+            if (this.count == 1 && player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
-+                org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
-             }
-             // CraftBukkit end
- 
-@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
-                 entityplayer = null;
-             }
- 
-            this.hurtAndBreak(amount, worldserver, entityplayer, (item) -> {
-+            this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent
-                 entity.onEquippedItemBroken(item, slot);
-             });
-         }
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/effects/ChangeItemDamage.java b/src/main/java/net/minecraft/world/item/enchantment/effects/ChangeItemDamage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/effects/ChangeItemDamage.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/effects/ChangeItemDamage.java
-@@ -0,0 +0,0 @@ public record ChangeItemDamage(LevelBasedValue amount) implements EnchantmentEnt
-     public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity user, Vec3 pos) {
-         ItemStack itemStack = context.itemStack();
-         if (itemStack.has(DataComponents.MAX_DAMAGE) && itemStack.has(DataComponents.DAMAGE)) {
-            ServerPlayer serverPlayer2 = context.owner() instanceof ServerPlayer serverPlayer ? serverPlayer : null;
-+            // ServerPlayer serverPlayer2 = context.owner() instanceof ServerPlayer serverPlayer ? serverPlayer : null; // Paper - EntityDamageItemEvent - always pass in entity
-             int i = (int)this.amount.calculate(level);
-            itemStack.hurtAndBreak(i, world, serverPlayer2, context.onBreak());
-+            itemStack.hurtAndBreak(i, world, context.owner(), context.onBreak()); // Paper - EntityDamageItemEvent - always pass in entity
-         }
-     }
- 
--- 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-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/Add-EntityInsideBlockEvent.patch
@@ -1,294 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 8 May 2021 18:02:36 -0700
-Subject: [PATCH] Add EntityInsideBlockEvent
-
-
-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 {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (!entity.fireImmune()) {
-             if (entity.getRemainingFireTicks() < 0) {
-                 entity.setRemainingFireTicks(entity.getRemainingFireTicks() + 1);
-diff --git a/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java b/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BasePressurePlateBlock.java
-@@ -0,0 +0,0 @@ public abstract class BasePressurePlateBlock extends Block {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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) {
-             int i = this.getSignalForState(state);
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-@@ -0,0 +0,0 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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) {
-             if (state.getValue(BigDripleafBlock.TILT) == Tilt.NONE && BigDripleafBlock.canEntityTilt(pos, entity) && !world.hasNeighborSignal(pos)) {
-                 // CraftBukkit start - tilt dripleaf
-diff --git a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java
-@@ -0,0 +0,0 @@ public class BubbleColumnBlock extends Block implements BucketPickup {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         BlockState blockState = world.getBlockState(pos.above());
-         if (blockState.isAir()) {
-             entity.onAboveBubbleCol(state.getValue(DRAG_DOWN));
-diff --git a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java
-@@ -0,0 +0,0 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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 && this.type.canButtonBeActivatedByArrows() && !(Boolean) state.getValue(ButtonBlock.POWERED)) {
-             this.checkPressed(state, world, pos);
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -0,0 +0,0 @@ public class CactusBlock extends Block {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         entity.hurt(world.damageSources().cactus().directBlock(world, pos), 1.0F); // CraftBukkit
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-@@ -0,0 +0,0 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if ((Boolean) state.getValue(CampfireBlock.LIT) && entity instanceof LivingEntity) {
-             entity.hurt(world.damageSources().campfire().directBlock(world, pos), (float) this.fireDamage); // CraftBukkit
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-@@ -0,0 +0,0 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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 worldserver) {
-             if (entity instanceof Ravager && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), !worldserver.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
-                 worldserver.destroyBlock(pos, true, entity);
-diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-@@ -0,0 +0,0 @@ public class DetectorRailBlock extends BaseRailBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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) {
-             if (!(Boolean) state.getValue(DetectorRailBlock.POWERED)) {
-                 this.checkPressed(world, pos, state);
-diff --git a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-@@ -0,0 +0,0 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (entity.canUsePortal(false)) {
-             BlockEntity tileentity = world.getBlockEntity(pos);
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -0,0 +0,0 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (entity.canUsePortal(false)) {
-             // CraftBukkit start - Entity in portal
-             EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
-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 {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (entity.getType().equals(EntityType.FALLING_BLOCK)) {
-             this.destroyBlock(world, pos);
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
-@@ -0,0 +0,0 @@ public class HoneyBlock extends HalfTransparentBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (this.isSlidingDown(pos, entity)) {
-             this.maybeDoSlideAchievement(entity, pos);
-             this.doSlideMovement(entity);
-diff --git a/src/main/java/net/minecraft/world/level/block/HopperBlock.java b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-@@ -0,0 +0,0 @@ public class HopperBlock extends BaseEntityBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         BlockEntity blockEntity = world.getBlockEntity(pos);
-         if (blockEntity instanceof HopperBlockEntity) {
-             HopperBlockEntity.entityInside(world, pos, state, entity, (HopperBlockEntity)blockEntity);
-diff --git a/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java
-@@ -0,0 +0,0 @@ public class LavaCauldronBlock extends AbstractCauldronBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (this.isEntityInsideContent(state, pos, entity)) {
-             entity.lavaHurt();
-         }
-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 {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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 worldserver) {
-             if (entity.isOnFire() && this.isEntityInsideContent(state, pos, entity)) {
-                 // CraftBukkit start - moved down
-diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -0,0 +0,0 @@ public class NetherPortalBlock extends Block implements Portal {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (entity.canUsePortal(false)) {
-             // CraftBukkit start - Entity in portal
-             EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
-diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
-@@ -0,0 +0,0 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
- 
-     @Override
-     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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 serverLevel && entity instanceof Ravager && serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
-             serverLevel.destroyBlock(pos, true, entity);
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-@@ -0,0 +0,0 @@ public class PowderSnowBlock extends Block implements BucketPickup {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (!(entity instanceof LivingEntity) || entity.getInBlockState().is((Block) this)) {
-             entity.makeStuckInBlock(state, new Vec3(0.8999999761581421D, 1.5D, 0.8999999761581421D));
-             if (world.isClientSide) {
-diff --git a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SweetBerryBushBlock.java
-@@ -0,0 +0,0 @@ public class SweetBerryBushBlock extends BushBlock implements BonemealableBlock
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (entity instanceof LivingEntity && entity.getType() != EntityType.FOX && entity.getType() != EntityType.BEE) {
-             entity.makeStuckInBlock(state, new Vec3(0.800000011920929D, 0.75D, 0.800000011920929D));
-             if (world instanceof ServerLevel) {
-diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-@@ -0,0 +0,0 @@ public class TripWireBlock extends Block {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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) {
-             if (!(Boolean) state.getValue(TripWireBlock.POWERED)) {
-                 this.checkPressed(world, pos, List.of(entity));
-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 {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         super.entityInside(state, world, pos, entity);
-         if (world instanceof ServerLevel && entity instanceof AbstractBoat) {
-             // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/level/block/WebBlock.java b/src/main/java/net/minecraft/world/level/block/WebBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/WebBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WebBlock.java
-@@ -0,0 +0,0 @@ public class WebBlock extends Block {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         Vec3 vec3 = new Vec3(0.25, 0.05F, 0.25);
-         if (entity instanceof LivingEntity livingEntity && livingEntity.hasEffect(MobEffects.WEAVING)) {
-             vec3 = new Vec3(0.5, 0.25, 0.5);
-diff --git a/src/main/java/net/minecraft/world/level/block/WitherRoseBlock.java b/src/main/java/net/minecraft/world/level/block/WitherRoseBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/WitherRoseBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/WitherRoseBlock.java
-@@ -0,0 +0,0 @@ public class WitherRoseBlock extends FlowerBlock {
- 
-     @Override
-     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-+        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 worldserver) {
-             if (world.getDifficulty() != Difficulty.PEACEFUL && entity instanceof LivingEntity entityliving) {
-                 if (!entityliving.isInvulnerableTo(worldserver, world.damageSources().wither())) {
--- a/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <10731363+JRoy@users.noreply.github.com>
-Date: Wed, 7 Oct 2020 12:04:01 -0400
-Subject: [PATCH] Add EntityLoadCrossbowEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
-+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-@@ -0,0 +0,0 @@ public class CrossbowItem extends ProjectileWeaponItem {
-     public boolean releaseUsing(ItemStack stack, Level world, LivingEntity user, int remainingUseTicks) {
-         int i = this.getUseDuration(stack, user) - remainingUseTicks;
-         float f = getPowerForTime(i, stack, user);
-        if (f >= 1.0F && !isCharged(stack) && tryLoadProjectiles(user, stack)) {
-+        // Paper start - Add EntityLoadCrossbowEvent
-+        if (f >= 1.0F && !isCharged(stack)) {
-+            final io.papermc.paper.event.entity.EntityLoadCrossbowEvent event = new io.papermc.paper.event.entity.EntityLoadCrossbowEvent(user.getBukkitLivingEntity(), stack.asBukkitMirror(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(user.getUsedItemHand()));
-+            if (!event.callEvent() || !tryLoadProjectiles(user, stack, event.shouldConsumeItem()) || !event.shouldConsumeItem()) {
-+                if (user instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
-+                return false;
-+            }
-+            // Paper end - Add EntityLoadCrossbowEvent
-             CrossbowItem.ChargingSounds chargingSounds = this.getChargingSounds(stack);
-             chargingSounds.end()
-                 .ifPresent(
-@@ -0,0 +0,0 @@ public class CrossbowItem extends ProjectileWeaponItem {
-         }
-     }
- 
-    private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow) {
-        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter);
-+    @io.papermc.paper.annotation.DoNotUse // Paper - Add EntityLoadCrossbowEvent
-+    private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow)  {
-+        // Paper start - Add EntityLoadCrossbowEvent
-+        return CrossbowItem.tryLoadProjectiles(shooter, crossbow, true);
-+    }
-+    private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
-+        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
-+        // Paper end - Add EntityLoadCrossbowEvent
-         if (!list.isEmpty()) {
-             crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
-             return true;
-diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
-+++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
-@@ -0,0 +0,0 @@ public abstract class ProjectileWeaponItem extends Item {
-     }
- 
-     protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter) {
-+        // Paper start
-+        return draw(stack, projectileStack, shooter, true);
-+    }
-+    protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter, boolean consume) {
-+        // Paper end
-         if (projectileStack.isEmpty()) {
-             return List.of();
-         } else {
-@@ -0,0 +0,0 @@ public abstract class ProjectileWeaponItem extends Item {
-             ItemStack itemstack2 = projectileStack.copy();
- 
-             for (int k = 0; k < j; ++k) {
-                ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0);
-+                ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0 || !consume); // Paper
- 
-                 if (!itemstack3.isEmpty()) {
-                     list.add(itemstack3);
--- a/patches/unapplied/server/Add-EntityMoveEvent.patch
+++ b/patches/unapplied/server/Add-EntityMoveEvent.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 11 Feb 2020 21:56:48 -0600
-Subject: [PATCH] Add EntityMoveEvent
-
-
-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
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
-             worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
-+            worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
- 
-             gameprofilerfiller.push(() -> {
-                 String s = String.valueOf(worldserver);
-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 ServerEntityGetter, WorldGenLe
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
-     public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
-+    public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
- 
-     public LevelChunk getChunkIfLoaded(int x, int z) {
-         return this.chunkSource.getChunk(x, z, false);
-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.pushEntities();
-         gameprofilerfiller.pop();
-+        // Paper start - Add EntityMoveEvent
-+        if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
-+            if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
-+                Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
-+                Location to = new Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
-+                io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-+                if (!event.callEvent()) {
-+                    this.absMoveTo(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch());
-+                } else if (!to.equals(event.getTo())) {
-+                    this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
-+                }
-+            }
-+        }
-+        // Paper end - Add EntityMoveEvent
-         world = this.level();
-         if (world instanceof ServerLevel worldserver) {
-             if (this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
--- 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.getOrThrow(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 CraftDamageTag(damageRegistry, damageTagKey);
-                 }
-             }
-+            // 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.get(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<DamageType> damageTags = CraftRegistry.getMinecraftRegistry(Registries.DAMAGE_TYPE);
-                 return damageTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftDamageTag(damageTags, pair.key())).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.key())).collect(ImmutableList.toImmutableList());
-+            }
-+            // Paper end
-             default -> throw new IllegalArgumentException();
-         }
-     }
--- a/patches/unapplied/server/Add-HiddenPotionEffect-API.patch
+++ b/patches/unapplied/server/Add-HiddenPotionEffect-API.patch
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <70228790+notTamion@users.noreply.github.com>
-Date: Sun, 5 Nov 2023 09:51:28 +0100
-Subject: [PATCH] Add HiddenPotionEffect API
-
-== AT ==
-public net.minecraft.world.effect.MobEffectInstance hiddenEffect
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-@@ -0,0 +0,0 @@ public class CraftPotionUtil {
- 
-     public static MobEffectInstance fromBukkit(PotionEffect effect) {
-         Holder<MobEffect> type = CraftPotionEffectType.bukkitToMinecraftHolder(effect.getType());
-+        // Paper - Note: do not copy over the hidden effect, as this method is only used for applying to entities which we do not want to convert over.
-         return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()); // Paper
-     }
- 
-@@ -0,0 +0,0 @@ public class CraftPotionUtil {
-         int duration = effect.getDuration();
-         boolean ambient = effect.isAmbient();
-         boolean particles = effect.isVisible();
-        return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon()); // Paper
-+        return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon(), effect.hiddenEffect == null ? null : toBukkit(effect.hiddenEffect)); // Paper
-     }
- 
-     public static boolean equals(Holder<MobEffect> mobEffect, PotionEffectType type) {
--- a/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 14 Oct 2021 12:09:39 -0500
-Subject: [PATCH] Add ItemFactory#getSpawnEgg 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 @@ import net.minecraft.core.HolderSet;
- import net.minecraft.core.RegistryAccess;
- import net.minecraft.core.component.DataComponentPatch;
- import net.minecraft.core.registries.Registries;
-+import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.tags.EnchantmentTags;
- import net.minecraft.util.RandomSource;
-@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
-             new net.md_5.bungee.api.chat.TextComponent(customName));
-     }
-     // Paper end - bungee hover events
-+
-+    // Paper start - old getSpawnEgg API
-+    // @Override // used to override, upstream added conflicting method, is called via Commodore now
-+    @Deprecated
-+    public ItemStack getSpawnEgg0(org.bukkit.entity.EntityType type) {
-+        if (type == null) {
-+            return null;
-+        }
-+        String typeId = type.getKey().toString();
-+        net.minecraft.resources.ResourceLocation typeKey = ResourceLocation.parse(typeId);
-+        net.minecraft.world.entity.EntityType<?> nmsType = net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getValue(typeKey);
-+        net.minecraft.world.item.SpawnEggItem eggItem = net.minecraft.world.item.SpawnEggItem.byId(nmsType);
-+        return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
-+    }
-+    // Paper end - old getSpawnEgg API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -0,0 +0,0 @@ public class Commodore {
-                         }
-                         // Paper end
- 
-+                        // Paper start - ItemFactory#getSpawnEgg (paper had original method that returned ItemStack, upstream added identical but returned Material)
-+                        if (owner.equals("org/bukkit/inventory/ItemFactory") && name.equals("getSpawnEgg") && desc.equals("(Lorg/bukkit/entity/EntityType;)Lorg/bukkit/inventory/ItemStack;")) {
-+                            super.visitInsn(Opcodes.SWAP); // has 1 param, this moves the owner instance to the top for the checkcast
-+                            super.visitTypeInsn(Opcodes.CHECKCAST, runtimeCbPkgPrefix() + "inventory/CraftItemFactory");
-+                            super.visitInsn(Opcodes.SWAP); // moves param back to the the top of stack
-+                            super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, runtimeCbPkgPrefix() + "inventory/CraftItemFactory", "getSpawnEgg0", desc, false);
-+                            return;
-+                        }
-+                        // Paper end - ItemFactory#getSpawnEgg
-                         if (modern) {
-                             if (owner.equals("org/bukkit/Material") || (instantiatedMethodType != null && instantiatedMethodType.getDescriptor().startsWith("(Lorg/bukkit/Material;)"))) {
-                                 switch (name) {
--- a/patches/unapplied/server/Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/Add-Mob-lookAt-API.patch
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 14 May 2021 13:42:17 -0500
-Subject: [PATCH] Add Mob#lookAt API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -0,0 +0,0 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
-     public boolean isInDaylight() {
-         return getHandle().isSunBurnTick();
-     }
-+
-+    @Override
-+    public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.Location location) {
-+        com.google.common.base.Preconditions.checkNotNull(location, "location cannot be null");
-+        com.google.common.base.Preconditions.checkArgument(location.getWorld().equals(getWorld()), "location in a different world");
-+        getHandle().getLookControl().setLookAt(location.getX(), location.getY(), location.getZ());
-+    }
-+
-+    @Override
-+    public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.Location location, float headRotationSpeed, float maxHeadPitch) {
-+        com.google.common.base.Preconditions.checkNotNull(location, "location cannot be null");
-+        com.google.common.base.Preconditions.checkArgument(location.getWorld().equals(getWorld()), "location in a different world");
-+        getHandle().getLookControl().setLookAt(location.getX(), location.getY(), location.getZ(), headRotationSpeed, maxHeadPitch);
-+    }
-+
-+    @Override
-+    public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.entity.Entity entity) {
-+        com.google.common.base.Preconditions.checkNotNull(entity, "entity cannot be null");
-+        com.google.common.base.Preconditions.checkArgument(entity.getWorld().equals(getWorld()), "entity in a different world");
-+        getHandle().getLookControl().setLookAt(((CraftEntity) entity).getHandle());
-+    }
-+
-+    @Override
-+    public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.entity.Entity entity, float headRotationSpeed, float maxHeadPitch) {
-+        com.google.common.base.Preconditions.checkNotNull(entity, "entity cannot be null");
-+        com.google.common.base.Preconditions.checkArgument(entity.getWorld().equals(getWorld()), "entity in a different world");
-+        getHandle().getLookControl().setLookAt(((CraftEntity) entity).getHandle(), headRotationSpeed, maxHeadPitch);
-+    }
-+
-+    @Override
-+    public void lookAt(double x, double y, double z) {
-+        getHandle().getLookControl().setLookAt(x, y, z);
-+    }
-+
-+    @Override
-+    public void lookAt(double x, double y, double z, float headRotationSpeed, float maxHeadPitch) {
-+        getHandle().getLookControl().setLookAt(x, y, z, headRotationSpeed, maxHeadPitch);
-+    }
-+
-+    @Override
-+    public int getHeadRotationSpeed() {
-+        return getHandle().getHeadRotSpeed();
-+    }
-+
-+    @Override
-+    public int getMaxHeadPitch() {
-+        return getHandle().getMaxHeadXRot();
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/Add-PlayerArmSwingEvent.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 12 Mar 2021 19:22:21 -0800
-Subject: [PATCH] Add PlayerArmSwingEvent
-
-
-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
-         } // Paper end - Call interact event
- 
-         // Arm swing animation
-        PlayerAnimationEvent event = new PlayerAnimationEvent(this.getCraftPlayer(), (packet.getHand() == InteractionHand.MAIN_HAND) ? PlayerAnimationType.ARM_SWING : PlayerAnimationType.OFF_ARM_SWING);
-+        io.papermc.paper.event.player.PlayerArmSwingEvent event = new io.papermc.paper.event.player.PlayerArmSwingEvent(this.getCraftPlayer(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(packet.getHand())); // Paper - Add PlayerArmSwingEvent
-         this.cserver.getPluginManager().callEvent(event);
- 
-         if (event.isCancelled()) return;
--- a/patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/Add-PlayerBedFailEnterEvent.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 24 Dec 2020 12:27:41 -0800
-Subject: [PATCH] Add PlayerBedFailEnterEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -0,0 +0,0 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
-                 BlockPos finalblockposition = pos;
-                 // CraftBukkit end
-                 player.startSleepInBed(pos).ifLeft((entityhuman_enumbedresult) -> {
-+                    // Paper start - PlayerBedFailEnterEvent
-+                    if (entityhuman_enumbedresult != null) {
-+                        io.papermc.paper.event.player.PlayerBedFailEnterEvent event = new io.papermc.paper.event.player.PlayerBedFailEnterEvent((org.bukkit.entity.Player) player.getBukkitEntity(), io.papermc.paper.event.player.PlayerBedFailEnterEvent.FailReason.values()[entityhuman_enumbedresult.ordinal()], org.bukkit.craftbukkit.block.CraftBlock.at(world, finalblockposition), !world.dimensionType().bedWorks(), io.papermc.paper.adventure.PaperAdventure.asAdventure(entityhuman_enumbedresult.getMessage()));
-+                        if (!event.callEvent()) {
-+                            return;
-+                        }
-+                        // Paper end - PlayerBedFailEnterEvent
-                     // CraftBukkit start - handling bed explosion from below here
-                    if (!world.dimensionType().bedWorks()) {
-+                    if (event.getWillExplode()) { // Paper - PlayerBedFailEnterEvent
-                         this.explodeBed(finaliblockdata, world, finalblockposition);
-                     } else
-                     // CraftBukkit end
-                     if (entityhuman_enumbedresult.getMessage() != null) {
-                        player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
-+                        final net.kyori.adventure.text.Component message = event.getMessage(); // Paper - PlayerBedFailEnterEvent
-+                        if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper - PlayerBedFailEnterEvent
-                     }
-+                    } // Paper - PlayerBedFailEnterEvent
- 
-                 });
-                 return InteractionResult.SUCCESS_SERVER;
--- a/patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/Add-PlayerChangeBeaconEffectEvent.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 24 Jun 2020 15:14:51 -0600
-Subject: [PATCH] Add PlayerChangeBeaconEffectEvent
-
-
-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 {
-         return BeaconMenu.decodeEffect(this.beaconData.get(2));
-     }
- 
-+    // Paper start - Add PlayerChangeBeaconEffectEvent
-+    private static @Nullable org.bukkit.potion.PotionEffectType convert(Optional<Holder<MobEffect>> optionalEffect) {
-+        return optionalEffect.map(org.bukkit.craftbukkit.potion.CraftPotionEffectType::minecraftHolderToBukkit).orElse(null);
-+    }
-+    // Paper end - Add PlayerChangeBeaconEffectEvent
-+
-     public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) {
-         if (this.paymentSlot.hasItem()) {
-            this.beaconData.set(1, BeaconMenu.encodeEffect((Holder) primary.orElse(null)));// CraftBukkit - decompile error
-            this.beaconData.set(2, BeaconMenu.encodeEffect((Holder) secondary.orElse(null)));// CraftBukkit - decompile error
-+            // 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());
-+            if (event.callEvent()) {
-+                // Paper end - Add PlayerChangeBeaconEffectEvent
-+                this.beaconData.set(1, BeaconMenu.encodeEffect(event.getPrimary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraftHolder(event.getPrimary())));// CraftBukkit - decompile error
-+                this.beaconData.set(2, BeaconMenu.encodeEffect(event.getSecondary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraftHolder(event.getSecondary())));// CraftBukkit - decompile error
-+            if (event.willConsumeItem()) { // Paper
-             this.paymentSlot.remove(1);
-+            } // Paper
-             this.access.execute(Level::blockEntityChanged);
-+            } // Paper end - Add PlayerChangeBeaconEffectEvent
-         }
- 
-     }
--- a/patches/unapplied/server/Add-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/Add-PlayerDeepSleepEvent.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 21 Apr 2021 15:58:19 -0700
-Subject: [PATCH] Add PlayerDeepSleepEvent
-
-
-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 {
- 
-         if (this.isSleeping()) {
-             ++this.sleepCounter;
-+            // Paper start - Add PlayerDeepSleepEvent
-+            if (this.sleepCounter == SLEEP_DURATION) {
-+                if (!new io.papermc.paper.event.player.PlayerDeepSleepEvent((org.bukkit.entity.Player) getBukkitEntity()).callEvent()) {
-+                    this.sleepCounter = Integer.MIN_VALUE;
-+                }
-+            }
-+            // Paper end - Add PlayerDeepSleepEvent
-             if (this.sleepCounter > 100) {
-                 this.sleepCounter = 100;
-             }
--- a/patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/Add-PlayerFlowerPotManipulateEvent.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MisterVector <whizkid3000@hotmail.com>
-Date: Tue, 13 Aug 2019 19:45:06 -0700
-Subject: [PATCH] Add PlayerFlowerPotManipulateEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-@@ -0,0 +0,0 @@ public class FlowerPotBlock extends Block {
-         } else if (!this.isEmpty()) {
-             return InteractionResult.CONSUME;
-         } else {
-+            // Paper start - Add PlayerFlowerPotManipulateEvent
-+            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+            org.bukkit.inventory.ItemStack placedStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(stack);
-+
-+            io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent((org.bukkit.entity.Player) player.getBukkitEntity(), block, placedStack, true);
-+            if (!event.callEvent()) {
-+                // Update client
-+                player.containerMenu.sendAllDataToRemote();
-+
-+                return InteractionResult.CONSUME;
-+            }
-+            // Paper end - Add PlayerFlowerPotManipulateEvent
-             world.setBlock(pos, blockState, 3);
-             world.gameEvent(player, GameEvent.BLOCK_CHANGE, pos);
-             player.awardStat(Stats.POT_FLOWER);
-@@ -0,0 +0,0 @@ public class FlowerPotBlock extends Block {
-             return InteractionResult.CONSUME;
-         } else {
-             ItemStack itemStack = new ItemStack(this.potted);
-+            // Paper start - Add PlayerFlowerPotManipulateEvent
-+            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+            org.bukkit.inventory.ItemStack pottedStack = new org.bukkit.inventory.ItemStack(org.bukkit.craftbukkit.block.CraftBlockType.minecraftToBukkit(this.potted));
-+
-+            io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent((org.bukkit.entity.Player) player.getBukkitEntity(), block, pottedStack, false);
-+            if (!event.callEvent()) {
-+                // Update client
-+                player.containerMenu.sendAllDataToRemote();
-+
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end - Add PlayerFlowerPotManipulateEvent
-             if (!player.addItem(itemStack)) {
-                 player.drop(itemStack, false);
-             }
--- a/patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/unapplied/server/Add-PlayerItemFrameChangeEvent.patch
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SamB440 <sam@islandearth.net>
-Date: Mon, 15 Nov 2021 18:10:10 +0000
-Subject: [PATCH] Add PlayerItemFrameChangeEvent
-
-
-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 @@
- package net.minecraft.world.entity.decoration;
- 
- import javax.annotation.Nullable;
-+import io.papermc.paper.event.player.PlayerItemFrameChangeEvent; // Paper - Add PlayerItemFrameChangeEvent
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.component.DataComponents;
-@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity {
-                     return true;
-                 }
-                 // CraftBukkit end
-+                // Paper start - Add PlayerItemFrameChangeEvent
-+                if (source.getEntity() instanceof Player player) {
-+                    var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.REMOVE);
-+                    if (!event.callEvent()) return true; // return true here because you aren't cancelling the damage, just the change
-+                    this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false);
-+                }
-+                // Paper end - Add PlayerItemFrameChangeEvent
-                 this.dropItem(world, source.getEntity(), false);
-                 this.gameEvent(GameEvent.BLOCK_CHANGE, source.getEntity());
-                 this.playSound(this.getRemoveItemSound(), 1.0F, 1.0F);
-@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity {
-                     if (worldmap != null && worldmap.isTrackedCountOverLimit(256)) {
-                         return InteractionResult.FAIL;
-                     } else {
-                        this.setItem(itemstack);
-+                        // Paper start - Add PlayerItemFrameChangeEvent
-+                        PlayerItemFrameChangeEvent event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), itemstack.asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.PLACE);
-+                        if (!event.callEvent()) {
-+                            return InteractionResult.FAIL;
-+                        }
-+                        this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()));
-+                        // Paper end - Add PlayerItemFrameChangeEvent
-                         this.gameEvent(GameEvent.BLOCK_CHANGE, player);
-                         itemstack.consume(1, player);
-                         return InteractionResult.SUCCESS;
-@@ -0,0 +0,0 @@ public class ItemFrame extends HangingEntity {
-                     return InteractionResult.PASS;
-                 }
-             } else {
-+                // Paper start - Add PlayerItemFrameChangeEvent
-+                PlayerItemFrameChangeEvent event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.ROTATE);
-+                if (!event.callEvent()) {
-+                    return InteractionResult.FAIL;
-+                }
-+                setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false, false);
-+                // Paper end - Add PlayerItemFrameChangeEvent
-                 this.playSound(this.getRotateItemSound(), 1.0F, 1.0F);
-                 this.setRotation(this.getRotation() + 1);
-                 this.gameEvent(GameEvent.BLOCK_CHANGE, player);
--- a/patches/unapplied/server/Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/Add-PlayerKickEvent-causes.patch
@@ -1,557 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 15 May 2021 20:30:45 -0700
-Subject: [PATCH] Add PlayerKickEvent causes
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-@@ -0,0 +0,0 @@ public class SignedMessageChain {
-                 if (signature == null) {
-                     throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.MISSING_PROFILE_KEY);
-                 } else if (playerPublicKey.data().hasExpired()) {
-                    throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.EXPIRED_PROFILE_KEY);
-+                    throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.EXPIRED_PROFILE_KEY,  org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY); // Paper - kick event causes
-                 } else {
-                     SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
-                     if (signedMessageLink == null) {
-                         throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN);
-                     } else if (body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) {
-                         this.setChainBroken();
-                        throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT);
-+                        throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
-                     } else {
-                         SignedMessageChain.this.lastTimeStamp = body.timeStamp();
-                         PlayerChatMessage playerChatMessage = new PlayerChatMessage(signedMessageLink, signature, body, null, FilterMask.PASS_THROUGH);
-@@ -0,0 +0,0 @@ public class SignedMessageChain {
-         static final Component INVALID_SIGNATURE = Component.translatable("chat.disabled.invalid_signature");
-         static final Component OUT_OF_ORDER_CHAT = Component.translatable("chat.disabled.out_of_order_chat");
- 
-        public DecodeException(Component message) {
-+        // Paper start
-+        public final org.bukkit.event.player.PlayerKickEvent.Cause kickCause;
-+        public DecodeException(Component message, org.bukkit.event.player.PlayerKickEvent.Cause event) {
-             super(message);
-+            this.kickCause = event;
-+        }
-+        // Paper end
-+        public DecodeException(Component message) {
-+            this(message, org.bukkit.event.player.PlayerKickEvent.Cause.UNKNOWN); // Paper
-         }
-     }
- 
-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
-                 ServerPlayer entityplayer = (ServerPlayer) iterator.next();
- 
-                 if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
-                    entityplayer.connection.disconnect(net.kyori.adventure.text.Component.text(org.spigotmc.SpigotConfig.whitelistMessage));
-+                    entityplayer.connection.disconnect(net.kyori.adventure.text.Component.text(org.spigotmc.SpigotConfig.whitelistMessage), org.bukkit.event.player.PlayerKickEvent.Cause.WHITELIST); // Paper - use configurable message & kick event cause
-                 }
-             }
- 
-diff --git a/src/main/java/net/minecraft/server/commands/BanIpCommands.java b/src/main/java/net/minecraft/server/commands/BanIpCommands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/BanIpCommands.java
-+++ b/src/main/java/net/minecraft/server/commands/BanIpCommands.java
-@@ -0,0 +0,0 @@ public class BanIpCommands {
-             }
- 
-             for (ServerPlayer serverPlayer : list) {
-                serverPlayer.connection.disconnect(Component.translatable("multiplayer.disconnect.ip_banned"));
-+                serverPlayer.connection.disconnect(Component.translatable("multiplayer.disconnect.ip_banned"), org.bukkit.event.player.PlayerKickEvent.Cause.IP_BANNED); // Paper - kick event cause
-             }
- 
-             return list.size();
-diff --git a/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java b/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java
-+++ b/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java
-@@ -0,0 +0,0 @@ public class BanPlayerCommands {
-                 );
-                 ServerPlayer serverPlayer = source.getServer().getPlayerList().getPlayer(gameProfile.getId());
-                 if (serverPlayer != null) {
-                    serverPlayer.connection.disconnect(Component.translatable("multiplayer.disconnect.banned"));
-+                    serverPlayer.connection.disconnect(Component.translatable("multiplayer.disconnect.banned"), org.bukkit.event.player.PlayerKickEvent.Cause.BANNED); // Paper - kick event cause
-                 }
-             }
-         }
-diff --git a/src/main/java/net/minecraft/server/commands/KickCommand.java b/src/main/java/net/minecraft/server/commands/KickCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/KickCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/KickCommand.java
-@@ -0,0 +0,0 @@ public class KickCommand {
- 
-             for (ServerPlayer serverPlayer : targets) {
-                 if (!source.getServer().isSingleplayerOwner(serverPlayer.getGameProfile())) {
-                    serverPlayer.connection.disconnect(reason);
-+                    serverPlayer.connection.disconnect(reason, org.bukkit.event.player.PlayerKickEvent.Cause.KICK_COMMAND); // Paper - kick event cause
-                     source.sendSuccess(() -> Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason), true);
-                     i++;
-                 }
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     }
- 
-     @Override
-    public void kickPlayer(Component reason) {
-        this.disconnect(reason);
-+    public void kickPlayer(Component reason, org.bukkit.event.player.PlayerKickEvent.Cause cause) { // Paper - kick event causes
-+        this.disconnect(reason, cause); // Paper - kick event causes
-     }
-     // CraftBukkit end
-     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-         } else if (!this.isSingleplayerOwner()) {
-             // Paper start - This needs to be handled on the main thread for plugins
-             server.submit(() -> {
-                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE);
-+                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-             });
-             // Paper end - This needs to be handled on the main thread for plugins
-         }
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-                 }
-             } catch (Exception ex) {
-                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
-                this.disconnect(Component.literal("Invalid payload REGISTER!"));
-+                this.disconnect(Component.literal("Invalid payload REGISTER!"), PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
-             }
-         } else if (identifier.equals(ServerCommonPacketListenerImpl.CUSTOM_UNREGISTER)) {
-             try {
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-                 }
-             } catch (Exception ex) {
-                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
-                this.disconnect(Component.literal("Invalid payload UNREGISTER!"));
-+                this.disconnect(Component.literal("Invalid payload UNREGISTER!"), PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
-             }
-         } else {
-             try {
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-                 this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), identifier.toString(), data);
-             } catch (Exception ex) {
-                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-                this.disconnect(Component.literal("Invalid custom payload!"));
-+                this.disconnect(Component.literal("Invalid custom payload!"), PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
-             }
-         }
- 
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-         PacketUtils.ensureRunningOnSameThread(packet, this, (BlockableEventLoop) this.server);
-         if (packet.action() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
-             ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack {} rejection", this.playerProfile().getName(), packet.id());
-            this.disconnect((Component) Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
-+            this.disconnect((Component) Component.translatable("multiplayer.requiredTexturePrompt.disconnect"), PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION); // Paper - kick event cause
-         }
-         // Paper start - adventure pack callbacks
-         // call the callbacks before the previously-existing event so the event has final say
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-             return;
-         }
-         // CraftBukkit end
-        this.disconnect(ServerCommonPacketListenerImpl.DISCONNECT_UNEXPECTED_QUERY);
-+        this.disconnect(ServerCommonPacketListenerImpl.DISCONNECT_UNEXPECTED_QUERY, PlayerKickEvent.Cause.INVALID_COOKIE); // Paper - kick event cause
-     }
- 
-     protected void keepConnectionAlive() {
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
- 
-         if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets
-             if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
-                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE);
-+                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-             } else if (this.checkIfClosed(currentTime)) { // Paper
-                 this.keepAlivePending = true;
-                 this.keepAliveTime = currentTime;
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     private boolean checkIfClosed(long time) {
-         if (this.closed) {
-             if (time - this.closedListenerTime >= 15000L) {
-                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE);
-+                this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-             }
- 
-             return false;
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
- 
-     // Paper start - adventure
-     public void disconnect(final net.kyori.adventure.text.Component reason) {
-        this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(reason));
-+        this.disconnect(reason, PlayerKickEvent.Cause.UNKNOWN);
-+    }
-+    public void disconnect(final net.kyori.adventure.text.Component reason, PlayerKickEvent.Cause cause) {
-+        this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(reason), cause);
-+        // Paper end - kick event causes
-     }
-     // Paper end - adventure
- 
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - kick event causes
-     public void disconnect(Component reason) {
-        this.disconnect(new DisconnectionDetails(reason));
-+        // Paper start - kick event causes
-+        this.disconnect(reason, PlayerKickEvent.Cause.UNKNOWN);
-+    }
-+    public void disconnect(final Component reason, PlayerKickEvent.Cause cause) {
-+        this.disconnect(new DisconnectionDetails(reason), cause);
-+        // Paper end - kick event causes
-     }
- 
-    public void disconnect(DisconnectionDetails disconnectionInfo) {
-+    public void disconnect(DisconnectionDetails disconnectionInfo, PlayerKickEvent.Cause cause) { // Paper - kick event cause
-         // CraftBukkit start - fire PlayerKickEvent
-         if (this.processedDisconnect) {
-             return;
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-             Waitable waitable = new Waitable() {
-                 @Override
-                 protected Object evaluate() {
-                    ServerCommonPacketListenerImpl.this.disconnect(disconnectionInfo);
-+                    ServerCommonPacketListenerImpl.this.disconnect(disconnectionInfo, cause); // Paper - kick event causes
-                     return null;
-                 }
-             };
-@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
- 
-         net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? this.player.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(this.player.getScoreboardName())); // Paper - Adventure
- 
-        PlayerKickEvent event = new PlayerKickEvent(this.player.getBukkitEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(disconnectionInfo.reason()), leaveMessage); // Paper - adventure
-+        PlayerKickEvent event = new PlayerKickEvent(this.player.getBukkitEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(disconnectionInfo.reason()), leaveMessage, cause); // Paper - adventure & kick event causes
- 
-         if (this.cserver.getServer().isRunning()) {
-             this.cserver.getPluginManager().callEvent(event);
-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
-         if (this.clientIsFloating && !this.player.isSleeping() && !this.player.isPassenger() && !this.player.isDeadOrDying()) {
-             if (++this.aboveGroundTickCount > this.getMaximumFlyingTicks(this.player)) {
-                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
-                this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingPlayer); // Paper - use configurable kick message
-+                this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingPlayer, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_PLAYER); // Paper - use configurable kick message & kick event cause
-                 return;
-             }
-         } else {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             if (this.clientVehicleIsFloating && this.lastVehicle.getControllingPassenger() == this.player) {
-                 if (++this.aboveGroundVehicleTickCount > this.getMaximumFlyingTicks(this.lastVehicle)) {
-                     ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString());
-                    this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingVehicle); // Paper - use configurable kick message
-+                    this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingVehicle, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_VEHICLE); // Paper - use configurable kick message & kick event cause
-                     return;
-                 }
-             } else {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         this.dropSpamThrottler.tick();
-         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L) {
-             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-            this.disconnect((Component) Component.translatable("multiplayer.disconnect.idling"));
-+            this.disconnect((Component) Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-         }
- 
-     }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     public void handleMoveVehicle(ServerboundMoveVehiclePacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-         if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(), packet.getY(), packet.getZ(), packet.getYRot(), packet.getXRot())) {
-            this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"));
-+            this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT); // Paper - kick event cause
-         } else if (!this.updateAwaitingTeleport()) {
-             Entity entity = this.player.getRootVehicle();
- 
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-         if (packet.getId() == this.awaitingTeleport) {
-             if (this.awaitingPositionFromClient == null) {
-                this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"));
-+                this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
-                 return;
-             }
- 
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - AsyncTabCompleteEvent; run this async
-         // CraftBukkit start
-         if (!this.tabSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { // Paper - configurable tab spam limits
-            this.disconnect(Component.translatable("disconnect.spam"));
-+            this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - Kick event cause
-             return;
-         }
-         // CraftBukkit end
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // Paper start - validate pick item position
-         if (!(packet.getSlot() >= 0 && packet.getSlot() < this.player.getInventory().items.size())) {
-             ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
-            this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"));
-+            this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
-             return;
-         }
-         this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-             if (byteTotal > byteAllowed) {
-                 ServerGamePacketListenerImpl.LOGGER.warn("{} tried to send a book too large. Book size: {} - Allowed: {} - Pages: {}", this.player.getScoreboardName(), byteTotal, byteAllowed, pageList.size());
-                this.disconnect(Component.literal("Book too large!"));
-+                this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
-                 return;
-             }
-         }
-         // Paper end - Book size limits
-         // CraftBukkit start
-         if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
-            this.disconnect(Component.literal("Book edited too quickly!"));
-+            this.disconnect(Component.literal("Book edited too quickly!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
-             return;
-         }
-         this.lastBookTick = MinecraftServer.currentTick;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-         if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(0.0D), packet.getY(0.0D), packet.getZ(0.0D), packet.getYRot(0.0F), packet.getXRot(0.0F))) {
-            this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"));
-+            this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
-         } else {
-             ServerLevel worldserver = this.player.serverLevel();
- 
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                         this.dropCount++;
-                         if (this.dropCount >= 20) {
-                             ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " dropped their items too quickly!");
-                            this.disconnect(Component.literal("You dropped your items too quickly (Hacking?)"));
-+                            this.disconnect(Component.literal("You dropped your items too quickly (Hacking?)"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
-                             return;
-                         }
-                     }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             this.player.resetLastActionTime();
-         } else {
-             ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
-            this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)")); // CraftBukkit
-+            this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // CraftBukkit // Paper - kick event cause
-         }
-     }
- 
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-     private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
-         if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
-            this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"));
-+            this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
-         } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-             this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
-         } else {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-             if (optional.isEmpty()) {
-                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-                this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED);
-+                this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
-             }
- 
-             return optional;
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // this.chatSpamThrottler.increment();
-         if (!this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) {
-             // CraftBukkit end
-            this.disconnect((Component) Component.translatable("disconnect.spam"));
-+            this.disconnect((Component) Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
-         }
- 
-     }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         synchronized (this.lastSeenMessages) {
-             if (!this.lastSeenMessages.applyOffset(packet.offset())) {
-                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-                this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED);
-+                this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
-             }
- 
-         }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             }
- 
-             if (i > 4096) {
-                this.disconnect((Component) Component.translatable("multiplayer.disconnect.too_many_pending_chats"));
-+                this.disconnect((Component) Component.translatable("multiplayer.disconnect.too_many_pending_chats"), org.bukkit.event.player.PlayerKickEvent.Cause.TOO_MANY_PENDING_CHATS); // Paper - kick event cause
-             }
- 
-         }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // Spigot Start
-         if ( entity == this.player && !this.player.isSpectator() )
-         {
-            this.disconnect( Component.literal( "Cannot interact with self!" ) );
-+            this.disconnect( Component.literal( "Cannot interact with self!" ), org.bukkit.event.player.PlayerKickEvent.Cause.SELF_INTERACTION ); // Paper - kick event cause
-             return;
-         }
-         // Spigot End
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             }
-                         }
- 
-                        ServerGamePacketListenerImpl.this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_entity_attacked"));
-+                        ServerGamePacketListenerImpl.this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_entity_attacked"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_ENTITY_ATTACKED); // Paper - add cause
-                         ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString());
-                     }
-                 });
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // Paper start - auto recipe limit
-         if (!org.bukkit.Bukkit.isPrimaryThread()) {
-             if (!this.recipeSpamPackets.isIncrementAndUnderThreshold()) {
-                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"));
-+                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
-                 return;
-             }
-         }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-         if (!Objects.equals(profilepublickey_a, profilepublickey_a1)) {
-             if (profilepublickey_a != null && profilepublickey_a1.expiresAt().isBefore(profilepublickey_a.expiresAt())) {
-                this.disconnect(ProfilePublicKey.EXPIRED_PROFILE_PUBLIC_KEY);
-+                this.disconnect(ProfilePublicKey.EXPIRED_PROFILE_PUBLIC_KEY, org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY); // Paper - kick event causes
-             } else {
-                 try {
-                     SignatureValidator signaturevalidator = this.server.getProfileKeySignatureValidator();
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                     this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
-                 } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
-                     ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
-                    this.disconnect(profilepublickey_b.getComponent());
-+                    this.disconnect(profilepublickey_b.getComponent(), profilepublickey_b.kickCause); // Paper - kick event causes
-                 }
- 
-             }
-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,
-     }
- 
-     @Override
-    public void kickPlayer(Component reason) {
-+    public void kickPlayer(Component reason, org.bukkit.event.player.PlayerKickEvent.Cause cause) { // Paper - kick event causes - during login, no event can be called.
-         this.disconnect(reason);
-     }
-     // CraftBukkit end
-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 {
-         while (iterator.hasNext()) {
-             entityplayer = (ServerPlayer) iterator.next();
-             this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
-            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
-+            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"), org.bukkit.event.player.PlayerKickEvent.Cause.DUPLICATE_LOGIN); // Paper - kick event cause
-         }
- 
-         // Instead of kicking then returning, we need to store the kick reason
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-         // Paper end
-         // CraftBukkit start - disconnect safely
-         for (ServerPlayer player : this.players) {
-            if (isRestarting) player.connection.disconnect(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.restartMessage)); else // Paper
-+            if (isRestarting) player.connection.disconnect(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.restartMessage), org.bukkit.event.player.PlayerKickEvent.Cause.UNKNOWN); else // Paper - kick event cause (cause is never used here)
-             player.connection.disconnect(java.util.Objects.requireNonNullElseGet(this.server.server.shutdownMessage(), net.kyori.adventure.text.Component::empty)); // CraftBukkit - add custom shutdown message // Paper - Adventure
-         }
-         // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java
-+++ b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java
-@@ -0,0 +0,0 @@ public record ProfilePublicKey(ProfilePublicKey.Data data) {
- 
-     public static ProfilePublicKey createValidated(SignatureValidator servicesSignatureVerifier, UUID playerUuid, ProfilePublicKey.Data publicKeyData) throws ProfilePublicKey.ValidationException {
-         if (!publicKeyData.validateSignature(servicesSignatureVerifier, playerUuid)) {
-            throw new ProfilePublicKey.ValidationException(INVALID_SIGNATURE);
-+            throw new ProfilePublicKey.ValidationException(INVALID_SIGNATURE, org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PUBLIC_KEY_SIGNATURE); // Paper - kick event causes
-         } else {
-             return new ProfilePublicKey(publicKeyData);
-         }
-@@ -0,0 +0,0 @@ public record ProfilePublicKey(ProfilePublicKey.Data data) {
-     }
- 
-     public static class ValidationException extends ThrowingComponent {
-+        public final org.bukkit.event.player.PlayerKickEvent.Cause kickCause; // Paper
-+        @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper
-         public ValidationException(Component messageText) {
-+            // Paper start
-+            this(messageText, org.bukkit.event.player.PlayerKickEvent.Cause.UNKNOWN);
-+        }
-+        public ValidationException(Component messageText, org.bukkit.event.player.PlayerKickEvent.Cause kickCause) {
-+            // Paper end
-             super(messageText);
-+            this.kickCause = kickCause; // Paper
-         }
-     }
- }
-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 {
- 
-         void sendPacket(Packet<?> packet);
- 
-        void kickPlayer(Component reason);
-+        void kickPlayer(Component reason, org.bukkit.event.player.PlayerKickEvent.Cause cause); // Paper - kick event causes
-     }
- 
-     public record CookieFuture(ResourceLocation key, CompletableFuture<byte[]> future) {
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     @Override
-     public void kickPlayer(String message) {
-         org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot
-        this.getHandle().transferCookieConnection.kickPlayer(CraftChatMessage.fromStringOrEmpty(message, true));
-+        this.getHandle().transferCookieConnection.kickPlayer(CraftChatMessage.fromStringOrEmpty(message, true), org.bukkit.event.player.PlayerKickEvent.Cause.PLUGIN); // Paper - kick event cause
-     }
- 
-     // Paper start
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void kick(final net.kyori.adventure.text.Component message) {
-+        kick(message, org.bukkit.event.player.PlayerKickEvent.Cause.PLUGIN);
-+    }
-+
-+    @Override
-+    public void kick(net.kyori.adventure.text.Component message, org.bukkit.event.player.PlayerKickEvent.Cause cause) {
-         org.spigotmc.AsyncCatcher.catchOp("player kick");
-         final ServerGamePacketListenerImpl connection = this.getHandle().connection;
-         if (connection != null) {
-            connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
-+            connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
-         }
-     }
- 
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         // Paper start - Improve chat handling
-         if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
-            this.getHandle().connection.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"));
-+            this.getHandle().connection.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - kick event causes
-         } else {
-             if (msg.startsWith("/")) {
-                 this.getHandle().connection.handleCommand(msg);
-diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/RestartCommand.java
-+++ b/src/main/java/org/spigotmc/RestartCommand.java
-@@ -0,0 +0,0 @@ public class RestartCommand extends Command
-             // Kick all players
-             for ( ServerPlayer p : com.google.common.collect.ImmutableList.copyOf( MinecraftServer.getServer().getPlayerList().players ) )
-             {
-                p.connection.disconnect( CraftChatMessage.fromStringOrEmpty( SpigotConfig.restartMessage, true ) );
-+                p.connection.disconnect( CraftChatMessage.fromStringOrEmpty( SpigotConfig.restartMessage, true ), org.bukkit.event.player.PlayerKickEvent.Cause.RESTART_COMMAND); // Paper - kick event reason (cause is never used))
-             }
-             // Give the socket a chance to send the packets
-             try
--- a/patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/Add-PlayerLecternPageChangeEvent.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 23 Nov 2020 12:58:51 -0800
-Subject: [PATCH] Add PlayerLecternPageChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-@@ -0,0 +0,0 @@ public class LecternMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         int j;
-+        io.papermc.paper.event.player.PlayerLecternPageChangeEvent playerLecternPageChangeEvent; CraftInventoryLectern bukkitView; // Paper - Add PlayerLecternPageChangeEvent
- 
-         if (id >= 100) {
-             j = id - 100;
-@@ -0,0 +0,0 @@ public class LecternMenu extends AbstractContainerMenu {
-             switch (id) {
-                 case 1:
-                     j = this.lecternData.get(0);
-                    this.setData(0, j - 1);
-+                    // Paper start - Add PlayerLecternPageChangeEvent
-+                    bukkitView = (CraftInventoryLectern) getBukkitView().getTopInventory();
-+                    playerLecternPageChangeEvent = new io.papermc.paper.event.player.PlayerLecternPageChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), bukkitView.getHolder(), bukkitView.getBook(), io.papermc.paper.event.player.PlayerLecternPageChangeEvent.PageChangeDirection.LEFT, j, j - 1);
-+                    if (!playerLecternPageChangeEvent.callEvent()) {
-+                        return false;
-+                    }
-+                    this.setData(0, playerLecternPageChangeEvent.getNewPage());
-+                    // Paper end - Add PlayerLecternPageChangeEvent
-                     return true;
-                 case 2:
-                     j = this.lecternData.get(0);
-                    this.setData(0, j + 1);
-+                    // Paper start - Add PlayerLecternPageChangeEvent
-+                    bukkitView = (CraftInventoryLectern) getBukkitView().getTopInventory();
-+                    playerLecternPageChangeEvent = new io.papermc.paper.event.player.PlayerLecternPageChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), bukkitView.getHolder(), bukkitView.getBook(), io.papermc.paper.event.player.PlayerLecternPageChangeEvent.PageChangeDirection.RIGHT, j, j + 1);
-+                    if (!playerLecternPageChangeEvent.callEvent()) {
-+                        return false;
-+                    }
-+                    this.setData(0, playerLecternPageChangeEvent.getNewPage());
-+                    // Paper end - Add PlayerLecternPageChangeEvent
-                     return true;
-                 case 3:
-                     if (!player.mayBuild()) {
--- a/patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/Add-PlayerLoomPatternSelectEvent.patch
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 25 Nov 2020 16:33:27 -0800
-Subject: [PATCH] Add PlayerLoomPatternSelectEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-@@ -0,0 +0,0 @@ public class LoomMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         if (id >= 0 && id < this.selectablePatterns.size()) {
-            this.selectedBannerPatternIndex.set(id);
-            this.setupResultSlot((Holder) this.selectablePatterns.get(id));
-+            // Paper start - Add PlayerLoomPatternSelectEvent
-+            int selectablePatternIndex = id;
-+            io.papermc.paper.event.player.PlayerLoomPatternSelectEvent event = new io.papermc.paper.event.player.PlayerLoomPatternSelectEvent((Player) player.getBukkitEntity(), ((CraftInventoryLoom) getBukkitView().getTopInventory()), org.bukkit.craftbukkit.block.banner.CraftPatternType.minecraftHolderToBukkit(this.selectablePatterns.get(selectablePatternIndex)));
-+            if (!event.callEvent()) {
-+                player.containerMenu.sendAllDataToRemote();
-+                return false;
-+            }
-+            final Holder<BannerPattern> eventPattern = org.bukkit.craftbukkit.block.banner.CraftPatternType.bukkitToMinecraftHolder(event.getPatternType());
-+            Holder<BannerPattern> selectedPattern = null;
-+            for (int i = 0; i < this.selectablePatterns.size(); i++) {
-+                final Holder<BannerPattern> holder = this.selectablePatterns.get(i);
-+                if (eventPattern.equals(holder)) {
-+                    selectablePatternIndex = i;
-+                    selectedPattern = holder;
-+                    break;
-+                }
-+            }
-+            if (selectedPattern == null) {
-+                selectedPattern = eventPattern;
-+                selectablePatternIndex = -1;
-+            }
-+
-+            player.containerMenu.sendAllDataToRemote();
-+            this.selectedBannerPatternIndex.set(selectablePatternIndex);
-+            this.setupResultSlot(java.util.Objects.requireNonNull(selectedPattern, "selectedPattern was null, this is unexpected"));
-+            // Paper end - Add PlayerLoomPatternSelectEvent
-             return true;
-         } else {
-             return false;
--- a/patches/unapplied/server/Add-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/Add-PlayerNameEntityEvent.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 5 Jul 2020 00:33:54 -0700
-Subject: [PATCH] Add PlayerNameEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/NameTagItem.java
-+++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
-@@ -0,0 +0,0 @@ public class NameTagItem extends Item {
-         Component component = stack.get(DataComponents.CUSTOM_NAME);
-         if (component != null && entity.getType().canSerialize()) {
-             if (!user.level().isClientSide && entity.isAlive()) {
-                entity.setCustomName(component);
-                if (entity instanceof Mob mob) {
-+                // Paper start - Add PlayerNameEntityEvent
-+                io.papermc.paper.event.player.PlayerNameEntityEvent event = new io.papermc.paper.event.player.PlayerNameEntityEvent(((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity(), entity.getBukkitLivingEntity(), io.papermc.paper.adventure.PaperAdventure.asAdventure(stack.getHoverName()), true);
-+                if (!event.callEvent()) return InteractionResult.PASS;
-+                LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
-+                newEntity.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
-+                if (event.isPersistent() && newEntity instanceof Mob mob) {
-+                // Paper end - Add PlayerNameEntityEvent
-                     mob.setPersistenceRequired();
-                 }
- 
--- a/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/Add-PlayerSetSpawnEvent.patch
@@ -1,204 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 19 May 2021 18:59:10 -0700
-Subject: [PATCH] Add PlayerSetSpawnEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-@@ -0,0 +0,0 @@ public class SetSpawnCommand {
-         ResourceKey<Level> resourcekey = source.getLevel().dimension();
-         Iterator iterator = targets.iterator();
- 
-+        final Collection<ServerPlayer> actualTargets = new java.util.ArrayList<>(); // Paper - Add PlayerSetSpawnEvent
-         while (iterator.hasNext()) {
-             ServerPlayer entityplayer = (ServerPlayer) iterator.next();
- 
-            entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.COMMAND); // CraftBukkit
-+            // Paper start - Add PlayerSetSpawnEvent
-+            if (entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.COMMAND)) {
-+                actualTargets.add(entityplayer);
-+            }
-+            // Paper end - Add PlayerSetSpawnEvent
-         }
-+        // Paper start - Add PlayerSetSpawnEvent
-+        if (actualTargets.isEmpty()) {
-+            return 0;
-+        }
-+        // Paper end - Add PlayerSetSpawnEvent
- 
-         String s = resourcekey.location().toString();
- 
-        if (targets.size() == 1) {
-+        if (actualTargets.size() == 1) { // Paper - Add PlayerSetSpawnEvent
-             source.sendSuccess(() -> {
-                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) targets.iterator().next()).getDisplayName());
-+                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) actualTargets.iterator().next()).getDisplayName()); // Paper - Add PlayerSetSpawnEvent
-             }, true);
-         } else {
-             source.sendSuccess(() -> {
-                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, targets.size());
-+                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, actualTargets.size()); // Paper - Add PlayerSetSpawnEvent
-             }, true);
-         }
- 
-        return targets.size();
-+        return actualTargets.size(); // Paper - Add PlayerSetSpawnEvent
-     }
- }
-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 net.minecraft.world.entity.player.Player {
-             } else if (this.bedBlocked(blockposition, enumdirection)) {
-                 return Either.left(net.minecraft.world.entity.player.Player.BedSleepingProblem.OBSTRUCTED);
-             } else {
-                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, PlayerSpawnChangeEvent.Cause.BED); // CraftBukkit
-+                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.BED); // Paper - Add PlayerSetSpawnEvent
-                 if (this.level().isDay()) {
-                     return Either.left(net.minecraft.world.entity.player.Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
-                 } else {
-@@ -0,0 +0,0 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
-         this.setRespawnPosition(player.getRespawnDimension(), player.getRespawnPosition(), player.getRespawnAngle(), player.isRespawnForced(), false);
-     }
- 
-+    @Deprecated // Paper - Add PlayerSetSpawnEvent
-     public void setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage) {
-        // CraftBukkit start
-        this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, PlayerSpawnChangeEvent.Cause.UNKNOWN);
-    }
-
-    public void setRespawnPosition(ResourceKey<Level> resourcekey, @Nullable BlockPos blockposition, float f, boolean flag, boolean flag1, PlayerSpawnChangeEvent.Cause cause) {
-        ServerLevel newWorld = this.server.getLevel(resourcekey);
-        Location newSpawn = (blockposition != null) ? CraftLocation.toBukkit(blockposition, newWorld.getWorld(), f, 0) : null;
-
-        PlayerSpawnChangeEvent event = new PlayerSpawnChangeEvent(this.getBukkitEntity(), newSpawn, flag, cause);
-        Bukkit.getServer().getPluginManager().callEvent(event);
-        if (event.isCancelled()) {
-            return;
-        }
-        newSpawn = event.getNewSpawn();
-        flag = event.isForced();
-
-        if (newSpawn != null) {
-            resourcekey = ((CraftWorld) newSpawn.getWorld()).getHandle().dimension();
-            blockposition = BlockPos.containing(newSpawn.getX(), newSpawn.getY(), newSpawn.getZ());
-            f = newSpawn.getYaw();
-        } else {
-            resourcekey = Level.OVERWORLD;
-            blockposition = null;
-            f = 0.0F;
-+        // Paper start - Add PlayerSetSpawnEvent
-+        this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.UNKNOWN);
-+    }
-+    @Deprecated
-+    public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, PlayerSpawnChangeEvent.Cause cause) {
-+        return this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, cause == PlayerSpawnChangeEvent.Cause.RESET ?
-+            com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN : com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.valueOf(cause.name()));
-+    }
-+    public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause cause) {
-+        Location spawnLoc = null;
-+        boolean willNotify = false;
-+        if (pos != null) {
-+            boolean flag2 = pos.equals(this.respawnPosition) && dimension.equals(this.respawnDimension);
-+            spawnLoc = io.papermc.paper.util.MCUtil.toLocation(this.getServer().getLevel(dimension), pos);
-+            spawnLoc.setYaw(angle);
-+            willNotify = sendMessage && !flag2;
-+        }
-+
-+        PlayerSpawnChangeEvent dumbEvent = new PlayerSpawnChangeEvent(this.getBukkitEntity(), spawnLoc, forced,
-+            cause == com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN ? PlayerSpawnChangeEvent.Cause.RESET : PlayerSpawnChangeEvent.Cause.valueOf(cause.name()));
-+        dumbEvent.callEvent();
-+
-+        com.destroystokyo.paper.event.player.PlayerSetSpawnEvent event = new com.destroystokyo.paper.event.player.PlayerSetSpawnEvent(this.getBukkitEntity(), cause, dumbEvent.getNewSpawn(), dumbEvent.isForced(), willNotify, willNotify ? net.kyori.adventure.text.Component.translatable("block.minecraft.set_spawn") : null);
-+        event.setCancelled(dumbEvent.isCancelled());
-+        if (!event.callEvent()) {
-+            return false;
-         }
-        // CraftBukkit end
-        if (blockposition != null) {
-            boolean flag2 = blockposition.equals(this.respawnPosition) && resourcekey.equals(this.respawnDimension);
-+        if (event.getLocation() != null) {
-+            dimension = event.getLocation().getWorld() != null ? ((CraftWorld) event.getLocation().getWorld()).getHandle().dimension() : dimension;
-+            pos = io.papermc.paper.util.MCUtil.toBlockPosition(event.getLocation());
-+            angle = event.getLocation().getYaw();
-+            forced = event.isForced();
-+            // Paper end - Add PlayerSetSpawnEvent
- 
-            if (flag1 && !flag2) {
-                this.sendSystemMessage(Component.translatable("block.minecraft.set_spawn"));
-+            if (event.willNotifyPlayer() && event.getNotification() != null) { // Paper - Add PlayerSetSpawnEvent
-+                this.sendSystemMessage(PaperAdventure.asVanilla(event.getNotification())); // Paper - Add PlayerSetSpawnEvent
-             }
- 
-            this.respawnPosition = blockposition;
-            this.respawnDimension = resourcekey;
-            this.respawnAngle = f;
-            this.respawnForced = flag;
-+            this.respawnPosition = pos;
-+            this.respawnDimension = dimension;
-+            this.respawnAngle = angle;
-+            this.respawnForced = forced;
-         } else {
-             this.respawnPosition = null;
-             this.respawnDimension = Level.OVERWORLD;
-@@ -0,0 +0,0 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
-             this.respawnForced = false;
-         }
- 
-+        return true; // Paper - Add PlayerSetSpawnEvent
-     }
- 
-     public SectionPos getLastSectionPos() {
-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 {
-         // CraftBukkit end
-         if (teleporttransition.missingRespawnBlock()) {
-             entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
-            entityplayer1.setRespawnPosition(null, null, 0f, false, false, PlayerSpawnChangeEvent.Cause.RESET); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
-+            entityplayer1.setRespawnPosition(null, null, 0f, false, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - PlayerSetSpawnEvent
-         }
- 
-         int i = flag ? 1 : 0;
-diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -0,0 +0,0 @@ public class RespawnAnchorBlock extends Block {
-                 ServerPlayer entityplayer = (ServerPlayer) player;
- 
-                 if (entityplayer.getRespawnDimension() != world.dimension() || !pos.equals(entityplayer.getRespawnPosition())) {
-                    entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.RESPAWN_ANCHOR); // CraftBukkit
-+                    if (entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.RESPAWN_ANCHOR)) { // Paper - Add PlayerSetSpawnEvent
-                     world.playSound((Player) null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
-                     return InteractionResult.SUCCESS_SERVER;
-+                    // Paper start - Add PlayerSetSpawnEvent
-+                    } else {
-+                        return InteractionResult.FAIL;
-+                    }
-+                    // Paper end - Add PlayerSetSpawnEvent
-                 }
-             }
- 
-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 {
-     @Override
-     public void setRespawnLocation(Location location, boolean override) {
-         if (location == null) {
-            this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
-+            this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
-         } else {
-            this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
-+            this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - Add PlayerSetSpawnEvent
-         }
-     }
- 
--- a/patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/Add-PlayerStonecutterRecipeSelectEvent.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 27 Nov 2020 17:14:27 -0800
-Subject: [PATCH] Add PlayerStonecutterRecipeSelectEvent
-
-Co-Authored-By: MiniDigger | Martin <admin@minidigger.dev>
-
-diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-@@ -0,0 +0,0 @@ public class StonecutterMenu extends AbstractContainerMenu {
- 
-     public StonecutterMenu(int syncId, Inventory playerInventory, final ContainerLevelAccess context) {
-         super(MenuType.STONECUTTER, syncId);
-        this.selectedRecipeIndex = DataSlot.standalone();
-+        this.selectedRecipeIndex = DataSlot.shared(new int[1], 0); // Paper - Add PlayerStonecutterRecipeSelectEvent
-         this.recipesForInput = SelectableRecipe.SingleInputSet.empty();
-         this.input = ItemStack.EMPTY;
-         this.slotUpdateListener = () -> {
-@@ -0,0 +0,0 @@ public class StonecutterMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         if (this.isValidRecipeIndex(id)) {
-            this.selectedRecipeIndex.set(id);
-            this.setupResultSlot(id);
-+            // Paper start - Add PlayerStonecutterRecipeSelectEvent
-+            int recipeIndex = id;
-+            this.selectedRecipeIndex.set(recipeIndex);
-+            this.selectedRecipeIndex.checkAndClearUpdateFlag(); // mark as changed
-+            paperEventBlock: if (this.isValidRecipeIndex(id)) {
-+                final Optional<RecipeHolder<StonecutterRecipe>> recipe = this.recipesForInput.entries().get(id).recipe().recipe();
-+                if (recipe.isEmpty()) break paperEventBlock; // The recipe selected does not have an actual server recipe (presumably its the empty one). Cannot call the event, just break.
-+
-+                io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent event = new io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent((Player) player.getBukkitEntity(), getBukkitView().getTopInventory(), (org.bukkit.inventory.StonecuttingRecipe) recipe.get().toBukkitRecipe());
-+                if (!event.callEvent()) {
-+                    player.containerMenu.sendAllDataToRemote();
-+                    return false;
-+                }
-+
-+                net.minecraft.resources.ResourceLocation key = org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(event.getStonecuttingRecipe().getKey());
-+                if (!recipe.get().id().location().equals(key)) { // If the recipe did NOT stay the same
-+                    for (int newRecipeIndex = 0; newRecipeIndex < this.recipesForInput.entries().size(); newRecipeIndex++) {
-+                        if (this.recipesForInput.entries().get(newRecipeIndex).recipe().recipe().filter(r -> r.id().location().equals(key)).isPresent()) {
-+                            recipeIndex = newRecipeIndex;
-+                            break;
-+                        }
-+                    }
-+                }
-+            }
-+            player.containerMenu.sendAllDataToRemote();
-+            this.selectedRecipeIndex.set(recipeIndex); // set new index, so that listeners can read it
-+            this.setupResultSlot(recipeIndex);
-+            // Paper end - Add PlayerStonecutterRecipeSelectEvent
-         }
- 
-         return true;
--- 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-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/Add-PufferFishStateChangeEvent.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Mon, 10 May 2021 16:59:05 +0100
-Subject: [PATCH] Add PufferFishStateChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-@@ -0,0 +0,0 @@ public class Pufferfish extends AbstractFish {
-     public void tick() {
-         if (!this.level().isClientSide && this.isAlive() && this.isEffectiveAi()) {
-             if (this.inflateCounter > 0) {
-+                boolean increase = true; // Paper - Add PufferFishStateChangeEvent
-                 if (this.getPuffState() == 0) {
-+                    if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 1).callEvent()) { // Paper - Add PufferFishStateChangeEvent
-                     this.makeSound(SoundEvents.PUFFER_FISH_BLOW_UP);
-                     this.setPuffState(1);
-+                    } else { increase = false; } // Paper - Add PufferFishStateChangeEvent
-                 } else if (this.inflateCounter > 40 && this.getPuffState() == 1) {
-+                    if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 2).callEvent()) { // Paper - Add PufferFishStateChangeEvent
-                     this.makeSound(SoundEvents.PUFFER_FISH_BLOW_UP);
-                     this.setPuffState(2);
-+                    } else { increase = false; } // Paper - Add PufferFishStateChangeEvent
-                 }
- 
-+                if (increase) { // Paper - Add PufferFishStateChangeEvent
-                 ++this.inflateCounter;
-+                } // Paper - Add PufferFishStateChangeEvent
-             } else if (this.getPuffState() != 0) {
-+                boolean increase = true; // Paper - Add PufferFishStateChangeEvent
-                 if (this.deflateTimer > 60 && this.getPuffState() == 2) {
-+                    if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 1).callEvent()) { // Paper - Add PufferFishStateChangeEvent
-                     this.makeSound(SoundEvents.PUFFER_FISH_BLOW_OUT);
-                     this.setPuffState(1);
-+                    } else { increase = false; } // Paper - Add PufferFishStateChangeEvent
-                 } else if (this.deflateTimer > 100 && this.getPuffState() == 1) {
-+                    if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 0).callEvent()) { // Paper - Add PufferFishStateChangeEvent
-                     this.makeSound(SoundEvents.PUFFER_FISH_BLOW_OUT);
-                     this.setPuffState(0);
-+                    } else { increase = false; } // Paper - Add PufferFishStateChangeEvent
-                 }
- 
-+                if (increase) { // Paper - Add PufferFishStateChangeEvent
-                 ++this.deflateTimer;
-+                } // Paper - Add PufferFishStateChangeEvent
-             }
-         }
- 
--- a/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/Add-Raw-Byte-Entity-Serialization.patch
@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Sun, 24 Oct 2021 16:20:31 -0400
-Subject: [PATCH] Add Raw Byte Entity Serialization
-
-== AT ==
-public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
-
-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
-         }
-     }
- 
-+    // Paper start - Entity serialization api
-+    public boolean serializeEntity(CompoundTag compound) {
-+        List<Entity> pass = new java.util.ArrayList<>(this.getPassengers());
-+        this.passengers = ImmutableList.of();
-+        boolean result = save(compound);
-+        this.passengers = ImmutableList.copyOf(pass);
-+        return result;
-+    }
-+    // Paper end - Entity serialization api
-     public boolean save(CompoundTag nbt) {
-         return this.isPassenger() ? false : this.saveAsPassenger(nbt);
-     }
-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 - tracked players API
- 
-+    // Paper start - raw entity serialization API
-+    @Override
-+    public boolean spawnAt(Location location, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
-+        Preconditions.checkNotNull(location, "location cannot be null");
-+        Preconditions.checkNotNull(reason, "reason cannot be null");
-+        this.entity.setLevel(((CraftWorld) location.getWorld()).getHandle());
-+        this.entity.setPos(location.getX(), location.getY(), location.getZ());
-+        this.entity.setRot(location.getYaw(), location.getPitch());
-+        return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason);
-+    }
-+    // Paper end - raw entity serialization API
-+
-     // Paper start - missing entity api
-     @Override
-     public boolean isInvisible() {  // Paper - moved up from LivingEntity
-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 {
-         return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow());
-     }
- 
-    private byte[] serializeNbtToBytes(CompoundTag compound) {
-+    @Override
-+    public byte[] serializeEntity(org.bukkit.entity.Entity entity) {
-+        Preconditions.checkNotNull(entity, "null cannot be serialized");
-+        Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");
-+
-+        net.minecraft.nbt.CompoundTag compound = new net.minecraft.nbt.CompoundTag();
-+        ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().serializeEntity(compound);
-+        return serializeNbtToBytes(compound);
-+    }
-+
-+    @Override
-+    public org.bukkit.entity.Entity deserializeEntity(byte[] data, org.bukkit.World world, boolean preserveUUID) {
-+        Preconditions.checkNotNull(data, "null cannot be deserialized");
-+        Preconditions.checkArgument(data.length > 0, "cannot deserialize nothing");
-+
-+        net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data);
-+        int dataVersion = compound.getInt("DataVersion");
-+        compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ENTITY, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, this.getDataVersion()).getValue();
-+        if (!preserveUUID) {
-+            // Generate a new UUID so we don't have to worry about deserializing the same entity twice
-+            compound.remove("UUID");
-+        }
-+        return net.minecraft.world.entity.EntityType.create(compound, ((org.bukkit.craftbukkit.CraftWorld) world).getHandle(), net.minecraft.world.entity.EntitySpawnReason.LOAD)
-+            .orElseThrow(() -> new IllegalArgumentException("An ID was not found for the data. Did you downgrade?")).getBukkitEntity();
-+    }
-+
-+    private byte[] serializeNbtToBytes(net.minecraft.nbt.CompoundTag compound) {
-         compound.putInt("DataVersion", getDataVersion());
-         java.io.ByteArrayOutputStream outputStream = new java.io.ByteArrayOutputStream();
-         try {
--- a/patches/unapplied/server/Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/unapplied/server/Add-RegistryAccess-for-managing-Registries.patch
--- a/patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/Add-ServerResourcesReloadedEvent.patch
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 2 Dec 2020 20:04:01 -0800
-Subject: [PATCH] Add ServerResourcesReloadedEvent
-
-
-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
-         return this.functionManager;
-     }
- 
-+    // Paper start - Add ServerResourcesReloadedEvent
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse
-     public CompletableFuture<Void> reloadResources(Collection<String> dataPacks) {
-+        return this.reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
-+    }
-+    public CompletableFuture<Void> reloadResources(Collection<String> dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
-+        // Paper end - Add ServerResourcesReloadedEvent
-         CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
-             Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
-             PackRepository resourcepackrepository = this.packRepository;
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
-             this.fuelValues = FuelValues.vanillaBurnTimes(this.registries.compositeAccess(), this.worldData.enabledFeatures());
-             org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings; they can be defined by datapacks so refresh it here
-+            new io.papermc.paper.event.server.ServerResourcesReloadedEvent(cause).callEvent(); // Paper - Add ServerResourcesReloadedEvent; fire after everything has been reloaded
-         }, this);
- 
-         if (this.isSameThread()) {
-diff --git a/src/main/java/net/minecraft/server/commands/ReloadCommand.java b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-@@ -0,0 +0,0 @@ public class ReloadCommand {
-     public ReloadCommand() {}
- 
-     public static void reloadPacks(Collection<String> dataPacks, CommandSourceStack source) {
-        source.getServer().reloadResources(dataPacks).exceptionally((throwable) -> {
-+        source.getServer().reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally((throwable) -> { // Paper - Add ServerResourcesReloadedEvent
-             ReloadCommand.LOGGER.warn("Failed to execute reload", throwable);
-             source.sendFailure(Component.translatable("commands.reload.failure"));
-             return null;
-@@ -0,0 +0,0 @@ public class ReloadCommand {
-         WorldData savedata = minecraftserver.getWorldData();
-         Collection<String> collection = resourcepackrepository.getSelectedIds();
-         Collection<String> collection1 = ReloadCommand.discoverNewPacks(resourcepackrepository, savedata, collection);
-        minecraftserver.reloadResources(collection1);
-+        minecraftserver.reloadResources(collection1, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper - Add ServerResourcesReloadedEvent
-     }
-     // CraftBukkit end
- 
--- a/patches/unapplied/server/Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/Add-StructuresLocateEvent.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dfsek <dfsek@protonmail.com>
-Date: Wed, 16 Sep 2020 01:12:29 -0700
-Subject: [PATCH] Add StructuresLocateEvent
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@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 {
- 
-     @Nullable
-     public Pair<BlockPos, Holder<Structure>> findNearestMapStructure(ServerLevel world, HolderSet<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
-+        // Paper start - StructuresLocateEvent
-+        final org.bukkit.World bukkitWorld = world.getWorld();
-+        final org.bukkit.Location origin = io.papermc.paper.util.MCUtil.toLocation(world, center);
-+        final List<org.bukkit.generator.structure.Structure> apiStructures = structures.stream().map(Holder::value).map(nms -> org.bukkit.craftbukkit.generator.structure.CraftStructure.minecraftToBukkit(nms)).toList();
-+        if (!apiStructures.isEmpty()) {
-+            final io.papermc.paper.event.world.StructuresLocateEvent event = new io.papermc.paper.event.world.StructuresLocateEvent(bukkitWorld, origin, apiStructures, radius, skipReferencedStructures);
-+            if (!event.callEvent()) {
-+                return null;
-+            }
-+            if (event.getResult() != null) {
-+                return Pair.of(io.papermc.paper.util.MCUtil.toBlockPos(event.getResult().pos()), world.registryAccess().lookupOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(event.getResult().structure())));
-+            }
-+            center = io.papermc.paper.util.MCUtil.toBlockPosition(event.getOrigin());
-+            radius = event.getRadius();
-+            skipReferencedStructures = event.shouldFindUnexplored();
-+            structures = HolderSet.direct(api -> world.registryAccess().lookupOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(api)), event.getStructures());
-+        }
-+        // Paper end
-         ChunkGeneratorStructureState chunkgeneratorstructurestate = world.getChunkSource().getGeneratorState();
-         Map<StructurePlacement, Set<Holder<Structure>>> map = new Object2ObjectArrayMap();
-         Iterator iterator = structures.iterator();
--- a/patches/unapplied/server/Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/Add-System.out-err-catcher.patch
@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: underscore11code <minecrafter11mrt@gmail.com>
-Date: Fri, 23 Jul 2021 23:01:42 -0700
-Subject: [PATCH] Add System.out/err catcher
-
-
-diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.logging;
-+
-+import org.bukkit.Bukkit;
-+import org.bukkit.plugin.java.JavaPlugin;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+import java.io.OutputStream;
-+import java.io.PrintStream;
-+import java.util.Objects;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
-+import java.util.concurrent.TimeUnit;
-+import java.util.logging.Level;
-+
-+public final class SysoutCatcher {
-+    private static final boolean SUPPRESS_NAGS = Boolean.getBoolean("io.papermc.paper.suppress.sout.nags");
-+    // Nanoseconds between nag at most; if interval is caught first, this is reset.
-+    // <= 0 for disabling.
-+    private static final long NAG_TIMEOUT = TimeUnit.MILLISECONDS.toNanos(
-+        Long.getLong("io.papermc.paper.sout.nags.timeout", TimeUnit.MINUTES.toMillis(5L)));
-+    // Count since last nag; if timeout is first, this is reset.
-+    // <= 0 for disabling.
-+    private static final long NAG_INTERVAL = Long.getLong("io.papermc.paper.sout.nags.interval", 200L);
-+
-+    // We don't particularly care about how correct this is at any given moment; let's do it on a best attempt basis.
-+    // The records are also pretty small, so let's just go for a size of 64 to start...
-+    //
-+    // Content: Plugin name => nag object
-+    //  Why plugin name?: This doesn't store a reference to the plugin; keeps the reload ability.
-+    //  Why not clean on reload?: Effort.
-+    private final ConcurrentMap<String, PluginNag> nagRecords = new ConcurrentHashMap<>(64);
-+
-+    public SysoutCatcher() {
-+        System.setOut(new WrappedOutStream(System.out, Level.INFO, "[STDOUT] "));
-+        System.setErr(new WrappedOutStream(System.err, Level.SEVERE, "[STDERR] "));
-+    }
-+
-+    private final class WrappedOutStream extends PrintStream {
-+        private static final StackWalker STACK_WALKER = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
-+        private final Level level;
-+        private final String prefix;
-+
-+        public WrappedOutStream(@NotNull final OutputStream out, final Level level, final String prefix) {
-+            super(out);
-+            this.level = level;
-+            this.prefix = prefix;
-+        }
-+
-+        @Override
-+        public void println(@Nullable final String line) {
-+            final Class<?> clazz = STACK_WALKER.getCallerClass();
-+            try {
-+                final JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz);
-+
-+                // Instead of just printing the message, send it to the plugin's logger
-+                plugin.getLogger().log(this.level, this.prefix + line);
-+
-+                if (SysoutCatcher.SUPPRESS_NAGS) {
-+                    return;
-+                }
-+                if (SysoutCatcher.NAG_INTERVAL > 0 || SysoutCatcher.NAG_TIMEOUT > 0) {
-+                    final PluginNag nagRecord = SysoutCatcher.this.nagRecords.computeIfAbsent(plugin.getName(), k -> new PluginNag());
-+                    final boolean hasTimePassed = SysoutCatcher.NAG_TIMEOUT > 0
-+                        && (nagRecord.lastNagTimestamp == Long.MIN_VALUE
-+                        || nagRecord.lastNagTimestamp + SysoutCatcher.NAG_TIMEOUT <= System.nanoTime());
-+                    final boolean hasMessagesPassed = SysoutCatcher.NAG_INTERVAL > 0
-+                        && (nagRecord.messagesSinceNag == Long.MIN_VALUE
-+                        || ++nagRecord.messagesSinceNag >= SysoutCatcher.NAG_INTERVAL);
-+                    if (!hasMessagesPassed && !hasTimePassed) {
-+                        return;
-+                    }
-+                    nagRecord.lastNagTimestamp = System.nanoTime();
-+                    nagRecord.messagesSinceNag = 0;
-+                }
-+                Bukkit.getLogger().warning(
-+                    String.format("Nag author(s): '%s' of '%s' about their usage of System.out/err.print. "
-+                            + "Please use your plugin's logger instead (JavaPlugin#getLogger).",
-+                        plugin.getPluginMeta().getAuthors(),
-+                        plugin.getPluginMeta().getDisplayName())
-+                );
-+            } catch (final IllegalArgumentException | IllegalStateException e) {
-+                // If anything happens, the calling class doesn't exist, there is no JavaPlugin that "owns" the calling class, etc
-+                // Just print out normally, with some added information
-+                Bukkit.getLogger().log(this.level, String.format("%s[%s] %s", this.prefix, clazz.getName(), line));
-+            }
-+        }
-+    }
-+
-+    private static class PluginNag {
-+        private long lastNagTimestamp = Long.MIN_VALUE;
-+        private long messagesSinceNag = Long.MIN_VALUE;
-+    }
-+}
-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 {
-     public Set<String> activeCompatibilities = Collections.emptySet();
-     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
- 
-     static {
-         ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
--- 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 {
-                 if (entityliving instanceof ServerPlayer) {
-                     ServerPlayer entityplayer = (ServerPlayer) entityliving;
- 
-                    entityplayer.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()) {
-+                        entityplayer.sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.deathMessage()));
-+                    }
-+                    // Paper end - Add TameableDeathMessageEvent
-                 }
-             }
-         }
--- a/patches/unapplied/server/Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/Add-Unix-domain-socket-support.patch
@@ -1,137 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Steinborn <git@steinborn.me>
-Date: Tue, 11 May 2021 17:39:22 -0400
-Subject: [PATCH] Add Unix domain socket support
-
-
-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.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist);
-         // this.worldData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading
-         DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode);
-+        // Paper start - Unix domain socket support
-+        java.net.SocketAddress bindAddress;
-+        if (this.getLocalIp().startsWith("unix:")) {
-+            if (!io.netty.channel.epoll.Epoll.isAvailable()) {
-+                DedicatedServer.LOGGER.error("**** INVALID CONFIGURATION!");
-+                DedicatedServer.LOGGER.error("You are trying to use a Unix domain socket but you're not on a supported OS.");
-+                return false;
-+            } else if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled && !org.spigotmc.SpigotConfig.bungee) {
-+                DedicatedServer.LOGGER.error("**** INVALID CONFIGURATION!");
-+                DedicatedServer.LOGGER.error("Unix domain sockets require IPs to be forwarded from a proxy.");
-+                return false;
-+            }
-+            bindAddress = new io.netty.channel.unix.DomainSocketAddress(this.getLocalIp().substring("unix:".length()));
-+        } else {
-         InetAddress inetaddress = null;
- 
-         if (!this.getLocalIp().isEmpty()) {
-@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         if (this.getPort() < 0) {
-             this.setPort(dedicatedserverproperties.serverPort);
-         }
-+        bindAddress = new java.net.InetSocketAddress(inetaddress, this.getPort());
-+        }
-+        // Paper end - Unix domain socket support
- 
-         this.initializeKeyPair();
-         DedicatedServer.LOGGER.info("Starting Minecraft server on {}:{}", this.getLocalIp().isEmpty() ? "*" : this.getLocalIp(), this.getPort());
- 
-         try {
-            this.getConnection().startTcpServerListener(inetaddress, this.getPort());
-+            this.getConnection().bind(bindAddress); // Paper - Unix domain socket support
-         } catch (IOException ioexception) {
-             DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
-             DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
-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 {
-         this.running = true;
-     }
- 
-+    // Paper start - Unix domain socket support
-     public void startTcpServerListener(@Nullable InetAddress address, int port) throws IOException {
-+        bind(new java.net.InetSocketAddress(address, port));
-+    }
-+    public void bind(java.net.SocketAddress address) throws IOException {
-+    // Paper end - Unix domain socket support
-         List list = this.channels;
- 
-         synchronized (this.channels) {
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-             EventLoopGroup eventloopgroup;
- 
-             if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
-+                // Paper start - Unix domain socket support
-+                if (address instanceof io.netty.channel.unix.DomainSocketAddress) {
-+                    oclass = io.netty.channel.epoll.EpollServerDomainSocketChannel.class;
-+                } else {
-                 oclass = EpollServerSocketChannel.class;
-+                }
-+                // Paper end - Unix domain socket support
-                 eventloopgroup = (EventLoopGroup) ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP.get();
-                 ServerConnectionListener.LOGGER.info("Using epoll channel type");
-             } else {
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-                     ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-                     io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper - Add Channel initialization listeners
-                 }
-            }).group(eventloopgroup).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
-+            }).group(eventloopgroup).localAddress(address)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit // Paper - Unix domain socket support
-         }
-     }
- 
-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 Start
-     public SocketAddress getRawAddress()
-     {
-+        // Paper start - Unix domain socket support; this can be nullable in the case of a Unix domain socket, so if it is, fake something
-+        if (connection.channel.remoteAddress() == null) {
-+            return new java.net.InetSocketAddress(java.net.InetAddress.getLoopbackAddress(), 0);
-+        }
-+        // Paper end - Unix domain socket support
-         return this.connection.channel.remoteAddress();
-     }
-     // Spigot End
-diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-         this.connection.setupOutboundProtocol(LoginProtocols.CLIENTBOUND);
-         // CraftBukkit start - Connection throttle
-         try {
-+            if (!(this.connection.channel.localAddress() instanceof io.netty.channel.unix.DomainSocketAddress)) { // Paper - Unix domain socket support; the connection throttle is useless when you have a Unix domain socket
-             long currentTime = System.currentTimeMillis();
-             long connectionThrottle = this.server.server.getConnectionThrottle();
-             InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-                     }
-                 }
-             }
-+            } // Paper - Unix domain socket support
-         } catch (Throwable t) {
-             org.apache.logging.log4j.LogManager.getLogger().debug("Failed to check connection throttle", t);
-         }
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-             if (!handledByEvent && proxyLogicEnabled) { // Paper
-                 // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                 if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper - Add bypass host check
-+                    // Paper start - Unix domain socket support
-+                    java.net.SocketAddress socketAddress = this.connection.getRemoteAddress();
-                     this.connection.hostname = split[0];
-                    this.connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());
-+                    this.connection.address = new java.net.InetSocketAddress(split[1], socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getPort() : 0);
-+                    // Paper end - Unix domain socket support
-                     this.connection.spoofedUUID = com.mojang.util.UndashedUuid.fromStringLenient( split[2] );
-                 } else
-                 {
--- a/patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/Add-WorldGameRuleChangeEvent.patch
@@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 20 Dec 2020 16:41:44 -0800
-Subject: [PATCH] Add WorldGameRuleChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-@@ -0,0 +0,0 @@ public class GameRuleCommand {
-         CommandSourceStack commandlistenerwrapper = (CommandSourceStack) context.getSource();
-         T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(key); // CraftBukkit
- 
-        t0.setFromArgument(context, "value");
-+        t0.setFromArgument(context, "value", key); // Paper - Add WorldGameRuleChangeEvent
-         commandlistenerwrapper.sendSuccess(() -> {
-             return Component.translatable("commands.gamerule.set", key.getId(), t0.toString());
-         }, true);
-diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java
-+++ b/src/main/java/net/minecraft/world/level/GameRules.java
-@@ -0,0 +0,0 @@ public class GameRules {
-             this.type = type;
-         }
- 
-        protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name);
-+        protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey); // Paper - Add WorldGameRuleChangeEvent
- 
-        public void setFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.updateFromArgument(context, name);
-+        public void setFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey) { // Paper - Add WorldGameRuleChangeEvent
-+            this.updateFromArgument(context, name, gameRuleKey); // Paper - Add WorldGameRuleChangeEvent
-             this.onChanged(((CommandSourceStack) context.getSource()).getLevel()); // CraftBukkit - per-world
-         }
- 
-@@ -0,0 +0,0 @@ public class GameRules {
-         }
- 
-         @Override
-        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.value = BoolArgumentType.getBool(context, name);
-+        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<BooleanValue> gameRuleKey) { // Paper start - Add WorldGameRuleChangeEvent
-+            io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Boolean>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(BoolArgumentType.getBool(context, name)));
-+            if (!event.callEvent()) return;
-+            this.value = Boolean.parseBoolean(event.getValue());
-+            // Paper end - Add WorldGameRuleChangeEvent
-         }
- 
-         public boolean get() {
-@@ -0,0 +0,0 @@ public class GameRules {
-         }
- 
-         @Override
-        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.value = IntegerArgumentType.getInteger(context, name);
-+        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<IntegerValue> gameRuleKey) { // Paper start - Add WorldGameRuleChangeEvent
-+            io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Integer>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(IntegerArgumentType.getInteger(context, name)));
-+            if (!event.callEvent()) return;
-+            this.value = Integer.parseInt(event.getValue());
-+            // Paper end - Add WorldGameRuleChangeEvent
-         }
- 
-         public int get() {
-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 {
-         if (rule == null || value == null) return false;
- 
-         if (!this.isGameRule(rule)) return false;
-+        // Paper start - Add WorldGameRuleChangeEvent
-+        GameRule<?> gameRule = GameRule.getByName(rule);
-+        io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, gameRule, value);
-+        if (!event.callEvent()) return false;
-+        // Paper end - Add WorldGameRuleChangeEvent
- 
-         GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(this.getGameRulesNMS().get(rule));
-        handle.deserialize(value);
-+        handle.deserialize(event.getValue()); // Paper - Add WorldGameRuleChangeEvent
-         handle.onChanged(this.getHandle());
-         return true;
-     }
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         Preconditions.checkArgument(newValue != null, "GameRule value cannot be null");
- 
-         if (!this.isGameRule(rule.getName())) return false;
-+        // Paper start - Add WorldGameRuleChangeEvent
-+        io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, rule, String.valueOf(newValue));
-+        if (!event.callEvent()) return false;
-+        // Paper end - Add WorldGameRuleChangeEvent
- 
-         GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(this.getGameRulesNMS().get(rule.getName()));
-        handle.deserialize(newValue.toString());
-+        handle.deserialize(event.getValue()); // Paper - Add WorldGameRuleChangeEvent
-         handle.onChanged(this.getHandle());
-         return true;
-     }
--- a/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -1,130 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MeFisto94 <MeFisto94@users.noreply.github.com>
-Date: Tue, 11 May 2021 00:48:33 +0200
-Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
- Skeletons
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
- 
-     abstract SoundEvent getStepSound();
- 
-+    // Paper start - shouldBurnInDay API
-+    private boolean shouldBurnInDay = true;
-+    public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-+    // Paper end - shouldBurnInDay API
-+
-     @Override
-     public void aiStep() {
-        boolean flag = this.isSunBurnTick();
-+        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - shouldBurnInDay API
- 
-         if (flag) {
-             ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-         this.reassessWeaponGoal();
-+        // Paper start - shouldBurnInDay API
-+        if (nbt.contains("Paper.ShouldBurnInDay")) {
-+            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+        }
-+        // Paper end - shouldBurnInDay API
-+    }
-+
-+    // Paper start - shouldBurnInDay API
-+    @Override
-+    public void addAdditionalSaveData(CompoundTag nbt) {
-+        super.addAdditionalSaveData(nbt);
-+        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
-     }
-+    // Paper end - shouldBurnInDay API
- 
-     @Override
-     public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
- 
-     @Override
-     public void aiStep() {
-        if (this.isAlive() && this.isSunBurnTick()) {
-+        if (this.isAlive() && this.shouldBurnInDay && this.isSunBurnTick()) { // Paper - shouldBurnInDay API
-             this.igniteForSeconds(8.0F);
-         }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         if (nbt.hasUUID("Paper.SpawningEntity")) {
-             this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
-         }
-+        if (nbt.contains("Paper.ShouldBurnInDay")) {
-+            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+        }
-         // Paper end
-     }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         if (this.spawningEntity != null) {
-             nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
-         }
-+        nbt.putBoolean("Paper.ShouldBurnInDay", shouldBurnInDay);
-         // Paper end
-     }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         return this.spawningEntity;
-     }
-     public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
-+    private boolean shouldBurnInDay = true;
-+    public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-     // Paper end
- 
-     private static enum AttackPhase {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class CraftAbstractSkeleton extends CraftMonster implements Abst
-         return (net.minecraft.world.entity.monster.AbstractSkeleton) super.getHandle();
-     }
-     // Paper end
-+    // Paper start
-+    @Override
-+    public boolean shouldBurnInDay() {
-+        return getHandle().shouldBurnInDay();
-+    }
-+
-+    @Override
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+        getHandle().setShouldBurnInDay(shouldBurnInDay);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
-     public java.util.UUID getSpawningEntity() {
-         return getHandle().getSpawningEntity();
-     }
-+
-+    @Override
-+    public boolean shouldBurnInDay() {
-+        return getHandle().shouldBurnInDay();
-+    }
-+
-+    @Override
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+        getHandle().setShouldBurnInDay(shouldBurnInDay);
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 16 May 2021 09:39:46 -0700
-Subject: [PATCH] Add back EntityPortalExitEvent
-
-
-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 (!this.isRemoved()) {
-                 // CraftBukkit start
-                 PositionMoveRotation absolutePosition = PositionMoveRotation.calculateAbsolute(PositionMoveRotation.of(this), PositionMoveRotation.of(teleportTarget), teleportTarget.relatives());
-+                Vec3 velocity = absolutePosition.deltaMovement(); // Paper
-                 Location to = CraftLocation.toBukkit(absolutePosition.position(), teleportTarget.newLevel().getWorld(), absolutePosition.yRot(), absolutePosition.xRot());
-                 // Paper start - gateway-specific teleport event
-                 final EntityTeleportEvent teleEvent;
-@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                 if (!to.equals(teleEvent.getTo())) {
-                     to = teleEvent.getTo();
-                     teleportTarget = new TeleportTransition(((CraftWorld) to.getWorld()).getHandle(), CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch(), teleportTarget.missingRespawnBlock(), teleportTarget.asPassenger(), Set.of(), teleportTarget.postTeleportTransition(), teleportTarget.cause());
-+                    // Paper start - Call EntityPortalExitEvent
-+                    velocity = Vec3.ZERO;
-                 }
-+                if (this.portalProcess != null) { // if in a portal
-+                    CraftEntity bukkitEntity = this.getBukkitEntity();
-+                    org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(
-+                        bukkitEntity,
-+                        bukkitEntity.getLocation(), to.clone(),
-+                        bukkitEntity.getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(velocity)
-+                    );
-+                    event.callEvent();
-+
-+                    // Only change the target if actually needed, since we reset relative flags
-+                    if (!event.isCancelled() && event.getTo() != null && (!event.getTo().equals(event.getFrom()) || !event.getAfter().equals(event.getBefore()))) {
-+                        to = event.getTo().clone();
-+                        velocity = org.bukkit.craftbukkit.util.CraftVector.toNMS(event.getAfter());
-+                        teleportTarget = new TeleportTransition(((CraftWorld) to.getWorld()).getHandle(), CraftLocation.toVec3D(to), velocity, to.getYaw(), to.getPitch(), teleportTarget.missingRespawnBlock(), teleportTarget.asPassenger(), Set.of(), teleportTarget.postTeleportTransition(), teleportTarget.cause());
-+                    }
-+                }
-+                if (this.isRemoved()) {
-+                    return null;
-+                }
-+                // Paper end - Call EntityPortalExitEvent
-                 // CraftBukkit end
-                 ServerLevel worldserver1 = teleportTarget.newLevel();
-                 boolean flag = worldserver1.dimension() != worldserver.dimension();
--- a/patches/unapplied/server/Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/Add-basic-Datapack-API.patch
@@ -1,209 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Connor Linfoot <connorlinfoot@me.com>
-Date: Sun, 16 May 2021 15:07:34 +0100
-Subject: [PATCH] Add basic Datapack API
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapack.java b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.datapack;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.event.server.ServerResourcesReloadedEvent;
-+import io.papermc.paper.world.flag.PaperFeatureFlagProviderImpl;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.concurrent.ConcurrentHashMap;
-+import net.kyori.adventure.text.Component;
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.packs.repository.Pack;
-+import net.minecraft.server.packs.repository.PackSource;
-+import org.bukkit.FeatureFlag;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public class PaperDatapack implements Datapack {
-+
-+    private static final Map<PackSource, DatapackSource> PACK_SOURCES = new ConcurrentHashMap<>();
-+    static {
-+        PACK_SOURCES.put(PackSource.DEFAULT, DatapackSource.DEFAULT);
-+        PACK_SOURCES.put(PackSource.BUILT_IN, DatapackSource.BUILT_IN);
-+        PACK_SOURCES.put(PackSource.FEATURE, DatapackSource.FEATURE);
-+        PACK_SOURCES.put(PackSource.WORLD, DatapackSource.WORLD);
-+        PACK_SOURCES.put(PackSource.SERVER, DatapackSource.SERVER);
-+    }
-+
-+    private final Pack pack;
-+    private final boolean enabled;
-+
-+    PaperDatapack(final Pack pack, final boolean enabled) {
-+        this.pack = pack;
-+        this.enabled = enabled;
-+    }
-+
-+    @Override
-+    public String getName() {
-+        return this.pack.getId();
-+    }
-+
-+    @Override
-+    public Component getTitle() {
-+        return PaperAdventure.asAdventure(this.pack.getTitle());
-+    }
-+
-+    @Override
-+    public Component getDescription() {
-+        return PaperAdventure.asAdventure(this.pack.getDescription());
-+    }
-+
-+    @Override
-+    public boolean isRequired() {
-+        return this.pack.isRequired();
-+    }
-+
-+    @Override
-+    public Compatibility getCompatibility() {
-+        return Datapack.Compatibility.valueOf(this.pack.getCompatibility().name());
-+    }
-+
-+    @Override
-+    public Set<FeatureFlag> getRequiredFeatures() {
-+        return PaperFeatureFlagProviderImpl.fromNms(this.pack.getRequestedFeatures());
-+    }
-+
-+    @Override
-+    public boolean isEnabled() {
-+        return this.enabled;
-+    }
-+
-+    @Override
-+    public void setEnabled(final boolean enabled) {
-+        final MinecraftServer server = MinecraftServer.getServer();
-+        final List<Pack> enabledPacks = new ArrayList<>(server.getPackRepository().getSelectedPacks());
-+        final @Nullable Pack packToChange = server.getPackRepository().getPack(this.getName());
-+        if (packToChange == null) {
-+            throw new IllegalStateException("Cannot toggle state of pack that doesn't exist: " + this.getName());
-+        }
-+        if (enabled == enabledPacks.contains(packToChange)) {
-+            return;
-+        }
-+        if (enabled) {
-+            packToChange.getDefaultPosition().insert(enabledPacks, packToChange, Pack::selectionConfig, false); // modeled off the default /datapack enable logic
-+        } else {
-+            enabledPacks.remove(packToChange);
-+        }
-+        server.reloadResources(enabledPacks.stream().map(Pack::getId).toList(), ServerResourcesReloadedEvent.Cause.PLUGIN);
-+    }
-+
-+    @Override
-+    public DatapackSource getSource() {
-+        return PACK_SOURCES.computeIfAbsent(this.pack.location().source(), source -> new DatapackSourceImpl(source.toString()));
-+    }
-+
-+    @Override
-+    public Component computeDisplayName() {
-+        return PaperAdventure.asAdventure(this.pack.getChatLink(this.enabled));
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.datapack;
-+
-+import com.google.common.collect.Collections2;
-+import java.util.Collection;
-+import java.util.Collections;
-+import java.util.function.Predicate;
-+import net.minecraft.server.packs.repository.Pack;
-+import net.minecraft.server.packs.repository.PackRepository;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public class PaperDatapackManager implements DatapackManager {
-+
-+    private final PackRepository repository;
-+
-+    public PaperDatapackManager(final PackRepository repository) {
-+        this.repository = repository;
-+    }
-+
-+    @Override
-+    public void refreshPacks() {
-+        this.repository.reload();
-+    }
-+
-+    @Override
-+    public @Nullable Datapack getPack(final @NonNull String name) {
-+        final @Nullable Pack pack = this.repository.getPack(name);
-+        if (pack == null) {
-+            return null;
-+        }
-+        return new PaperDatapack(pack, this.repository.getSelectedPacks().contains(pack));
-+    }
-+
-+    @Override
-+    public Collection<Datapack> getPacks() {
-+        final Collection<Pack> enabledPacks = this.repository.getSelectedPacks();
-+        return this.transformPacks(this.repository.getAvailablePacks(), enabledPacks::contains);
-+    }
-+
-+    @Override
-+    public Collection<Datapack> getEnabledPacks() {
-+        return this.transformPacks(this.repository.getSelectedPacks(), pack -> true);
-+    }
-+
-+    private Collection<Datapack> transformPacks(final Collection<Pack> packs, final Predicate<Pack> enabled) {
-+        return Collections.unmodifiableCollection(
-+            Collections2.transform(
-+                packs,
-+                pack -> new PaperDatapack(pack, enabled.test(pack))
-+            )
-+        );
-+    }
-+}
-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 List<CraftPlayer> playerView;
-     public int reloadCount;
-     public Set<String> activeCompatibilities = Collections.emptySet();
-+    private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
-     public static Exception excessiveVelEx; // Paper - Velocity warnings
- 
-     static {
-@@ -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));
-         }
-+        datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
-     }
- 
-     public boolean getCommandBlockOverride(String command) {
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
-         return mobGoals;
-     }
-+
-+    @Override
-+    public io.papermc.paper.datapack.PaperDatapackManager getDatapackManager() {
-+        return datapackManager;
-+    }
-+
-     // Paper end
- }
--- a/patches/unapplied/server/Add-bypass-host-check.patch
+++ b/patches/unapplied/server/Add-bypass-host-check.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Apr 2021 21:27:01 +0100
-Subject: [PATCH] Add bypass host check
-
-Paper.bypassHostCheck
-
-Seriously, fix your firewalls. -.-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-     private static final Component IGNORE_STATUS_REASON = Component.translatable("disconnect.ignoring_status_request");
-     private final MinecraftServer server;
-     private final Connection connection;
-+    private static final boolean BYPASS_HOSTCHECK = Boolean.getBoolean("Paper.bypassHostCheck"); // Paper
- 
-     public ServerHandshakePacketListenerImpl(MinecraftServer server, Connection connection) {
-         this.server = server;
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-             String[] split = packet.hostName().split("\00");
-             if (!handledByEvent && proxyLogicEnabled) { // Paper
-                 // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
-+                if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper - Add bypass host check
-                     this.connection.hostname = split[0];
-                     this.connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());
-                     this.connection.spoofedUUID = com.mojang.util.UndashedUuid.fromStringLenient( split[2] );
--- a/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 2 Dec 2020 18:23:26 -0800
-Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
-
-
-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 ServerEntityGetter, WorldGenLe
-         this.serverLevelData.setClearWeatherTime(clearDuration);
-         this.serverLevelData.setRainTime(rainDuration);
-         this.serverLevelData.setThunderTime(rainDuration);
-        this.serverLevelData.setRaining(raining);
-        this.serverLevelData.setThundering(thundering);
-+        this.serverLevelData.setRaining(raining, org.bukkit.event.weather.WeatherChangeEvent.Cause.COMMAND); // Paper - Add cause to Weather/ThunderChangeEvents
-+        this.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.COMMAND); // Paper - Add cause to Weather/ThunderChangeEvents
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-                 this.serverLevelData.setThunderTime(j);
-                 this.serverLevelData.setRainTime(k);
-                 this.serverLevelData.setClearWeatherTime(i);
-                this.serverLevelData.setThundering(flag1);
-                this.serverLevelData.setRaining(flag2);
-+                this.serverLevelData.setThundering(flag1, org.bukkit.event.weather.ThunderChangeEvent.Cause.NATURAL); // Paper - Add cause to Weather/ThunderChangeEvents
-+                this.serverLevelData.setRaining(flag2, org.bukkit.event.weather.WeatherChangeEvent.Cause.NATURAL); // Paper - Add cause to Weather/ThunderChangeEvents
-             }
- 
-             this.oThunderLevel = this.thunderLevel;
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-     @VisibleForTesting
-     public void resetWeatherCycle() {
-         // CraftBukkit start
-        this.serverLevelData.setRaining(false);
-+        this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-         // Not that everyone ever manages to get the whole server to sleep at the same time....
-         if (!this.serverLevelData.isRaining()) {
-             this.serverLevelData.setRainTime(0);
-         }
-         // CraftBukkit end
-        this.serverLevelData.setThundering(false);
-+        this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // CraftBukkit start
-         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-         // Not that everyone ever manages to get the whole server to sleep at the same time....
-diff --git a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
-+++ b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
-@@ -0,0 +0,0 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
- 
-     @Override
-     public void setThundering(boolean thundering) {
-+        // Paper start - Add cause to Weather/ThunderChangeEvents
-+        this.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.UNKNOWN);
-+    }
-+    public void setThundering(boolean thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause cause) {
-+        // Paper end - Add cause to Weather/ThunderChangeEvents
-         // CraftBukkit start
-         if (this.thundering == thundering) {
-             return;
-@@ -0,0 +0,0 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
- 
-         org.bukkit.World world = Bukkit.getWorld(this.getLevelName());
-         if (world != null) {
-            ThunderChangeEvent thunder = new ThunderChangeEvent(world, thundering);
-+            ThunderChangeEvent thunder = new ThunderChangeEvent(world, thundering, cause); // Paper - Add cause to Weather/ThunderChangeEvents
-             Bukkit.getServer().getPluginManager().callEvent(thunder);
-             if (thunder.isCancelled()) {
-                 return;
-@@ -0,0 +0,0 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
- 
-     @Override
-     public void setRaining(boolean raining) {
-+        // Paper start - Add cause to Weather/ThunderChangeEvents
-+        this.setRaining(raining, org.bukkit.event.weather.WeatherChangeEvent.Cause.UNKNOWN);
-+    }
-+
-+    public void setRaining(boolean raining, org.bukkit.event.weather.WeatherChangeEvent.Cause cause) {
-+        // Paper end - Add cause to Weather/ThunderChangeEvents
-         // CraftBukkit start
-         if (this.raining == raining) {
-             return;
-@@ -0,0 +0,0 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
- 
-         org.bukkit.World world = Bukkit.getWorld(this.getLevelName());
-         if (world != null) {
-            WeatherChangeEvent weather = new WeatherChangeEvent(world, raining);
-+            WeatherChangeEvent weather = new WeatherChangeEvent(world, raining, cause); // Paper - Add cause to Weather/ThunderChangeEvents
-             Bukkit.getServer().getPluginManager().callEvent(weather);
-             if (weather.isCancelled()) {
-                 return;
-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 {
- 
-     @Override
-     public void setStorm(boolean hasStorm) {
-        this.world.levelData.setRaining(hasStorm);
-+        this.world.serverLevelData.setRaining(hasStorm, org.bukkit.event.weather.WeatherChangeEvent.Cause.PLUGIN); // Paper - Add cause to Weather/ThunderChangeEvents
-         this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
-         this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
-     }
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
- 
-     @Override
-     public void setThundering(boolean thundering) {
-        this.world.serverLevelData.setThundering(thundering);
-+        this.world.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.PLUGIN); // Paper - Add cause to Weather/ThunderChangeEvents
-         this.setThunderDuration(0); // Reset weather duration (legacy behaviour)
-         this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
-     }
--- 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-critical-damage-API.patch
+++ b/patches/unapplied/server/Add-critical-damage-API.patch
@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dodison <kacpik@mapik.eu>
-Date: Mon, 26 Jul 2021 17:32:36 +0200
-Subject: [PATCH] Add critical damage API
-
-
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -0,0 +0,0 @@ public class DamageSource {
-     public Holder<DamageType> typeHolder() {
-         return this.type;
-     }
-+
-+    // Paper start - add critical damage API
-+    private boolean critical;
-+    public boolean isCritical() {
-+        return this.critical;
-+    }
-+    public DamageSource critical() {
-+        return this.critical(true);
-+    }
-+    public DamageSource critical(boolean critical) {
-+        this.critical = critical;
-+        return this;
-+    }
-+    // Paper end - add critical damage API
- }
-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 {
- 
-                     flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
-                     if (flag2) {
-+                        damagesource = damagesource.critical(true); // Paper start - critical damage API
-                         f *= 1.5F;
-                     }
- 
-@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
-                                     float f7 = this.getEnchantedDamage(entityliving2, f6, damagesource) * f2;
- 
-                                     // CraftBukkit start - Only apply knockback if the damage hits
-                                    if (!entityliving2.hurtServer((ServerLevel) this.level(), this.damageSources().playerAttack(this).sweep(), f7)) {
-+                                    if (!entityliving2.hurtServer((ServerLevel) this.level(), this.damageSources().playerAttack(this).sweep().critical(flag2), f7)) { // Paper - add critical damage API
-                                         continue;
-                                     }
-                                     // CraftBukkit end
-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 {
-             entityliving.setLastHurtMob(entity);
-         }
- 
-+        if (this.isCritArrow()) damagesource = damagesource.critical(); // Paper - add critical damage API
-         boolean flag = entity.getType() == EntityType.ENDERMAN;
-         int k = entity.getRemainingFireTicks();
- 
-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 CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-             }
-             DamageCause damageCause = (damager.getBukkitEntity() instanceof org.bukkit.entity.TNTPrimed) ? DamageCause.BLOCK_EXPLOSION : DamageCause.ENTITY_EXPLOSION;
-            return CraftEventFactory.callEntityDamageEvent(damager, entity, damageCause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-+            return CraftEventFactory.callEntityDamageEvent(damager, entity, damageCause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-         } else if (damager != null || source.getDirectEntity() != null) {
-             DamageCause cause = (source.isSweep()) ? DamageCause.ENTITY_SWEEP_ATTACK : DamageCause.ENTITY_ATTACK;
- 
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-                 cause = DamageCause.MAGIC;
-             }
- 
-            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-+            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-         } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) {
-             return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.VOID, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-         } else if (source.is(DamageTypes.LAVA)) {
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-             cause = DamageCause.CUSTOM;
-         }
- 
-        return CraftEventFactory.callEntityDamageEvent((Entity) null, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-+        return CraftEventFactory.callEntityDamageEvent((Entity) null, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-     }
- 
-    private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
-+    private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled, boolean critical) { // Paper - add critical damage API
-         EntityDamageEvent event;
-         if (damager != null) {
-            event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
-+            event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
-         } else {
-             event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
-         }
--- a/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Riley Park <rileysebastianpark@gmail.com>
-Date: Mon, 17 May 2021 00:34:55 -0700
-Subject: [PATCH] Add environment variable to disable server gui
-
-
-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 {
-                 */
-                 boolean flag2 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
- 
-+                if(!Boolean.parseBoolean(System.getenv().getOrDefault("PAPER_DISABLE_SERVER_GUI", String.valueOf(false)))) // Paper - Add environment variable to disable server gui
-                 if (flag2 && !GraphicsEnvironment.isHeadless()) {
-                     dedicatedserver1.showGui();
-                 }
--- a/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
-Date: Wed, 10 Mar 2021 21:26:31 +0100
-Subject: [PATCH] Add fast alternative constructor for Rotations
-
-
-diff --git a/src/main/java/net/minecraft/core/Rotations.java b/src/main/java/net/minecraft/core/Rotations.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/Rotations.java
-+++ b/src/main/java/net/minecraft/core/Rotations.java
-@@ -0,0 +0,0 @@ public class Rotations {
-         this(serialized.getFloat(0), serialized.getFloat(1), serialized.getFloat(2));
-     }
- 
-+    // Paper start - faster alternative constructor
-+    private Rotations(float x, float y, float z, Void dummy_var) {
-+        this.x = x;
-+        this.y = y;
-+        this.z = z;
-+    }
-+
-+    public static Rotations createWithoutValidityChecks(float x, float y, float z) {
-+        return new Rotations(x, y, z, null);
-+    }
-+    // Paper end - faster alternative constructor
-+
-     public ListTag save() {
-         ListTag listTag = new ListTag();
-         listTag.add(FloatTag.valueOf(this.x));
--- a/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aleksander Jagiello <themolkapl@gmail.com>
-Date: Sun, 24 Jan 2021 22:17:54 +0100
-Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     public BukkitTask runTaskTimerAsynchronously(Plugin plugin, BukkitRunnable task, long delay, long period) throws IllegalArgumentException {
-         throw new UnsupportedOperationException("Use BukkitRunnable#runTaskTimerAsynchronously(Plugin, long, long)");
-     }
-+
-+    // Paper start - add getMainThreadExecutor
-+    @Override
-+    public Executor getMainThreadExecutor(Plugin plugin) {
-+        Preconditions.checkArgument(plugin != null, "Plugin cannot be null");
-+        return command -> {
-+            Preconditions.checkArgument(command != null, "Command cannot be null");
-+            this.runTask(plugin, command);
-+        };
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-hasCollision-methods-to-various-places.patch
+++ b/patches/unapplied/server/Add-hasCollision-methods-to-various-places.patch
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 4 Nov 2021 11:50:40 -0700
-Subject: [PATCH] Add hasCollision methods to various places
-
-== AT ==
-public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
-
-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 {
-     public boolean isSolid() {
-         return this.getNMS().blocksMotion();
-     }
-+
-+    @Override
-+    public boolean isCollidable() {
-+        return getNMS().getBlock().hasCollision;
-+    }
-     // Paper end
- 
-     @Override
-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 BlockState copy(Location location) {
-         return new CraftBlockState(this, location);
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isCollidable() {
-+        return this.data.getBlock().hasCollision;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
-@@ -0,0 +0,0 @@ public class CraftBlockType<B extends BlockData> implements BlockType.Typed<B>,
-         return this.block.getDescriptionId();
-     }
-     // Paper end - add Translatable
-+
-+    // Paper start - hasCollision API
-+    @Override
-+    public boolean hasCollision() {
-+        return this.block.hasCollision;
-+    }
-+    // Paper end - hasCollision API
- }
--- a/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jakub Zacek <dawon@dawon.eu>
-Date: Mon, 4 Oct 2021 10:16:44 +0200
-Subject: [PATCH] Add methods to find targets for lightning strikes
-
-== AT ==
-public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
-
-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 ServerEntityGetter, WorldGenLe
-     }
- 
-     protected BlockPos findLightningTargetAround(BlockPos pos) {
-+        // Paper start - Add methods to find targets for lightning strikes
-+        return this.findLightningTargetAround(pos, false);
-+    }
-+    public BlockPos findLightningTargetAround(BlockPos pos, boolean returnNullWhenNoTarget) {
-+        // Paper end - Add methods to find targets for lightning strikes
-         BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
-         Optional<BlockPos> optional = this.findLightningRod(blockposition1);
- 
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-             if (!list.isEmpty()) {
-                 return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
-             } else {
-+                if (returnNullWhenNoTarget) return null; // Paper - Add methods to find targets for lightning strikes
-                 if (blockposition1.getY() == this.getMinY() - 1) {
-                     blockposition1 = blockposition1.above(2);
-                 }
-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 {
-         return (LightningStrike) lightning.getBukkitEntity();
-     }
- 
-+    // Paper start - Add methods to find targets for lightning strikes
-+    @Override
-+    public Location findLightningRod(Location location) {
-+        return this.world.findLightningRod(io.papermc.paper.util.MCUtil.toBlockPosition(location))
-+            .map(blockPos -> io.papermc.paper.util.MCUtil.toLocation(this.world, blockPos)
-+                // get the actual rod pos
-+                .subtract(0, 1, 0))
-+            .orElse(null);
-+    }
-+
-+    @Override
-+    public Location findLightningTarget(Location location) {
-+        final BlockPos pos = this.world.findLightningTargetAround(io.papermc.paper.util.MCUtil.toBlockPosition(location), true);
-+        return pos == null ? null : io.papermc.paper.util.MCUtil.toLocation(this.world, pos);
-+    }
-+    // Paper end - Add methods to find targets for lightning strikes
-+
-     @Override
-     public boolean generateTree(Location loc, TreeType type) {
-         return this.generateTree(loc, CraftWorld.rand, type);
--- 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-InventoryType.patch
+++ b/patches/unapplied/server/Add-missing-InventoryType.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 27 Dec 2023 16:46:07 -0800
-Subject: [PATCH] Add missing InventoryType
-
-Upstream did not add a DECORATED_POT inventory type
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -0,0 +0,0 @@ public class CraftInventory implements Inventory {
-             return InventoryType.COMPOSTER;
-         } else if (this.inventory instanceof JukeboxBlockEntity) {
-             return InventoryType.JUKEBOX;
-+            // Paper start
-+        } else if (this.inventory instanceof net.minecraft.world.level.block.entity.DecoratedPotBlockEntity) {
-+            return org.bukkit.event.inventory.InventoryType.DECORATED_POT;
-+            // Paper end
-         } else {
-             return InventoryType.CHEST;
-         }
--- 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-API.patch
+++ b/patches/unapplied/server/Add-missing-block-data-API.patch
@@ -1,214 +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 API
-
-General purpose patch adding missing getters/setters to BlockData and
-its child types.
-
-Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
-Co-authored-by: Fabrizio La Rosa <lr.fabrizio@gmail.com>
-
-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
- }
-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/CraftDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
-@@ -0,0 +0,0 @@ public final class CraftDecoratedPot extends org.bukkit.craftbukkit.block.data.C
-     public void setWaterlogged(boolean waterlogged) {
-         this.set(CraftDecoratedPot.WATERLOGGED, waterlogged);
-     }
-+
-+    // Paper start - add missing block data api
-+    private static final net.minecraft.world.level.block.state.properties.BooleanProperty CRACKED = getBoolean(net.minecraft.world.level.block.DecoratedPotBlock.class, "cracked");
-+
-+    @Override
-+    public boolean isCracked() {
-+        return this.get(CraftDecoratedPot.CRACKED);
-+    }
-+
-+    @Override
-+    public void setCracked(final boolean cracked) {
-+        this.set(CraftDecoratedPot.CRACKED, cracked);
-+    }
-+    // Paper end - add missing block data api
- }
-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-forceDrop-toggles.patch
+++ b/patches/unapplied/server/Add-missing-forceDrop-toggles.patch
@@ -1,124 +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:25:35 -0700
-Subject: [PATCH] Add missing forceDrop toggles
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-@@ -0,0 +0,0 @@ public class WorkAtComposter extends WorkAtPoi {
-                 simpleContainer.removeItemType(Items.WHEAT, m);
-                 ItemStack itemStack = simpleContainer.addItem(new ItemStack(Items.BREAD, l));
-                 if (!itemStack.isEmpty()) {
-+                    villager.forceDrops = true; // Paper - Add missing forceDrop toggles
-                     villager.spawnAtLocation(world, itemStack, 0.5F);
-+                    villager.forceDrops = false; // Paper - Add missing forceDrop toggles
-                 }
-             }
-         }
-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 {
- 
-         if (world1 instanceof ServerLevel worldserver) {
-             if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-+                this.forceDrops = true; // Paper - Add missing forceDrop toggles
-                 this.dropFromGiftLootTable(worldserver, BuiltInLootTables.PANDA_SNEEZE, this::spawnAtLocation);
-+                this.forceDrops = false; // Paper - Add missing forceDrop toggles
-             }
-         }
- 
-@@ -0,0 +0,0 @@ public class Panda extends Animal {
-                         ItemStack itemstack1 = this.getItemBySlot(EquipmentSlot.MAINHAND);
- 
-                         if (!itemstack1.isEmpty() && !player.hasInfiniteMaterials()) {
-+                            this.forceDrops = true; // Paper - Add missing forceDrop toggles
-                             this.spawnAtLocation(worldserver, itemstack1);
-+                            this.forceDrops = false; // Paper - Add missing forceDrop toggles
-                         }
- 
-                         this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(itemstack.getItem(), 1));
-@@ -0,0 +0,0 @@ public class Panda extends Animal {
-             ItemStack itemstack = Panda.this.getItemBySlot(EquipmentSlot.MAINHAND);
- 
-             if (!itemstack.isEmpty()) {
-+                Panda.this.forceDrops = true; // Paper - Add missing forceDrop toggles
-                 Panda.this.spawnAtLocation(getServerLevel(Panda.this.level()), itemstack);
-+                Panda.this.forceDrops = false; // Paper - Add missing forceDrop toggles
-                 Panda.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-                 int i = Panda.this.isLazy() ? Panda.this.random.nextInt(50) + 10 : Panda.this.random.nextInt(150) + 10;
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-@@ -0,0 +0,0 @@ public class Bogged extends AbstractSkeleton implements Shearable {
-     }
- 
-     private void spawnShearedMushrooms(ServerLevel world, ItemStack shears) {
-+        this.forceDrops = true; // Paper - Add missing forceDrop toggles
-         this.dropFromShearingLootTable(world, BuiltInLootTables.BOGGED_SHEAR, shears, (worldserver1, itemstack1) -> {
-             this.spawnAtLocation(worldserver1, itemstack1, this.getBbHeight());
-         });
-+        this.forceDrops = false; // Paper - Add missing forceDrop toggles
-     }
- 
-     @Override
-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 finishConversion(ServerLevel world) {
-         PiglinAi.cancelAdmiring(world, this);
-+        this.forceDrops = true; // Paper - Add missing forceDrop toggles
-         this.inventory.removeAllItems().forEach((itemstack) -> {
-             this.spawnAtLocation(world, itemstack);
-         });
-+        this.forceDrops = false; // Paper - Add missing forceDrop toggles
-         super.finishConversion(world);
-     }
- 
-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 {
- 
-     private static void holdInOffhand(ServerLevel world, Piglin piglin, ItemStack stack) {
-         if (PiglinAi.isHoldingItemInOffHand(piglin)) {
-+            piglin.forceDrops = true; // Paper - Add missing forceDrop toggles
-             piglin.spawnAtLocation(world, piglin.getItemInHand(InteractionHand.OFF_HAND));
-+            piglin.forceDrops = false; // Paper - Add missing forceDrop toggles
-         }
- 
-         piglin.holdInOffHand(stack);
-@@ -0,0 +0,0 @@ public class PiglinAi {
- 
-     protected static void cancelAdmiring(ServerLevel world, Piglin piglin) {
-         if (PiglinAi.isAdmiringItem(piglin) && !piglin.getOffhandItem().isEmpty()) {
-+            piglin.forceDrops = true; // Paper - Add missing forceDrop toggles
-             piglin.spawnAtLocation(world, piglin.getOffhandItem());
-+            piglin.forceDrops = false; // Paper - Add missing forceDrop toggles
-             piglin.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
-         }
- 
-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 {
-             double d0 = (double) this.getEquipmentDropChance(enumitemslot);
- 
-             if (!itemstack1.isEmpty() && (double) Math.max(this.random.nextFloat() - 0.1F, 0.0F) < d0) {
-+                this.forceDrops = true; // Paper - Add missing forceDrop toggles
-                 this.spawnAtLocation(world, itemstack1);
-+                this.forceDrops = false; // Paper - Add missing forceDrop toggles
-             }
- 
-             this.onItemPickup(itemEntity);
--- a/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch
+++ b/patches/unapplied/server/Add-missing-structure-set-seed-configs.patch
@@ -1,399 +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.RegistryHelper;
-+import org.bukkit.support.environment.AllFeatures;
-+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;
-+
-+@AllFeatures
-+public class StructureSeedConfigTest {
-+
-+    @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 = RegistryHelper.getRegistry().lookupOrThrow(Registries.STRUCTURE_SET);
-+        for (final ResourceKey<StructureSet> setKey : structureSets.registryKeySet()) {
-+            assertEquals(ResourceLocation.DEFAULT_NAMESPACE, setKey.location().getNamespace());
-+            final StructureSet set = structureSets.getValueOrThrow(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-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/Add-missing-team-sidebar-display-slots.patch
@@ -1,114 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 1 Oct 2021 08:04:39 -0700
-Subject: [PATCH] Add missing team sidebar display slots
-
-== AT ==
-public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations
-public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations toBukkitSlot(Lnet/minecraft/world/scores/DisplaySlot;)Lorg/bukkit/scoreboard/DisplaySlot;
-public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations fromBukkitSlot(Lorg/bukkit/scoreboard/DisplaySlot;)Lnet/minecraft/world/scores/DisplaySlot;
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
-+++ b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
-@@ -0,0 +0,0 @@ public class FieldRename {
-         }
- 
-         return switch (owner) {
-+            case "org/bukkit/scoreboard/DisplaySlot" -> FieldRename.convertDisplaySlot(from); // Paper - DisplaySlot
-             case "org/bukkit/block/banner/PatternType" -> FieldRename.convertPatternTypeName(apiVersion, from);
-             case "org/bukkit/enchantments/Enchantment" -> FieldRename.convertEnchantmentName(apiVersion, from);
-             case "org/bukkit/block/Biome" -> FieldRename.convertBiomeName(apiVersion, from);
-@@ -0,0 +0,0 @@ public class FieldRename {
-     //}
-     // Paper end
- 
-+    // Paper start - DisplaySlot
-+    @DoNotReroute
-+    public static String convertDisplaySlot(final String from) {
-+        if (from.startsWith("SIDEBAR_") && !from.startsWith("SIDEBAR_TEAM_")) {
-+            return from.replace("SIDEBAR_", "SIDEBAR_TEAM_");
-+        }
-+        return from;
-+    }
-+    // Paper end - DisplaySlot
-+
-     // PatternType
-     private static final FieldRenameData PATTERN_TYPE_DATA = FieldRenameData.Builder.newBuilder()
-             .forVersionsBefore(ApiVersion.FIELD_NAME_PARITY)
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java
-@@ -0,0 +0,0 @@ import org.bukkit.scoreboard.RenderType;
- 
- public final class CraftScoreboardTranslations {
-     static final int MAX_DISPLAY_SLOT = 19;
-+    @Deprecated // Paper
-     static final ImmutableBiMap<DisplaySlot, String> SLOTS = ImmutableBiMap.<DisplaySlot, String>builder()
-             .put(DisplaySlot.BELOW_NAME, "below_name")
-             .put(DisplaySlot.PLAYER_LIST, "list")
-             .put(DisplaySlot.SIDEBAR, "sidebar")
-            .put(DisplaySlot.SIDEBAR_BLACK, "sidebar.team.black")
-            .put(DisplaySlot.SIDEBAR_DARK_BLUE, "sidebar.team.dark_blue")
-            .put(DisplaySlot.SIDEBAR_DARK_GREEN, "sidebar.team.dark_green")
-            .put(DisplaySlot.SIDEBAR_DARK_AQUA, "sidebar.team.dark_aqua")
-            .put(DisplaySlot.SIDEBAR_DARK_RED, "sidebar.team.dark_red")
-            .put(DisplaySlot.SIDEBAR_DARK_PURPLE, "sidebar.team.dark_purple")
-            .put(DisplaySlot.SIDEBAR_GOLD, "sidebar.team.gold")
-            .put(DisplaySlot.SIDEBAR_GRAY, "sidebar.team.gray")
-            .put(DisplaySlot.SIDEBAR_DARK_GRAY, "sidebar.team.dark_gray")
-            .put(DisplaySlot.SIDEBAR_BLUE, "sidebar.team.blue")
-            .put(DisplaySlot.SIDEBAR_GREEN, "sidebar.team.green")
-            .put(DisplaySlot.SIDEBAR_AQUA, "sidebar.team.aqua")
-            .put(DisplaySlot.SIDEBAR_RED, "sidebar.team.red")
-            .put(DisplaySlot.SIDEBAR_LIGHT_PURPLE, "sidebar.team.light_purple")
-            .put(DisplaySlot.SIDEBAR_YELLOW, "sidebar.team.yellow")
-            .put(DisplaySlot.SIDEBAR_WHITE, "sidebar.team.white")
-             .buildOrThrow();
- 
-     private CraftScoreboardTranslations() {}
- 
-     public static DisplaySlot toBukkitSlot(net.minecraft.world.scores.DisplaySlot minecraft) {
-+        if (true) return DisplaySlot.NAMES.value(minecraft.getSerializedName()); // Paper
-         return CraftScoreboardTranslations.SLOTS.inverse().get(minecraft.getSerializedName());
-     }
- 
-     public static net.minecraft.world.scores.DisplaySlot fromBukkitSlot(DisplaySlot slot) {
-+        if (true) return net.minecraft.world.scores.DisplaySlot.CODEC.byName(slot.getId()); // Paper
-         return net.minecraft.world.scores.DisplaySlot.CODEC.byName(CraftScoreboardTranslations.SLOTS.get(slot));
-     }
- 
-diff --git a/src/test/java/io/papermc/paper/scoreboard/DisplaySlotTest.java b/src/test/java/io/papermc/paper/scoreboard/DisplaySlotTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/scoreboard/DisplaySlotTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.scoreboard;
-+
-+import org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations;
-+import org.bukkit.scoreboard.DisplaySlot;
-+import org.bukkit.support.environment.Normal;
-+import org.junit.jupiter.api.Test;
-+
-+import static org.junit.jupiter.api.Assertions.assertNotNull;
-+
-+@Normal
-+public class DisplaySlotTest {
-+
-+    @Test
-+    public void testBukkitToMinecraftDisplaySlots() {
-+        for (DisplaySlot bukkitSlot : DisplaySlot.values()) {
-+            assertNotNull(CraftScoreboardTranslations.fromBukkitSlot(bukkitSlot));
-+        }
-+    }
-+
-+    @Test
-+    public void testMinecraftToBukkitDisplaySlots() {
-+        for (net.minecraft.world.scores.DisplaySlot nmsSlot : net.minecraft.world.scores.DisplaySlot.values()) {
-+            assertNotNull(CraftScoreboardTranslations.toBukkitSlot(nmsSlot));
-+        }
-+    }
-+}
--- a/patches/unapplied/server/Add-more-Campfire-API.patch
+++ b/patches/unapplied/server/Add-more-Campfire-API.patch
@@ -1,111 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LemonCaramel <admin@caramel.moe>
-Date: Fri, 16 Jul 2021 00:39:03 +0900
-Subject: [PATCH] Add more Campfire API
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
-     private final NonNullList<ItemStack> items;
-     public final int[] cookingProgress;
-     public final int[] cookingTime;
-+    public final boolean[] stopCooking; // Paper - Add more Campfire API
- 
-     public CampfireBlockEntity(BlockPos pos, BlockState state) {
-         super(BlockEntityType.CAMPFIRE, pos, state);
-         this.items = NonNullList.withSize(4, ItemStack.EMPTY);
-         this.cookingProgress = new int[4];
-         this.cookingTime = new int[4];
-+        this.stopCooking = new boolean[4]; // Paper - Add more Campfire API
-     }
- 
-     public static void cookTick(ServerLevel world, BlockPos pos, BlockState state, CampfireBlockEntity blockEntity, RecipeManager.CachedCheck<SingleRecipeInput, CampfireCookingRecipe> recipeMatchGetter) {
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
- 
-             if (!itemstack.isEmpty()) {
-                 flag = true;
-+                if (!blockEntity.stopCooking[i]) { // Paper - Add more Campfire API
-                 int j = blockEntity.cookingProgress[i]++;
-+                } // Paper - Add more Campfire API
- 
-                 if (blockEntity.cookingProgress[i] >= blockEntity.cookingTime[i]) {
-                     SingleRecipeInput singlerecipeinput = new SingleRecipeInput(itemstack);
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
-             System.arraycopy(aint, 0, this.cookingTime, 0, Math.min(this.cookingTime.length, aint.length));
-         }
- 
-+        // Paper start - Add more Campfire API
-+        if (nbt.contains("Paper.StopCooking", org.bukkit.craftbukkit.util.CraftMagicNumbers.NBT.TAG_BYTE_ARRAY)) {
-+            byte[] abyte = nbt.getByteArray("Paper.StopCooking");
-+            boolean[] cookingState = new boolean[4];
-+            for (int index = 0; index < abyte.length; index++) {
-+                cookingState[index] = abyte[index] == 1;
-+            }
-+            System.arraycopy(cookingState, 0, this.stopCooking, 0, Math.min(this.stopCooking.length, abyte.length));
-+        }
-+        // Paper end - Add more Campfire API
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
-         ContainerHelper.saveAllItems(nbt, this.items, true, registries);
-         nbt.putIntArray("CookingTimes", this.cookingProgress);
-         nbt.putIntArray("CookingTotalTimes", this.cookingTime);
-+        // Paper start - Add more Campfire API
-+        byte[] cookingState = new byte[4];
-+        for (int index = 0; index < cookingState.length; index++) {
-+            cookingState[index] = (byte) (this.stopCooking[index] ? 1 : 0);
-+        }
-+        nbt.putByteArray("Paper.StopCooking", cookingState);
-+        // Paper end - Add more Campfire API
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java
-@@ -0,0 +0,0 @@ public class CraftCampfire extends CraftBlockEntityState<CampfireBlockEntity> im
-     public CraftCampfire copy(Location location) {
-         return new CraftCampfire(this, location);
-     }
-+
-+    // Paper start
-+    @Override
-+    public void stopCooking() {
-+        for (int i = 0; i < getSnapshot().stopCooking.length; ++i)
-+            this.stopCooking(i);
-+    }
-+
-+    @Override
-+    public void startCooking() {
-+        for (int i = 0; i < getSnapshot().stopCooking.length; ++i)
-+            this.startCooking(i);
-+    }
-+
-+    @Override
-+    public boolean stopCooking(int index) {
-+        org.apache.commons.lang.Validate.isTrue(-1 < index && index < 4, "Slot index must be between 0 (incl) to 3 (incl)");
-+        boolean previous = this.isCookingDisabled(index);
-+        getSnapshot().stopCooking[index] = true;
-+        return previous;
-+    }
-+
-+    @Override
-+    public boolean startCooking(int index) {
-+        org.apache.commons.lang.Validate.isTrue(-1 < index && index < 4, "Slot index must be between 0 (incl) to 3 (incl)");
-+        boolean previous = this.isCookingDisabled(index);
-+        getSnapshot().stopCooking[index] = false;
-+        return previous;
-+    }
-+
-+    @Override
-+    public boolean isCookingDisabled(int index) {
-+        org.apache.commons.lang.Validate.isTrue(-1 < index && index < 4, "Slot index must be between 0 (incl) to 3 (incl)");
-+        return getSnapshot().stopCooking[index];
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/Add-more-LimitedRegion-API.patch
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dfsek <dfsek@protonmail.com>
-Date: Sat, 19 Jun 2021 20:15:59 -0700
-Subject: [PATCH] Add more LimitedRegion API
-
-
-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
-     public void addEntityWithPassengers(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason) {
-         this.entities.add(entity);
-     }
-+
-+    // Paper start - Add more LimitedRegion API
-+    @Override
-+    public void setBlockState(int x, int y, int z, BlockState state) {
-+        BlockPos pos = new BlockPos(x, y, z);
-+        if (!state.getBlockData().matches(getHandle().getBlockState(pos).createCraftBlockData())) {
-+            throw new IllegalArgumentException("BlockData does not match! Expected " + state.getBlockData().getAsString(false) + ", got " + getHandle().getBlockState(pos).createCraftBlockData().getAsString(false));
-+        }
-+        getHandle().getBlockEntity(pos).loadWithComponents(((org.bukkit.craftbukkit.block.CraftBlockEntityState<?>) state).getSnapshotNBT(), this.getHandle().registryAccess());
-+    }
-+
-+    @Override
-+    public void scheduleBlockUpdate(int x, int y, int z) {
-+        BlockPos position = new BlockPos(x, y, z);
-+        getHandle().scheduleTick(position, getHandle().getBlockState(position).getBlock(), 0);
-+    }
-+
-+    @Override
-+    public void scheduleFluidUpdate(int x, int y, int z) {
-+        BlockPos position = new BlockPos(x, y, z);
-+        getHandle().scheduleTick(position, getHandle().getFluidState(position).getType(), 0);
-+    }
-+
-+    @Override
-+    public World getWorld() {
-+        // reading/writing the returned Minecraft world causes a deadlock.
-+        // By implementing this, and covering it in warnings, we're assuming people won't be stupid, and
-+        // if they are stupid, they'll figure it out pretty fast.
-+        return getHandle().getMinecraftWorld().getWorld();
-+    }
-+
-+    @Override
-+    public int getCenterChunkX() {
-+        return centerChunkX;
-+    }
-+
-+    @Override
-+    public int getCenterChunkZ() {
-+        return centerChunkZ;
-+    }
-+    // Paper end - Add more LimitedRegion API
- }
--- a/patches/unapplied/server/Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/Add-more-WanderingTrader-API.patch
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Thu, 6 May 2021 14:56:43 +0100
-Subject: [PATCH] Add more WanderingTrader API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -0,0 +0,0 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     @Nullable
-     private BlockPos wanderTarget;
-     private int despawnDelay;
-+    // Paper start - Add more WanderingTrader API
-+    public boolean canDrinkPotion = true;
-+    public boolean canDrinkMilk = true;
-+    // Paper end - Add more WanderingTrader API
- 
-     public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
-         super(type, world);
-@@ -0,0 +0,0 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
-         this.goalSelector.addGoal(0, new UseItemGoal<>(this, PotionContents.createItemStack(Items.POTION, Potions.INVISIBILITY), SoundEvents.WANDERING_TRADER_DISAPPEARED, (entityvillagertrader) -> {
-            return this.level().isNight() && !entityvillagertrader.isInvisible();
-+            return this.canDrinkPotion && this.level().isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
-         }));
-         this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> {
-            return this.level().isDay() && entityvillagertrader.isInvisible();
-+            return this.canDrinkMilk && this.level().isDay() && entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
-         }));
-         this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
-         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -0,0 +0,0 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
-     public void setDespawnDelay(int despawnDelay) {
-         this.getHandle().setDespawnDelay(despawnDelay);
-     }
-+
-+    // Paper start - Add more WanderingTrader API
-+    @Override
-+    public void setCanDrinkPotion(boolean bool) {
-+        getHandle().canDrinkPotion = bool;
-+    }
-+
-+    @Override
-+    public boolean canDrinkPotion() {
-+        return getHandle().canDrinkPotion;
-+    }
-+
-+    @Override
-+    public void setCanDrinkMilk(boolean bool) {
-+        getHandle().canDrinkMilk = bool;
-+    }
-+
-+    @Override
-+    public boolean canDrinkMilk() {
-+        return getHandle().canDrinkMilk;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-more-advancement-API.patch
+++ b/patches/unapplied/server/Add-more-advancement-API.patch
@@ -1,213 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: syldium <syldium@mailo.com>
-Date: Fri, 9 Jul 2021 18:50:40 +0200
-Subject: [PATCH] Add more advancement API
-
-== AT ==
-public net.minecraft.advancements.Advancement decorateName(Lnet/minecraft/advancements/DisplayInfo;)Lnet/minecraft/network/chat/Component;
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/advancement/PaperAdvancementDisplay.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.advancement;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.Component;
-+import net.minecraft.advancements.Advancement;
-+import net.minecraft.advancements.AdvancementType;
-+import net.minecraft.advancements.DisplayInfo;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+import org.bukkit.inventory.ItemStack;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public record PaperAdvancementDisplay(DisplayInfo handle) implements AdvancementDisplay {
-+
-+    @Override
-+    public @NotNull Frame frame() {
-+        return asPaperFrame(this.handle.getType());
-+    }
-+
-+    @Override
-+    public @NotNull Component title() {
-+        return PaperAdventure.asAdventure(this.handle.getTitle());
-+    }
-+
-+    @Override
-+    public @NotNull Component description() {
-+        return PaperAdventure.asAdventure(this.handle.getDescription());
-+    }
-+
-+    @Override
-+    public @NotNull ItemStack icon() {
-+        return CraftItemStack.asBukkitCopy(this.handle.getIcon());
-+    }
-+
-+    @Override
-+    public boolean doesShowToast() {
-+        return this.handle.shouldShowToast();
-+    }
-+
-+    @Override
-+    public boolean doesAnnounceToChat() {
-+        return this.handle.shouldAnnounceChat();
-+    }
-+
-+    @Override
-+    public boolean isHidden() {
-+        return this.handle.isHidden();
-+    }
-+
-+    @Override
-+    public @Nullable NamespacedKey backgroundPath() {
-+        return this.handle.getBackground().map(CraftNamespacedKey::fromMinecraft).orElse(null);
-+    }
-+
-+    @Override
-+    public @NotNull Component displayName() {
-+        return PaperAdventure.asAdventure(Advancement.decorateName(java.util.Objects.requireNonNull(this.handle, "cannot build display name for null handle, invalid state")));
-+    }
-+
-+    public static @NotNull Frame asPaperFrame(final @NotNull AdvancementType frameType) {
-+        return switch (frameType) {
-+            case TASK -> Frame.TASK;
-+            case CHALLENGE -> Frame.CHALLENGE;
-+            case GOAL -> Frame.GOAL;
-+        };
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/advancements/DisplayInfo.java b/src/main/java/net/minecraft/advancements/DisplayInfo.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/advancements/DisplayInfo.java
-+++ b/src/main/java/net/minecraft/advancements/DisplayInfo.java
-@@ -0,0 +0,0 @@ public class DisplayInfo {
-     private final boolean hidden;
-     private float x;
-     private float y;
-+    public final io.papermc.paper.advancement.AdvancementDisplay paper = new io.papermc.paper.advancement.PaperAdvancementDisplay(this); // Paper - Add more advancement API
- 
-     public DisplayInfo(
-         ItemStack icon,
-diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-@@ -0,0 +0,0 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
-         return new CraftAdvancementRequirements(this.handle.value().requirements());
-     }
- 
-+    // Paper start - Add more advancement API
-     @Override
-    public AdvancementDisplay getDisplay() {
-        if (this.handle.value().display().isEmpty()) {
-            return null;
-+    public io.papermc.paper.advancement.AdvancementDisplay getDisplay() {
-+        return this.handle.value().display().map(d -> d.paper).orElse(null);
-+    }
-+
-+    @Deprecated
-+    @io.papermc.paper.annotation.DoNotUse
-+    public AdvancementDisplay getDisplay0() { // May be called by plugins via Commodore
-+        return this.handle.value().display().map(CraftAdvancementDisplay::new).orElse(null);
-+    }
-+
-+    @Override
-+    public net.kyori.adventure.text.Component displayName() {
-+        return io.papermc.paper.adventure.PaperAdventure.asAdventure(net.minecraft.advancements.Advancement.name(this.handle));
-+    }
-+
-+    @Override
-+    public org.bukkit.advancement.Advancement getParent() {
-+        return this.handle.value().parent()
-+            .map(net.minecraft.server.MinecraftServer.getServer().getAdvancements()::get)
-+            .map(AdvancementHolder::toBukkit)
-+            .orElse(null);
-+    }
-+
-+    @Override
-+    public Collection<org.bukkit.advancement.Advancement> getChildren() {
-+        final com.google.common.collect.ImmutableList.Builder<org.bukkit.advancement.Advancement> children = com.google.common.collect.ImmutableList.<org.bukkit.advancement.Advancement>builder();
-+        final net.minecraft.advancements.AdvancementNode advancementNode = net.minecraft.server.MinecraftServer.getServer().getAdvancements().tree().get(this.handle);
-+        if (advancementNode != null) {
-+            for (final net.minecraft.advancements.AdvancementNode child : advancementNode.children()) {
-+                children.add(child.holder().toBukkit());
-+            }
-         }
-+        return children.build();
-+    }
- 
-        return new CraftAdvancementDisplay(this.handle.value().display().get());
-+    @Override
-+    public org.bukkit.advancement.Advancement getRoot() {
-+        final net.minecraft.advancements.AdvancementNode advancementNode = net.minecraft.server.MinecraftServer.getServer().getAdvancements().tree().get(this.handle);
-+        return java.util.Objects.requireNonNull(advancementNode, "could not find internal advancement node for advancement " + this.handle.id()).root().holder().toBukkit();
-     }
-+    // Paper end - Add more advancement API
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
-+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
-@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
- import org.bukkit.craftbukkit.util.CraftChatMessage;
- import org.bukkit.inventory.ItemStack;
- 
-+@Deprecated // Paper
- public class CraftAdvancementDisplay implements org.bukkit.advancement.AdvancementDisplay {
- 
-     private final DisplayInfo handle;
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -0,0 +0,0 @@ public class Commodore {
-                             super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf);
-                             return;
-                         }
-+                        if (owner.equals("org/bukkit/advancement/Advancement") && name.equals("getDisplay") && desc.endsWith(")Lorg/bukkit/advancement/AdvancementDisplay;")) {
-+                            super.visitTypeInsn(Opcodes.CHECKCAST, runtimeCbPkgPrefix() + "advancement/CraftAdvancement");
-+                            super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, runtimeCbPkgPrefix() + "advancement/CraftAdvancement", "getDisplay0", desc, false);
-+                            return;
-+                        }
-                         // Paper end
- 
-                         if (modern) {
-diff --git a/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.advancement;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.format.TextColor;
-+import net.minecraft.advancements.AdvancementType;
-+import net.minecraft.network.chat.contents.TranslatableContents;
-+import org.bukkit.support.environment.Normal;
-+import org.junit.jupiter.api.Test;
-+
-+import static org.junit.jupiter.api.Assertions.assertEquals;
-+
-+@Normal
-+public class AdvancementFrameTest {
-+
-+    @Test
-+    public void test() {
-+        for (final AdvancementType advancementType : AdvancementType.values()) {
-+            final TextColor expectedColor = PaperAdventure.asAdventure(advancementType.getChatColor());
-+            final String expectedTranslationKey = ((TranslatableContents) advancementType.getDisplayName().getContents()).getKey();
-+            final var frame = PaperAdvancementDisplay.asPaperFrame(advancementType);
-+            assertEquals(expectedTranslationKey, frame.translationKey(), "The translation keys should be the same");
-+            assertEquals(expectedColor, frame.color(), "The frame colors should be the same");
-+            assertEquals(advancementType.getSerializedName(), AdvancementDisplay.Frame.NAMES.key(frame));
-+        }
-+    }
-+}
--- a/patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/Add-option-to-fix-items-merging-through-walls.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: GioSDA <gsdambrosio@gmail.com>
-Date: Wed, 10 Mar 2021 10:06:45 -0800
-Subject: [PATCH] Add option to fix items merging through walls
-
-
-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 {
-                 ItemEntity entityitem = (ItemEntity) iterator.next();
- 
-                 if (entityitem.isMergable()) {
-+                    // Paper start - Fix items merging through walls
-+                    if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) {
-+                        if (this.level().clipDirect(this.position(), entityitem.position(),
-+                            net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.HitResult.Type.BLOCK) {
-+                            continue;
-+                        }
-+                    }
-+                    // Paper end - Fix items merging through walls
-                     this.tryToMerge(entityitem);
-                     if (this.isRemoved()) {
-                         break;
--- a/patches/unapplied/server/Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/Add-packet-limiter-config.patch
@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Fri, 30 Oct 2020 22:37:16 -0700
-Subject: [PATCH] Add packet limiter config
-
-Example config:
-packet-limiter:
-  kick-message: '&cSent too many packets'
-  limits:
-    all:
-      interval: 7.0
-      max-packet-rate: 500.0
-    ServerboundPlaceRecipePacket:
-      interval: 4.0
-      max-packet-rate: 5.0
-      action: DROP
-
-all section refers to all incoming packets, the action for all is
-hard coded to KICK.
-
-For specific limits, the section name is the class's name,
-and an action can be defined: DROP or KICK
-
-If interval or rate are less-than 0, the limit is ignored
-
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         return null;
-     }
-     // Paper end - add utility methods
-+    // Paper start - packet limiter
-+    protected final Object PACKET_LIMIT_LOCK = new Object();
-+    protected final @Nullable io.papermc.paper.util.IntervalledCounter allPacketCounts = io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.allPackets.isEnabled() ? new io.papermc.paper.util.IntervalledCounter(
-+        (long)(io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.allPackets.interval() * 1.0e9)
-+    ) : null;
-+    protected final java.util.Map<Class<? extends net.minecraft.network.protocol.Packet<?>>, io.papermc.paper.util.IntervalledCounter> packetSpecificLimits = new java.util.HashMap<>();
-+
-+    private boolean stopReadingPackets;
-+    private void killForPacketSpam() {
-+        this.sendPacket(new ClientboundDisconnectPacket(io.papermc.paper.adventure.PaperAdventure.asVanilla(io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.kickMessage)), PacketSendListener.thenRun(() -> {
-+            this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.kickMessage));
-+        }), true);
-+        this.setReadOnly();
-+        this.stopReadingPackets = true;
-+    }
-+    // Paper end - packet limiter
- 
-     public Connection(PacketFlow side) {
-         this.receiving = side;
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             if (packetlistener == null) {
-                 throw new IllegalStateException("Received a packet before the packet listener was initialized");
-             } else {
-+                // Paper start - packet limiter
-+                if (this.stopReadingPackets) {
-+                    return;
-+                }
-+                if (this.allPacketCounts != null ||
-+                    io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.containsKey(packet.getClass())) {
-+                    long time = System.nanoTime();
-+                    synchronized (PACKET_LIMIT_LOCK) {
-+                        if (this.allPacketCounts != null) {
-+                            this.allPacketCounts.updateAndAdd(1, time);
-+                            if (this.allPacketCounts.getRate() >= io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.allPackets.maxPacketRate()) {
-+                                this.killForPacketSpam();
-+                                return;
-+                            }
-+                        }
-+
-+                        for (Class<?> check = packet.getClass(); check != Object.class; check = check.getSuperclass()) {
-+                            io.papermc.paper.configuration.GlobalConfiguration.PacketLimiter.PacketLimit packetSpecificLimit =
-+                                io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.get(check);
-+                            if (packetSpecificLimit == null || !packetSpecificLimit.isEnabled()) {
-+                                continue;
-+                            }
-+                            io.papermc.paper.util.IntervalledCounter counter = this.packetSpecificLimits.computeIfAbsent((Class)check, (clazz) -> {
-+                                return new io.papermc.paper.util.IntervalledCounter((long)(packetSpecificLimit.interval() * 1.0e9));
-+                            });
-+                            counter.updateAndAdd(1, time);
-+                            if (counter.getRate() >= packetSpecificLimit.maxPacketRate()) {
-+                                switch (packetSpecificLimit.action()) {
-+                                    case DROP:
-+                                        return;
-+                                    case KICK:
-+                                        String deobfedPacketName = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(check.getName());
-+
-+                                        String playerName;
-+                                        if (this.packetListener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl impl) {
-+                                            playerName = impl.getOwner().getName();
-+                                        } else {
-+                                            playerName = this.getLoggableAddress(net.minecraft.server.MinecraftServer.getServer().logIPs());
-+                                        }
-+
-+                                        Connection.LOGGER.warn("{} kicked for packet spamming: {}", playerName, deobfedPacketName.substring(deobfedPacketName.lastIndexOf(".") + 1));
-+                                        this.killForPacketSpam();
-+                                        return;
-+                                }
-+                            }
-+                        }
-+                    }
-+                }
-+                // Paper end - packet limiter
-                 if (packetlistener.shouldHandleMessage(packet)) {
-                     try {
-                         Connection.genericsFtw(packet, packetlistener);
--- a/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -1,343 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 16 Aug 2021 01:31:54 -0500
-Subject: [PATCH] Add '/paper mobcaps' and '/paper playermobcaps'
-
-Add commands to get the mobcaps for a world, as well as the mobcaps for
-each player when per-player mob spawning is enabled.
-
-Also has a hover text on each mob category listing what entity types are
-in said category
-
-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("dumpplugins"), new DumpPluginsCommand());
-         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
-         commands.put(Set.of("dumpitem"), new DumpItemCommand());
-+        commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
- 
-         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/MobcapsCommand.java b/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import com.google.common.collect.ImmutableMap;
-+import io.papermc.paper.command.CommandUtil;
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.function.ToIntFunction;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.ComponentLike;
-+import net.kyori.adventure.text.JoinConfiguration;
-+import net.kyori.adventure.text.TextComponent;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextColor;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.server.level.ServerPlayer;
-+import net.minecraft.world.entity.MobCategory;
-+import net.minecraft.world.level.NaturalSpawner;
-+import org.bukkit.Bukkit;
-+import org.bukkit.World;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.craftbukkit.entity.CraftPlayer;
-+import org.bukkit.entity.Player;
-+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 MobcapsCommand implements PaperSubcommand {
-+    static final Map<MobCategory, TextColor> MOB_CATEGORY_COLORS = ImmutableMap.<MobCategory, TextColor>builder()
-+        .put(MobCategory.MONSTER, NamedTextColor.RED)
-+        .put(MobCategory.CREATURE, NamedTextColor.GREEN)
-+        .put(MobCategory.AMBIENT, NamedTextColor.GRAY)
-+        .put(MobCategory.AXOLOTLS, TextColor.color(0x7324FF))
-+        .put(MobCategory.UNDERGROUND_WATER_CREATURE, TextColor.color(0x3541E6))
-+        .put(MobCategory.WATER_CREATURE, TextColor.color(0x006EFF))
-+        .put(MobCategory.WATER_AMBIENT, TextColor.color(0x00B3FF))
-+        .put(MobCategory.MISC, TextColor.color(0x636363))
-+        .build();
-+
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        switch (subCommand) {
-+            case "mobcaps" -> this.printMobcaps(sender, args);
-+            case "playermobcaps" -> this.printPlayerMobcaps(sender, args);
-+        }
-+        return true;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        return switch (subCommand) {
-+            case "mobcaps" -> CommandUtil.getListMatchingLast(sender, args, this.suggestMobcaps(args));
-+            case "playermobcaps" -> CommandUtil.getListMatchingLast(sender, args, this.suggestPlayerMobcaps(sender, args));
-+            default -> throw new IllegalArgumentException();
-+        };
-+    }
-+
-+    private List<String> suggestMobcaps(final String[] args) {
-+        if (args.length == 1) {
-+            final List<String> worlds = new ArrayList<>(Bukkit.getWorlds().stream().map(World::getName).toList());
-+            worlds.add("*");
-+            return worlds;
-+        }
-+
-+        return Collections.emptyList();
-+    }
-+
-+    private List<String> suggestPlayerMobcaps(final CommandSender sender, final String[] args) {
-+        if (args.length == 1) {
-+            final List<String> list = new ArrayList<>();
-+            for (final Player player : Bukkit.getOnlinePlayers()) {
-+                if (!(sender instanceof Player senderPlayer) || senderPlayer.canSee(player)) {
-+                    list.add(player.getName());
-+                }
-+            }
-+            return list;
-+        }
-+
-+        return Collections.emptyList();
-+    }
-+
-+    private void printMobcaps(final CommandSender sender, final String[] args) {
-+        final List<World> worlds;
-+        if (args.length == 0) {
-+            if (sender instanceof Player player) {
-+                worlds = List.of(player.getWorld());
-+            } else {
-+                sender.sendMessage(Component.text("Must specify a world! ex: '/paper mobcaps world'", NamedTextColor.RED));
-+                return;
-+            }
-+        } else if (args.length == 1) {
-+            final String input = args[0];
-+            if (input.equals("*")) {
-+                worlds = Bukkit.getWorlds();
-+            } else {
-+                final @Nullable World world = Bukkit.getWorld(input);
-+                if (world == null) {
-+                    sender.sendMessage(Component.text("'" + input + "' is not a valid world!", NamedTextColor.RED));
-+                    return;
-+                } else {
-+                    worlds = List.of(world);
-+                }
-+            }
-+        } else {
-+            sender.sendMessage(Component.text("Too many arguments!", NamedTextColor.RED));
-+            return;
-+        }
-+
-+        for (final World world : worlds) {
-+            final ServerLevel level = ((CraftWorld) world).getHandle();
-+            final NaturalSpawner.@Nullable SpawnState state = level.getChunkSource().getLastSpawnState();
-+
-+            final int chunks;
-+            if (state == null) {
-+                chunks = 0;
-+            } else {
-+                chunks = state.getSpawnableChunkCount();
-+            }
-+            sender.sendMessage(Component.join(JoinConfiguration.noSeparators(),
-+                Component.text("Mobcaps for world: "),
-+                Component.text(world.getName(), NamedTextColor.AQUA),
-+                Component.text(" (" + chunks + " spawnable chunks)")
-+            ));
-+
-+            sender.sendMessage(createMobcapsComponent(
-+                category -> {
-+                    if (state == null) {
-+                        return 0;
-+                    } else {
-+                        return state.getMobCategoryCounts().getOrDefault(category, 0);
-+                    }
-+                },
-+                category -> NaturalSpawner.globalLimitForCategory(level, category, chunks)
-+            ));
-+        }
-+    }
-+
-+    private void printPlayerMobcaps(final CommandSender sender, final String[] args) {
-+        final @Nullable Player player;
-+        if (args.length == 0) {
-+            if (sender instanceof Player pl) {
-+                player = pl;
-+            } else {
-+                sender.sendMessage(Component.text("Must specify a player! ex: '/paper playermobcount playerName'", NamedTextColor.RED));
-+                return;
-+            }
-+        } else if (args.length == 1) {
-+            final String input = args[0];
-+            player = Bukkit.getPlayerExact(input);
-+            if (player == null) {
-+                sender.sendMessage(Component.text("Could not find player named '" + input + "'", NamedTextColor.RED));
-+                return;
-+            }
-+        } else {
-+            sender.sendMessage(Component.text("Too many arguments!", NamedTextColor.RED));
-+            return;
-+        }
-+
-+        final ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
-+        final ServerLevel level = serverPlayer.serverLevel();
-+
-+        if (!level.paperConfig().entities.spawning.perPlayerMobSpawns) {
-+            sender.sendMessage(Component.text("Use '/paper mobcaps' for worlds where per-player mob spawning is disabled.", NamedTextColor.RED));
-+            return;
-+        }
-+
-+        sender.sendMessage(Component.join(JoinConfiguration.noSeparators(), Component.text("Mobcaps for player: "), Component.text(player.getName(), NamedTextColor.GREEN)));
-+        sender.sendMessage(createMobcapsComponent(
-+            category -> level.chunkSource.chunkMap.getMobCountNear(serverPlayer, category),
-+            category -> level.getWorld().getSpawnLimitUnsafe(org.bukkit.craftbukkit.util.CraftSpawnCategory.toBukkit(category))
-+        ));
-+    }
-+
-+    private static Component createMobcapsComponent(final ToIntFunction<MobCategory> countGetter, final ToIntFunction<MobCategory> limitGetter) {
-+        return MOB_CATEGORY_COLORS.entrySet().stream()
-+            .map(entry -> {
-+                final MobCategory category = entry.getKey();
-+                final TextColor color = entry.getValue();
-+
-+                final Component categoryHover = Component.join(JoinConfiguration.noSeparators(),
-+                    Component.text("Entity types in category ", TextColor.color(0xE0E0E0)),
-+                    Component.text(category.getName(), color),
-+                    Component.text(':', NamedTextColor.GRAY),
-+                    Component.newline(),
-+                    Component.newline(),
-+                    BuiltInRegistries.ENTITY_TYPE.entrySet().stream()
-+                        .filter(it -> it.getValue().getCategory() == category)
-+                        .map(it -> Component.translatable(it.getValue().getDescriptionId()))
-+                        .collect(Component.toComponent(Component.text(", ", NamedTextColor.GRAY)))
-+                );
-+
-+                final Component categoryComponent = Component.text()
-+                    .content("  " + category.getName())
-+                    .color(color)
-+                    .hoverEvent(categoryHover)
-+                    .build();
-+
-+                final TextComponent.Builder builder = Component.text()
-+                    .append(
-+                        categoryComponent,
-+                        Component.text(": ", NamedTextColor.GRAY)
-+                    );
-+                final int limit = limitGetter.applyAsInt(category);
-+                if (limit != -1) {
-+                    builder.append(
-+                        Component.text(countGetter.applyAsInt(category)),
-+                        Component.text("/", NamedTextColor.GRAY),
-+                        Component.text(limit)
-+                    );
-+                } else {
-+                    builder.append(Component.text()
-+                        .append(
-+                            Component.text('n'),
-+                            Component.text("/", NamedTextColor.GRAY),
-+                            Component.text('a')
-+                        )
-+                        .hoverEvent(Component.text("This category does not naturally spawn.")));
-+                }
-+                return builder;
-+            })
-+            .map(ComponentLike::asComponent)
-+            .collect(Component.toComponent(Component.newline()));
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -0,0 +0,0 @@ public final class NaturalSpawner {
-         gameprofilerfiller.pop();
-     }
- 
-+    // Paper start - Add mobcaps commands
-+    public static int globalLimitForCategory(final ServerLevel level, final MobCategory category, final int spawnableChunkCount) {
-+        final int categoryLimit = level.getWorld().getSpawnLimitUnsafe(CraftSpawnCategory.toBukkit(category));
-+        if (categoryLimit < 1) {
-+            return categoryLimit;
-+        }
-+        return categoryLimit * spawnableChunkCount / NaturalSpawner.MAGIC_NUMBER;
-+    }
-+    // Paper end - Add mobcaps commands
-+
-     public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
-         BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);
- 
-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
-+        return this.getSpawnLimitUnsafe(spawnCategory);
-+    }
-+    public int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
-+        // Paper end - Add mobcaps commands
-         return this.spawnCategoryLimit.getOrDefault(spawnCategory, -1);
-     }
- 
-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(spawnCategory != null, "SpawnCategory cannot be null");
-         Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
- 
-+        // Paper start - Add mobcaps commands
-+        return this.getSpawnLimitUnsafe(spawnCategory);
-+    }
-+    public final int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
-         int limit = this.spawnCategoryLimit.getOrDefault(spawnCategory, -1);
-         if (limit < 0) {
-            limit = this.server.getSpawnLimit(spawnCategory);
-+            limit = this.server.getSpawnLimitUnsafe(spawnCategory);
-+            // Paper end - Add mobcaps commands
-         }
-         return limit;
-     }
-diff --git a/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java b/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import java.util.HashSet;
-+import java.util.Set;
-+import net.minecraft.world.entity.MobCategory;
-+import org.bukkit.support.environment.Normal;
-+import org.junit.jupiter.api.Assertions;
-+import org.junit.jupiter.api.Test;
-+
-+@Normal
-+public class MobcapsCommandTest {
-+    @Test
-+    public void testMobCategoryColors() {
-+        final Set<String> missing = new HashSet<>();
-+        for (final MobCategory value : MobCategory.values()) {
-+            if (!MobcapsCommand.MOB_CATEGORY_COLORS.containsKey(value)) {
-+                missing.add(value.getName());
-+            }
-+        }
-+        Assertions.assertTrue(missing.isEmpty(), "MobcapsCommand.MOB_CATEGORY_COLORS map missing TextColors for [" + String.join(", ", missing + "]"));
-+    }
-+}
--- a/patches/unapplied/server/Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/Add-recipe-to-cook-events.patch
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
-Date: Wed, 6 Jan 2021 12:04:03 -0800
-Subject: [PATCH] Add recipe to cook events
-
-
-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
-             CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
-             org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
- 
-            FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result);
-+            FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeholder.toBukkitRecipe()); // Paper - Add recipe to cook events
-             world.getCraftServer().getPluginManager().callEvent(furnaceSmeltEvent);
- 
-             if (furnaceSmeltEvent.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
- 
-                 if (blockEntity.cookingProgress[i] >= blockEntity.cookingTime[i]) {
-                     SingleRecipeInput singlerecipeinput = new SingleRecipeInput(itemstack);
-                    ItemStack itemstack1 = (ItemStack) recipeMatchGetter.getRecipeFor(singlerecipeinput, world).map((recipeholder) -> {
-+                    // Paper start - add recipe to cook events
-+                    final Optional<RecipeHolder<CampfireCookingRecipe>> recipeHolderOptional = recipeMatchGetter.getRecipeFor(singlerecipeinput, world);
-+                    ItemStack itemstack1 = (ItemStack) recipeHolderOptional.map((recipeholder) -> {
-+                    // Paper end - add recipe to cook events
-                         return ((CampfireCookingRecipe) recipeholder.value()).assemble(singlerecipeinput, world.registryAccess());
-                     }).orElse(itemstack);
- 
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
-                         CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
-                         org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
- 
-                        BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result);
-+                        BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipeHolderOptional.map(RecipeHolder::toBukkitRecipe).orElse(null)); // Paper - Add recipe to cook events
-                         world.getCraftServer().getPluginManager().callEvent(blockCookEvent);
- 
-                         if (blockCookEvent.isCancelled()) {
--- a/patches/unapplied/server/Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/Add-root-admin-user-detection.patch
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: egg82 <eggys82@gmail.com>
-Date: Sat, 11 Sep 2021 22:55:14 +0200
-Subject: [PATCH] Add root/admin user detection
-
-This patch detects whether or not the server is currently executing as a privileged user and spits out a warning.
-The warning serves as a sort-of PSA for newer server admins who don't understand the risks of running as root.
-We've seen plenty of bad/malicious plugins hit markets, and there's been a few close-calls with exploits in the past.
-Hopefully this helps mitigate some potential damage to servers, even if it is just a warning.
-
-Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
-
-diff --git a/src/main/java/io/papermc/paper/util/ServerEnvironment.java b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.util;
-+
-+import com.sun.security.auth.module.NTSystem;
-+import com.sun.security.auth.module.UnixSystem;
-+import java.util.Set;
-+import org.apache.commons.lang.SystemUtils;
-+
-+public class ServerEnvironment {
-+    private static final boolean RUNNING_AS_ROOT_OR_ADMIN;
-+    private static final String WINDOWS_HIGH_INTEGRITY_LEVEL = "S-1-16-12288";
-+
-+    static {
-+        if (SystemUtils.IS_OS_WINDOWS) {
-+            RUNNING_AS_ROOT_OR_ADMIN = Set.of(new NTSystem().getGroupIDs()).contains(WINDOWS_HIGH_INTEGRITY_LEVEL);
-+        } else {
-+            RUNNING_AS_ROOT_OR_ADMIN = new UnixSystem().getUid() == 0;
-+        }
-+    }
-+
-+    public static boolean userIsRootOrAdmin() {
-+        return RUNNING_AS_ROOT_OR_ADMIN;
-+    }
-+}
-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
-             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
-         }
- 
-+        // Paper start - detect running as root
-+        if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
-+            DedicatedServer.LOGGER.warn("****************************");
-+            DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
-+            DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
-+            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
-+            DedicatedServer.LOGGER.warn("****************************");
-+        }
-+        // Paper end - detect running as root
-+
-         DedicatedServer.LOGGER.info("Loading properties");
-         DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
- 
--- a/patches/unapplied/server/Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/Add-sendOpLevel-API.patch
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 29 Dec 2020 15:03:03 +0100
-Subject: [PATCH] Add sendOpLevel API
-
-
-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 {
-     }
- 
-     private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
-+        // Paper start - Add sendOpLevel API
-+        this.sendPlayerPermissionLevel(player, permissionLevel, true);
-+    }
-+    public void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel, boolean recalculatePermissions) {
-+        // Paper end - Add sendOpLevel API
-         if (player.connection != null) {
-             byte b0;
- 
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-             player.connection.send(new ClientboundEntityEventPacket(player, b0));
-         }
- 
-+        if (recalculatePermissions) { // Paper - Add sendOpLevel API
-         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(player);
-+        } // Paper - Add sendOpLevel API
-     }
- 
-     public boolean isWhiteListed(GameProfile profile) {
-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 - Add sendOpLevel API
-+    @Override
-+    public void sendOpLevel(byte level) {
-+        Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
-+
-+        this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
-+    }
-+    // Paper end - Add sendOpLevel API
-+
-     @Override
-     public void setCompassTarget(Location loc) {
-         Preconditions.checkArgument(loc != null, "Location cannot be null");
--- a/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch
+++ b/patches/unapplied/server/Add-support-for-Proxy-Protocol.patch
@@ -1,65 +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.1")
-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 {
-                 ServerConnectionListener.LOGGER.info("Using default channel type");
-             }
- 
-+            // Paper start - Warn people with console access that HAProxy is in use.
-+            if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.proxyProtocol) {
-+                ServerConnectionListener.LOGGER.warn("Using HAProxy, please ensure the server port is adequately firewalled.");
-+            }
-+            // Paper end - Warn people with console access that HAProxy is in use.
-+
-             this.channels.add(((ServerBootstrap) ((ServerBootstrap) (new ServerBootstrap()).channel(oclass)).childHandler(new ChannelInitializer<Channel>() {
-                 protected void initChannel(Channel channel) {
-                     try {
-@@ -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-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 26 Nov 2020 11:47:24 +0000
-Subject: [PATCH] Add toggle for always placing the dragon egg
-
-
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -0,0 +0,0 @@ public class EndDragonFight {
-             this.dragonEvent.setVisible(false);
-             this.spawnExitPortal(true);
-             this.spawnNewGateway();
-            if (!this.previouslyKilled) {
-+            if (this.level.paperConfig().entities.behavior.enderDragonsDeathAlwaysPlacesDragonEgg || !this.previouslyKilled) { // Paper - Add toggle for always placing the dragon egg
-                 this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.origin)), Blocks.DRAGON_EGG.defaultBlockState());
-             }
- 
--- a/patches/unapplied/server/Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/Add-world-settings-for-mobs-picking-up-loot.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 28 Nov 2020 18:43:52 -0800
-Subject: [PATCH] Add world settings for mobs picking up loot
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-         this.populateDefaultEquipmentSlots(randomsource, difficulty);
-         this.populateDefaultEquipmentEnchantments(world, randomsource, difficulty);
-         this.reassessWeaponGoal();
-        this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier());
-+        this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot
-         if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
-             LocalDate localdate = LocalDate.now();
-             int i = localdate.get(ChronoField.DAY_OF_MONTH);
-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 {
-         float f = difficulty.getSpecialMultiplier();
- 
-         if (spawnReason != EntitySpawnReason.CONVERSION) {
-            this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * f);
-+            this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.zombies || randomsource.nextFloat() < 0.55F * f); // Paper - Add world settings for mobs picking up loot
-         }
- 
-         if (object == null) {
--- a/patches/unapplied/server/Add-worldborder-events.patch
+++ b/patches/unapplied/server/Add-worldborder-events.patch
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jan 2021 22:40:34 -0800
-Subject: [PATCH] Add worldborder events
-
-
-diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-+++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void setCenter(double x, double z) {
-+        // Paper start - Add worldborder events
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), new org.bukkit.Location(world.getWorld(), this.getCenterX(), 0, this.getCenterZ()), new org.bukkit.Location(world.getWorld(), x, 0, z));
-+            if (!event.callEvent()) return;
-+            x = event.getNewCenter().getX();
-+            z = event.getNewCenter().getZ();
-+        }
-+        // Paper end - Add worldborder events
-         this.centerX = x;
-         this.centerZ = z;
-         this.extent.onCenterChange();
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void setSize(double size) {
-+        // Paper start - Add worldborder events
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE, getSize(), size, 0);
-+            if (!event.callEvent()) return;
-+            if (event.getType() == io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE && event.getDuration() > 0) { // If changed to a timed transition
-+                lerpSizeBetween(event.getOldSize(), event.getNewSize(), event.getDuration());
-+                return;
-+            }
-+            size = event.getNewSize();
-+        }
-+        // Paper end - Add worldborder events
-         this.extent = new WorldBorder.StaticBorderExtent(size);
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void lerpSizeBetween(double fromSize, double toSize, long time) {
-+        // Paper start - Add worldborder events
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type type;
-+            if (fromSize == toSize) { // new size = old size
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE; // Use INSTANT_MOVE because below it creates a Static border if they are equal.
-+            } else {
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE;
-+            }
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), type, fromSize, toSize, time);
-+            if (!event.callEvent()) return;
-+            toSize = event.getNewSize();
-+            time = event.getDuration();
-+        }
-+        // Paper end - Add worldborder events
-         this.extent = (WorldBorder.BorderExtent) (fromSize == toSize ? new WorldBorder.StaticBorderExtent(toSize) : new WorldBorder.MovingBorderExtent(fromSize, toSize, time));
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -0,0 +0,0 @@ public class WorldBorder {
- 
-         @Override
-         public WorldBorder.BorderExtent update() {
-+            if (world != null && this.getLerpRemainingTime() <= 0L) new io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent(world.getWorld(), world.getWorld().getWorldBorder(), this.from, this.to, this.lerpDuration).callEvent(); // Paper - Add worldborder events
-             return (WorldBorder.BorderExtent) (this.getLerpRemainingTime() <= 0L ? WorldBorder.this.new StaticBorderExtent(this.to) : this);
-         }
- 
--- a/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Wed, 20 Jan 2021 14:23:37 -0600
-Subject: [PATCH] Allow adding items to BlockDropItemEvent
-
-
-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 void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
-        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), Lists.transform(items, (item) -> (org.bukkit.entity.Item) item.getBukkitEntity()));
-+        // Paper start - Allow adding items to BlockDropItemEvent
-+        List<Item> list = new ArrayList<>();
-+        for (ItemEntity item : items) {
-+            list.add((Item) item.getBukkitEntity());
-+        }
-+        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), list);
-+        // Paper end - Allow adding items to BlockDropItemEvent
-         Bukkit.getPluginManager().callEvent(event);
- 
-         if (!event.isCancelled()) {
-            for (ItemEntity item : items) {
-                item.level().addFreshEntity(item);
-+            // Paper start - Allow adding items to BlockDropItemEvent
-+            for (Item bukkit : list) {
-+                if (!bukkit.isValid()) {
-+                    Entity item = ((org.bukkit.craftbukkit.entity.CraftItem) bukkit).getHandle();
-+                    item.level().addFreshEntity(item);
-+                }
-+            }
-+        } else {
-+            for (Item bukkit : list) {
-+                if (bukkit.isValid()) {
-+                    bukkit.remove();
-+                }
-             }
-+            // Paper end - Allow adding items to BlockDropItemEvent
-         }
-     }
- 
--- a/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/unapplied/server/Allow-changing-the-EnderDragon-podium.patch
@@ -1,142 +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 {
-                 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 {
-     public void doServerTick(ServerLevel world) {
-         this.time++;
-         if (this.targetLocation == null) {
-            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+            BlockPos blockPos = world.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 {
- 
-     private void findNewTarget(ServerLevel world) {
-         if (this.currentPath != null && this.currentPath.isDone()) {
-            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, 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 {
-     private void findNewTarget(ServerLevel world) {
-         if (this.currentPath == null || this.currentPath.isDone()) {
-             int i = this.dragon.findClosestNode();
-            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, this.dragon.getPodium()); // Paper - Allow changing the EnderDragon podium
-             Player player = world.getNearestPlayer(NEAR_EGG_TARGETING, this.dragon, (double)blockPos.getX(), (double)blockPos.getY(), (double)blockPos.getZ());
-             int j;
-             if (player != null) {
-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(ServerLevel world) {
-         if (this.targetLocation == null) {
-             this.targetLocation = Vec3.atBottomCenterOf(
-                world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()))
-+                world.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 {
-     @Override
-     public void doServerTick(ServerLevel world) {
-         if (!this.firstTick && this.currentPath != null) {
-            BlockPos blockPos = world.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, EndPodiumFeature.getLocation(this.dragon.getFightOrigin()));
-+            BlockPos blockPos = world.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/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BrodyBeckwith <brody@beckwith.dev>
-Date: Fri, 9 Oct 2020 20:30:12 -0400
-Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
-
-
-diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-@@ -0,0 +0,0 @@ public class SpawnEggItem extends Item {
-             EntityType entitytypes;
- 
-             if (tileentity instanceof Spawner) {
-+                if (world.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper - Allow disabling mob spawner spawn egg transformation
-+
-                 Spawner spawner = (Spawner) tileentity;
- 
-                 entitytypes = this.getType(itemstack);
--- a/patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/Allow-skipping-writing-of-comments-to-server.propert.patch
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Professor Bloodstone <git@bloodstone.dev>
-Date: Fri, 23 Jul 2021 02:32:04 +0200
-Subject: [PATCH] Allow skipping writing of comments to server.properties
-
-Makes less git noise, as it won't update the date every single time
-
-Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/dedicated/Settings.java
-+++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -0,0 +0,0 @@ public abstract class Settings<T extends Settings<T>> {
- 
-     private static final Logger LOGGER = LogUtils.getLogger();
-     public final Properties properties;
-+    private static final boolean skipComments = Boolean.getBoolean("Paper.skipServerPropertiesComments"); // Paper - allow skipping server.properties comments
-     // CraftBukkit start
-     private OptionSet options = null;
- 
-@@ -0,0 +0,0 @@ public abstract class Settings<T extends Settings<T>> {
-                 return;
-             }
-             // CraftBukkit end
-            BufferedWriter bufferedwriter = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
-+            // Paper start - allow skipping server.properties comments
-+            java.io.OutputStream outputstream = Files.newOutputStream(path);
-+            java.io.BufferedOutputStream bufferedOutputStream =  !skipComments ? new java.io.BufferedOutputStream(outputstream) : new java.io.BufferedOutputStream(outputstream) {
-+                private boolean isRightAfterNewline = true; // If last written char was newline
-+                private boolean isComment = false; // Are we writing comment currently?
-+
-+                @Override
-+                public void write(@org.jetbrains.annotations.NotNull byte[] b) throws IOException {
-+                    this.write(b, 0, b.length);
-+                }
-+
-+                @Override
-+                public void write(@org.jetbrains.annotations.NotNull byte[] bbuf, int off, int len) throws IOException {
-+                    int latest_offset = off; // The latest offset, updated when comment ends
-+                    for (int index = off; index < off + len; ++index ) {
-+                        byte c = bbuf[index];
-+                        boolean isNewline = (c == '\n' || c == '\r');
-+                        if (isNewline && this.isComment) {
-+                            // Comment has ended
-+                            this.isComment = false;
-+                            latest_offset = index+1;
-+                        }
-+                        if (c == '#' && this.isRightAfterNewline) {
-+                            this.isComment = true;
-+                            if (index != latest_offset) {
-+                                // We got some non-comment data earlier
-+                                super.write(bbuf, latest_offset, index-latest_offset);
-+                            }
-+                        }
-+                        this.isRightAfterNewline = isNewline; // Store for next iteration
-+
-+                    }
-+                    if (latest_offset < off+len && !this.isComment) {
-+                        // We have some unwritten data, that isn't part of a comment
-+                        super.write(bbuf, latest_offset, (off + len) - latest_offset);
-+                    }
-+                }
-+            };
-+            BufferedWriter bufferedwriter = new BufferedWriter(new java.io.OutputStreamWriter(bufferedOutputStream, java.nio.charset.StandardCharsets.UTF_8.newEncoder()));
-+            // Paper end - allow skipping server.properties comments
- 
-             try {
-                 this.properties.store(bufferedwriter, "Minecraft server properties");
--- a/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anton Lindroth <ntoonio@gmail.com>
-Date: Wed, 15 Apr 2020 01:54:02 +0200
-Subject: [PATCH] Allow using signs inside spawn protection
-
-
-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
-                     int i = this.player.level().getMaxY();
- 
-                     if (blockposition.getY() <= i) {
-                        if (this.awaitingPositionFromClient == null && worldserver.mayInteract(this.player, blockposition)) {
-+                        if (this.awaitingPositionFromClient == null && (worldserver.mayInteract(this.player, blockposition) || (worldserver.paperConfig().spawn.allowUsingSignsInsideSpawnProtection && worldserver.getBlockState(blockposition).getBlock() instanceof net.minecraft.world.level.block.SignBlock))) { // Paper - Allow using signs inside spawn protection
-                             this.player.stopUsingItem(); // CraftBukkit - SPIGOT-4706
-                             InteractionResult enuminteractionresult = this.player.gameMode.useItemOn(this.player, worldserver, itemstack, enumhand, movingobjectpositionblock);
- 
--- 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.generatingStep.targetStatus()) + (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/Cache-resource-keys-and-optimize-reference-Holder-ta.patch
+++ b/patches/unapplied/server/Cache-resource-keys-and-optimize-reference-Holder-ta.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 20 Mar 2022 22:06:47 -0700
-Subject: [PATCH] Cache resource keys and optimize reference Holder tags set
-
-TagKeys are always interned, so we can use a reference hash set for them
-
-diff --git a/src/main/java/net/minecraft/core/Holder.java b/src/main/java/net/minecraft/core/Holder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/Holder.java
-+++ b/src/main/java/net/minecraft/core/Holder.java
-@@ -0,0 +0,0 @@ public interface Holder<T> {
-         }
- 
-         void bindTags(Collection<TagKey<T>> tags) {
-            this.tags = Set.copyOf(tags);
-+            this.tags = java.util.Collections.unmodifiableSet(new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(tags)); // Paper
-         }
- 
-         @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityType.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityType.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityType.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityType.java
-@@ -0,0 +0,0 @@ public class CraftEntityType {
-         return bukkit;
-     }
- 
-+    private static final java.util.Map<EntityType, net.minecraft.resources.ResourceKey<net.minecraft.world.entity.EntityType<?>>> KEY_CACHE = java.util.Collections.synchronizedMap(new java.util.EnumMap<>(EntityType.class)); // Paper
-     public static net.minecraft.world.entity.EntityType<?> bukkitToMinecraft(EntityType bukkit) {
-         Preconditions.checkArgument(bukkit != null);
-
-         return CraftRegistry.getMinecraftRegistry(Registries.ENTITY_TYPE)
-                .getOptional(CraftNamespacedKey.toMinecraft(bukkit.getKey())).orElseThrow();
-+                .getOptional(KEY_CACHE.computeIfAbsent(bukkit, type -> net.minecraft.resources.ResourceKey.create(Registries.ENTITY_TYPE, CraftNamespacedKey.toMinecraft(type.getKey())))).orElseThrow();
-     }
- 
-     public static Holder<net.minecraft.world.entity.EntityType<?>> bukkitToMinecraftHolder(EntityType bukkit) {
--- a/patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/Change-EnderEye-target-without-changing-other-things.patch
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 21 Aug 2021 12:13:53 -0700
-Subject: [PATCH] Change EnderEye target without changing other things
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-@@ -0,0 +0,0 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
-     }
- 
-     public void signalTo(BlockPos pos) {
-+        // Paper start - Change EnderEye target without changing other things
-+        this.signalTo(pos, true);
-+    }
-+    public void signalTo(BlockPos pos, boolean update) {
-+        // Paper end - Change EnderEye target without changing other things
-         double d0 = (double) pos.getX();
-         int i = pos.getY();
-         double d1 = (double) pos.getZ();
-@@ -0,0 +0,0 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
-             this.tz = d1;
-         }
- 
-+        if (update) { // Paper - Change EnderEye target without changing other things
-         this.life = 0;
-         this.surviveAfterDeath = this.random.nextInt(5) > 0;
-+        } // Paper - Change EnderEye target without changing other things
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-@@ -0,0 +0,0 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
- 
-     @Override
-     public void setTargetLocation(Location location) {
-+        // Paper start - Change EnderEye target without changing other things
-+        this.setTargetLocation(location, true);
-+    }
-+
-+    @Override
-+    public void setTargetLocation(Location location, boolean update) {
-+        // Paper end - Change EnderEye target without changing other things
-         Preconditions.checkArgument(this.getWorld().equals(location.getWorld()), "Cannot target EnderSignal across worlds");
-        this.getHandle().signalTo(CraftLocation.toBlockPosition(location));
-+        this.getHandle().signalTo(CraftLocation.toBlockPosition(location), update); // Paper - Change EnderEye target without changing other things
-     }
- 
-     @Override
--- a/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/Check-requirement-before-suggesting-root-nodes.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: stonar96 <minecraft.stonar96@gmail.com>
-Date: Sun, 12 Sep 2021 00:14:21 +0200
-Subject: [PATCH] Check requirement before suggesting root nodes
-
-Child nodes are handled by CommandDispatcher#parse checking
-requirements.
-
-Vanilla clients only send ServerboundCommandSuggestionPacket when
-encountering a command node with ASK_SERVER suggestions, however a
-modified client can send this packet whenever it wants.
-
-diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java
-+++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
-@@ -0,0 +0,0 @@ public class CommandDispatcher<S> {
-         int i = 0;
-         for (final CommandNode<S> node : parent.getChildren()) {
-             CompletableFuture<Suggestions> future = Suggestions.empty();
-+            // Paper start - Don't suggest if the requirement isn't met
-+            if (parent != this.root || node.canUse(context.getSource())) {
-             try {
-                if (node.canUse(parse.getContext().getSource())) future = node.listSuggestions(context.build(truncatedInput), new SuggestionsBuilder(truncatedInput, truncatedInputLowerCase, start)); // CraftBukkit
-+                future = node.listSuggestions(context.build(truncatedInput), new SuggestionsBuilder(truncatedInput, truncatedInputLowerCase, start)); // CraftBukkit
-             } catch (final CommandSyntaxException ignored) {
-             }
-+            }
-+            // Paper end - Don't suggest if the requirement isn't met
-             futures[i++] = future;
-         }
- 
--- a/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Sat, 14 Nov 2020 16:48:37 +0100
-Subject: [PATCH] Collision option for requiring a player participant
-
-
-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 push(Entity entity) {
-         if (!this.isPassengerOfSameVehicle(entity)) {
-             if (!entity.noPhysics && !this.noPhysics) {
-+                if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
-                 double d0 = entity.getX() - this.getX();
-                 double d1 = entity.getZ() - this.getZ();
-                 double d2 = Mth.absMax(d0, d1);
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
-@@ -0,0 +0,0 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
- 
-     @Override
-     public void push(Entity entity) {
-+        if (!this.level().paperConfig().collisions.allowVehicleCollisions && this.level().paperConfig().collisions.onlyPlayersCollide && !(entity instanceof Player)) return; // Paper - Collision option for requiring a player participant
-         if (entity instanceof AbstractBoat) {
-             if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
-                 // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -0,0 +0,0 @@ public abstract class AbstractMinecart extends VehicleEntity {
-     public void push(Entity entity) {
-         if (!this.level().isClientSide) {
-             if (!entity.noPhysics && !this.noPhysics) {
-+                if (!this.level().paperConfig().collisions.allowVehicleCollisions && this.level().paperConfig().collisions.onlyPlayersCollide && !(entity instanceof Player)) return; // Paper - Collision option for requiring a player participant
-                 if (!this.hasPassenger(entity)) {
-                     // CraftBukkit start
-                     VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
--- a/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/Config-option-for-Piglins-guarding-chests.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 2 Dec 2020 03:07:58 -0800
-Subject: [PATCH] Config option for Piglins guarding chests
-
-
-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 {
-     }
- 
-     public static void angerNearbyPiglins(ServerLevel world, Player player, boolean blockOpen) {
-+        if (!player.level().paperConfig().entities.behavior.piglinsGuardChests) return; // Paper - Config option for Piglins guarding chests
-         List<Piglin> list = player.level().getEntitiesOfClass(Piglin.class, player.getBoundingBox().inflate(16.0D));
- 
-         list.stream().filter(PiglinAi::isIdle).filter((entitypiglin) -> {
--- a/patches/unapplied/server/Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 22:27:43 -0800
-Subject: [PATCH] Configurable door breaking difficulty
-
-== AT ==
-public net.minecraft.world.entity.monster.Vindicator DOOR_BREAKING_PREDICATE
-public net.minecraft.world.entity.monster.Zombie DOOR_BREAKING_PREDICATE
-
-Co-authored-by: Doc <nachito94@msn.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -0,0 +0,0 @@ public class Vindicator extends AbstractIllager {
- 
-     static class VindicatorBreakDoorGoal extends BreakDoorGoal {
-         public VindicatorBreakDoorGoal(Mob mob) {
-            super(mob, 6, Vindicator.DOOR_BREAKING_PREDICATE);
-+            super(mob, 6, com.google.common.base.Predicates.in(mob.level().paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(mob.getType(), mob.level().paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.VINDICATOR)))); // Paper - Configurable door breaking difficulty
-             this.setFlags(EnumSet.of(Goal.Flag.MOVE));
-         }
- 
-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 {
- 
-     public Zombie(EntityType<? extends Zombie> type, Level world) {
-         super(type, world);
-        this.breakDoorGoal = new BreakDoorGoal(this, Zombie.DOOR_BREAKING_PREDICATE);
-+        this.breakDoorGoal = new BreakDoorGoal(this, com.google.common.base.Predicates.in(world.paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(type, world.paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.ZOMBIE)))); // Paper - Configurable door breaking difficulty
-     }
- 
-     public Zombie(Level world) {
--- a/patches/unapplied/server/Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/Configurable-feature-seeds.patch
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Tue, 31 Aug 2021 17:05:27 +0200
-Subject: [PATCH] Configurable feature seeds
-
-Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.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 {
-                                 return (String) optional.orElseGet(placedfeature::toString);
-                             };
- 
-                            seededrandom.setFeatureSeed(i, l1, l);
-+                            // Paper start - Configurable feature seeds; change populationSeed used in random
-+                            long featurePopulationSeed = i;
-+                            final long configFeatureSeed = generatoraccessseed.getMinecraftWorld().paperConfig().featureSeeds.features.getLong(placedfeature.feature());
-+                            if (configFeatureSeed != -1) {
-+                                featurePopulationSeed = seededrandom.setDecorationSeed(configFeatureSeed, blockposition.getX(), blockposition.getZ()); // See seededrandom.setDecorationSeed from above
-+                            }
-+                            seededrandom.setFeatureSeed(featurePopulationSeed, l1, l);
-+                            // Paper end - Configurable feature seeds
- 
-                             try {
-                                 generatoraccessseed.setCurrentlyGenerating(supplier1);
--- a/patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/Configurable-item-frame-map-cursor-update-interval.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
-Date: Fri, 13 Aug 2021 01:14:38 +0200
-Subject: [PATCH] Configurable item frame map cursor update interval
-
-
-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 {
-             if (true || this.tickCount % 10 == 0) { // CraftBukkit - Moved below, should always enter this block
-                 ItemStack itemstack = entityitemframe.getItem();
- 
-                if (this.tickCount % 10 == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
-+                if (this.level.paperConfig().maps.itemFrameCursorUpdateInterval > 0 && this.tickCount % this.level.paperConfig().maps.itemFrameCursorUpdateInterval == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks // Paper - Make item frame map cursor update interval configurable
-                     MapId mapid = (MapId) itemstack.get(DataComponents.MAP_ID);
-                     MapItemSavedData worldmap = MapItem.getSavedData(mapid, this.level);
- 
--- 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-max-leash-distance.patch
+++ b/patches/unapplied/server/Configurable-max-leash-distance.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 21:04:03 -0800
-Subject: [PATCH] Configurable max leash distance
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Leashable.java b/src/main/java/net/minecraft/world/entity/Leashable.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Leashable.java
-+++ b/src/main/java/net/minecraft/world/entity/Leashable.java
-@@ -0,0 +0,0 @@ public interface Leashable {
-                     return;
-                 }
- 
-                if ((double) f > 10.0D) {
-+                if ((double) f > entity.level().paperConfig().misc.maxLeashDistance.or(LEASH_TOO_FAR_DIST)) { // Paper - Configurable max leash distance
-                     ((Leashable) entity).leashTooFarBehaviour();
-                 } else if ((double) f > 6.0D) {
-                     ((Leashable) entity).elasticRangeLeashBehaviour(entity1, f);
-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 boolean handleLeashAtDistance(Entity leashHolder, float distance) {
-         if (this.isInSittingPose()) {
-            if (distance > 10.0F) {
-+            if (distance > (float) this.level().paperConfig().misc.maxLeashDistance.or(Leashable.LEASH_TOO_FAR_DIST)) { // Paper - Configurable max leash distance
-                 this.dropLeash(true, true);
-             }
- 
--- 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(string -> LOGGER.error("Failed to parse vibration listener for Sculk Sensor: '{}'", string))
-                 .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 registries) {
-         super.saveAdditional(nbt, registries);
-@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
-             .encodeStart(registryOps, this.vibrationData)
-             .resultOrPartial(string -> LOGGER.error("Failed to encode vibration listener for Sculk Sensor: '{}'", string))
-             .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-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/unapplied/server/Correctly-check-if-bucket-dispenses-will-succeed-for.patch
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 1 Jan 2024 12:57:19 -0800
-Subject: [PATCH] Correctly check if bucket dispenses will succeed for event
-
-Upstream incorrectly checks if the bucket place will succeed
-in order to fire the BlockDispenseEvent. This patch corrects
-that.
-
-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 {
-                 int y = blockposition.getY();
-                 int z = blockposition.getZ();
-                 BlockState iblockdata = worldserver.getBlockState(blockposition);
-                if (iblockdata.isAir() || iblockdata.canBeReplaced() || (dispensiblecontaineritem instanceof BucketItem && iblockdata.getBlock() instanceof LiquidBlockContainer && ((LiquidBlockContainer) iblockdata.getBlock()).canPlaceLiquid((Player) null, worldserver, blockposition, iblockdata, ((BucketItem) dispensiblecontaineritem).content))) {
-+                // Paper start - correctly check if the bucket place will succeed
-+                /* Taken from SolidBucketItem#emptyContents */
-+                boolean willEmptyContentsSolidBucketItem = dispensiblecontaineritem instanceof net.minecraft.world.item.SolidBucketItem && worldserver.isInWorldBounds(blockposition) && iblockdata.isAir();
-+                /* Taken from BucketItem#emptyContents */
-+                boolean willEmptyBucketItem = dispensiblecontaineritem instanceof final BucketItem bucketItem && bucketItem.content instanceof net.minecraft.world.level.material.FlowingFluid && (iblockdata.isAir() || iblockdata.canBeReplaced(bucketItem.content) || (iblockdata.getBlock() instanceof LiquidBlockContainer liquidBlockContainer && liquidBlockContainer.canPlaceLiquid(null, worldserver, blockposition, iblockdata, bucketItem.content)));
-+                if (willEmptyContentsSolidBucketItem || willEmptyBucketItem) {
-+                // Paper end - correctly check if the bucket place will succeed
-                     org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
-                     CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
- 
--- 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.updateStaticRegistryTags();
-             this.resources.managers.getRecipeManager().finalizeRecipeLoading(this.worldData.enabledFeatures());
-+            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(ItemTags.BREWING_FUEL) : (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(ItemTags.BREWING_FUEL) : (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 {
-     }
- 
-     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/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 11 Mar 2021 03:03:32 -0800
-Subject: [PATCH] Do not run close logic for inventories on chunk unload
-
-Still call the event and change the active container though. We
-want to avoid close logic because it's possible to load the
-chunk through it. This should also be OK from a leak prevention/
-state desync POV because the TE is getting unloaded anyways.
-
-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 ServerEntityGetter, WorldGenLe
-         // Spigot Start
-         for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
-             if (tileentity instanceof net.minecraft.world.Container) {
-+                // Paper start - this area looks like it can load chunks, change the behavior
-+                // chests for example can apply physics to the world
-+                // so instead we just change the active container and call the event
-                 for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
-                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
-+                    ((org.bukkit.craftbukkit.entity.CraftHumanEntity) h).getHandle().closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
-                 }
-+                // Paper end - this area looks like it can load chunks, change the behavior
-             }
-         }
-         // Spigot End
-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 net.minecraft.world.entity.player.Player {
-         this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
-         this.doCloseContainer();
-     }
-+    // Paper start - special close for unloaded inventory
-+    @Override
-+    public void closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        // copied from above
-+        CraftEventFactory.handleInventoryCloseEvent(this, reason); // CraftBukkit
-+        // Paper end
-+        // copied from below
-+        this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
-+        this.containerMenu = this.inventoryMenu;
-+        // do not run close logic
-+    }
-+    // Paper end - special close for unloaded inventory
- 
-     @Override
-     public void doCloseContainer() {
-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 {
-         this.containerMenu = this.inventoryMenu;
-     }
-     // Paper end - Inventory close reason
-+    // Paper start - special close for unloaded inventory
-+    public void closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        this.containerMenu = this.inventoryMenu;
-+    }
-+    // Paper end - special close for unloaded inventory
- 
-     public void closeContainer() {
-         this.containerMenu = this.inventoryMenu;
--- 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) Component.translatable("multiplayer.disconnect.invalid_vehicle_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_VEHICLE_MOVEMENT); // Paper - kick event cause
-         } else if (!this.updateAwaitingTeleport()) {
-             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/Show More
+++ b/Show More