diff --git a/patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/unapplied/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch b/patches/api/Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/unapplied/api/Expose-LivingEntity-hurt-direction.patch
rename to patches/api/Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch b/patches/api/Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/unapplied/api/Player-Chunk-Load-Unload-Events.patch
rename to patches/api/Player-Chunk-Load-Unload-Events.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/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.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/MC-4-Fix-item-position-desync.patch b/patches/server/MC-4-Fix-item-position-desync.patch
similarity index 92%
rename from patches/unapplied/server/MC-4-Fix-item-position-desync.patch
rename to patches/server/MC-4-Fix-item-position-desync.patch
index ec65fc5778..d0b7dd89e7 100644
--- a/patches/unapplied/server/MC-4-Fix-item-position-desync.patch
+++ b/patches/server/MC-4-Fix-item-position-desync.patch
@@ -13,15 +13,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
-     private static void trackPluginScoreboards() {
          trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
      }
-+
+ 
 +    public static boolean fixEntityPositionDesync = true;
 +    private static void fixEntityPositionDesync() {
 +        fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync);
 +    }
- }
++
+     public static void registerCommands() {
+         for (Map.Entry<String, Command> entry : commands.entrySet()) {
+             MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java
@@ -44,7 +46,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, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
          // Paper end
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 94%
rename from patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
rename to patches/server/Player-Chunk-Load-Unload-Events.patch
index 82f0517429..bb7f35fb37 100644
--- a/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/Player-Chunk-Load-Unload-Events.patch
@@ -9,8 +9,8 @@ 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 {
-     public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket, Packet<?> lightUpdatePacket) {
-         this.connection.send(lightUpdatePacket);
+ 
+     public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
          this.connection.send(chunkDataPacket);
 +        // Paper start
 +        if(io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0){