It compiles

patches/server/0014-Timings-v2.patch

@@ -1031,7 +1031,7 @@ index 770f6a08c613093577172385549df8040ded627b..c1bb511cc25ca97282ee02d2b207e294
 
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 7cacfceed5ef9276a19123a8a9079579423d03ac..d62f6ef628f591e4362c4aa7db9d38fa2304af4c 100644
+index 7cacfceed5ef9276a19123a8a9079579423d03ac..6c33eefffad236b8c43bad891b3a3ec09e2d083a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -413,13 +413,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -1094,7 +1094,16 @@ index 7cacfceed5ef9276a19123a8a9079579423d03ac..d62f6ef628f591e4362c4aa7db9d38fa
 
                  this.lastSpawnState = spawnercreature_d;
                  gameprofilerfiller.popPush("spawnAndTick");
-@@ -728,13 +735,17 @@ public class ServerChunkCache extends ChunkSource {
+@@ -719,22 +726,24 @@ public class ServerChunkCache extends ChunkSource {
+                         }
+
+                         if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) {
+-                            this.level.timings.doTickTiles.startTiming(); // Spigot
+                             this.level.tickChunk(chunk1, l);
+-                            this.level.timings.doTickTiles.stopTiming(); // Spigot
+                         }
+                     }
+                 }
 
                  gameprofilerfiller.popPush("customSpawners");
                  if (flag) {

patches/server/0015-Rewrite-dataconverter-system.patch

@@ -24896,10 +24896,18 @@ index e534dac9d69147174f6b9e8ce7f27fde536351ce..270fd52ec733c89bd91155c8222936fa
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-index 836bcea1c6a9de29b4a248220331f3a8c697204d..ff33031e59db6f9a4a11c7877f97615ef00a5a27 100644
+index 836bcea1c6a9de29b4a248220331f3a8c697204d..423405e34fc052e6c068d616c1aaedd8ab72ba94 100644
 --- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
 +++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-@@ -290,10 +290,10 @@ public class LevelStorageSource {
+@@ -5,6 +5,7 @@ import com.mojang.datafixers.DataFixer;
+ import com.mojang.logging.LogUtils;
+ import com.mojang.serialization.DataResult;
+ import com.mojang.serialization.Dynamic;
++import com.mojang.serialization.DynamicOps;
+ import com.mojang.serialization.Lifecycle;
+ import java.io.BufferedOutputStream;
+ import java.io.BufferedReader;
+@@ -290,10 +291,10 @@ public class LevelStorageSource {
      static Dynamic<?> readLevelDataTagFixed(Path path, DataFixer dataFixer) throws IOException {
          CompoundTag nbttagcompound = LevelStorageSource.readLevelDataTagRaw(path);
          CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Data");
@@ -24908,10 +24916,23 @@ index 836bcea1c6a9de29b4a248220331f3a8c697204d..ff33031e59db6f9a4a11c7877f97615e
          Dynamic<?> dynamic = DataFixTypes.LEVEL.updateToCurrentVersion(dataFixer, new Dynamic(NbtOps.INSTANCE, nbttagcompound1), i);
          Dynamic<?> dynamic1 = dynamic.get("Player").orElseEmptyMap();
 -        Dynamic<?> dynamic2 = DataFixTypes.PLAYER.updateToCurrentVersion(dataFixer, dynamic1, i);
-+        Dynamic<?> dynamic2 = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, dynamic1, version, SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper
++        Dynamic<?> dynamic2 = LevelStorageSource.dank(dynamic1, version); // Paper
 
          dynamic = dynamic.set("Player", dynamic2);
          Dynamic<?> dynamic3 = dynamic.get("WorldGenSettings").orElseEmptyMap();
+@@ -303,6 +304,12 @@ public class LevelStorageSource {
+         return dynamic;
+     }
+
++    // Paper start
++    private static <T> Dynamic<T> dank(final Dynamic<T> input, final int version) {
++        return new Dynamic<>(input.getOps(), (T) ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, (CompoundTag)input.getValue(), version, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion()));
++    }
++    // Paper end
++
+     private LevelSummary readLevelSummary(LevelStorageSource.LevelDirectory save, boolean locked) {
+         Path path = save.dataFile();
+
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 index 8292978e1386c55d99241c3ee2ead3440b9e2570..3d74ffc6e38b0dbe7ca6d8d84a63f78d6b1908a7 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java

patches/server/0018-Rewrite-chunk-system.patch

@@ -19101,7 +19101,7 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..942042863f0105769c15b865d4d98a09
 +    */ // Paper - rewrite chunk system
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08e81a6b65 100644
+index 6c33eefffad236b8c43bad891b3a3ec09e2d083a..b4d36ff6b6ba72693c269929b84c5481949f13fd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -139,108 +139,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -19498,7 +19498,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08
              this.tickChunks();
              this.level.timings.chunks.stopTiming(); // Paper - timings
              this.chunkMap.tick();
-@@ -756,7 +603,12 @@ public class ServerChunkCache extends ChunkSource {
+@@ -754,7 +601,12 @@ public class ServerChunkCache extends ChunkSource {
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
 
          if (playerchunk != null) {
@@ -19512,7 +19512,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08
          }
 
      }
-@@ -922,17 +774,10 @@ public class ServerChunkCache extends ChunkSource {
+@@ -920,17 +772,10 @@ public class ServerChunkCache extends ChunkSource {
          @Override
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
          public boolean pollTask() {
@@ -19532,7 +19532,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08
      }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..51f0705499003ea71274e1d5c8a77306fa868485 100644
+index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..2c9f52ad948f9ee5bb20f7f8eb4a541f0b596b26 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -196,7 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -20102,6 +20102,15 @@ index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..51f0705499003ea71274e1d5c8a77306
      }
 
      @Override
+@@ -2080,7 +2329,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report);
+
+         crashreportsystemdetails.setDetail("Loaded entity count", () -> {
+-            return String.valueOf(this.entityManager.count());
++            return String.valueOf(this.entityLookup.getAllCopy().length); // Paper
+         });
+         return crashreportsystemdetails;
+     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 index b403b7d585f474e2b6029404d19e756a40206f7f..b6939932a4b8800c8751125a4a6d4dcea39110c1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java

patches/server/0064-Complete-resource-pack-API.patch

@@ -22,7 +22,7 @@ index 0a6feccc657e62d7bad5e1461d5538a4c3a16b76..53833e155cf0d2328f2c2b3670297092
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a58b0d10d73310587a05e40e072029ee258063e1..06c0f72a83de5866f4c734c0809d60446a736af6 100644
+index a58b0d10d73310587a05e40e072029ee258063e1..00b1f8c60aa2021bfae42fd7bfab3d5edb55a098 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -192,6 +192,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -58,7 +58,7 @@ index a58b0d10d73310587a05e40e072029ee258063e1..06c0f72a83de5866f4c734c0809d6044
 +        net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
 +                            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
 +                           null;
-+        this.getHandle().connection.send(new ClientboundResourcePackPacket(url, hash, required, promptComponent));
++        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(UUID.randomUUID(), url, hash, required, promptComponent));
 +    }
 +
 +    @Override

patches/server/0088-Configurable-Player-Collision.patch

@@ -43,7 +43,7 @@ index 180bcaa2b5a74c527d8556301fb4a8161c76a64c..24f7ecc68c206346e4e2957bc27bf557
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b74689297ca20efee391fe1da80377082d1758e5..34b10814b94fb3fd22f96988c74be434e41058fb 100644
+index b74689297ca20efee391fe1da80377082d1758e5..828abde34c7d883831e81b7759a862db43cfe2c6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -156,6 +156,7 @@ public abstract class PlayerList {
@@ -91,7 +91,7 @@ index b74689297ca20efee391fe1da80377082d1758e5..34b10814b94fb3fd22f96988c74be434
 
 +        // Paper start - Remove collideRule team if it exists
 +        if (this.collideRuleTeamName != null) {
-+            final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
++            final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
 +            final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName);
 +            if (team != null) scoreboard.removePlayerTeam(team);
 +        }

patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch → patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch

@@ -64,7 +64,7 @@ index 77ea9b316f186243c74cc080cc7c382ab6666a21..e91dd35a84dceae1ad9c5ede0565591e
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2bbbe256df74726b27359a217c0f0b71c32e6e2b..2dbaf34170fd2c94cd288657a84e13084f4a89b9 100644
+index 6d4099d8c9d0c2ea20b98ea3f30ac44a697ff400..8550245a088be78359b55fa0cc582df35dbbebed 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1175,8 +1175,15 @@ public abstract class PlayerList {

patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch → patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -375,7 +375,7 @@ index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09a
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2dbaf34170fd2c94cd288657a84e13084f4a89b9..486e9e3dca76c047753b87927735c98698d5ca5a 100644
+index 8550245a088be78359b55fa0cc582df35dbbebed..ea7effdb4274c7e2c19d737a74b1fc5847b9888c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -160,8 +160,7 @@ public abstract class PlayerList {

patches/server/0148-ProfileWhitelistVerifyEvent.patch → patches/server/0147-ProfileWhitelistVerifyEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 486e9e3dca76c047753b87927735c98698d5ca5a..3564d97af63494ede27941b63a7255239fa8a126 100644
+index ea7effdb4274c7e2c19d737a74b1fc5847b9888c..6e0a21935f9d5f35cbce72b32e0a89bb636804e2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -631,9 +631,9 @@ public abstract class PlayerList {

patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch → patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch

@@ -90,7 +90,7 @@ index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe3
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b8734cda9d1384d929795f69de36887acafd698..34d9f11430ac8502774458fe02118a5c5ca49b44 100644
+index 28f71ea4234e122e28d65ffa66c3684f3a2857b4..2c31e9052e3b18177660ad9befc6fcd24085da88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -295,6 +295,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch → patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c6e56303ec8ee466a6de7e6bd76c4f6814e8db30..35b6e7a0cf8ec57763858fa8e4f287769271a85b 100644
+index c6e56303ec8ee466a6de7e6bd76c4f6814e8db30..2dad35f00a98be534db1da1a38a6865e41a1a94d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -816,6 +816,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          boolean flag = this.tickRateManager().runsNormally();
 
          int tilesThisCycle = 0;
-+        var toRemove = new it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet<TickingBlockEntity>(net.minecraft.Util.identityStrategy()); // Paper - use removeAll
++        var toRemove = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<TickingBlockEntity>(); // Paper - use removeAll
 +        toRemove.add(null);
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;

patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch → patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch

@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 35b6e7a0cf8ec57763858fa8e4f287769271a85b..82cd225802ecc518c34426c010525192ef544f34 100644
+index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c0e5162bb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0168-Ability-to-apply-mending-to-XP-API.patch → patches/server/0167-Ability-to-apply-mending-to-XP-API.patch

@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 34d9f11430ac8502774458fe02118a5c5ca49b44..168c1d20320f23182ff2de519d28e8401f12b6b3 100644
+index 2c31e9052e3b18177660ad9befc6fcd24085da88..a5014c7a0cb6329edd919c7fafed8ec396b23c36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1549,7 +1549,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch → patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch

@@ -40,7 +40,7 @@ index e580df88baadfd943756b1e440c7253a287fa0e9..ea520b828378c268d05425096c6493ca
 
              return true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index fe4fc7792ac1bfcde0980884a6369d08e81a6b65..d30373d369049827b5b7611d35c8b7fc8fc08d23 100644
+index b4d36ff6b6ba72693c269929b84c5481949f13fd..058b4e79ac861e772e828b92aacffba7efe4bb7e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -557,6 +557,15 @@ public class ServerChunkCache extends ChunkSource {

patches/server/0181-Player.setPlayerProfile-API.patch → patches/server/0180-Player.setPlayerProfile-API.patch

@@ -55,7 +55,7 @@ index 477d3245facb5ae59c786d4f696f64226cb540a6..e8490a58dd4d9bc39a5bb2f9fc109526
 
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 168c1d20320f23182ff2de519d28e8401f12b6b3..22ed227ba141ffd232aed49ca673348f452d3983 100644
+index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfaae4691a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -278,11 +278,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0186-Flag-to-disable-the-channel-limit.patch → patches/server/0185-Flag-to-disable-the-channel-limit.patch

@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 22ed227ba141ffd232aed49ca673348f452d3983..f93e5812cc239ff69d22a53ac52be2c71203ad07 100644
+index 4e72258af26918dc9a9ab5afcb70acfaae4691a2..43e577dc39db6e9b373db0e67dc72e770150339b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -195,6 +195,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0191-Block-Enderpearl-Travel-Exploit.patch → patches/server/0190-Block-Enderpearl-Travel-Exploit.patch

@@ -16,7 +16,7 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 98ea55455d365b8d25ecb998daacbcbb1b45e5a7..146320ce5e9de7e4b081afca54c0c8aa45e6cfe4 100644
+index 5f6bd432566c4e437d7580e465b52b49bdfc057d..6c03c96adfa68b1817423d012affa5b3952ade04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2356,6 +2356,12 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch → patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 146320ce5e9de7e4b081afca54c0c8aa45e6cfe4..ac331aef54f9e595129bded04ff6d9c7b8b7d5b0 100644
+index 6c03c96adfa68b1817423d012affa5b3952ade04..e024c296f471737764af260ca4cd7e9005e044ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1738,12 +1738,17 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch → patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch

@@ -9,7 +9,7 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ba96a1c657d4e81076536d0d6432e4d6584bda2c..0141b58ed74234a63820b6557687a24611d463be 100644
+index 451ba2db54dc1682924fa65283bc88687157322e..d47ada5544478dcfcb49f6b437e634105397fdfe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1907,8 +1907,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S