diff --git a/patches/unapplied/server/Add-API-for-quit-reason.patch b/patches/server/Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/unapplied/server/Add-API-for-quit-reason.patch
rename to patches/server/Add-API-for-quit-reason.patch
diff --git a/patches/unapplied/server/Add-Destroy-Speed-API.patch b/patches/server/Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-Destroy-Speed-API.patch
rename to patches/server/Add-Destroy-Speed-API.patch
diff --git a/patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch b/patches/server/Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/unapplied/server/Add-LivingEntity-clearActiveItem.patch
rename to patches/server/Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch b/patches/server/Add-PlayerItemCooldownEvent.patch
similarity index 90%
rename from patches/unapplied/server/Add-PlayerItemCooldownEvent.patch
rename to patches/server/Add-PlayerItemCooldownEvent.patch
index b9ec5eb903..19af0bce76 100644
--- a/patches/unapplied/server/Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/Add-PlayerItemCooldownEvent.patch
@@ -23,5 +23,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end - Add PlayerItemCooldownEvent
 +
      @Override
-     protected void onCooldownStarted(Item item, int duration) {
-         super.onCooldownStarted(item, duration);
+     protected void onCooldownStarted(ResourceLocation groupId, int duration) {
+         super.onCooldownStarted(groupId, duration);
diff --git a/patches/server/Add-PlayerJumpEvent.patch b/patches/server/Add-PlayerJumpEvent.patch
index a49da4b356..52c4144876 100644
--- a/patches/server/Add-PlayerJumpEvent.patch
+++ b/patches/server/Add-PlayerJumpEvent.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                                    this.player.jumpFromGround();
 +                                } else {
 +                                    from = event.getFrom();
-+                                    this.internalTeleport(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet());
++                                    this.internalTeleport(new PositionMoveRotation(org.bukkit.craftbukkit.util.CraftLocation.toVec3D(from), Vec3.ZERO, from.getYaw(), from.getPitch()), Collections.emptySet());
 +                                    return;
 +                                }
 +                                // Paper end - Add PlayerJumpEvent
diff --git a/patches/unapplied/server/Add-PlayerShearBlockEvent.patch b/patches/server/Add-PlayerShearBlockEvent.patch
similarity index 98%
rename from patches/unapplied/server/Add-PlayerShearBlockEvent.patch
rename to patches/server/Add-PlayerShearBlockEvent.patch
index 25734752e0..e78c7fdeaf 100644
--- a/patches/unapplied/server/Add-PlayerShearBlockEvent.patch
+++ b/patches/server/Add-PlayerShearBlockEvent.patch
@@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java
 @@ -0,0 +0,0 @@ public class PumpkinBlock extends Block {
          } else if (world.isClientSide) {
-             return ItemInteractionResult.sidedSuccess(world.isClientSide);
+             return InteractionResult.SUCCESS;
          } else {
 +            // Paper start - Add PlayerShearBlockEvent
 +            io.papermc.paper.event.block.PlayerShearBlockEvent event = new io.papermc.paper.event.block.PlayerShearBlockEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), new java.util.ArrayList<>());
diff --git a/patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/unapplied/server/Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/unapplied/server/Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch b/patches/server/Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/unapplied/server/Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/unapplied/server/Add-ignore-discounts-API.patch b/patches/server/Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/unapplied/server/Add-ignore-discounts-API.patch
rename to patches/server/Add-ignore-discounts-API.patch
diff --git a/patches/unapplied/server/Add-missing-default-perms-for-commands.patch b/patches/server/Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/unapplied/server/Add-missing-default-perms-for-commands.patch
rename to patches/server/Add-missing-default-perms-for-commands.patch
diff --git a/patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/unapplied/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch b/patches/server/Beacon-API-custom-effect-ranges.patch
similarity index 98%
rename from patches/unapplied/server/Beacon-API-custom-effect-ranges.patch
rename to patches/server/Beacon-API-custom-effect-ranges.patch
index 8e9c8df86d..1c2f55561f 100644
--- a/patches/unapplied/server/Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/Beacon-API-custom-effect-ranges.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          }
  
-         this.lockKey = LockCode.fromTag(nbt);
+         this.lockKey = LockCode.fromTag(nbt, registries);
 +        this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper - Custom beacon ranges
      }
  
@@ -89,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          }
  
-         this.lockKey.addToTag(nbt);
+         this.lockKey.addToTag(nbt, registries);
 +        nbt.putDouble(PAPER_RANGE_TAG, this.effectRange); // Paper - Custom beacon ranges
      }
  
diff --git a/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch
index 300947eceb..e8387e8a34 100644
--- a/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/Break-up-and-make-tab-spam-limits-configurable.patch
@@ -25,19 +25,11 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ import com.mojang.brigadier.ParseResults;
- import com.mojang.brigadier.StringReader;
- import com.mojang.brigadier.suggestion.Suggestions;
- import com.mojang.logging.LogUtils;
-+import io.papermc.paper.configuration.GlobalConfiguration;
- import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
- import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
- import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private int tickCount;
      private int ackBlockChangesUpTo = -1;
      private final TickThrottler chatSpamThrottler = new TickThrottler(20, 200);
-+    private final TickThrottler tabSpamThrottler = new TickThrottler(GlobalConfiguration.get().spamLimiter.tabSpamIncrement, GlobalConfiguration.get().spamLimiter.tabSpamLimit); // Paper - configurable tab spam limits
++    private final TickThrottler tabSpamThrottler = new TickThrottler(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement, io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit); // Paper - configurable tab spam limits
      private final TickThrottler dropSpamThrottler = new TickThrottler(20, 1480);
      private double firstGoodX;
      private double firstGoodY;
diff --git a/patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/unapplied/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 91%
rename from patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
index 45c61331ca..a9e68abebd 100644
--- a/patches/unapplied/server/Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/Climbing-should-not-bypass-cramming-gamerule.patch
@@ -51,8 +51,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  return;
              }
              // Paper end - don't run getEntities if we're not going to use its result
--            List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushableBy(this));
-+            List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushable(this, this.level().paperConfig().collisions.fixClimbingBypassingCrammingRule)); // Paper - Climbing should not bypass cramming gamerule
+-            List list = this.level().getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushableBy(this));
++            List list = this.level().getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushable(this, this.level().paperConfig().collisions.fixClimbingBypassingCrammingRule)); // Paper - Climbing should not bypass cramming gamerule
  
              if (!list.isEmpty()) {
                  // Paper - don't run getEntities if we're not going to use its result; moved up
@@ -128,6 +128,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return false;
      }
  
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractBoat.java
+@@ -0,0 +0,0 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
+     }
+ 
+     @Override
+-    public boolean isPushable() {
++    public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
+         return true;
+     }
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
@@ -141,16 +154,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return true;
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -0,0 +0,0 @@ public class Boat extends VehicleEntity implements Leashable, VariantHolder<Boat
-     }
- 
-     @Override
--    public boolean isPushable() {
-+    public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
-         return true;
-     }
- 
diff --git a/patches/unapplied/server/Entity-isTicking.patch b/patches/server/Entity-isTicking.patch
similarity index 100%
rename from patches/unapplied/server/Entity-isTicking.patch
rename to patches/server/Entity-isTicking.patch
diff --git a/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch b/patches/server/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
rename to patches/server/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/unapplied/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 98%
rename from patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
index c3f528412b..9354c134f9 100644
--- a/patches/unapplied/server/Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -9,7 +9,7 @@ diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/mai
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/unapplied/server/Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch b/patches/server/Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/unapplied/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch b/patches/server/Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/unapplied/server/Fix-bell-block-entity-memory-leak.patch
rename to patches/server/Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch b/patches/server/Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/unapplied/server/Fix-client-lag-on-advancement-loading.patch
rename to patches/server/Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/unapplied/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 100%
rename from patches/unapplied/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/unapplied/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch b/patches/server/Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/unapplied/server/Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch b/patches/server/Fix-item-locations-dropped-from-campfires.patch
similarity index 96%
rename from patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/Fix-item-locations-dropped-from-campfires.patch
index f69fafe958..4127c2b886 100644
--- a/patches/unapplied/server/Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/Fix-item-locations-dropped-from-campfires.patch
@@ -23,6 +23,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                            world.addFreshEntity(droppedItem);
 +                        }
 +                        // Paper end - Fix item locations dropped from campfires
-                         campfire.items.set(i, ItemStack.EMPTY);
+                         blockEntity.items.set(i, ItemStack.EMPTY);
                          world.sendBlockUpdated(pos, state, state, 3);
                          world.gameEvent((Holder) GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(state));
diff --git a/patches/unapplied/server/Item-no-age-no-player-pickup.patch b/patches/server/Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/unapplied/server/Item-no-age-no-player-pickup.patch
rename to patches/server/Item-no-age-no-player-pickup.patch
diff --git a/patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/unapplied/server/Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/unapplied/server/Limit-recipe-packets.patch b/patches/server/Limit-recipe-packets.patch
similarity index 51%
rename from patches/unapplied/server/Limit-recipe-packets.patch
rename to patches/server/Limit-recipe-packets.patch
index 444c51b44c..63f52a86eb 100644
--- a/patches/unapplied/server/Limit-recipe-packets.patch
+++ b/patches/server/Limit-recipe-packets.patch
@@ -9,28 +9,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     // CraftBukkit start - multithreaded fields
-     private final AtomicInteger chatSpamTickCount = new AtomicInteger();
-     private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-+    private final java.util.concurrent.atomic.AtomicInteger recipeSpamPackets =  new java.util.concurrent.atomic.AtomicInteger(); // Paper - auto recipe limit
-     // CraftBukkit end
-     private int dropSpamTickCount;
+     private final TickThrottler chatSpamThrottler = new TickThrottler(20, 200);
+     private final TickThrottler tabSpamThrottler = new TickThrottler(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement, io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit); // Paper - configurable tab spam limits
+     private final TickThrottler dropSpamThrottler = new TickThrottler(20, 1480);
++    private final TickThrottler recipeSpamPackets = new TickThrottler(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement, io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit);
      private double firstGoodX;
+     private double firstGoodY;
+     private double firstGoodZ;
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // CraftBukkit start
-         for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
-         if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - configurable tab spam limits
-+        if (recipeSpamPackets.get() > 0) recipeSpamPackets.getAndDecrement(); // Paper - auto recipe limit
-         /* Use thread-safe field access instead
-         if (this.chatSpamTickCount > 0) {
-             --this.chatSpamTickCount;
+         this.keepConnectionAlive();
+         this.chatSpamThrottler.tick();
+         this.tabSpamThrottler.tick(); // Paper - configurable tab spam limits
++        this.recipeSpamPackets.tick(); // Paper - auto recipe limit
+         this.dropSpamThrottler.tick();
+         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L) {
+             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
 +        // Paper start - auto recipe limit
 +        if (!org.bukkit.Bukkit.isPrimaryThread()) {
-+            if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
++            if (!this.recipeSpamPackets.isIncrementAndUnderThreshold()) {
 +                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"));
 +                return;
 +            }
@@ -38,4 +38,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end - auto recipe limit
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
          this.player.resetLastActionTime();
-         if (!this.player.isSpectator() && this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu instanceof RecipeBookMenu) {
+         if (!this.player.isSpectator() && this.player.containerMenu.containerId == packet.containerId()) {
diff --git a/patches/unapplied/server/More-lightning-API.patch b/patches/server/More-lightning-API.patch
similarity index 100%
rename from patches/unapplied/server/More-lightning-API.patch
rename to patches/server/More-lightning-API.patch
diff --git a/patches/unapplied/server/Optimise-getType-calls.patch b/patches/server/Optimise-getType-calls.patch
similarity index 100%
rename from patches/unapplied/server/Optimise-getType-calls.patch
rename to patches/server/Optimise-getType-calls.patch
diff --git a/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch b/patches/server/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
rename to patches/server/Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/unapplied/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/unapplied/server/Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch b/patches/server/Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/unapplied/server/Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/unapplied/server/Toggle-for-removing-existing-dragon.patch b/patches/server/Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/unapplied/server/Toggle-for-removing-existing-dragon.patch
rename to patches/server/Toggle-for-removing-existing-dragon.patch
diff --git a/patches/unapplied/server/Villager-resetOffers.patch b/patches/server/Villager-resetOffers.patch
similarity index 100%
rename from patches/unapplied/server/Villager-resetOffers.patch
rename to patches/server/Villager-resetOffers.patch