diff --git a/patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/unapplied/server/Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/unapplied/server/Add-ThrownEggHatchEvent.patch b/patches/server/Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/unapplied/server/Add-ThrownEggHatchEvent.patch
rename to patches/server/Add-ThrownEggHatchEvent.patch
diff --git a/patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch b/patches/server/Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/unapplied/server/Add-debug-for-sync-chunk-loads.patch
rename to patches/server/Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/unapplied/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch b/patches/server/Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/unapplied/server/Add-option-to-disable-pillager-patrols.patch
rename to patches/server/Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 89%
rename from patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
index 1bd35cece0..37efb4406e 100644
--- a/patches/unapplied/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public void inactiveTick() { }
      // Spigot end
      protected int numCollisions = 0; // Paper - Cap entity collisions
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      // Paper start - Entity origin API
      @javax.annotation.Nullable
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (spawnedViaMobSpawner) {
                  nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
              }
@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -0,0 +0,0 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch b/patches/server/Add-tick-times-API-and-mspt-command.patch
similarity index 96%
rename from patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch
rename to patches/server/Add-tick-times-API-and-mspt-command.patch
index 06b9ef18a0..ad0d8d0764 100644
--- a/patches/unapplied/server/Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/Add-tick-times-API-and-mspt-command.patch
@@ -141,15 +141,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private KeyPair keyPair;
      @Nullable
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.aggregatedTickTimesNanos += j;
+         this.tickTimesNanos[k] = j;
          this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float) j / (float) TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F;
-         long l = Util.getNanos();
- 
 +        // Paper start - Add tick times API and /mspt command
-+        tickTimes5s.add(this.tickCount, j);
-+        tickTimes10s.add(this.tickCount, j);
-+        tickTimes60s.add(this.tickCount, j);
++        this.tickTimes5s.add(this.tickCount, j);
++        this.tickTimes10s.add(this.tickCount, j);
++        this.tickTimes60s.add(this.tickCount, j);
 +        // Paper end - Add tick times API and /mspt command
-         this.logTickTime(l - i);
+         this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/unapplied/server/Alternative-item-despawn-rate.patch b/patches/server/Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/unapplied/server/Alternative-item-despawn-rate.patch
rename to patches/server/Alternative-item-despawn-rate.patch
diff --git a/patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 92%
rename from patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index c30c098291..0d04051663 100644
--- a/patches/unapplied/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -30,5 +30,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this.moveControl = new BeeFlyingMoveControl(this, 20, true);
 +        // Paper end - Fix MC-167279
          this.lookControl = new Bee.BeeLookControl(this);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0F);
-         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F);
+         this.setPathfindingMalus(PathType.WATER, -1.0F);
diff --git a/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch b/patches/server/Configurable-chance-of-villager-zombie-infection.patch
similarity index 96%
rename from patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/Configurable-chance-of-villager-zombie-infection.patch
index 22bca3d9aa..619408577f 100644
--- a/patches/unapplied/server/Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/Configurable-chance-of-villager-zombie-infection.patch
@@ -15,9 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean killedEntity(ServerLevel world, LivingEntity other) {
          boolean flag = super.killedEntity(world, other);
  
--        if ((world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager) {
--            Villager entityvillager = (Villager) other;
--
+-        if ((world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager entityvillager) {
 -            if (world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
 -                return flag;
 -            }
diff --git a/patches/unapplied/server/Configurable-projectile-relative-velocity.patch b/patches/server/Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/unapplied/server/Configurable-projectile-relative-velocity.patch
rename to patches/server/Configurable-projectile-relative-velocity.patch
diff --git a/patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/unapplied/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 98%
rename from patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
index a48fa2a1e5..b6a431fde9 100644
--- a/patches/unapplied/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            if (!Bee.this.level().isLoadedAndInBounds(Bee.this.hivePos)) return; // Paper - Do not allow bees to load chunks for beehives
              BlockEntity tileentity = Bee.this.level().getBlockEntity(Bee.this.hivePos);
  
-             if (tileentity instanceof BeehiveBlockEntity) {
+             if (tileentity instanceof BeehiveBlockEntity tileentitybeehive) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
diff --git a/patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch b/patches/server/Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/Don-t-move-existing-players-to-world-spawn.patch
index 2dc70227de..b49c952c3c 100644
--- a/patches/unapplied/server/Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/Don-t-move-existing-players-to-world-spawn.patch
@@ -17,14 +17,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
+         this.server = server;
          this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
-         this.setMaxUpStep(1.0F);
 -        this.fudgeSpawnLocation(world);
 +        // this.fudgeSpawnLocation(world); // Paper - Don't move existing players to world spawn
          this.updateOptions(clientOptions);
+         this.object = null;
  
-         this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
 @@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
                  position = Vec3.atCenterOf(world.getSharedSpawnPos());
              }
diff --git a/patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/unapplied/server/Don-t-tick-dead-players.patch b/patches/server/Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/unapplied/server/Don-t-tick-dead-players.patch
rename to patches/server/Don-t-tick-dead-players.patch
diff --git a/patches/unapplied/server/Dont-send-unnecessary-sign-update.patch b/patches/server/Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/unapplied/server/Dont-send-unnecessary-sign-update.patch
rename to patches/server/Dont-send-unnecessary-sign-update.patch
diff --git a/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch b/patches/server/Duplicate-UUID-Resolve-Option.patch
similarity index 94%
rename from patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch
rename to patches/server/Duplicate-UUID-Resolve-Option.patch
index 3d1e7352b6..a823c8477c 100644
--- a/patches/unapplied/server/Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/Duplicate-UUID-Resolve-Option.patch
@@ -87,6 +87,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return false;
 +    }
 +    // Paper end - duplicate uuid resolving
-     public CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>> prepareTickingChunk(ChunkHolder holder) {
-         CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getChunkRangeFuture(holder, 1, (i) -> {
++
+     public CompletableFuture<ChunkResult<LevelChunk>> prepareTickingChunk(ChunkHolder holder) {
+         CompletableFuture<ChunkResult<List<ChunkAccess>>> completablefuture = this.getChunkRangeFuture(holder, 1, (i) -> {
              return ChunkStatus.FULL;
diff --git a/patches/unapplied/server/Entity-Jump-API.patch b/patches/server/Entity-Jump-API.patch
similarity index 100%
rename from patches/unapplied/server/Entity-Jump-API.patch
rename to patches/server/Entity-Jump-API.patch
diff --git a/patches/unapplied/server/Expose-MinecraftServer-isRunning.patch b/patches/server/Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/unapplied/server/Expose-MinecraftServer-isRunning.patch
rename to patches/server/Expose-MinecraftServer-isRunning.patch
diff --git a/patches/unapplied/server/Expose-the-internal-current-tick.patch b/patches/server/Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/unapplied/server/Expose-the-internal-current-tick.patch
rename to patches/server/Expose-the-internal-current-tick.patch
diff --git a/patches/unapplied/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 90%
rename from patches/unapplied/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index abf4fad11e..46a83d3a42 100644
--- a/patches/unapplied/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -66,7 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        player.supressTrackerForLogin = true;
 +        worldserver1.addNewPlayer(player);
 +        this.server.getCustomBossEvents().onPlayerConnect(player); // see commented out section below worldserver.addPlayerJoin(entityplayer);
-+        mountSavedVehicle(player, worldserver1, nbttagcompound);
++        this.mountSavedVehicle(player, worldserver1, optional);
 +        // Paper end - Fire PlayerJoinEvent when Player is actually ready
          // CraftBukkit start
          CraftPlayer bukkitPlayer = player.getBukkitEntity();
@@ -79,19 +79,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        ((ServerLevel)player.level()).getChunkSource().chunkMap.addEntity(player); // Paper - Fire PlayerJoinEvent when Player is actually ready; track entity now
          // CraftBukkit end
  
-         player.getEntityData().refresh(player); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+         player.refreshEntityData(player); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
-             playerconnection.send(new ClientboundUpdateMobEffectPacket(player.getId(), mobeffect));
-         }
  
+             playerconnection.send(new ClientboundUpdateMobEffectPacket(player.getId(), mobeffect, false));
+         }
+-
 +        // Paper start - Fire PlayerJoinEvent when Player is actually ready; move vehicle into method so it can be called above - short circuit around that code
-+        onPlayerJoinFinish(player, worldserver1, s1);
++        this.onPlayerJoinFinish(player, worldserver1, s1);
 +    }
-+    private void mountSavedVehicle(ServerPlayer player, ServerLevel worldserver1, CompoundTag nbttagcompound) {
++    private void mountSavedVehicle(ServerPlayer player, ServerLevel worldserver1, Optional<CompoundTag> optional) {
 +        // Paper end - Fire PlayerJoinEvent when Player is actually ready
-         if (nbttagcompound != null && nbttagcompound.contains("RootVehicle", 10)) {
-             CompoundTag nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
-             // CraftBukkit start
+         if (optional.isPresent() && ((CompoundTag) optional.get()).contains("RootVehicle", 10)) {
+             CompoundTag nbttagcompound = ((CompoundTag) optional.get()).getCompound("RootVehicle");
+             ServerLevel finalWorldServer = worldserver1; // CraftBukkit - decompile error
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
              }
          }
diff --git a/patches/unapplied/server/Fix-items-not-falling-correctly.patch b/patches/server/Fix-items-not-falling-correctly.patch
similarity index 98%
rename from patches/unapplied/server/Fix-items-not-falling-correctly.patch
rename to patches/server/Fix-items-not-falling-correctly.patch
index c1c7332b8f..03cde16b4d 100644
--- a/patches/unapplied/server/Fix-items-not-falling-correctly.patch
+++ b/patches/server/Fix-items-not-falling-correctly.patch
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            if (!this.onGround() || this.getDeltaMovement().horizontalDistanceSqr() > 9.999999747378752E-6D || (this.tickCount + this.getId()) % 4 == 0) {
 +            if (!this.onGround() || this.getDeltaMovement().horizontalDistanceSqr() > 9.999999747378752E-6D || (this.tickCount + this.getId()) % 4 == 0) { // Paper - Diff on change
                  this.move(MoverType.SELF, this.getDeltaMovement());
-                 float f1 = 0.98F;
+                 float f = 0.98F;
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
diff --git a/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 93%
rename from patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch
index 04f949512e..c75ff17741 100644
--- a/patches/unapplied/server/Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class ChunkStorage implements AutoCloseable {
      }
  
-     public void write(ChunkPos chunkPos, CompoundTag nbt) {
+     public CompletableFuture<Void> write(ChunkPos chunkPos, CompoundTag nbt) {
 +        // Paper start - guard against serializing mismatching coordinates
 +        if (nbt != null && !chunkPos.equals(ChunkSerializer.getChunkCoordinate(nbt))) {
 +            final String world = (this instanceof net.minecraft.server.level.ChunkMap) ? ((net.minecraft.server.level.ChunkMap) this).level.getWorld().getName() : null;
@@ -46,6 +46,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                + " but compound says coordinate is " + ChunkSerializer.getChunkCoordinate(nbt) + (world == null ? " for an unknown world" : (" for world: " + world)));
 +        }
 +        // Paper end - guard against serializing mismatching coordinates
-         this.worker.store(chunkPos, nbt);
-         if (this.legacyStructureHandler != null) {
-             this.legacyStructureHandler.removeIndex(chunkPos.toLong());
+         this.handleLegacyStructureIndex(chunkPos);
+         return this.worker.store(chunkPos, nbt);
+     }
diff --git a/patches/unapplied/server/Implement-Player-Client-Options-API.patch b/patches/server/Implement-Player-Client-Options-API.patch
similarity index 99%
rename from patches/unapplied/server/Implement-Player-Client-Options-API.patch
rename to patches/server/Implement-Player-Client-Options-API.patch
index 24889d082b..ff929c7fa0 100644
--- a/patches/unapplied/server/Implement-Player-Client-Options-API.patch
+++ b/patches/server/Implement-Player-Client-Options-API.patch
@@ -91,14 +91,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
+         this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
-         this.setMaxUpStep(1.0F);
          // this.fudgeSpawnLocation(world); // Paper - Don't move existing players to world spawn
 -        this.updateOptions(clientOptions);
 +        this.updateOptionsNoEvents(clientOptions); // Paper - don't call options events on login
+         this.object = null;
  
          this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
- 
 @@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
          }
      }
diff --git a/patches/unapplied/server/Improve-Block-breakNaturally-API.patch b/patches/server/Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/unapplied/server/Improve-Block-breakNaturally-API.patch
rename to patches/server/Improve-Block-breakNaturally-API.patch
diff --git a/patches/unapplied/server/Improve-java-version-check.patch b/patches/server/Improve-java-version-check.patch
similarity index 100%
rename from patches/unapplied/server/Improve-java-version-check.patch
rename to patches/server/Improve-java-version-check.patch
diff --git a/patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/unapplied/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/unapplied/server/Make-the-GUI-graph-fancier.patch b/patches/server/Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/unapplied/server/Make-the-GUI-graph-fancier.patch
rename to patches/server/Make-the-GUI-graph-fancier.patch
diff --git a/patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/unapplied/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/unapplied/server/Optimise-Chunk-getFluid.patch b/patches/server/Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/unapplied/server/Optimise-Chunk-getFluid.patch
rename to patches/server/Optimise-Chunk-getFluid.patch
diff --git a/patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 100%
rename from patches/unapplied/server/Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 88%
rename from patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
index b90e61c4f6..b60ce28e8f 100644
--- a/patches/unapplied/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -43,12 +43,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            if (playerchunk == null) {
 -                return null;
 -            } else {
--                Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure> either = (Either) playerchunk.getFutureIfPresent(ChunkStatus.FULL).getNow(null); // CraftBukkit - decompile error
+-                ChunkResult<ChunkAccess> chunkresult = (ChunkResult) playerchunk.getFutureIfPresent(ChunkStatus.FULL).getNow(null); // CraftBukkit - decompile error
 -
--                if (either == null) {
+-                if (chunkresult == null) {
 -                    return null;
 -                } else {
--                    ChunkAccess ichunkaccess1 = (ChunkAccess) either.left().orElse(null); // CraftBukkit - decompile error
+-                    ChunkAccess ichunkaccess1 = (ChunkAccess) chunkresult.orElse(null); // CraftBukkit - decompile error
 -
 -                    if (ichunkaccess1 != null) {
 -                        this.storeInCache(k, ichunkaccess1, ChunkStatus.FULL);
diff --git a/patches/unapplied/server/Optimize-Pathfinding.patch b/patches/server/Optimize-Pathfinding.patch
similarity index 92%
rename from patches/unapplied/server/Optimize-Pathfinding.patch
rename to patches/server/Optimize-Pathfinding.patch
index 327e70e688..27e69b0138 100644
--- a/patches/unapplied/server/Optimize-Pathfinding.patch
+++ b/patches/server/Optimize-Pathfinding.patch
@@ -19,6 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private int pathfindFailures = 0;
 +    // Paper end - Perf: Optimise pathfinding
 +
+     public boolean moveTo(double x, double y, double z, int distance, double speed) {
+         return this.moveTo(this.createPath(x, y, z, distance), speed);
+     }
+ 
      public boolean moveTo(Entity entity, double speed) {
 +        // Paper start - Perf: Optimise pathfinding
 +        if (this.pathfindFailures > 10 && this.path == null && net.minecraft.server.MinecraftServer.currentTick < this.lastFailure + 40) {
diff --git a/patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch b/patches/server/Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/unapplied/server/Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/unapplied/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch b/patches/server/PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/unapplied/server/PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 94%
rename from patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 2a118f6f55..d3642f9353 100644
--- a/patches/unapplied/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -34,9 +34,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
 -            ServerLevel.this.getChunkSource().addEntity(entity);
 +            // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
-             if (entity instanceof ServerPlayer) {
-                 ServerPlayer entityplayer = (ServerPlayer) entity;
- 
+             if (entity instanceof ServerPlayer entityplayer) {
+                 ServerLevel.this.players.add(entityplayer);
+                 ServerLevel.this.updateSleepingPlayerList();
 @@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
diff --git a/patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch b/patches/server/Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch b/patches/server/Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-opening-inventories-when-frozen.patch
rename to patches/server/Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/unapplied/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/unapplied/server/Reduce-Either-Optional-allocation.patch b/patches/server/Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/unapplied/server/Reduce-Either-Optional-allocation.patch
rename to patches/server/Reduce-Either-Optional-allocation.patch
diff --git a/patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/unapplied/server/Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/unapplied/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/unapplied/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 98%
rename from patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch
index 9bf8a918cc..57fde8c242 100644
--- a/patches/unapplied/server/Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -30,4 +30,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end - Show blockstate location if we failed to read it
      }
  
-     protected CraftBlockEntityState(CraftBlockEntityState<T> state) {
+     protected CraftBlockEntityState(CraftBlockEntityState<T> state, Location location) {
diff --git a/patches/unapplied/server/Tracking-Range-Improvements.patch b/patches/server/Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/unapplied/server/Tracking-Range-Improvements.patch
rename to patches/server/Tracking-Range-Improvements.patch
diff --git a/patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch b/patches/server/Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/unapplied/server/Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/unapplied/server/add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/unapplied/server/offset-item-frame-ticking.patch b/patches/server/offset-item-frame-ticking.patch
similarity index 100%
rename from patches/unapplied/server/offset-item-frame-ticking.patch
rename to patches/server/offset-item-frame-ticking.patch
diff --git a/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch
deleted file mode 100644
index 5a55ae6426..0000000000
--- a/patches/unapplied/server/Fix-items-vanishing-through-end-portal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AJMFactsheets <AJMFactsheets@gmail.com>
-Date: Wed, 22 Jan 2020 19:52:28 -0600
-Subject: [PATCH] Fix items vanishing through end portal
-
-If the Paper configuration option "keep-spawn-loaded" is set to false,
-items entering the overworld from the end will spawn at Y = 0.
-
-This is due to logic in the getHighestBlockYAt method in World.java
-only searching the heightmap if the chunk is loaded.
-
-Quickly loading the exact world spawn chunk before searching the
-heightmap resolves the issue without having to load all spawn chunks.
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-             if (flag1) {
-                 blockposition1 = ServerLevel.END_SPAWN_POINT;
-             } else {
-+                destination.getChunkAt(destination.getSharedSpawnPos()); // Paper - Ensure spawn chunk is always loaded before calculating Y coordinate
-                 blockposition1 = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, destination.getSharedSpawnPos());
-             }
-             // CraftBukkit start
diff --git a/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch
deleted file mode 100644
index 94b66446c2..0000000000
--- a/patches/unapplied/server/Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Fri, 17 Jan 2020 18:44:55 -0800
-Subject: [PATCH] Fix last firework in stack not having effects when dispensed
-
-CB used the resulting item in the dispenser rather than the item
-dispensed. The resulting item would have size == 0 and therefore
-be convertered to air, hence why the effects disappeared.
-
-diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -0,0 +0,0 @@ public interface DispenseItemBehavior {
- 
-                 itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
-                 Vec3 vec3d = DispenseItemBehavior.getEntityPokingOutOfBlockPos(pointer, EntityType.FIREWORK_ROCKET, enumdirection);
--                FireworkRocketEntity entityfireworks = new FireworkRocketEntity(pointer.level(), stack, vec3d.x(), vec3d.y(), vec3d.z(), true);
-+                FireworkRocketEntity entityfireworks = new FireworkRocketEntity(pointer.level(), itemstack1, vec3d.x(), vec3d.y(), vec3d.z(), true); // Paper - GH-2871 - fix last firework in stack having no effects when dispensed
- 
-                 entityfireworks.shoot((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), 0.5F, 1.0F);
-                 pointer.level().addFreshEntity(entityfireworks);