diff --git a/versions/24w04a/patches/net/minecraft/commands/Commands.java.patch b/versions/24w04a/patches/net/minecraft/commands/Commands.java.patch
index 983fb26..aaa8714 100644
--- a/versions/24w04a/patches/net/minecraft/commands/Commands.java.patch
+++ b/versions/24w04a/patches/net/minecraft/commands/Commands.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -369,7 +_,7 @@
+@@ -371,7 +_,7 @@
      ) {
          for (CommandNode<CommandSourceStack> commandNode : rootCommandSource.getChildren()) {
              if (commandNode.canUse(source)) {
diff --git a/versions/24w04a/patches/net/minecraft/core/RegistrySynchronization.java.patch b/versions/24w04a/patches/net/minecraft/core/RegistrySynchronization.java.patch
deleted file mode 100644
index 9e89927..0000000
--- a/versions/24w04a/patches/net/minecraft/core/RegistrySynchronization.java.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/net/minecraft/core/RegistrySynchronization.java
-+++ b/net/minecraft/core/RegistrySynchronization.java
-@@ -48,7 +_,7 @@
- 
-     private static <E> DataResult<? extends Codec<E>> getNetworkCodec(ResourceKey<? extends Registry<E>> registryKey) {
-         return Optional.ofNullable(NETWORKABLE_REGISTRIES.get(registryKey))
--            .map(registryData -> registryData.networkCodec())
-+            .map(registryData -> (Codec<E>) registryData.networkCodec())
-             .map(DataResult::success)
-             .orElseGet(() -> DataResult.error(() -> "Unknown or not serializable registry: " + registryKey));
-     }
-@@ -69,7 +_,7 @@
-         return mapCodec.xmap(
-             RegistryAccess.ImmutableRegistryAccess::new,
-             registryAccess -> ownedNetworkableRegistries(registryAccess)
--                    .collect(ImmutableMap.toImmutableMap(registryEntry -> registryEntry.key(), registryEntry -> registryEntry.value()))
-+                    .collect(ImmutableMap.toImmutableMap(registryEntry -> (K) registryEntry.key(), registryEntry -> (V) registryEntry.value()))
-         );
-     }
- 
diff --git a/versions/24w04a/patches/net/minecraft/server/MinecraftServer.java.patch b/versions/24w04a/patches/net/minecraft/server/MinecraftServer.java.patch
index fc0fa4d..a01e08e 100644
--- a/versions/24w04a/patches/net/minecraft/server/MinecraftServer.java.patch
+++ b/versions/24w04a/patches/net/minecraft/server/MinecraftServer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -787,7 +_,7 @@
+@@ -829,7 +_,7 @@
      }
  
      @Override
diff --git a/versions/24w04a/patches/net/minecraft/server/level/ServerLevel.java.patch b/versions/24w04a/patches/net/minecraft/server/level/ServerLevel.java.patch
index e4a65ae..9b550c3 100644
--- a/versions/24w04a/patches/net/minecraft/server/level/ServerLevel.java.patch
+++ b/versions/24w04a/patches/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1554,7 +_,7 @@
+@@ -1558,7 +_,7 @@
  
              return map.object2IntEntrySet()
                  .stream()
diff --git a/versions/24w04a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch b/versions/24w04a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
index c25db79..498a954 100644
--- a/versions/24w04a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
+++ b/versions/24w04a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/SpawnPlacements.java
 +++ b/net/minecraft/world/entity/SpawnPlacements.java
-@@ -68,7 +_,7 @@
+@@ -73,7 +_,7 @@
          EntityType<T> entityType, ServerLevelAccessor serverLevel, MobSpawnType spawnType, BlockPos pos, RandomSource random
      ) {
          SpawnPlacements.Data data = DATA_BY_TYPE.get(entityType);