diff --git a/patches/unapplied/api/Add-GS4-Query-event.patch b/patches/api/Add-GS4-Query-event.patch
similarity index 100%
rename from patches/unapplied/api/Add-GS4-Query-event.patch
rename to patches/api/Add-GS4-Query-event.patch
diff --git a/patches/unapplied/api/Add-PlayerPostRespawnEvent.patch b/patches/api/Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/unapplied/api/Add-PlayerPostRespawnEvent.patch
rename to patches/api/Add-PlayerPostRespawnEvent.patch
diff --git a/patches/unapplied/api/Entity-getEntitySpawnReason.patch b/patches/api/Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/unapplied/api/Entity-getEntitySpawnReason.patch
rename to patches/api/Entity-getEntitySpawnReason.patch
diff --git a/patches/unapplied/server/Entity-getEntitySpawnReason.patch b/patches/server/Entity-getEntitySpawnReason.patch
similarity index 96%
rename from patches/unapplied/server/Entity-getEntitySpawnReason.patch
rename to patches/server/Entity-getEntitySpawnReason.patch
index 92fe9de579..0d6bafc0ec 100644
--- a/patches/unapplied/server/Entity-getEntitySpawnReason.patch
+++ b/patches/server/Entity-getEntitySpawnReason.patch
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              ServerLevel finalWorldServer = worldserver1;
              Entity entity = EntityType.loadEntityRecursive(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
 -                return !finalWorldServer.addWithUUID(entity1) ? null : entity1;
-+                return !finalWorldServer.addEntitySerialized(entity1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity1; // Paper
++                return !finalWorldServer.addWithUUID(entity1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT) ? null : entity1; // Paper
                  // CraftBukkit end
              });
  
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import net.minecraft.world.entity.item.ItemEntity;
  import net.minecraft.world.entity.player.Player;
  import net.minecraft.world.entity.vehicle.Boat;
-@@ -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
              }
          }
      };
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // Paper end
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-@@ -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
                  }
                  nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbt.putBoolean("Paper.FromMobSpawner", true);
-@@ -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
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/unapplied/server/Fire-event-on-GS4-query.patch b/patches/server/Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/unapplied/server/Fire-event-on-GS4-query.patch
rename to patches/server/Fire-event-on-GS4-query.patch
diff --git a/patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch b/patches/server/Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/unapplied/server/Implement-PlayerPostRespawnEvent.patch
rename to patches/server/Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/unapplied/server/Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from patches/unapplied/server/Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/Update-entity-Metadata-for-all-tracked-players.patch