MOOOOOOOORE

2024-10-23 23:35:21 +02:00 · 2024-10-23 23:35:21 +02:00 · d52e2d241d
commit d52e2d241d
parent 1dc142534d
36 changed files with 281 additions and 357 deletions
--- a/patches/unapplied/server/0733-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/unapplied/server/0733-Fix-plugin-loggers-on-server-shutdown.patch
@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Miguel=20Moreno?= <josemmo@pm.me>
-Date: Sat, 5 Jun 2021 13:45:15 +0200
-Subject: [PATCH] Fix plugin loggers on server shutdown
-
-
-diff --git a/src/main/java/io/papermc/paper/log/CustomLogManager.java b/src/main/java/io/papermc/paper/log/CustomLogManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dcd79602dc
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/log/CustomLogManager.java
-@@ -0,0 +1,26 @@
-+package io.papermc.paper.log;
-+
-+import java.util.logging.LogManager;
-+
-+public class CustomLogManager extends LogManager {
-+    private static CustomLogManager instance;
-+
-+    public CustomLogManager() {
-+        instance = this;
-+    }
-+
-+    @Override
-+    public void reset() {
-+        // Ignore calls to this method
-+    }
-+
-+    private void superReset() {
-+        super.reset();
-+    }
-+
-+    public static void forceReset() {
-+        if (instance != null) {
-+            instance.superReset();
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 11b9eb8d7d5f9ad736f2c6784c5d9e745a355093..bef05e09c654794405832ad75c3471f63399dfee 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1237,6 +1237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 } catch (Exception ignored) {
-                 }
-                 // CraftBukkit end
-+                io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
-                 this.onServerExit();
-             }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 168cbb239ac5d632908f2b0aca82cbcfdc35651f..c1e88c31910e96ef07cece05046c0b55e708b52d 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -19,6 +19,12 @@ public class Main {
-     public static boolean useJline = true;
-     public static boolean useConsole = true;
- 
-+    // Paper start - Reset loggers after shutdown
-+    static {
-+        System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager");
-+    }
-+    // Paper end - Reset loggers after shutdown
-+
-     public static void main(String[] args) {
-         // Paper start
-         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
--- a/patches/unapplied/server/0734-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/unapplied/server/0734-Stop-large-look-changes-from-crashing-the-server.patch
@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MWHunter <s0521458@student.rockvalleycollege.edu>
-Date: Wed, 24 Aug 2022 09:54:11 -0400
-Subject: [PATCH] Stop large look changes from crashing the server
-
-Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5383d231748f2d30b2f2bf3ce07d3667e4d828e9..e6d20887572817099cb863515978d3f06926be3d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3158,37 +3158,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         this.level().getProfiler().pop();
-         this.level().getProfiler().push("rangeChecks");
- 
-        while (this.getYRot() - this.yRotO < -180.0F) {
-            this.yRotO -= 360.0F;
-        }
-
-        while (this.getYRot() - this.yRotO >= 180.0F) {
-            this.yRotO += 360.0F;
-        }
-+        // Paper start - stop large pitch and yaw changes from crashing the server
-+        this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
- 
-        while (this.yBodyRot - this.yBodyRotO < -180.0F) {
-            this.yBodyRotO -= 360.0F;
-        }
-+        this.yBodyRotO += Math.round((this.yBodyRot - this.yBodyRotO) / 360.0F) * 360.0F;
- 
-        while (this.yBodyRot - this.yBodyRotO >= 180.0F) {
-            this.yBodyRotO += 360.0F;
-        }
-
-        while (this.getXRot() - this.xRotO < -180.0F) {
-            this.xRotO -= 360.0F;
-        }
-+        this.xRotO += Math.round((this.getXRot() - this.xRotO) / 360.0F) * 360.0F;
- 
-        while (this.getXRot() - this.xRotO >= 180.0F) {
-            this.xRotO += 360.0F;
-        }
-
-        while (this.yHeadRot - this.yHeadRotO < -180.0F) {
-            this.yHeadRotO -= 360.0F;
-        }
-
-        while (this.yHeadRot - this.yHeadRotO >= 180.0F) {
-            this.yHeadRotO += 360.0F;
-        }
-+        this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
-+        // Paper end
- 
-         this.level().getProfiler().pop();
-         this.animStep += f2;
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 06ca07edef062f21c51860146086297ca345104d..63ffa02f820d88f865ae604712edcf2ac13f0bff 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -313,13 +313,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-     }
- 
-     protected static float lerpRotation(float prevRot, float newRot) {
-        while (newRot - prevRot < -180.0F) {
-            prevRot -= 360.0F;
-        }
-
-        while (newRot - prevRot >= 180.0F) {
-            prevRot += 360.0F;
-        }
-+        prevRot += Math.round((newRot - prevRot) / 360.0F) * 360.0F; // Paper - stop large look changes from crashing the server
- 
-         return Mth.lerp(0.2F, prevRot, newRot);
-     }
--- a/patches/unapplied/server/0735-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/unapplied/server/0735-Fire-EntityChangeBlockEvent-in-more-places.patch
@ -1,344 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 9 Aug 2021 20:45:46 -0700
-Subject: [PATCH] Fire EntityChangeBlockEvent in more places
-
-Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com>
-Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/world/effect/WeavingMobEffect.java b/src/main/java/net/minecraft/world/effect/WeavingMobEffect.java
-index 6a84eaeddd0d7f050053c8aa0659d6811192aad4..1b2d41a6c6f149701c8a78f3d345f45069f1f857 100644
--- a/src/main/java/net/minecraft/world/effect/WeavingMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/WeavingMobEffect.java
-@@ -25,11 +25,11 @@ class WeavingMobEffect extends MobEffect {
-     @Override
-     public void onMobRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
-         if (reason == Entity.RemovalReason.KILLED && (entity instanceof Player || entity.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) {
-            this.spawnCobwebsRandomlyAround(entity.level(), entity.getRandom(), entity.getOnPos());
-+            this.spawnCobwebsRandomlyAround(entity, entity.level(), entity.getRandom(), entity.getOnPos()); // Paper - Fire EntityChangeBlockEvent in more places
-         }
-     }
- 
-    private void spawnCobwebsRandomlyAround(Level world, RandomSource random, BlockPos pos) {
-+    private void spawnCobwebsRandomlyAround(LivingEntity entity, Level world, RandomSource random, BlockPos pos) { // Paper - Fire EntityChangeBlockEvent in more places
-         Set<BlockPos> set = Sets.newHashSet();
-         int i = this.maxCobwebs.applyAsInt(random);
- 
-@@ -46,6 +46,7 @@ class WeavingMobEffect extends MobEffect {
-         }
- 
-         for (BlockPos blockPos3 : set) {
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockPos3, Blocks.COBWEB.defaultBlockState())) continue; // Paper - Fire EntityChangeBlockEvent in more places
-             world.setBlock(blockPos3, Blocks.COBWEB.defaultBlockState(), 3);
-             world.levelEvent(3018, blockPos3, 0);
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-index bf5015c4bb68e5c46313bab1e59c0a4d45053b73..0471d9c85af02133f99cca4e181b83b58a3f1abc 100644
--- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
-+++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-@@ -99,7 +99,7 @@ public class LightningBolt extends Entity {
-                 }
- 
-                 this.powerLightningRod();
-                LightningBolt.clearCopperOnLightningStrike(this.level(), this.getStrikePosition());
-+                LightningBolt.clearCopperOnLightningStrike(this.level(), this.getStrikePosition(), this); // Paper - Call EntityChangeBlockEvent
-                 this.gameEvent(GameEvent.LIGHTNING_STRIKE);
-             }
-         }
-@@ -193,7 +193,7 @@ public class LightningBolt extends Entity {
-         }
-     }
- 
-    private static void clearCopperOnLightningStrike(Level world, BlockPos pos) {
-+    private static void clearCopperOnLightningStrike(Level world, BlockPos pos, Entity lightning) { // Paper - Call EntityChangeBlockEvent
-         BlockState iblockdata = world.getBlockState(pos);
-         BlockPos blockposition1;
-         BlockState iblockdata1;
-@@ -207,24 +207,29 @@ public class LightningBolt extends Entity {
-         }
- 
-         if (iblockdata1.getBlock() instanceof WeatheringCopper) {
-            world.setBlockAndUpdate(blockposition1, WeatheringCopper.getFirst(world.getBlockState(blockposition1)));
-+            // Paper start - Call EntityChangeBlockEvent
-+            BlockState newBlock = WeatheringCopper.getFirst(world.getBlockState(blockposition1));
-+            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1, newBlock)) {
-+                world.setBlockAndUpdate(blockposition1, newBlock);
-+            }
-+            // Paper end - Call EntityChangeBlockEvent
-             BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
-             int i = world.random.nextInt(3) + 3;
- 
-             for (int j = 0; j < i; ++j) {
-                 int k = world.random.nextInt(8) + 1;
- 
-                LightningBolt.randomWalkCleaningCopper(world, blockposition1, blockposition_mutableblockposition, k);
-+                LightningBolt.randomWalkCleaningCopper(world, blockposition1, blockposition_mutableblockposition, k, lightning); // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-             }
- 
-         }
-     }
- 
-    private static void randomWalkCleaningCopper(Level world, BlockPos pos, BlockPos.MutableBlockPos mutablePos, int count) {
-+    private static void randomWalkCleaningCopper(Level world, BlockPos pos, BlockPos.MutableBlockPos mutablePos, int count, Entity lightning) { // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-         mutablePos.set(pos);
- 
-         for (int j = 0; j < count; ++j) {
-            Optional<BlockPos> optional = LightningBolt.randomStepCleaningCopper(world, mutablePos);
-+            Optional<BlockPos> optional = LightningBolt.randomStepCleaningCopper(world, mutablePos, lightning); // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
- 
-             if (optional.isEmpty()) {
-                 break;
-@@ -235,7 +240,7 @@ public class LightningBolt extends Entity {
- 
-     }
- 
-    private static Optional<BlockPos> randomStepCleaningCopper(Level world, BlockPos pos) {
-+    private static Optional<BlockPos> randomStepCleaningCopper(Level world, BlockPos pos, Entity lightning) { // Paper - transmit LightningBolt instance to call EntityChangeBlockEvent
-         Iterator iterator = BlockPos.randomInCube(world.random, 10, pos, 1).iterator();
- 
-         BlockPos blockposition1;
-@@ -252,6 +257,7 @@ public class LightningBolt extends Entity {
- 
-         BlockPos blockposition1Final = blockposition1; // CraftBukkit - decompile error
-         WeatheringCopper.getPrevious(iblockdata).ifPresent((iblockdata1) -> {
-+            if (CraftEventFactory.callEntityChangeBlockEvent(lightning, blockposition1Final, iblockdata1)) // Paper - call EntityChangeBlockEvent
-             world.setBlockAndUpdate(blockposition1Final, iblockdata1); // CraftBukkit - decompile error
-         });
-         world.levelEvent(3002, blockposition1, -1);
-diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
-index c227784544e52ee2c75ab1a2181e0b0ba7246f4b..f005ea92449cf5e249ff64f4791c3bc6b8635528 100644
--- a/src/main/java/net/minecraft/world/item/AxeItem.java
-+++ b/src/main/java/net/minecraft/world/item/AxeItem.java
-@@ -65,6 +65,11 @@ public class AxeItem extends DiggerItem {
-                 return InteractionResult.PASS;
-             } else {
-                 ItemStack itemStack = context.getItemInHand();
-+                // Paper start - EntityChangeBlockEvent
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional.get())) {
-+                    return InteractionResult.PASS;
-+                }
-+                // Paper end
-                 if (player instanceof ServerPlayer) {
-                     CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
-                 }
-diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-index 391579b515c5a07066f82b33c4f9ef8ee1d05530..d8ce44a180f848f4c9c04967470c4359af979b2f 100644
--- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-@@ -46,6 +46,11 @@ public class EnderEyeItem extends Item {
-                 return InteractionResult.SUCCESS;
-             } else {
-                 BlockState iblockdata1 = (BlockState) iblockdata.setValue(EndPortalFrameBlock.HAS_EYE, true);
-+                // Paper start
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockposition, iblockdata1)) {
-+                    return InteractionResult.PASS;
-+                }
-+                // Paper end
- 
-                 Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition);
-                 world.setBlock(blockposition, iblockdata1, 2);
-diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java
-index decabf6fccaca3d1bfeba679ac71677d33315f5e..14d37bf64af719eae3ea154ea7f952cc27712b57 100644
--- a/src/main/java/net/minecraft/world/item/HoneycombItem.java
-+++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java
-@@ -74,6 +74,14 @@ public class HoneycombItem extends Item implements SignApplicator {
-         return getWaxed(blockState).map(state -> {
-             Player player = context.getPlayer();
-             ItemStack itemStack = context.getItemInHand();
-+            // Paper start - EntityChangeBlockEvent
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state)) {
-+                if (!player.isCreative()) {
-+                    player.containerMenu.sendAllDataToRemote();
-+                }
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
-             }
-diff --git a/src/main/java/net/minecraft/world/item/PotionItem.java b/src/main/java/net/minecraft/world/item/PotionItem.java
-index 92fa6523f2bba105a74fff228e36e58666ed56ae..d147b24bb57b322d3f5f4a9eb8cfef2acdd9e0f5 100644
--- a/src/main/java/net/minecraft/world/item/PotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/PotionItem.java
-@@ -109,6 +109,12 @@ public class PotionItem extends Item {
-         BlockState iblockdata = world.getBlockState(blockposition);
- 
-         if (context.getClickedFace() != Direction.DOWN && iblockdata.is(BlockTags.CONVERTABLE_TO_MUD) && potioncontents.is(Potions.WATER)) {
-+            // Paper start
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityhuman, blockposition, Blocks.MUD.defaultBlockState())) {
-+                entityhuman.containerMenu.sendAllDataToRemote();
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             world.playSound((Player) null, blockposition, SoundEvents.GENERIC_SPLASH, SoundSource.BLOCKS, 1.0F, 1.0F);
-             entityhuman.setItemInHand(context.getHand(), ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
-             entityhuman.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
-diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java
-index c0e96284bb470353c0e54ad4e0c2205017913e61..24f6a158e4759aac3be8da4cf5e0d40bd295355b 100644
--- a/src/main/java/net/minecraft/world/item/ShovelItem.java
-+++ b/src/main/java/net/minecraft/world/item/ShovelItem.java
-@@ -46,20 +46,29 @@ public class ShovelItem extends DiggerItem {
-             Player player = context.getPlayer();
-             BlockState blockState2 = FLATTENABLES.get(blockState.getBlock());
-             BlockState blockState3 = null;
-+            Runnable afterAction = null; // Paper
-             if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
-                level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
-+                afterAction = () -> level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F); // Paper
-                 blockState3 = blockState2;
-             } else if (blockState.getBlock() instanceof CampfireBlock && blockState.getValue(CampfireBlock.LIT)) {
-+                afterAction = () -> { // Paper
-                 if (!level.isClientSide()) {
-                     level.levelEvent(null, 1009, blockPos, 0);
-                 }
- 
-                 CampfireBlock.dowse(context.getPlayer(), level, blockPos, blockState);
-+                }; // Paper
-                 blockState3 = blockState.setValue(CampfireBlock.LIT, Boolean.valueOf(false));
-             }
- 
-             if (blockState3 != null) {
-                 if (!level.isClientSide) {
-+                    // Paper start
-+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(context.getPlayer(), blockPos, blockState3)) {
-+                        return InteractionResult.PASS;
-+                    }
-+                    afterAction.run();
-+                    // Paper end
-                     level.setBlock(blockPos, blockState3, 11);
-                     level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, blockState3));
-                     if (player != null) {
-diff --git a/src/main/java/net/minecraft/world/level/block/CakeBlock.java b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-index d72f4a01ca07df8a9678b3ca4707e5363e482283..43e306b5ef00b39923c1597f212b4a07fb95f1ca 100644
--- a/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CakeBlock.java
-@@ -65,6 +65,12 @@ public class CakeBlock extends Block {
-             if (block instanceof CandleBlock) {
-                 CandleBlock candleblock = (CandleBlock) block;
- 
-+                // Paper start - call change block event
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, CandleCakeBlock.byCandle(candleblock))) {
-+                    player.containerMenu.sendAllDataToRemote(); // update inv because candle could decrease
-+                    return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
-+                }
-+                // Paper end - call change block event
-                 stack.consume(1, player);
-                 world.playSound((Player) null, pos, SoundEvents.CAKE_ADD_CANDLE, SoundSource.BLOCKS, 1.0F, 1.0F);
-                 world.setBlockAndUpdate(pos, CandleCakeBlock.byCandle(candleblock));
-@@ -96,6 +102,14 @@ public class CakeBlock extends Block {
-         if (!player.canEat(false)) {
-             return InteractionResult.PASS;
-         } else {
-+            // Paper start - call change block event
-+            int i = state.getValue(CakeBlock.BITES);
-+            final BlockState newState = i < MAX_BITES ? state.setValue(CakeBlock.BITES, i + 1) : world.getFluidState(pos).createLegacyBlock();
-+            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, newState)) {
-+                ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
-+                return InteractionResult.PASS; // return a non-consume result to cake blocks don't drop their candles
-+            }
-+            // Paper end - call change block event
-             player.awardStat(Stats.EAT_CAKE_SLICE);
-             // CraftBukkit start
-             // entityhuman.getFoodData().eat(2, 0.1F);
-@@ -109,7 +123,7 @@ public class CakeBlock extends Block {
- 
-             ((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity().sendHealthUpdate();
-             // CraftBukkit end
-            int i = (Integer) state.getValue(CakeBlock.BITES);
-+            // Paper - move up
- 
-             world.gameEvent((Entity) player, (Holder) GameEvent.EAT, pos);
-             if (i < 6) {
-diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 804adb5ed92dfcf4c29c756dd95d7164150a9666..19fa8a9f935e9063497f8c0bd7909036fa0af2b7 100644
--- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -239,6 +239,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
-             if (i < 7 && !world.isClientSide) {
-                 BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
-+                // Paper start - handle cancelled events
-+                if (iblockdata1 == null) {
-+                    return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
-+                }
-+                // Paper end
- 
-                 world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
-                 player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
-@@ -269,11 +274,16 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         if (i < 7 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
-             // CraftBukkit start
-             double rand = world.getRandom().nextDouble();
-            BlockState iblockdata1 = ComposterBlock.addItem(user, state, DummyGeneratorAccess.INSTANCE, pos, stack, rand);
-            if (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1)) {
-+            BlockState iblockdata1 = null; // Paper
-+            if (false && (state == iblockdata1 || !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(user, pos, iblockdata1))) { // Paper - move event call into addItem
-                 return state;
-             }
-             iblockdata1 = ComposterBlock.addItem(user, state, world, pos, stack, rand);
-+            // Paper start - handle cancelled events
-+            if (iblockdata1 == null) {
-+                return state;
-+            }
-+            // Paper end
-             // CraftBukkit end
- 
-             stack.shrink(1);
-@@ -314,11 +324,13 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         return iblockdata1;
-     }
- 
-+    @Nullable // Paper
-     static BlockState addItem(@Nullable Entity user, BlockState state, LevelAccessor world, BlockPos pos, ItemStack stack) {
-         // CraftBukkit start
-         return ComposterBlock.addItem(user, state, world, pos, stack, world.getRandom().nextDouble());
-     }
- 
-+    @Nullable // Paper - make it nullable
-     static BlockState addItem(@Nullable Entity entity, BlockState iblockdata, LevelAccessor generatoraccess, BlockPos blockposition, ItemStack itemstack, double rand) {
-         // CraftBukkit end
-         int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
-@@ -329,6 +341,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         } else {
-             int j = i + 1;
-             BlockState iblockdata1 = (BlockState) iblockdata.setValue(ComposterBlock.LEVEL, j);
-+            // Paper start - move the EntityChangeBlockEvent here to avoid conflict later for the compost events
-+            if (entity != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata1)) {
-+                return null;
-+            }
-+            // Paper end
- 
-             generatoraccess.setBlock(blockposition, iblockdata1, 3);
-             generatoraccess.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entity, iblockdata1));
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index ef8a0236ab4fb648c4bb2a8cfc90e3cefe8f9f1d..1a3d8755c8f6a7cfe06069e2082d8147aaaff097 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
-@@ -259,7 +259,13 @@ public class BeehiveBlockEntity extends BlockEntity {
-                                         --j;
-                                     }
- 
-                                    world.setBlockAndUpdate(blockposition, (BlockState) iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j));
-+                                    // Paper start - Fire EntityChangeBlockEvent in more places
-+                                    BlockState newBlockState = iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j);
-+
-+                                    if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entitybee, blockposition, newBlockState)) {
-+                                        world.setBlockAndUpdate(blockposition, newBlockState);
-+                                    }
-+                                    // Paper end - Fire EntityChangeBlockEvent in more places
-                                 }
-                             }
-                         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index daf3c26fce7569761951bfd5594c6726d854a9ff..e8a73d34dbb372581b03018aade170a31c266099 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -120,7 +120,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
- 
-     @Override
-     public void gameEvent(Holder<GameEvent> event, Vec3 emitterPos, GameEvent.Context emitter) {
-        // Used by BlockComposter
-+        // Used by ComposterBlock
-     }
- 
-     @Override
--- a/patches/unapplied/server/0736-Missing-eating-regain-reason.patch
+++ b/patches/unapplied/server/0736-Missing-eating-regain-reason.patch
@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Fri, 5 Aug 2022 12:16:51 +0200
-Subject: [PATCH] Missing eating regain reason
-
-
-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 2ed442c8d36f285420cf84a956e90b6036384ce0..23d4dcc82115fd1a0a77565a0472304042d5f12d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -398,7 +398,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
-                         this.usePlayerItem(player, hand, itemstack);
-                         FoodProperties foodinfo = (FoodProperties) itemstack.get(DataComponents.FOOD);
- 
-                        this.heal(foodinfo != null ? (float) foodinfo.nutrition() : 1.0F);
-+                        this.heal(foodinfo != null ? (float) foodinfo.nutrition() : 1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
-                     }
- 
-                     return InteractionResult.sidedSuccess(this.level().isClientSide());
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 12d3ef81247f3088490f9b87d8068c2e2c6338c7..aecd17953dc117d369885d4c8d7b5c7c3a0f8f0f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -387,7 +387,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-             boolean flag = this.getHealth() < this.getMaxHealth();
- 
-             if (flag) {
-                this.heal(2.0F);
-+                this.heal(2.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
-             }
- 
-             boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 33b7e578f39608d522a9c270cac69be44a34456b..82c57124433cc033c99e609e8ad71e03d340bc5e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -184,7 +184,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         }
- 
-         if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
-            this.heal(f);
-+            this.heal(f, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // Paper - Add missing regain reason
-             flag = true;
-         }
- 
--- a/patches/unapplied/server/0737-Missing-effect-cause.patch
+++ b/patches/unapplied/server/0737-Missing-effect-cause.patch
@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Tue, 16 Aug 2022 19:44:55 +0200
-Subject: [PATCH] Missing effect cause
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 3dec72f407ca4af53ac5fe32f05326638af05474..01a0731e92d39c8718538244e34a271fb8717fc2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -401,7 +401,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
-             player.addEffect(new MobEffectInstance(MobEffects.REGENERATION, j, 0), this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // CraftBukkit
-         }
- 
-        player.removeEffect(MobEffects.DIG_SLOWDOWN);
-+        player.removeEffect(MobEffects.DIG_SLOWDOWN, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.AXOLOTL); // Paper - Add missing effect cause
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
-index 483a24b094e2afa49405f4ef5a0d3f04eab31dec..530e3105e11094beab88b4d991aa0756880746d1 100644
--- a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
-+++ b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java
-@@ -28,7 +28,7 @@ public class HoneyBottleItem extends Item {
-         }
- 
-         if (!world.isClientSide) {
-            user.removeEffect(MobEffects.POISON);
-+            user.removeEffect(MobEffects.POISON, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper - Add missing effect cause
-         }
- 
-         if (stack.isEmpty()) {
-diff --git a/src/main/java/net/minecraft/world/item/OminousBottleItem.java b/src/main/java/net/minecraft/world/item/OminousBottleItem.java
-index aba027a4c73fd7a01556e71cfc39dbe5e9c9464a..d42b64ab58997f45974f70dc660643ac4e372a39 100644
--- a/src/main/java/net/minecraft/world/item/OminousBottleItem.java
-+++ b/src/main/java/net/minecraft/world/item/OminousBottleItem.java
-@@ -36,7 +36,7 @@ public class OminousBottleItem extends Item {
-         if (!world.isClientSide) {
-             world.playSound(null, user.blockPosition(), SoundEvents.OMINOUS_BOTTLE_DISPOSE, user.getSoundSource(), 1.0F, 1.0F);
-             Integer integer = stack.getOrDefault(DataComponents.OMINOUS_BOTTLE_AMPLIFIER, Integer.valueOf(0));
-            user.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, integer, false, false, true));
-+            user.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, integer, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.POTION_DRINK); // Paper - Add missing effect cause
-         }
- 
-         stack.consume(1, user);
-diff --git a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
-index f15c54be432480ae5bcda3a60e21e54fdce04b8a..5b448006debecab983167d15fac59fc2a04805df 100644
--- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
-+++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java
-@@ -48,7 +48,7 @@ public class SuspiciousStewItem extends Item {
-         while (iterator.hasNext()) {
-             SuspiciousStewEffects.Entry suspicioussteweffects_a = (SuspiciousStewEffects.Entry) iterator.next();
- 
-            user.addEffect(suspicioussteweffects_a.createEffectInstance());
-+            user.addEffect(suspicioussteweffects_a.createEffectInstance(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.FOOD); // Paper - Add missing effect cause
-         }
- 
-         return super.finishUsingItem(stack, world, user);
--- a/patches/unapplied/server/0738-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/unapplied/server/0738-Added-byte-array-serialization-deserialization-for-P.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nex <nex@bits.team>
-Date: Thu, 24 Feb 2022 16:28:07 +0100
-Subject: [PATCH] Added byte array serialization/deserialization for
- PersistentDataContainers
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-index 984e988a47aa55a3fd92198e379d0f92f511daef..5a4e7e7150b7c137b077e0b393f17ed35b5aec34 100644
--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
-@@ -184,4 +184,27 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
-         this.customDataTags.clear();
-     }
-     // Paper end
-+
-+    // Paper start - byte array serialization
-+    @Override
-+    public byte[] serializeToBytes() throws java.io.IOException {
-+        final net.minecraft.nbt.CompoundTag root = this.toTagCompound();
-+        final java.io.ByteArrayOutputStream byteArrayOutput = new java.io.ByteArrayOutputStream();
-+        try (final java.io.DataOutputStream dataOutput = new java.io.DataOutputStream(byteArrayOutput)) {
-+            net.minecraft.nbt.NbtIo.write(root, dataOutput);
-+            return byteArrayOutput.toByteArray();
-+        }
-+    }
-+
-+    @Override
-+    public void readFromBytes(final byte[] bytes, final boolean clear) throws java.io.IOException {
-+        if (clear) {
-+            this.clear();
-+        }
-+        try (final java.io.DataInputStream dataInput = new java.io.DataInputStream(new java.io.ByteArrayInputStream(bytes))) {
-+            final net.minecraft.nbt.CompoundTag compound = net.minecraft.nbt.NbtIo.read(dataInput);
-+            this.putAll(compound);
-+        }
-+    }
-+    // Paper end - byte array serialization
- }
--- a/patches/unapplied/server/0739-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/unapplied/server/0739-Call-BlockPhysicsEvent-more-often.patch
@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sun, 7 Aug 2022 22:16:36 +0200
-Subject: [PATCH] Call BlockPhysicsEvent more often
-
-
-diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-index 457a963ee6ebd3cf5c3831f6660e3850335af49f..106af2b2c7ff72c7549975aef75cdcff8d9a7d97 100644
--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-@@ -119,7 +119,20 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
-         public boolean runNext(Level world) {
-             BlockPos blockPos = this.sourcePos.relative(NeighborUpdater.UPDATE_ORDER[this.idx++]);
-             BlockState blockState = world.getBlockState(blockPos);
-            NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
-+            // Paper start - Call BlockPhysicsEvent
-+            try {
-+                org.bukkit.event.block.BlockPhysicsEvent event = new org.bukkit.event.block.BlockPhysicsEvent(
-+                    org.bukkit.craftbukkit.block.CraftBlock.at(world, blockPos),
-+                    org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState),
-+                    org.bukkit.craftbukkit.block.CraftBlock.at(world, this.sourcePos));
-+
-+                if (event.callEvent()) { // continue to check for adjacent block (increase idx)
-+                    NeighborUpdater.executeUpdate(world, blockState, blockPos, this.sourceBlock, this.sourcePos, false);
-+                }
-+            } catch (StackOverflowError ex) {
-+                world.lastPhysicsProblem = blockPos;
-+            }
-+            // Paper end - Call BlockPhysicsEvent
-             if (this.idx < NeighborUpdater.UPDATE_ORDER.length && NeighborUpdater.UPDATE_ORDER[this.idx] == this.skipDirection) {
-                 this.idx++;
-             }
--- a/patches/unapplied/server/0740-Configurable-chat-thread-limit.patch
+++ b/patches/unapplied/server/0740-Configurable-chat-thread-limit.patch
@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Sep 2022 06:33:17 +0100
-Subject: [PATCH] Configurable chat thread limit
-
-By default, spigot shifts chat over to an unbounded thread pool,
-on a normal server, this really offers no gains, the creation of a thread
-on submitting to the pool on these servers eats more time vs just running it in
-the netty pipeline, however, on servers using plugins which do work in here, there
-could be some overall benefits to moving this stuff outside of the pipeline.
-
-In general, this patch does two things:
-1) Exposes the core size for the pool, this allows for ensuring that a number of threads
-sit around in the pool, mitigating the need for creating new threads; This IS however
-caveated, the ThreadPoolExecutor will ONLY create core threads as they're needed, it
-just won't allow for us to dip back under the # of core threads, this can potentially
-be mitigated by calling prestartCoreThread, however, I'm not sure if there is much justification
-for this
-2) Exposes a max size for the pool, as stated, by default this is unbounded, for most
-servers limiting the size of the pool is going to have 0 effects given how fast chat
-is actually processed, this is honestly really just exposed for the misnomers or people
-who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
-
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index b92bfd89e32becde2e7630c6116c16f8a4f6614a..73e8a524925ed6f2580d3bd01616646fabafda78 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -303,7 +303,18 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-             @PostProcess
-             private void postProcess() {
-                // TODO: fill in separate patch
-+                //noinspection ConstantConditions
-+                if (net.minecraft.server.MinecraftServer.getServer() == null) return; // In testing env, this will be null here
-+                int _chatExecutorMaxSize = (this.chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : this.chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?;
-+                int _chatExecutorCoreSize = Math.max(this.chatExecutorCoreSize, 0);
-+
-+                if (_chatExecutorMaxSize < _chatExecutorCoreSize) {
-+                    _chatExecutorMaxSize = _chatExecutorCoreSize;
-+                }
-+
-+                java.util.concurrent.ThreadPoolExecutor executor = (java.util.concurrent.ThreadPoolExecutor) net.minecraft.server.MinecraftServer.getServer().chatExecutor;
-+                executor.setCorePoolSize(_chatExecutorCoreSize);
-+                executor.setMaximumPoolSize(_chatExecutorMaxSize);
-             }
-         }
-         public int maxJoinsPerTick = 5;
--- a/patches/unapplied/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/unapplied/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Mon, 19 Sep 2022 00:13:02 +0100
-Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type
- change
-
-TODO: Remove in 1.21?
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 63d4ffe93a445abf3c766d4f1f8fbf4a412a2a03..419b899f0e65b9656432513b69f60150c75bd13f 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -458,6 +458,12 @@ public class Commodore {
-                             super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, runtimeCbPkgPrefix() + "advancement/CraftAdvancement", "getDisplay0", desc, false);
-                             return;
-                         }
-+                        if (owner.equals("org/bukkit/WorldCreator") && name.equals("keepSpawnLoaded") && desc.equals("(Lnet/kyori/adventure/util/TriState;)V")) {
-+                            super.visitMethodInsn(opcode, owner, name, "(Lnet/kyori/adventure/util/TriState;)Lorg/bukkit/WorldCreator;", itf);
-+                            // new method has a return, so, make sure we pop it
-+                            super.visitInsn(Opcodes.POP);
-+                            return;
-+                        }
-                         // Paper end
- 
-                         // Paper start - ItemFactory#getSpawnEgg (paper had original method that returned ItemStack, upstream added identical but returned Material)
--- a/patches/unapplied/server/0742-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/unapplied/server/0742-fix-Jigsaw-block-kicking-user.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Legitimoose <legitimoose@gmail.com>
-Date: Wed, 28 Sep 2022 22:45:49 -0700
-Subject: [PATCH] fix Jigsaw block kicking user
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
-index 0083602f8c8826e247fecbdb5cdb6548ff6180ce..675f6b2932e036d2eedf065fd2db4bf9f0e4250d 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
-@@ -137,7 +137,12 @@ public class JigsawBlockEntity extends BlockEntity {
-     public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
-         BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front());
-         Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registries.TEMPLATE_POOL);
-        Holder<StructureTemplatePool> holder = registry.getHolderOrThrow(this.pool);
-+        // Paper start - Replace getHolderOrThrow with a null check
-+        Holder<StructureTemplatePool> holder = registry.getHolder(this.pool).orElse(null);
-+        if (holder == null) {
-+            return;
-+        }
-+        // Paper end - Replace getHolderOrThrow with a null check
-         JigsawPlacement.generateJigsaw(world, holder, this.target, maxDepth, blockPos, keepJigsaws);
-     }
- 
--- a/patches/unapplied/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/unapplied/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch
@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Legitimoose <legitimoose@gmail.com>
-Date: Thu, 29 Sep 2022 16:25:50 -0700
-Subject: [PATCH] use BlockFormEvent for mud converting into clay
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index 95cb7492ac691a8e8aa9894f701b802a7eda5446..a2bd54dae4b0460d200f6d5300194a7ef5a28830 100644
--- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -215,10 +215,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
-                             if (((PointedDripstoneBlock.FluidInfo) optional.get()).sourceState.is(Blocks.MUD) && fluidtype == Fluids.WATER) {
-                                 BlockState iblockdata1 = Blocks.CLAY.defaultBlockState();
- 
-                                world.setBlockAndUpdate(((PointedDripstoneBlock.FluidInfo) optional.get()).pos, iblockdata1);
-+                                // Paper start - Call BlockFormEvent
-+                                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, ((PointedDripstoneBlock.FluidInfo) optional.get()).pos, iblockdata1)) {
-                                 Block.pushEntitiesUp(((PointedDripstoneBlock.FluidInfo) optional.get()).sourceState, iblockdata1, world, ((PointedDripstoneBlock.FluidInfo) optional.get()).pos);
-                                 world.gameEvent((Holder) GameEvent.BLOCK_CHANGE, ((PointedDripstoneBlock.FluidInfo) optional.get()).pos, GameEvent.Context.of(iblockdata1));
-                                 world.levelEvent(1504, blockposition1, 0);
-+                                }
-+                                // Paper end - Call BlockFormEvent
-                             } else {
-                                 BlockPos blockposition2 = PointedDripstoneBlock.findFillableCauldronBelowStalactiteTip(world, blockposition1, fluidtype);
- 
--- a/patches/unapplied/server/0744-Add-getDrops-to-BlockState.patch
+++ b/patches/unapplied/server/0744-Add-getDrops-to-BlockState.patch
@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Fri, 12 Aug 2022 23:24:37 -0700
-Subject: [PATCH] Add getDrops to BlockState
-
-Originally added isPreferredTool to BlockData but
-upstream added that.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index e96023b71845526383288917e8d7c5759a4c0e9b..fa63a6cfcfcc4eee4503a82d85333c139c8c8b2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-@@ -347,5 +347,24 @@ public class CraftBlockState implements BlockState {
-     public boolean isCollidable() {
-         return this.data.getBlock().hasCollision;
-     }
-+
-+    @Override
-+    public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) {
-+        this.requirePlaced();
-+        net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item);
-+
-+        // Modelled off EntityHuman#hasBlock
-+        if (item == null || !data.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(data)) {
-+            return net.minecraft.world.level.block.Block.getDrops(
-+                data,
-+                world.getHandle(),
-+                position,
-+                world.getHandle().getBlockEntity(position), entity == null ? null :
-+                    ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle(), nms
-+            ).stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asBukkitCopy).toList();
-+        } else {
-+            return java.util.Collections.emptyList();
-+        }
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/0745-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/unapplied/server/0745-Fix-a-bunch-of-vanilla-bugs.patch
@ -1,425 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 11 Jul 2022 11:56:41 -0700
-Subject: [PATCH] Fix a bunch of vanilla bugs
-
-https://bugs.mojang.com/browse/MC-253721
-  wrong msg for opping multiple players
-
-https://bugs.mojang.com/browse/MC-248588
-  respect mob griefing gamerule for draining water cauldrons
-
-https://bugs.mojang.com/browse/MC-244739
-  play goat eating sound for last item in stack
-
-https://bugs.mojang.com/browse/MC-243057
-  ignore furnace fuel slot in recipe book click
-
-https://bugs.mojang.com/browse/MC-147659
-  Some witch huts spawn the incorrect cat
-  Note: Marked as Won't Fix, makes 0 sense
-
-https://bugs.mojang.com/browse/MC-179072
-  Creepers do not defuse when switching from Survival to Creative/Spectator
-
-https://bugs.mojang.com/browse/MC-259571
-  Fix changeGameModeForPlayer to use gameModeForPlayer
-
-https://bugs.mojang.com/browse/MC-262422
-  Fix lightning being able to hit spectators
-
-https://bugs.mojang.com/browse/MC-224454
-  Fix mobs attempting to pathfind through azalea blocks
-
-https://bugs.mojang.com/browse/MC-263999
-  Fix mobs breaking doors not spawning block break particles
-
-https://bugs.mojang.com/browse/MC-210802
-  Fixes sheep eating blocks outside of ticking range
-
-https://bugs.mojang.com/browse/MC-123848
-  Fixes item frames dropping items above when pointing down
-
-https://bugs.mojang.com/browse/MC-174630
-  Fix secondary beacon effect remaining after switching effect
-
-https://bugs.mojang.com/browse/MC-153086
-  Fix the beacon deactivation sound always playing when broken
-
-https://bugs.mojang.com/browse/MC-200092
-  Fix yaw being ignored for a player's first spawn pos
-
-https://bugs.mojang.com/browse/MC-158900
-  Fix error when joining after tempban expired
-
-https://bugs.mojang.com/browse/MC-99075
-  Fix inventory desync within spawn protected area
-
-https://bugs.mojang.com/browse/MC-273635
-  Fix TrialSpawner forgets assigned mob when placed by player
-
-== AT ==
-public net/minecraft/world/entity/Mob leashInfoTag
-
-Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
-Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/server/commands/DeOpCommands.java b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-index 0283f26151488d715dc823a0008c9a37ef6740fb..d98447e58233745665f0833196226077d972cc2a 100644
--- a/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-+++ b/src/main/java/net/minecraft/server/commands/DeOpCommands.java
-@@ -35,7 +35,7 @@ public class DeOpCommands {
-             if (playerList.isOp(gameProfile)) {
-                 playerList.deop(gameProfile);
-                 i++;
-                source.sendSuccess(() -> Component.translatable("commands.deop.success", targets.iterator().next().getName()), true);
-+                source.sendSuccess(() -> Component.translatable("commands.deop.success", gameProfile.getName()), true); // Paper - fixes MC-253721
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/commands/OpCommand.java b/src/main/java/net/minecraft/server/commands/OpCommand.java
-index 6854ca4d4fec2b4fa541c3fabf63787665572609..e7b444a10b244828827b3c66c53465206ea8e0ec 100644
--- a/src/main/java/net/minecraft/server/commands/OpCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/OpCommand.java
-@@ -46,7 +46,7 @@ public class OpCommand {
-             if (!playerList.isOp(gameProfile)) {
-                 playerList.op(gameProfile);
-                 i++;
-                source.sendSuccess(() -> Component.translatable("commands.op.success", targets.iterator().next().getName()), true);
-+                source.sendSuccess(() -> Component.translatable("commands.op.success", gameProfile.getName()), true); // Paper - fixes MC-253721
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 071e9ef3680c5dc492c6142ccd05f6788ebc3035..61fda6927f060cdf8bcfddaaa08bbbe2c514c630 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1027,7 +1027,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         // CraftBukkit end
-     }
- 
-    boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) {
-+    public boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) { // Paper - public
-         // Spigot start
-         return this.anyPlayerCloseEnoughForSpawning(pos, false);
-     }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b88a7f580b4138ceb262f3d398e78fdc2e6b018c..1edad85fc5c199dcab66497fa758e48dd14aec8c 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -777,7 +777,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         } else {
-             AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, new BlockPos(blockposition1.atY(this.getMaxBuildHeight()))).inflate(3.0D);
-             List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
-                return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition());
-+                return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition()) && !entityliving.isSpectator(); // Paper - Fix lightning being able to hit spectators (MC-262422)
-             });
- 
-             if (!list.isEmpty()) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 6abecaac8407b992d208a9108e11fd4954a4106f..03d89f326d320c5d778c3d1e2db7d6b88753faec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -93,7 +93,7 @@ public class ServerPlayerGameMode {
-                 return event; // Paper - Expand PlayerGameModeChangeEvent
-             }
-             // CraftBukkit end
-            this.setGameModeForPlayer(gameMode, this.previousGameModeForPlayer);
-+            this.setGameModeForPlayer(gameMode, this.gameModeForPlayer); // Paper - Fix MC-259571
-             this.player.onUpdateAbilities();
-             this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
-             this.level.updateSleepingPlayerList();
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ca32e5aa6e77ca1bab886e7b6a778ec931ac4e4c..28808ffc6e486f7dc01be370c9eb249dc1f7ea46 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1814,7 +1814,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                             } else if (enuminteractionresult.shouldSwing() && !this.player.gameMode.interactResult) { // Paper - Call interact event
-                                 this.player.swing(enumhand, true);
-                             }
-                        }
-+                        } else { this.player.containerMenu.sendAllDataToRemote(); } // Paper - Fix inventory desync; MC-99075
-                     } else {
-                         MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED);
- 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03572023ae7f061bf34fed8ac27852e08d6412c0..38b9ab369e25e4b718418375f76e782283b48411 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -260,7 +260,7 @@ public abstract class PlayerList {
-         }
-         if (optional.isEmpty() || invalidPlayerWorld[0]) {
-             // Paper end - reset to main world spawn if first spawn or invalid world
-            player.moveTo(player.adjustSpawnLocation(worldserver1, worldserver1.getSharedSpawnPos()).getBottomCenter(), 0.0F, 0.0F);
-+            player.moveTo(player.adjustSpawnLocation(worldserver1, worldserver1.getSharedSpawnPos()).getBottomCenter(), worldserver1.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
-         }
-         // Paper end - Entity#getEntitySpawnReason
-         player.setServerLevel(worldserver1);
-@@ -703,8 +703,10 @@ public abstract class PlayerList {
-         Player player = entity.getBukkitEntity();
-         PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.channel.remoteAddress()).getAddress());
- 
-        if (this.bans.isBanned(gameprofile)) {
-            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
-+        // Paper start - Fix MC-158900
-+        UserBanListEntry gameprofilebanentry;
-+        if (this.bans.isBanned(gameprofile) && (gameprofilebanentry = this.bans.get(gameprofile)) != null) {
-+            // Paper end - Fix MC-158900
- 
-             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
-             if (gameprofilebanentry.getExpires() != null) {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index 784a894688f98f9d0368a36d456c5c94e1ee3695..a85885ee51df585fa11ae9f8fcd67ff2a71c5a18 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -77,9 +77,10 @@ public class BreakDoorGoal extends DoorInteractGoal {
-                 return;
-             }
-             // CraftBukkit end
-+            final net.minecraft.world.level.block.state.BlockState oldState = this.mob.level().getBlockState(this.doorPos); // Paper - fix MC-263999
-             this.mob.level().removeBlock(this.doorPos, false);
-             this.mob.level().levelEvent(1021, this.doorPos, 0);
-            this.mob.level().levelEvent(2001, this.doorPos, Block.getId(this.mob.level().getBlockState(this.doorPos)));
-+            this.mob.level().levelEvent(2001, this.doorPos, Block.getId(oldState)); // Paper - fix MC-263999
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-index d802985f1431be4332c07f0dab88feebedea4ce2..4e2c23ccdf4e4a4d65b291dbe20952bae1838bff 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-@@ -31,6 +31,11 @@ public class EatBlockGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
-+        // Paper start - Fix MC-210802
-+        if (!((net.minecraft.server.level.ServerLevel) this.level).chunkSource.chunkMap.anyPlayerCloseEnoughForSpawning(this.mob.chunkPosition())) {
-+            return false;
-+        }
-+        // Paper end
-         if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) {
-             return false;
-         } else {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-index ef71b3ef4444c05b4211de87e1c8ec52cbe3e72a..137ec75ee803789deb7b1ca93dd9369c9af362b9 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-@@ -21,6 +21,13 @@ public class SwellGoal extends Goal {
-         return this.creeper.getSwellDir() > 0 || livingEntity != null && this.creeper.distanceToSqr(livingEntity) < 9.0;
-     }
- 
-+    // Paper start - Fix MC-179072
-+    @Override
-+    public boolean canContinueToUse() {
-+        return !net.minecraft.world.entity.EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(this.creeper.getTarget()) && canUse();
-+    }
-+    // Paper end
-+
-     @Override
-     public void start() {
-         this.creeper.getNavigation().stop();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 923806900ef6248576e71260d40e9caf2c8943e8..02e49c7ae5e120302b6479cf3e3934b9217eebf0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -243,9 +243,10 @@ public class Goat extends Animal {
-             player.setItemInHand(hand, itemstack1);
-             return InteractionResult.sidedSuccess(this.level().isClientSide);
-         } else {
-+            boolean isFood = this.isFood(itemstack); // Paper - track before stack is possibly decreased to 0 (Fixes MC-244739)
-             InteractionResult enuminteractionresult = super.mobInteract(player, hand);
- 
-            if (enuminteractionresult.consumesAction() && this.isFood(itemstack)) {
-+            if (enuminteractionresult.consumesAction() && isFood) { // Paper
-                 this.level().playSound((Player) null, (Entity) this, this.getEatingSound(itemstack), SoundSource.NEUTRAL, 1.0F, Mth.randomBetween(this.level().random, 0.8F, 1.2F));
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 3c6edc5ea44b7ec15d8fc7a2dca95a11a0d6108a..ba4e0ad7c7c2731d61ec7f60f19d7e9ec31a28ba 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -260,6 +260,14 @@ public class ItemFrame extends HangingEntity {
-         return (ItemStack) this.getEntityData().get(ItemFrame.DATA_ITEM);
-     }
- 
-+    // Paper start - Fix MC-123848 (spawn item frame drops above block)
-+    @Nullable
-+    @Override
-+    public net.minecraft.world.entity.item.ItemEntity spawnAtLocation(ItemStack stack) {
-+        return this.spawnAtLocation(stack, getDirection().equals(Direction.DOWN) ? -0.6F : 0.0F);
-+    }
-+    // Paper end
-+
-     @Nullable
-     public MapId getFramedMapId(ItemStack itemstack) {
-         return (MapId) itemstack.get(DataComponents.MAP_ID);
-diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-index 08dcc94c9eca9a5fd61055f05b7737ba5840b5bf..e0e5046c84941a8d17e18c177f3daea9cb631940 100644
--- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -82,8 +82,8 @@ public class CatSpawner implements CustomSpawner {
-         if (cat == null) {
-             return 0;
-         } else {
-+            cat.moveTo(pos, 0.0F, 0.0F); // Paper - move up - Fix MC-147659
-             cat.finalizeSpawn(world, world.getCurrentDifficultyAt(pos), MobSpawnType.NATURAL, null);
-            cat.moveTo(pos, 0.0F, 0.0F);
-             world.addFreshEntityWithPassengers(cat);
-             return 1;
-         }
-diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index 396559c281eee9e8c677cb222721414e8d9e12a2..8b0ebf659f6b219ce2a5d10b0d79f9b89b47c911 100644
--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-@@ -178,6 +178,11 @@ public class BeaconMenu extends AbstractContainerMenu {
-     // Paper end - Add PlayerChangeBeaconEffectEvent
- 
-     public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) {
-+        // Paper start - fix MC-174630 - validate secondary power
-+        if (secondary.isPresent() && secondary.get() != net.minecraft.world.effect.MobEffects.REGENERATION && (primary.isPresent() && secondary.get() != primary.get())) {
-+            secondary = Optional.empty();
-+        }
-+        // Paper end
-         if (this.paymentSlot.hasItem()) {
-             // Paper start - Add PlayerChangeBeaconEffectEvent
-             io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), convert(primary), convert(secondary), this.access.getLocation().getBlock());
-diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-index cd90129be2cf8095abd80528e5de3bbe05022a9d..fad69dfc20574ab23634b14252b50929cca75b21 100644
--- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-@@ -51,4 +51,11 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock {
-     public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
-         TreeGrower.AZALEA.growTree(world, world.getChunkSource().getGenerator(), pos, state, random);
-     }
-+
-+    // Paper start - Fix MC-224454
-+    @Override
-+    public boolean isPathfindable(BlockState state, net.minecraft.world.level.pathfinder.PathComputationType type) {
-+        return false;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index fa5366961861370c2366e6f0ff026a6d65128316..a5c7c2d24498c66159316a4f92677625975ce5ca 100644
--- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-@@ -69,7 +69,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
-         if (!world.isClientSide && entity.isOnFire() && this.isEntityInsideContent(state, pos, entity)) {
-             // CraftBukkit start
-            if (entity.mayInteract(world, pos)) {
-+            if ((entity instanceof net.minecraft.world.entity.player.Player || world.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING)) && entity.mayInteract(world, pos)) { // Paper - Fixes MC-248588
-                 if (!this.handleEntityOnFireInsideWithEvent(state, world, pos, entity)) { // Paper - fix powdered snow cauldron extinguishing entities
-                     return;
-                 }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index aa59a45bcbe652996eddb80a3187618b7f6d1234..f1a7054a0ee1842e78338d8984f151b24c352849 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
-@@ -648,13 +648,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
- 
-     @Override
-     public void fillStackedContents(StackedContents finder) {
-        Iterator iterator = this.items.iterator();
-
-        while (iterator.hasNext()) {
-            ItemStack itemstack = (ItemStack) iterator.next();
-
-            finder.accountStack(itemstack);
-        }
-+        // Paper start - don't account fuel stack (fixes MC-243057)
-+        finder.accountStack(this.items.get(SLOT_INPUT));
-+        finder.accountStack(this.items.get(SLOT_RESULT));
-+        // Paper end
- 
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index e124f040386e130aebd7135434c4f06d130d28f6..f8d432ef21e59796da4b11c9748ba151c54e5e04 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -295,7 +295,11 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-         org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
-         new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-         // Paper end - beacon activation/deactivation events
-+        // Paper start - fix MC-153086
-+        if (this.levels > 0 && !this.beamSections.isEmpty()) {
-         BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
-+        }
-+        // Paper end
-         super.setRemoved();
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-index 055f4b87c01ee7ecf7d2a111b72cc5aa85d9fbe8..6684ded7135f943f8cea954b417f596369215357 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-@@ -100,13 +100,13 @@ public class TrialSpawnerData {
-         this.ejectingLootTable = rewardLootTable;
-     }
- 
-    public void reset() {
-+    public void reset(TrialSpawner logic) { // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-         this.detectedPlayers.clear();
-         this.totalMobsSpawned = 0;
-         this.nextMobSpawnsAt = 0L;
-         this.cooldownEndsAt = 0L;
-         this.currentMobs.clear();
-        this.nextSpawnData = Optional.empty();
-+        if (!logic.getConfig().spawnPotentialsDefinition().isEmpty()) this.nextSpawnData = Optional.empty(); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-     }
- 
-     public boolean hasMobToSpawn(TrialSpawner logic, RandomSource random) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
-index ffabcfaef8defe932473dee515f05220921904e0..005aea8a747e9cbbc352b8b57c64b84ec71ad321 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
-@@ -68,7 +68,7 @@ public enum TrialSpawnerState implements StringRepresentable {
-             case INACTIVE -> trialSpawnerData.getOrCreateDisplayEntity(logic, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
-             case WAITING_FOR_PLAYERS -> {
-                 if (!logic.canSpawnInLevel(world)) {
-                    trialSpawnerData.reset();
-+                    trialSpawnerData.reset(logic); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-                     yield this;
-                 } else if (!trialSpawnerData.hasMobToSpawn(logic, world.random)) {
-                     yield INACTIVE;
-@@ -79,7 +79,7 @@ public enum TrialSpawnerState implements StringRepresentable {
-             }
-             case ACTIVE -> {
-                 if (!logic.canSpawnInLevel(world)) {
-                    trialSpawnerData.reset();
-+                    trialSpawnerData.reset(logic); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-                     yield WAITING_FOR_PLAYERS;
-                 } else if (!trialSpawnerData.hasMobToSpawn(logic, world.random)) {
-                     yield INACTIVE;
-@@ -145,7 +145,7 @@ public enum TrialSpawnerState implements StringRepresentable {
-                     yield ACTIVE;
-                 } else if (trialSpawnerData.isCooldownFinished(world)) {
-                     logic.removeOminous(world, pos);
-                    trialSpawnerData.reset();
-+                    trialSpawnerData.reset(logic); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-                     yield WAITING_FOR_PLAYERS;
-                 } else {
-                     yield this;
-diff --git a/src/main/java/net/minecraft/world/level/portal/DimensionTransition.java b/src/main/java/net/minecraft/world/level/portal/DimensionTransition.java
-index 1595a379875abc718659f6b1ce7c64c6383b1bc8..788f79dc38012595b385ee6a449daa0bccf0079a 100644
--- a/src/main/java/net/minecraft/world/level/portal/DimensionTransition.java
-+++ b/src/main/java/net/minecraft/world/level/portal/DimensionTransition.java
-@@ -39,7 +39,7 @@ public record DimensionTransition(ServerLevel newLevel, Vec3 pos, Vec3 speed, fl
-     }
- 
-     public DimensionTransition(ServerLevel worldserver, Entity entity, DimensionTransition.PostDimensionTransition dimensiontransition_a, PlayerTeleportEvent.TeleportCause cause) {
-        this(worldserver, findAdjustedSharedSpawnPos(worldserver, entity), Vec3.ZERO, 0.0F, 0.0F, false, dimensiontransition_a, cause);
-+        this(worldserver, findAdjustedSharedSpawnPos(worldserver, entity), Vec3.ZERO, worldserver.getSharedSpawnAngle(), 0.0F, false, dimensiontransition_a, cause); // Paper - MC-200092 - fix spawn pos yaw being ignored
-         // CraftBukkit end
-     }
- 
-@@ -55,7 +55,7 @@ public record DimensionTransition(ServerLevel newLevel, Vec3 pos, Vec3 speed, fl
-     }
- 
-     public static DimensionTransition missingRespawnBlock(ServerLevel world, Entity entity, DimensionTransition.PostDimensionTransition postDimensionTransition) {
-        return new DimensionTransition(world, findAdjustedSharedSpawnPos(world, entity), Vec3.ZERO, 0.0F, 0.0F, true, postDimensionTransition);
-+        return new DimensionTransition(world, findAdjustedSharedSpawnPos(world, entity), Vec3.ZERO, world.getSharedSpawnAngle(), 0.0F, true, postDimensionTransition); // Paper - MC-200092 - fix spawn pos yaw being ignored
-     }
- 
-     private static Vec3 findAdjustedSharedSpawnPos(ServerLevel world, Entity entity) {
--- a/patches/unapplied/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/unapplied/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Mon, 3 Oct 2022 20:48:19 +0200
-Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d3707c3fabc09068f3b07edebe9a333c153dfab5..4bf6281a75597072b19658208e4447c4d1ee8ba2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2186,7 +2186,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }
- 
-             if (entity instanceof Mob entityinsentient) {
-                if (ServerLevel.this.isUpdatingNavigations) {
-+                if (false && ServerLevel.this.isUpdatingNavigations) { // Paper - Remove unnecessary onTrackingStart during navigation warning
-                     String s = "onTrackingStart called during navigation iteration";
- 
-                     Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2266,7 +2266,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }
- 
-             if (entity instanceof Mob entityinsentient) {
-                if (ServerLevel.this.isUpdatingNavigations) {
-+                if (false && ServerLevel.this.isUpdatingNavigations) { // Paper - Remove unnecessary onTrackingStart during navigation warning
-                     String s = "onTrackingStart called during navigation iteration";
- 
-                     Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
--- a/patches/unapplied/server/0747-Fix-custom-piglin-loved-items.patch
+++ b/patches/unapplied/server/0747-Fix-custom-piglin-loved-items.patch
@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jul 2022 21:50:44 -0700
-Subject: [PATCH] Fix custom piglin loved items
-
-Upstream didn't modify the isLovedItem check in wantsToPickup
-so piglins never actually tried to pickup interestItems
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index d601bff8e8f62af78791ad357b51b92faf04e55f..d3d50ec0f4466464c048449d8a844569c447d59b 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
-@@ -403,7 +403,7 @@ public class PiglinAi {
-         } else {
-             boolean flag = piglin.canAddToInventory(stack);
- 
-            return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag));
-+            return stack.is(Items.GOLD_NUGGET) ? flag : (PiglinAi.isFood(stack) ? !PiglinAi.hasEatenRecently(piglin) && flag : (!PiglinAi.isLovedItem(stack, piglin) ? piglin.canReplaceCurrentItem(stack) : PiglinAi.isNotHoldingLovedItemInOffHand(piglin) && flag)); // Paper - upstream missed isLovedItem check
-         }
-     }
- 
--- a/patches/unapplied/server/0748-EntityPickupItemEvent-fixes.patch
+++ b/patches/unapplied/server/0748-EntityPickupItemEvent-fixes.patch
@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jul 2022 21:45:36 -0700
-Subject: [PATCH] EntityPickupItemEvent fixes
-
-Fixes double firing of the event in PiglinAi
-
-Fixes cancelling the event for piglins still triggering the
-advancement trigger
-
-Fires the event when a Raider tries to pick up a raid banner
-to become raid leader.
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index d2dfa49e124460f4762b950f9ded106d2ec15dc2..bc58323801ee16fe9b63c21332144ec002a902f2 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
-@@ -412,7 +412,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
- 
-     @Override
-     protected void pickUpItem(ItemEntity item) {
-        this.onItemPickup(item);
-+        // this.onItemPickup(item); // Paper - EntityPickupItemEvent fixes; call in PiglinAi#pickUpItem after EntityPickupItemEvent is fired
-         PiglinAi.pickUpItem(this, item);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index d3d50ec0f4466464c048449d8a844569c447d59b..b9810a1f6ac91ae9631dd1ebc225f009d91b7845 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
-@@ -242,11 +242,16 @@ public class PiglinAi {
-         ItemStack itemstack;
- 
-         // CraftBukkit start
-        if (drop.getItem().is(Items.GOLD_NUGGET) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled()) {
-+        // Paper start - EntityPickupItemEvent fixes; fix event firing twice
-+        if (drop.getItem().is(Items.GOLD_NUGGET) /* && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled() */) {
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, 0, false).isCancelled()) return;
-+            piglin.onItemPickup(drop); // Paper - moved from Piglin#pickUpItem - call prior to item entity modification
-+            // Paper end - EntityPickupItemEvent fixes
-             piglin.take(drop, drop.getItem().getCount());
-             itemstack = drop.getItem();
-             drop.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
-         } else if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(piglin, drop, drop.getItem().getCount() - 1, false).isCancelled()) {
-+            piglin.onItemPickup(drop); // Paper - EntityPickupItemEvent fixes; moved from Piglin#pickUpItem - call prior to item entity modification
-             piglin.take(drop, 1);
-             itemstack = PiglinAi.removeOneItemFromItemEntity(drop);
-         } else {
-@@ -261,7 +266,7 @@ public class PiglinAi {
-         } else if (PiglinAi.isFood(itemstack) && !PiglinAi.hasEatenRecently(piglin)) {
-             PiglinAi.eat(piglin);
-         } else {
-            boolean flag = !piglin.equipItemIfPossible(itemstack, drop).equals(ItemStack.EMPTY); // CraftBukkit
-+            boolean flag = !piglin.equipItemIfPossible(itemstack, null).equals(ItemStack.EMPTY); // CraftBukkit // Paper - pass null item entity to prevent duplicate pickup item event call - called above.
- 
-             if (!flag) {
-                 PiglinAi.putInInventory(piglin, itemstack);
-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 174d246b0a4d0fc9d769aad08da627ca8487bdf2..bbf21ea433f9e3963aac0ede597ed8d3c8e50ed8 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-@@ -225,6 +225,11 @@ public abstract class Raider extends PatrollingMonster {
-         boolean flag = this.hasActiveRaid() && this.getCurrentRaid().getLeader(this.getWave()) != null;
- 
-         if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getLeaderBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) {
-+            // Paper start - EntityPickupItemEvent fixes
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, item, 0, false).isCancelled()) {
-+                return;
-+            }
-+            // Paper end - EntityPickupItemEvent fixes
-             EquipmentSlot enumitemslot = EquipmentSlot.HEAD;
-             ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
-             double d0 = (double) this.getEquipmentDropChance(enumitemslot);
--- a/patches/unapplied/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/unapplied/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch
@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 16 Jun 2022 21:57:02 -0700
-Subject: [PATCH] Correctly handle interactions with items on cooldown
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 03d89f326d320c5d778c3d1e2db7d6b88753faec..717d015dd4637dd9d568b751be1dc1046b0a0560 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -514,6 +514,7 @@ public class ServerPlayerGameMode {
-         BlockPos blockposition = hitResult.getBlockPos();
-         BlockState iblockdata = world.getBlockState(blockposition);
-         boolean cancelledBlock = false;
-+        boolean cancelledItem = false; // Paper - correctly handle items on cooldown
- 
-         if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
-             return InteractionResult.FAIL;
-@@ -523,10 +524,10 @@ public class ServerPlayerGameMode {
-         }
- 
-         if (player.getCooldowns().isOnCooldown(stack.getItem())) {
-            cancelledBlock = true;
-+            cancelledItem = true; // Paper - correctly handle items on cooldown
-         }
- 
-        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation());
-+        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper - correctly handle items on cooldown
-         this.firedInteract = true;
-         this.interactResult = event.useItemInHand() == Event.Result.DENY;
-         this.interactPosition = blockposition.immutable();
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ba1599b733946bef468a9b006411f8827844e791..b6cca72b4785d5cf009077c81c1cca718d8cfe28 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -556,6 +556,12 @@ public class CraftEventFactory {
-     }
- 
-     public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 targetPos) {
-+        // Paper start - cancelledItem param
-+        return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, false, hand, targetPos);
-+    }
-+
-+    public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, boolean cancelledItem, InteractionHand hand, Vec3 targetPos) {
-+        // Paper end - cancelledItem param
-         Player player = (who == null) ? null : (Player) who.getBukkitEntity();
-         CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
- 
-@@ -590,6 +596,11 @@ public class CraftEventFactory {
-         if (cancelledBlock) {
-             event.setUseInteractedBlock(Event.Result.DENY);
-         }
-+        // Paper start
-+        if (cancelledItem) {
-+            event.setUseItemInHand(Result.DENY);
-+        }
-+        // Paper end
-         craftServer.getPluginManager().callEvent(event);
- 
-         return event;
--- a/patches/unapplied/server/0750-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/unapplied/server/0750-Add-PlayerInventorySlotChangeEvent.patch
@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jakub Zacek <dawon@dawon.eu>
-Date: Sun, 24 Apr 2022 22:56:59 +0200
-Subject: [PATCH] Add PlayerInventorySlotChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ad3896dd524acb573adffdfb38b13dd699539cef..3dbaa3c6b75a0f8bfdef42d210f2ac6f560cde3d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -352,6 +352,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
- 
-                 }
-             }
-+            // Paper start - Add PlayerInventorySlotChangeEvent
-+            @Override
-+            public void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack oldStack, ItemStack stack) {
-+                Slot slot = handler.getSlot(slotId);
-+                if (!(slot instanceof ResultSlot)) {
-+                    if (slot.container == ServerPlayer.this.getInventory()) {
-+                        if (io.papermc.paper.event.player.PlayerInventorySlotChangeEvent.getHandlerList().getRegisteredListeners().length == 0) {
-+                            CriteriaTriggers.INVENTORY_CHANGED.trigger(ServerPlayer.this, ServerPlayer.this.getInventory(), stack);
-+                            return;
-+                        }
-+                        io.papermc.paper.event.player.PlayerInventorySlotChangeEvent event = new io.papermc.paper.event.player.PlayerInventorySlotChangeEvent(ServerPlayer.this.getBukkitEntity(), slotId, CraftItemStack.asBukkitCopy(oldStack), CraftItemStack.asBukkitCopy(stack));
-+                        event.callEvent();
-+                        if (event.shouldTriggerAdvancements()) {
-+                            CriteriaTriggers.INVENTORY_CHANGED.trigger(ServerPlayer.this, ServerPlayer.this.getInventory(), stack);
-+                        }
-+                    }
-+                }
-+            }
-+            // Paper end - Add PlayerInventorySlotChangeEvent
- 
-             @Override
-             public void dataChanged(AbstractContainerMenu handler, int property, int value) {}
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index b8d8aad81f54f7f43c01da075e63ec9173750bec..f7b9849819c185cd89533aca1f6d34398ffc1077 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -302,7 +302,7 @@ public abstract class AbstractContainerMenu {
-             while (iterator.hasNext()) {
-                 ContainerListener icrafting = (ContainerListener) iterator.next();
- 
-                icrafting.slotChanged(this, slot, itemstack2);
-+                icrafting.slotChanged(this, slot, itemstack1, itemstack2); // Paper - Add PlayerInventorySlotChangeEvent
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/inventory/ContainerListener.java b/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-index 0e19cc55646625bf32a354d3df2dc2d6bcff96f4..eba024c9aadef8902aacccea1584ffbee6c04e44 100644
--- a/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-+++ b/src/main/java/net/minecraft/world/inventory/ContainerListener.java
-@@ -5,5 +5,11 @@ import net.minecraft.world.item.ItemStack;
- public interface ContainerListener {
-     void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack stack);
- 
-+    // Paper start - Add PlayerInventorySlotChangeEvent
-+    default void slotChanged(AbstractContainerMenu handler, int slotId, ItemStack oldStack, ItemStack stack) {
-+        slotChanged(handler, slotId, stack);
-+    }
-+    // Paper end - Add PlayerInventorySlotChangeEvent
-+
-     void dataChanged(AbstractContainerMenu handler, int property, int value);
- }
--- a/patches/unapplied/server/0751-Elder-Guardian-appearance-API.patch
+++ b/patches/unapplied/server/0751-Elder-Guardian-appearance-API.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Tue, 11 Oct 2022 20:38:47 +0300
-Subject: [PATCH] Elder Guardian appearance API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3374dcd3b1f22b6c1803b9580c4cea6552b6afb1..1e563ed8f7e85d68682e679b27b0f6100eb10aea 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3298,6 +3298,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
-     // Paper end
- 
-+    // Paper start
-+    @Override
-+    public void showElderGuardian(boolean silent) {
-+        if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
-+    }
-+    // Paper end
-+
-     public Player.Spigot spigot()
-     {
-         return this.spigot;
--- a/patches/unapplied/server/0752-Add-entity-knockback-API.patch
+++ b/patches/unapplied/server/0752-Add-entity-knockback-API.patch
@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Sun, 16 Oct 2022 12:10:17 -0700
-Subject: [PATCH] Add entity knockback API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 877e3d20edba3fe2ea6b51d0b54ec8893bd112ed..2a7fffa71106327d0ffee632408d45faaec76702 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1127,4 +1127,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
-     }
-     // Paper end - hurt direction API
-+
-+    // Paper start - knockback API
-+    @Override
-+    public void knockback(final double strength, final double directionX, final double directionZ) {
-+        Preconditions.checkArgument(strength > 0, "Knockback strength must be > 0");
-+        this.getHandle().knockback(strength, directionX, directionZ);
-+    };
-+    // Paper end - knockback API
- }
--- a/patches/unapplied/server/0753-Detect-headless-JREs.patch
+++ b/patches/unapplied/server/0753-Detect-headless-JREs.patch
@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Noah van der Aa <ndvdaa@gmail.com>
-Date: Sat, 22 Oct 2022 14:47:45 +0200
-Subject: [PATCH] Detect headless JREs
-
-Crashes caused by the missing AWT dependency come up in the support channels fairly often.
-This patch detects the missing dependency and stops the server with a clear error message,
-containing a link to instructions on how to install a non-headless JRE.
-
-diff --git a/src/main/java/io/papermc/paper/util/ServerEnvironment.java b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-index 68098dfe716e93aafcca4d8d5b5a81d8648b3654..2b7070e0cefa7cf0777df159693750fea14e800b 100644
--- a/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-+++ b/src/main/java/io/papermc/paper/util/ServerEnvironment.java
-@@ -20,4 +20,14 @@ public class ServerEnvironment {
-     public static boolean userIsRootOrAdmin() {
-         return RUNNING_AS_ROOT_OR_ADMIN;
-     }
-+
-+    public static String awtDependencyCheck() {
-+        try {
-+            new java.awt.Color(0);
-+        } catch (UnsatisfiedLinkError e) {
-+            return e.getClass().getName() + ": " + e.getMessage();
-+        }
-+
-+        return null;
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 467b8ca8007c5d3a7b72b88e3a979bdf09f1a283..13e1a914d4523f1c192db2a9a1ee6522e0ee27da 100644
--- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -167,6 +167,18 @@ public class Main {
-                 return;
-             }
- 
-+            // Paper start - Detect headless JRE
-+            String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
-+            if (awtException != null) {
-+                Main.LOGGER.error("You are using a headless JRE distribution.");
-+                Main.LOGGER.error("This distribution is missing certain graphic libraries that the Minecraft server needs to function.");
-+                Main.LOGGER.error("For instructions on how to install the non-headless JRE, see https://docs.papermc.io/misc/java-install");
-+                Main.LOGGER.error("");
-+                Main.LOGGER.error(awtException);
-+                return;
-+            }
-+            // Paper end - Detect headless JRE
-+
-             org.spigotmc.SpigotConfig.disabledAdvancements = spigotConfiguration.getStringList("advancements.disabled"); // Paper - fix SPIGOT-5885, must be set early in init
-             // Paper start - fix SPIGOT-5824
-             File file;
--- a/patches/unapplied/server/0754-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/unapplied/server/0754-fix-entity-vehicle-collision-event-not-called.patch
@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: lukas81298 <lukas81298@gmail.com>
-Date: Tue, 12 Jan 2021 14:41:38 +0100
-Subject: [PATCH] fix entity vehicle collision event not called
-
-
-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 93634fb01962ca7a35026e3c365f2a7f6b258a39..a38ce400550893f63640e3bb5bb801ab40f06266 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -165,7 +165,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
- 
-     @Override
-     public boolean canCollideWith(Entity other) {
-        return Boat.canVehicleCollide(this, other);
-+        // Paper start - fix VehicleEntityCollisionEvent not called when colliding with player
-+        boolean collides = Boat.canVehicleCollide(this, other);
-+        if (!collides) {
-+            return false;
-+        }
-+        org.bukkit.event.vehicle.VehicleEntityCollisionEvent collisionEvent = new org.bukkit.event.vehicle.VehicleEntityCollisionEvent((org.bukkit.entity.Vehicle) getBukkitEntity(), other.getBukkitEntity());
-+
-+        return collisionEvent.callEvent();
-+        // Paper end - fix VehicleEntityCollisionEvent not called when colliding with player
-     }
- 
-     @Override
--- a/patches/unapplied/server/0755-Add-EntityToggleSitEvent.patch
+++ b/patches/unapplied/server/0755-Add-EntityToggleSitEvent.patch
@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: KyGuy2002 <IEatBeans#1165>
-Date: Fri, 11 Mar 2022 15:33:10 +0000
-Subject: [PATCH] Add EntityToggleSitEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 4c5b0b1a71ec5ba0e8dcd5ef52bf667e9bb30be9..87c669517baa923ffa7392e400e7344e81fc9406 100644
--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-+++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-@@ -86,7 +86,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-         }
- 
-         this.orderedToSit = nbt.getBoolean("Sitting");
-        this.setInSittingPose(this.orderedToSit);
-+        this.setInSittingPose(this.orderedToSit, false); // Paper - Add EntityToggleSitEvent
-     }
- 
-     @Override
-@@ -166,6 +166,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
-     }
- 
-     public void setInSittingPose(boolean inSittingPose) {
-+        // Paper start - Add EntityToggleSitEvent
-+        this.setInSittingPose(inSittingPose, true);
-+    }
-+    public void setInSittingPose(boolean inSittingPose, boolean callEvent) {
-+        if (callEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), inSittingPose).callEvent()) return;
-+        // Paper end - Add EntityToggleSitEvent
-         byte b0 = (Byte) this.entityData.get(TamableAnimal.DATA_FLAGS_ID);
- 
-         if (inSittingPose) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 3265b3b5aede517b6fd8bb836947795bf8881350..9a0adf65d4d54852301a91b6fe444e4c5a139f5d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -432,7 +432,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
- 
-         this.setSleeping(nbt.getBoolean("Sleeping"));
-         this.setVariant(Fox.Type.byName(nbt.getString("Type")));
-        this.setSitting(nbt.getBoolean("Sitting"));
-+        this.setSitting(nbt.getBoolean("Sitting"), false); // Paper - Add EntityToggleSitEvent
-         this.setIsCrouching(nbt.getBoolean("Crouching"));
-         if (this.level() instanceof ServerLevel) {
-             this.setTargetGoals();
-@@ -445,6 +445,12 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
-     }
- 
-     public void setSitting(boolean sitting) {
-+        // Paper start - Add EntityToggleSitEvent
-+        this.setSitting(sitting, true);
-+    }
-+    public void setSitting(boolean sitting, boolean fireEvent) {
-+        if (fireEvent && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return;
-+        // Paper end - Add EntityToggleSitEvent
-         this.setFlag(1, sitting);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 7b3d5322611990406028e59b1409907291e27b21..293d6891948e99ac9bd741008f7dcbc5fc1a2e3d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -145,6 +145,7 @@ public class Panda extends Animal {
-     }
- 
-     public void sit(boolean sitting) {
-+        if (!new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), sitting).callEvent()) return; // Paper - Add EntityToggleSitEvent
-         this.setFlag(8, sitting);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index aecd17953dc117d369885d4c8d7b5c7c3a0f8f0f..0388b09e1c4f03958384680ed487792a54007463 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -570,7 +570,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void sitDown() {
-        if (!this.isCamelSitting()) {
-+        if (!this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), true).callEvent()) { // Paper - Add EntityToggleSitEvent
-             this.makeSound(SoundEvents.CAMEL_SIT);
-             this.setPose(Pose.SITTING);
-             this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -579,7 +579,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void standUp() {
-        if (this.isCamelSitting()) {
-+        if (this.isCamelSitting() && new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) { // Paper - Add EntityToggleSitEvent
-             this.makeSound(SoundEvents.CAMEL_STAND);
-             this.setPose(Pose.STANDING);
-             this.gameEvent(GameEvent.ENTITY_ACTION);
-@@ -588,6 +588,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     public void standUpInstantly() {
-+        if (this.isCamelSitting() && !new io.papermc.paper.event.entity.EntityToggleSitEvent(this.getBukkitEntity(), false).callEvent()) return; // Paper - Add EntityToggleSitEvent
-         this.setPose(Pose.STANDING);
-         this.gameEvent(GameEvent.ENTITY_ACTION);
-         this.resetLastPoseChangeTickToFullStand(this.level().getGameTime());
--- a/patches/unapplied/server/0756-Add-fire-tick-delay-option.patch
+++ b/patches/unapplied/server/0756-Add-fire-tick-delay-option.patch
@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VytskaLT <VytskaLT@protonmail.com>
-Date: Wed, 22 Jun 2022 14:34:28 +0300
-Subject: [PATCH] Add fire-tick-delay option
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 9db6df5f28be559a324ead2fcfbe189eac076e2e..0a77a470d78f68e8397f29f298e7f52fbd7ba9a2 100644
--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-@@ -171,7 +171,7 @@ public class FireBlock extends BaseFireBlock {
- 
-     @Override
-     protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-        world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world.random));
-+        world.scheduleTick(pos, (Block) this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
-         if (world.getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
-             if (!state.canSurvive(world, pos)) {
-                 this.fireExtinguished(world, pos); // CraftBukkit - invalid place location
-@@ -372,11 +372,11 @@ public class FireBlock extends BaseFireBlock {
-     protected void onPlace(BlockState iblockdata, Level world, BlockPos blockposition, BlockState iblockdata1, boolean flag, UseOnContext context) {
-         super.onPlace(iblockdata, world, blockposition, iblockdata1, flag, context);
-         // CraftBukkit end
-        world.scheduleTick(blockposition, (Block) this, FireBlock.getFireTickDelay(world.random));
-+        world.scheduleTick(blockposition, (Block) this, FireBlock.getFireTickDelay(world)); // Paper - Add fire-tick-delay option
-     }
- 
-    private static int getFireTickDelay(RandomSource random) {
-        return 30 + random.nextInt(10);
-+    private static int getFireTickDelay(Level world) { // Paper - Add fire-tick-delay option
-+        return world.paperConfig().environment.fireTickDelay + world.random.nextInt(10); // Paper - Add fire-tick-delay option
-     }
- 
-     @Override
--- a/patches/unapplied/server/0757-Add-Moving-Piston-API.patch
+++ b/patches/unapplied/server/0757-Add-Moving-Piston-API.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sat, 4 Dec 2021 13:29:36 -0500
-Subject: [PATCH] Add Moving Piston API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-index 25b759dee5ae2b311965f26ba311591199894be4..293ac0b658224fc0b3c2acdfc86eff3c8a9fdc04 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftMovingPiston.java
-@@ -4,7 +4,7 @@ import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
- import org.bukkit.Location;
- import org.bukkit.World;
- 
-public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> {
-+public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEntity> implements io.papermc.paper.block.MovingPiston { // Paper - Add Moving Piston API
- 
-     public CraftMovingPiston(World world, PistonMovingBlockEntity tileEntity) {
-         super(world, tileEntity);
-@@ -23,4 +23,26 @@ public class CraftMovingPiston extends CraftBlockEntityState<PistonMovingBlockEn
-     public CraftMovingPiston copy(Location location) {
-         return new CraftMovingPiston(this, location);
-     }
-+
-+    // Paper start - Add Moving Piston API
-+    @Override
-+    public org.bukkit.block.data.BlockData getMovingBlock() {
-+        return org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(this.getTileEntity().getMovedState());
-+    }
-+
-+    @Override
-+    public org.bukkit.block.BlockFace getDirection() {
-+        return org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(this.getTileEntity().getDirection());
-+    }
-+
-+    @Override
-+    public boolean isExtending() {
-+        return this.getTileEntity().isExtending();
-+    }
-+
-+    @Override
-+    public boolean isPistonHead() {
-+        return this.getTileEntity().isSourcePiston();
-+    }
-+    // Paper end - Add Moving Piston API
- }
--- a/patches/unapplied/server/0758-Ignore-impossible-spawn-tick.patch
+++ b/patches/unapplied/server/0758-Ignore-impossible-spawn-tick.patch
@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dannyball710 <dannyball710@gmail.com>
-Date: Sat, 12 Feb 2022 23:42:48 +0800
-Subject: [PATCH] Ignore impossible spawn tick
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 8efc06d29c62fa2be8515ed3359d52a6d4b807d2..f57e1b78204dff661ad5d3ee93a88a00330af2dc 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -84,6 +84,7 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
-         // Paper start - Configurable mob spawner tick rate
-         if (spawnDelay > 0 && --tickDelay > 0) return;
-         tickDelay = world.paperConfig().tickRates.mobSpawner;
--- a/patches/unapplied/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/unapplied/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 26 Oct 2022 13:13:12 -0700
-Subject: [PATCH] Fix EntityArgument and EntitySelectorParser permissions to
- align with EntitySelector#checkPermissions
-
-Fixes where the user has permission for selectors but not their
-suggestions, which especially matters when we force suggestions to
-the server for this type
-
-diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-index a327939abe2cce22747366051b6b7aaa2db3a8cc..3281ea4dca20d2bb22b2b1c6b9abb1329bc829c1 100644
--- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-+++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-@@ -135,7 +135,12 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
-             StringReader stringreader = new StringReader(suggestionsbuilder.getInput());
- 
-             stringreader.setCursor(suggestionsbuilder.getStart());
-            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, EntitySelectorParser.allowSelectors(icompletionprovider));
-+            // Paper start - Fix EntityArgument permissions
-+            final boolean permission = object instanceof CommandSourceStack stack
-+                    ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector")
-+                    : icompletionprovider.hasPermission(2);
-+            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, permission);
-+            // Paper end - Fix EntityArgument permissions
- 
-             try {
-                 argumentparserselector.parse();
-diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
-index dd50a530439576f56f245ff0b7eb090f9f0c9180..9d31e29ec62f437e642ed60da69c4b106bd9e770 100644
--- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
-+++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
-@@ -133,7 +133,7 @@ public class EntitySelectorParser {
-         boolean flag;
- 
-         if (source instanceof SharedSuggestionProvider icompletionprovider) {
-            if (icompletionprovider.hasPermission(2)) {
-+            if (source instanceof net.minecraft.commands.CommandSourceStack stack ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector") : icompletionprovider.hasPermission(2)) { // Paper - Fix EntityArgument permissions
-                 flag = true;
-                 return flag;
-             }
--- a/patches/unapplied/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/unapplied/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Denery <dorofeevij@gmail.com>
-Date: Mon, 31 Oct 2022 14:20:52 +0300
-Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
- entities from being set on fire
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 180a86c419cad9873c53a49c8881ced647a753e0..1aa3396a33e24f3849725769fe58b57374ee7611 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3193,6 +3193,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             pluginManager.callEvent(entityCombustEvent);
-             if (!entityCombustEvent.isCancelled()) {
-                 this.igniteForSeconds(entityCombustEvent.getDuration(), false);
-+            // Paper start - fix EntityCombustEvent cancellation
-+            } else {
-+                this.setRemainingFireTicks(this.remainingFireTicks - 1);
-+            // Paper end - fix EntityCombustEvent cancellation
-             }
-             // CraftBukkit end
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-index 0c5409af685ef1f251db3d9f9e21295c82a1e02a..8b5918dc07f17ae5001c03dc743128fd9520b819 100644
--- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-@@ -135,6 +135,10 @@ public abstract class BaseFireBlock extends Block {
- 
-                 if (!event.isCancelled()) {
-                     entity.igniteForSeconds(event.getDuration(), false);
-+                    // Paper start - fix EntityCombustEvent cancellation
-+                } else {
-+                    entity.setRemainingFireTicks(entity.getRemainingFireTicks() - 1);
-+                    // Paper end - fix EntityCombustEvent cancellation
-                 }
-                 // CraftBukkit end
-             }
--- a/patches/unapplied/server/0761-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/unapplied/server/0761-Add-PrePlayerAttackEntityEvent.patch
@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 18 Sep 2022 13:10:18 -0400
-Subject: [PATCH] Add PrePlayerAttackEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fab56040ecf496e74f583ec5d6c6c9861cfa4e13..ad334f149fe1b44d4ebe48489dcd2811ff1b5cd0 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1257,8 +1257,17 @@ public abstract class Player extends LivingEntity {
-     }
- 
-     public void attack(Entity target) {
-        if (target.isAttackable()) {
-            if (!target.skipAttackInteraction(this)) {
-+        // Paper start - PlayerAttackEntityEvent
-+        boolean willAttack = target.isAttackable() && !target.skipAttackInteraction(this); // Vanilla logic
-+        io.papermc.paper.event.player.PrePlayerAttackEntityEvent playerAttackEntityEvent = new io.papermc.paper.event.player.PrePlayerAttackEntityEvent(
-+            (org.bukkit.entity.Player) this.getBukkitEntity(),
-+            target.getBukkitEntity(),
-+            willAttack
-+        );
-+
-+        if (playerAttackEntityEvent.callEvent() && willAttack) { // Logic moved to willAttack local variable.
-+            {
-+        // Paper end - PlayerAttackEntityEvent
-                 float f = this.isAutoSpinAttack() ? this.autoSpinAttackDmg : (float) this.getAttributeValue(Attributes.ATTACK_DAMAGE);
-                 ItemStack itemstack = this.getWeaponItem();
-                 DamageSource damagesource = this.damageSources().playerAttack(this);
--- a/patches/unapplied/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/unapplied/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 12 Nov 2022 10:08:58 -0800
-Subject: [PATCH] ensure reset EnderDragon boss event name
-
-Fix MC-257487
-
-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 98d1c097fdbbc8080624f365634e0812a5eea5ac..bf39f006efef529db697ed4dccbd1657a2673b79 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
-@@ -73,6 +73,7 @@ public class EndDragonFight {
-     private static final int GATEWAY_DISTANCE = 96;
-     public static final int DRAGON_SPAWN_Y = 128;
-     private final Predicate<Entity> validPlayer;
-+    private static final Component DEFAULT_BOSS_EVENT_NAME = Component.translatable("entity.minecraft.ender_dragon"); // Paper - ensure reset EnderDragon boss event name
-     public final ServerBossEvent dragonEvent;
-     public final ServerLevel level;
-     private final BlockPos origin;
-@@ -101,7 +102,7 @@ public class EndDragonFight {
-     }
- 
-     public EndDragonFight(ServerLevel world, long gatewaysSeed, EndDragonFight.Data data, BlockPos origin) {
-        this.dragonEvent = (ServerBossEvent) (new ServerBossEvent(Component.translatable("entity.minecraft.ender_dragon"), BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS)).setPlayBossMusic(true).setCreateWorldFog(true);
-+        this.dragonEvent = (ServerBossEvent) (new ServerBossEvent(DEFAULT_BOSS_EVENT_NAME, BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS)).setPlayBossMusic(true).setCreateWorldFog(true); // Paper - ensure reset EnderDragon boss event name
-         this.gateways = new ObjectArrayList();
-         this.ticksSinceLastPlayerScan = 21;
-         this.skipArenaLoadedCheck = false;
-@@ -505,6 +506,10 @@ public class EndDragonFight {
-             this.ticksSinceDragonSeen = 0;
-             if (dragon.hasCustomName()) {
-                 this.dragonEvent.setName(dragon.getDisplayName());
-+                // Paper start - ensure reset EnderDragon boss event name
-+            } else {
-+                this.dragonEvent.setName(DEFAULT_BOSS_EVENT_NAME);
-+                // Paper end - ensure reset EnderDragon boss event name
-             }
-         }
- 
--- a/patches/unapplied/server/0763-Add-Player-Warden-Warning-API.patch
+++ b/patches/unapplied/server/0763-Add-Player-Warden-Warning-API.patch
@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dawon <dawon@dawon.eu>
-Date: Sat, 15 Oct 2022 00:46:57 +0200
-Subject: [PATCH] Add Player Warden Warning API
-
-== AT ==
-public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker ticksSinceLastWarning
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTicks
-public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e563ed8f7e85d68682e679b27b0f6100eb10aea..922ec82d566fd5ac0b40ed95629e63be3d1bf264 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3303,6 +3303,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void showElderGuardian(boolean silent) {
-         if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
-     }
-+
-+    @Override
-+    public int getWardenWarningCooldown() {
-+        return this.getHandle().wardenSpawnTracker.cooldownTicks;
-+    }
-+
-+    @Override
-+    public void setWardenWarningCooldown(int cooldown) {
-+        this.getHandle().wardenSpawnTracker.cooldownTicks = Math.max(cooldown, 0);
-+    }
-+
-+    @Override
-+    public int getWardenTimeSinceLastWarning() {
-+        return this.getHandle().wardenSpawnTracker.ticksSinceLastWarning;
-+    }
-+
-+    @Override
-+    public void setWardenTimeSinceLastWarning(int time) {
-+        this.getHandle().wardenSpawnTracker.ticksSinceLastWarning = time;
-+    }
-+
-+    @Override
-+    public int getWardenWarningLevel() {
-+        return this.getHandle().wardenSpawnTracker.getWarningLevel();
-+    }
-+
-+    @Override
-+    public void setWardenWarningLevel(int warningLevel) {
-+        this.getHandle().wardenSpawnTracker.setWarningLevel(warningLevel);
-+    }
-+
-+    @Override
-+    public void increaseWardenWarningLevel() {
-+        this.getHandle().wardenSpawnTracker.increaseWarningLevel();
-+    }
-     // Paper end
- 
-     public Player.Spigot spigot()
--- a/patches/unapplied/server/0764-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/unapplied/server/0764-More-vanilla-friendly-methods-to-update-trades.patch
@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sun, 16 Oct 2022 16:12:49 +0200
-Subject: [PATCH] More vanilla friendly methods to update trades
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 9d5a5a7fff7f75871e167f83edb0e9d5348748d7..393588661c41b490ee6bce2f687962f7ddeff7d4 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -921,6 +921,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
- 
-     @Override
-     protected void updateTrades() {
-+        // Paper start - More vanilla friendly methods to update trades
-+        updateTrades(TRADES_PER_LEVEL);
-+    }
-+
-+    public boolean updateTrades(int amount) {
-+        // Paper end - More vanilla friendly methods to update trades
-         VillagerData villagerdata = this.getVillagerData();
-         Int2ObjectMap int2objectmap;
- 
-@@ -938,9 +944,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-             if (avillagertrades_imerchantrecipeoption != null) {
-                 MerchantOffers merchantrecipelist = this.getOffers();
- 
-                this.addOffersFromItemListings(merchantrecipelist, avillagertrades_imerchantrecipeoption, 2);
-+                this.addOffersFromItemListings(merchantrecipelist, avillagertrades_imerchantrecipeoption, amount); // Paper - More vanilla friendly methods to update trades
-+                return true; // Paper - More vanilla friendly methods to update trades
-             }
-         }
-+        return false; // Paper - More vanilla friendly methods to update trades
-     }
- 
-     public void gossip(ServerLevel world, Villager villager, long time) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index 52312bec840322d32ea845f0bd64eb3ca1380854..bd2987fa1fb194a581567134ed980e8fc043f435 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -97,6 +97,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
-     }
- 
-     // Paper start
-+    @Override
-+    public boolean increaseLevel(int amount) {
-+        Preconditions.checkArgument(amount > 0, "Level earned must be positive");
-+        int supposedFinalLevel = this.getVillagerLevel() + amount;
-+        Preconditions.checkArgument(net.minecraft.world.entity.npc.VillagerData.MIN_VILLAGER_LEVEL <= supposedFinalLevel && supposedFinalLevel <= net.minecraft.world.entity.npc.VillagerData.MAX_VILLAGER_LEVEL,
-+            "Final level reached after the donation (%d) must be between [%d, %d]".formatted(supposedFinalLevel, net.minecraft.world.entity.npc.VillagerData.MIN_VILLAGER_LEVEL, net.minecraft.world.entity.npc.VillagerData.MAX_VILLAGER_LEVEL));
-+
-+        it.unimi.dsi.fastutil.ints.Int2ObjectMap<net.minecraft.world.entity.npc.VillagerTrades.ItemListing[]> trades =
-+            net.minecraft.world.entity.npc.VillagerTrades.TRADES.get(this.getHandle().getVillagerData().getProfession());
-+
-+        if (trades == null || trades.isEmpty()) {
-+            this.getHandle().setVillagerData(this.getHandle().getVillagerData().setLevel(supposedFinalLevel));
-+            return false;
-+        }
-+
-+        while (amount > 0) {
-+            this.getHandle().increaseMerchantCareer();
-+            amount--;
-+        }
-+        return true;
-+    }
-+
-+    @Override
-+    public boolean addTrades(int amount) {
-+        Preconditions.checkArgument(amount > 0, "Number of trades unlocked must be positive");
-+        return this.getHandle().updateTrades(amount);
-+    }
-+
-     @Override
-     public int getRestocksToday() {
-         return getHandle().numberOfRestocksToday;
--- a/patches/unapplied/server/0765-Add-paper-dumplisteners-command.patch
+++ b/patches/unapplied/server/0765-Add-paper-dumplisteners-command.patch
@ -1,197 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
-Date: Tue, 25 Oct 2022 21:15:37 +0200
-Subject: [PATCH] Add /paper dumplisteners command
-
-Co-authored-by: TwoLeggedCat <80929284+TwoLeggedCat@users.noreply.github.com>
-
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-index fd4f37711989431f997d77fb0917f8a9232ce53f..46bf42d5ea9e7b046f962531c5962d287cf44a41 100644
--- a/src/main/java/io/papermc/paper/command/PaperCommand.java
-+++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -41,6 +41,7 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
-         commands.put(Set.of("dumpitem"), new DumpItemCommand());
-         commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
-+        commands.put(Set.of("dumplisteners"), new DumpListenersCommand());
- 
-         return commands.entrySet().stream()
-             .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java b/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..aa44d4685de3caee4131449bead7a084868ff976
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/DumpListenersCommand.java
-@@ -0,0 +1,172 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.PrintWriter;
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.reflect.Field;
-+import java.time.LocalDateTime;
-+import java.time.format.DateTimeFormatter;
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Set;
-+import net.kyori.adventure.text.Component;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.plugin.Plugin;
-+import org.bukkit.plugin.RegisteredListener;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.newline;
-+import static net.kyori.adventure.text.Component.space;
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class DumpListenersCommand implements PaperSubcommand {
-+    private static final MethodHandle EVENT_TYPES_HANDLE;
-+
-+    static {
-+        try {
-+            final Field eventTypesField = HandlerList.class.getDeclaredField("EVENT_TYPES");
-+            eventTypesField.setAccessible(true);
-+            EVENT_TYPES_HANDLE = MethodHandles.lookup().unreflectGetter(eventTypesField);
-+        } catch (final ReflectiveOperationException e) {
-+            throw new RuntimeException(e);
-+        }
-+    }
-+
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        if (args.length >= 1 && args[0].equals("tofile")) {
-+            this.dumpToFile(sender);
-+            return true;
-+        }
-+        this.doDumpListeners(sender, args);
-+        return true;
-+    }
-+
-+    private void dumpToFile(final CommandSender sender) {
-+        final File file = new File("debug/listeners-"
-+            + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
-+        file.getParentFile().mkdirs();
-+        try (final PrintWriter writer = new PrintWriter(file)) {
-+            for (final String eventClass : eventClassNames()) {
-+                final HandlerList handlers;
-+                try {
-+                    handlers = (HandlerList) findClass(eventClass).getMethod("getHandlerList").invoke(null);
-+                } catch (final ReflectiveOperationException e) {
-+                    continue;
-+                }
-+                if (handlers.getRegisteredListeners().length != 0) {
-+                    writer.println(eventClass);
-+                }
-+                for (final RegisteredListener registeredListener : handlers.getRegisteredListeners()) {
-+                    writer.println(" - " + registeredListener);
-+                }
-+            }
-+        } catch (final IOException ex) {
-+            throw new RuntimeException(ex);
-+        }
-+        sender.sendMessage(text("Dumped listeners to " + file, GREEN));
-+    }
-+
-+    private void doDumpListeners(final CommandSender sender, final String[] args) {
-+        if (args.length == 0) {
-+            sender.sendMessage(text("Usage: /paper dumplisteners tofile|<className>", RED));
-+            return;
-+        }
-+
-+        try {
-+            final HandlerList handlers = (HandlerList) findClass(args[0]).getMethod("getHandlerList").invoke(null);
-+
-+            if (handlers.getRegisteredListeners().length == 0) {
-+                sender.sendMessage(text(args[0] + " does not have any registered listeners."));
-+                return;
-+            }
-+
-+            sender.sendMessage(text("Listeners for " + args[0] + ":"));
-+
-+            for (final RegisteredListener listener : handlers.getRegisteredListeners()) {
-+                final Component hoverText = text("Priority: " + listener.getPriority().name() + " (" + listener.getPriority().getSlot() + ")", WHITE)
-+                    .append(newline())
-+                    .append(text("Listener: " + listener.getListener()))
-+                    .append(newline())
-+                    .append(text("Executor: " + listener.getExecutor()))
-+                    .append(newline())
-+                    .append(text("Ignoring cancelled: " + listener.isIgnoringCancelled()));
-+
-+                sender.sendMessage(text(listener.getPlugin().getName(), GREEN)
-+                    .append(space())
-+                    .append(text("(" + listener.getListener().getClass().getName() + ")", GRAY).hoverEvent(hoverText)));
-+            }
-+
-+            sender.sendMessage(text("Total listeners: " + handlers.getRegisteredListeners().length));
-+
-+        } catch (final ClassNotFoundException e) {
-+            sender.sendMessage(text("Unable to find a class named '" + args[0] + "'. Make sure to use the fully qualified name.", RED));
-+        } catch (final NoSuchMethodException e) {
-+            sender.sendMessage(text("Class '" + args[0] + "' does not have a valid getHandlerList method.", RED));
-+        } catch (final ReflectiveOperationException e) {
-+            sender.sendMessage(text("Something went wrong, see the console for more details.", RED));
-+            MinecraftServer.LOGGER.warn("Error occurred while dumping listeners for class " + args[0], e);
-+        }
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        return switch (args.length) {
-+            case 0 -> suggestions();
-+            case 1 -> suggestions().stream()
-+                .filter(clazz -> clazz.toLowerCase(Locale.ROOT).contains(args[0].toLowerCase(Locale.ROOT)))
-+                .toList();
-+            default -> Collections.emptyList();
-+        };
-+    }
-+
-+    private static List<String> suggestions() {
-+        final List<String> ret = new ArrayList<>();
-+        ret.add("tofile");
-+        ret.addAll(eventClassNames());
-+        return ret;
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    private static Set<String> eventClassNames() {
-+        try {
-+            return (Set<String>) EVENT_TYPES_HANDLE.invokeExact();
-+        } catch (final Throwable e) {
-+            SneakyThrow.sneaky(e);
-+            return Collections.emptySet(); // Unreachable
-+        }
-+    }
-+
-+    private static Class<?> findClass(final String className) throws ClassNotFoundException {
-+        try {
-+            return Class.forName(className);
-+        } catch (final ClassNotFoundException ignore) {
-+            for (final Plugin plugin : Bukkit.getServer().getPluginManager().getPlugins()) {
-+                if (!plugin.isEnabled()) {
-+                    continue;
-+                }
-+
-+                try {
-+                    return Class.forName(className, false, plugin.getClass().getClassLoader());
-+                } catch (final ClassNotFoundException ignore0) {
-+                }
-+            }
-+        }
-+        throw new ClassNotFoundException(className);
-+    }
-+}