Clean rebuild

Add to gradle build so that this is automatically done
throughout the update

build.gradle.kts

@@ -136,6 +136,11 @@ tasks.collectAtsFromPatches {
     extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
 }
 
+// Uncomment while updating for a new Minecraft version
+tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches> {
+    filterPatches.set(false)
+}
+
 tasks.register("printMinecraftVersion") {
     doLast {
         println(providers.gradleProperty("mcVersion").get().trim())

patches/api/0247-Add-StructuresLocateEvent.patch

@@ -505,7 +505,7 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 5a09d288c980eefbd69471d83aabac627b0ac0b3..6e839812b6b523ddfac06d7d3921043b972c5b7f 100644
+index 09e3c2872462da546b891cbc396aaffb77f6aadf..c21aefb63678d78a441436761373e9710c1e543a 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
 @@ -228,6 +228,15 @@ public interface Registry<T extends Keyed> extends Iterable<T> {

patches/api/0347-More-PotionEffectType-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 6e839812b6b523ddfac06d7d3921043b972c5b7f..3d55f1a6c71a8f9281906f034fb8af087005c8f0 100644
+index c21aefb63678d78a441436761373e9710c1e543a..1d96ed754be09b52a518967c870eba05bb3e99ee 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
 @@ -236,6 +236,26 @@ public interface Registry<T extends Keyed> extends Iterable<T> {

patches/server/0006-MC-Dev-fixes.patch

@@ -133,7 +133,7 @@ index 2dc801061025888192c3bf2c4c38b928c16a0165..ca788f0dcec4a117b410fe8348969e05
  
      public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..5e3c750b2ce30b4c89143c5dfbb7a90e861f169f 100644
+index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..40cdff9eaa1e78e02060d970e477d96f960cfed3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -151,7 +151,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider

patches/server/0008-CB-fixes.patch

@@ -45,7 +45,7 @@ index 299d0755b782a26af6c6acc00e3d8ab0269348a9..70791a052c1ec8f41d7f1e65c33eee4f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 5e3c750b2ce30b4c89143c5dfbb7a90e861f169f..1769045a053f7f4576099fb21686d84b682194f5 100644
+index 40cdff9eaa1e78e02060d970e477d96f960cfed3..c853123c451c41beb42209c7edc14a5dcffa2a50 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -446,9 +446,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider

patches/server/0011-Paper-command.patch

@@ -615,7 +615,7 @@ index 2ac30ef2dd72582f2b7f6a05b1f94b12b44fafc9..a01d423f44b3e547b4fa4d6654f9df63
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 19fdfbe49108b1e757ed89d995f5440815c51311..6024046b18027e7db68280b957e964605a9854a7 100644
+index 7d95f4e919f46fd415a3cf88b1bb7c163c5065ec..182c3a3852726172dfe97f2b989323001c6efad8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -927,6 +927,7 @@ public final class CraftServer implements Server {

patches/server/0013-Paper-Plugins.patch

@@ -6974,7 +6974,7 @@ index 35e7f8e7b19c217fa5f3f55abb0f8b9cd6b16f18..72c2f0bf9434e09a0dd51294d3a2200f
              Bootstrap.validate();
              Util.startTimerHackThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6024046b18027e7db68280b957e964605a9854a7..5acdd3253a33d9c9f5e1af955b6e1dc072f77858 100644
+index 182c3a3852726172dfe97f2b989323001c6efad8..1dc5dc35830437a8511b6fbaf96201ea7228aa59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -269,7 +269,8 @@ public final class CraftServer implements Server {

patches/server/0014-Timings-v2.patch

@@ -1317,7 +1317,7 @@ index a1b9a2eeba2febef1b568a4c5aea99829210dbe1..403f7c7f31e0072b0cad0706bc981ece
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e65c889dd1a84a1a8959d1cb80a8c233c3600a6f..b0fc8e4f369d656f90500ea3d64ceb27909b82ef 100644
+index ae2c702955a60a38c48b5fce43b4edb19284b82c..90c73b9075489242556a7ba749618e20c0ed0c4d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1586,7 +1586,7 @@ index c02fa35cefc9194d1838abbe4f2dc2b226a41e41..b300d12e9e00519028b53aca9c3fb01f
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 5aa89166e854136f366eb36ff02a37ae9ba77ab1..6e1ace21431f679d55a2580dc23c32cf5f75b2af 100644
+index e4deb276f956c5f292ab8bf7836eeeffd6ed59d5..4185d524f61e87a469d563c938f742f63dad3c2f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -682,6 +682,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1632,7 +1632,7 @@ index 0eb09ce5c850d85ffd7229d27cf06b3e0edda11b..cc1d7626a82881c4410d65c6a33dadae
          };
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5acdd3253a33d9c9f5e1af955b6e1dc072f77858..1b6ca18237de5f154a1b0ddaea34347869fa637e 100644
+index 1dc5dc35830437a8511b6fbaf96201ea7228aa59..e982442204972e140f0e5ebac777a931ea7394e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -369,7 +369,7 @@ public final class CraftServer implements Server {
@@ -1846,7 +1846,7 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2118aac177923da4239ccd926af0daab87268bc8..ebe5ed6ec66ec5f0979c8ff2998a9d6c1539b2fe 100644
+index 8beafda74a1e1c274906ba91a6f93ac8b5c85437..5afdada0d56c2f9af431ea6485faa277229befa9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2522,6 +2522,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0018-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b6ca18237de5f154a1b0ddaea34347869fa637e..1aeff8d9ff446369dbcae30bcff26f94f7af0a25 100644
+index e982442204972e140f0e5ebac777a931ea7394e2..7912cf0e4cab7d6c99106d43b2cdc4f4e80aebac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -423,6 +423,35 @@ public final class CraftServer implements Server {

patches/server/0026-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -19,7 +19,7 @@ index 96897d883671e018bae5f71545c5f7af205e309c..ff3073b6780c04f5f11b5384bb6b6289
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1aeff8d9ff446369dbcae30bcff26f94f7af0a25..57685febc623e99c752cd7536f666fedd3e13df8 100644
+index 7912cf0e4cab7d6c99106d43b2cdc4f4e80aebac..a79ae43bffcd23b5639cdc179f129b1879a5a779 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -260,7 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;

patches/server/0029-Player-affects-spawning-API.patch

@@ -60,7 +60,7 @@ index 1d1bd8c8088e9dfbcbd7e9d2971b6241614fc5d6..d99923c355e50bfa4682dd147d83dd1c
              return false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 41e4903b4feb860309510f8f4ff89a4e3710b395..d07e321a3836a15058f11c88cc0deedb124bb407 100644
+index b32e55685d2a3f571828ed3cf69cb985ccaaa931..86dc8bdfdc4eabef2266f3409366b373fb0ae13d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -325,7 +325,7 @@ public class Zombie extends Monster {

patches/server/0030-Further-improve-server-tick-loop.patch

@@ -139,7 +139,7 @@ index ff3073b6780c04f5f11b5384bb6b6289eafd0c4f..2aeeffe6d011a1ecc848b80f0236c8a3
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57685febc623e99c752cd7536f666fedd3e13df8..1e601581d7b6bb59ccec3c0b4a87747ec6c64f84 100644
+index a79ae43bffcd23b5639cdc179f129b1879a5a779..17056a7ea6c6a3a671872d2be603d7dd60ae04e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2437,6 +2437,17 @@ public final class CraftServer implements Server {

patches/server/0031-Only-refresh-abilities-if-needed.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e68f0f2cde8ab40087bf26b93d053c2a0a49436c..40e48c6ae95db4eb6241a7613a09597943fad200 100644
+index 1098c95f8f27e0ff3cf593a4f0dfde0dbe4d3152..f4ec1141f13135286077875177de672905c8898a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1838,12 +1838,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0032-Entity-Origin-API.patch

@@ -94,7 +94,7 @@ index f668a80c6bff67bf766207985c1af73f09e1bd1c..06d8211ef27a21da66d4622795cbcc8b
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 2905556cbb4715b0dcbaab54222e76669ce0e81d..6634c0b15213f2c50cfd0f5dde9d5fb8151a3570 100644
+index 93e5e8294b6571a355432e728f7dd49ddcf70d3e..26ef917d401eb79466e246d82b5d689c7133c7a2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -341,6 +341,14 @@ public class FallingBlockEntity extends Entity {

patches/server/0039-Optimize-explosions.patch

@@ -120,7 +120,7 @@ index e360022498b91a8371b33d84bf6fff96c503999d..925d37ca684e7e6a3ad88e6e040f3599
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 05e8f34044241ce9b6c1afa4f90a92492d3a64b1..9ba534fe0aa464a01fc7ed5927bd190669351100 100644
+index 627f80e726f306edc765be5e6ac59ca73aade10b..0a7a354c085655c243fdf94c7dc82cdc95b3987a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0044-Implement-PlayerLocaleChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d5fda07eb5408513fa0b4bca3fa14679b2beebe7..8f8ff85199445fae3c42acdfdfe5a8c0d7344a36 100644
+index eb42e0ce8e2698973307e2b6774cbbd79c1d6457..e448641f3e64114a6ff986990fc7bdaa28736129 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1811,7 +1811,7 @@ public class ServerPlayer extends Player {
@@ -30,7 +30,7 @@ index d5fda07eb5408513fa0b4bca3fa14679b2beebe7..8f8ff85199445fae3c42acdfdfe5a8c0
          this.locale = packet.language;
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 40e48c6ae95db4eb6241a7613a09597943fad200..cef936dea0592b08b1cca0482d1220ffe4b2c05a 100644
+index f4ec1141f13135286077875177de672905c8898a..484fab5eeeb92407ded625b96678c9aa93199d70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2169,8 +2169,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0046-Configurable-container-update-tick-rate.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8f8ff85199445fae3c42acdfdfe5a8c0d7344a36..d834b6570c9a45fb415afc19262c8735463c27d9 100644
+index e448641f3e64114a6ff986990fc7bdaa28736129..95d9824ad7a00e8d75ce243403004193d0bee605 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -241,6 +241,7 @@ public class ServerPlayer extends Player {

patches/server/0048-Disable-spigot-tick-limiters.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9ba534fe0aa464a01fc7ed5927bd190669351100..89e065a643eb16ccc308bcf42ea9f5d02c181a1f 100644
+index 0a7a354c085655c243fdf94c7dc82cdc95b3987a..42e81640354c2679570823347b28ee1155e7a00e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -689,9 +689,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0049-Add-PlayerInitialSpawnEvent.patch

@@ -12,7 +12,7 @@ improve setPosition to use raw
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 95ca77e276a5172b03dafddf20d3b3ff9c502cf5..233056040541993dd2c13602970c3438ee2eeba6 100644
+index 90c73b9075489242556a7ba749618e20c0ed0c4d..2a905bc0c177fb7ad5464fb99682d475f42c0c85 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -240,7 +240,7 @@ public abstract class PlayerList {

patches/server/0053-Expose-server-CommandMap.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d3254e29df8543de33923a54b78c3af027e68b71..0edef3dd3dafe59f296f7a82705ec2269e68a2d6 100644
+index 6e488fe34231afa20d0f8f62299bb631359ee51c..7681198cbc8f36b9e860182a1f3541a4b22fc82e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2012,6 +2012,7 @@ public final class CraftServer implements Server {

patches/server/0055-Player-Tab-List-and-Title-APIs.patch

@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1f69f7183b2765695446fd587527def4dd8c4c9..20daf74908ecb0c569bd92260c82d61bb5555cfd 100644
+index b8fc2196b8f77b826d229265e96b5cce1e5301cb..bd811f33bb2df565d876bc3433b1ce9ce58acba4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@

patches/server/0057-Add-velocity-warnings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0edef3dd3dafe59f296f7a82705ec2269e68a2d6..f8bb3493faf56a2e214dab9efb1c8f05b0b53fbd 100644
+index 7681198cbc8f36b9e860182a1f3541a4b22fc82e..6be92dea5f2c042a427de77b6ae5b9e45a662388 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -296,6 +296,7 @@ public final class CraftServer implements Server {

patches/server/0058-Configurable-inter-world-teleportation-safety.patch

@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 20daf74908ecb0c569bd92260c82d61bb5555cfd..2ab9fa95aecc9393a80b94a37915b4f22d83ce27 100644
+index bd811f33bb2df565d876bc3433b1ce9ce58acba4..db7063bb4dddcf485f9e57505ae2bd31ade5376e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1140,7 +1140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch

@@ -23,7 +23,7 @@ index 4d12403d8ae7c620e169e87b0a0ab48e28251811..bb8de860d826e4c92ffdbd7ef2675458
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index da488c4dbf8f6c36cb7cfa64be1645be8a7e4ecf..eb0280854b9c3bda9660a99ae7355f2874660d7a 100644
+index fcc82ba0c632362285903bcdcc6c65069419f295..a8835f87a8961dd8c32dc9b17b8656ee12c23f96 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -834,6 +834,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

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

@@ -23,7 +23,7 @@ index 42a44820a3c13e2b0e29e02ed384c1918c9a0b17..94636c92758568051f829aed59aab872
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2ab9fa95aecc9393a80b94a37915b4f22d83ce27..5fe88000bb29f5fd83ca8708b24a2c9ad2f5a562 100644
+index db7063bb4dddcf485f9e57505ae2bd31ade5376e..04e9a84b36f7f702e34216513348a0871ade22e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -178,6 +178,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0064-Default-loading-permissions.yml-before-plugins.patch

@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f8bb3493faf56a2e214dab9efb1c8f05b0b53fbd..ead12a480569aaeccc6e27f70acdce8cd27a47e8 100644
+index 6be92dea5f2c042a427de77b6ae5b9e45a662388..4edf6a317ba5ce46e098c4ce1836c147853eadb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -457,6 +457,7 @@ public final class CraftServer implements Server {

patches/server/0065-Allow-Reloading-of-Custom-Permissions.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ead12a480569aaeccc6e27f70acdce8cd27a47e8..176746f19c07b059164f4b4b3bd2ec82ec79656b 100644
+index 4edf6a317ba5ce46e098c4ce1836c147853eadb1..2fa6753e7bd9c1a6c08b467fe6d2d7ca3943f0a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2603,5 +2603,23 @@ public final class CraftServer implements Server {

patches/server/0066-Remove-Metadata-on-reload.patch

@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 176746f19c07b059164f4b4b3bd2ec82ec79656b..bc0bff6f06a74e2bb3f00fac2fdcc543bc970c2f 100644
+index 2fa6753e7bd9c1a6c08b467fe6d2d7ca3943f0a7..0953f4555bc18176f35d91754ad308143899a8a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -962,8 +962,16 @@ public final class CraftServer implements Server {

patches/server/0069-Add-World-Util-Methods.patch

@@ -19,7 +19,7 @@ index ef48e76ca18576e631d5d2f1652d3449d558a582..71be3d403dc0c345b447685fa339cb1c
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 49ef7d349e0e4b1d45611ff0a225ba94c3db2600..47f2776db17089e4e889c0a126845e1d29f2d60f 100644
+index a7fb12648c2e655e191d8c805753ae0c05421d17..5e4b102e747a053280871879c3c18fc3d3d2d18a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -342,6 +342,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0070-Custom-replacement-for-eaten-items.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index eb0280854b9c3bda9660a99ae7355f2874660d7a..571f170c7816d37ff1f082f00cab3725c660a10a 100644
+index a8835f87a8961dd8c32dc9b17b8656ee12c23f96..1238da8b035a0b0dd3d00557ca0de7a82f5fdf53 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3649,10 +3649,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0071-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 571f170c7816d37ff1f082f00cab3725c660a10a..7e3378861990034015a6796013b78d504dcb8b5e 100644
+index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4879cd510 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -795,7 +795,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -44,7 +44,7 @@ index 571f170c7816d37ff1f082f00cab3725c660a10a..7e3378861990034015a6796013b78d50
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5fe88000bb29f5fd83ca8708b24a2c9ad2f5a562..55715c017e4e08a0e3db95dea5b8ec4fd4acf00d 100644
+index 04e9a84b36f7f702e34216513348a0871ade22e5..877f82735c407c1d567628fafc7c7fd6adebb410 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2096,6 +2096,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0074-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch

@@ -29,7 +29,7 @@ index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c8624935
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 47f2776db17089e4e889c0a126845e1d29f2d60f..22285078d79690c836eb34331d4d4c40f4b85932 100644
+index 5e4b102e747a053280871879c3c18fc3d3d2d18a..dcf1894ed6939b47cd8323421d5734fd5af6dedb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -284,7 +284,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -88,7 +88,7 @@ index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc
      @Override
      public FluidState getFluidState(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 7edb17360bc0611c6a1412b868ed128c9dbcfb4f..24ded8c0900792e3f037972ae70857121ed3dde1 100644
+index 2006760ff24ec9ce5f71c107ddf942e550d03589..b7e03ac0e07a48c5d3a401a918ab6cc2a7daafec 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -295,12 +295,29 @@ public class LevelChunk extends ChunkAccess {

patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch

@@ -30,7 +30,7 @@ index 16e0887abe2643b13f7fefd986783e88d37fbdfb..5c2ca51139b0647a2c7ae1b268b6d151
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 22285078d79690c836eb34331d4d4c40f4b85932..dc84da6d6036802792cf9a31bb219cc24bb9e57b 100644
+index dcf1894ed6939b47cd8323421d5734fd5af6dedb..fc48c03fa4f3c7e2463ef2ce477ce1e71d1e3faf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -491,7 +491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0077-Configurable-Chunk-Inhabited-Time.patch

@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 24ded8c0900792e3f037972ae70857121ed3dde1..69fbe3c3815dd59af667b57b34e1247c61498c48 100644
+index b7e03ac0e07a48c5d3a401a918ab6cc2a7daafec..419125e865cb086f0ef75f69749cc03a178d9a41 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -280,6 +280,13 @@ public class LevelChunk extends ChunkAccess {

patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 45830cf2b42c2c983cef922c6355e5d6a7cfb982..951a7df30bd70bb3051c04f592529d560be6948e 100644
+index f2141c1bb4e1fd6697326b50db74f78a8367b9e4..27c63ef4fcfcf763926261cbd48c9a6e754142d6 100644
 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -19,6 +19,7 @@ import net.kyori.adventure.audience.Audience;

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

@@ -43,7 +43,7 @@ index 7fca70658ecdc89b79381ca2ab33b931ce6871ae..feee1da3091fdbcef0336ab0ab85fd9f
          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 233056040541993dd2c13602970c3438ee2eeba6..1fa3e06326a871d2d9562433c31e3b17a80fd08c 100644
+index 2a905bc0c177fb7ad5464fb99682d475f42c0c85..ebbe5fb5d22cc6a7a2f131ab8fa209ff47c0c92a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -99,6 +99,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage;

patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7e3378861990034015a6796013b78d504dcb8b5e..ad9f1b9b7adc799af751bfbd0ee6fe6d27a58851 100644
+index 5e40ee2695b7ed50fddc0e8226f0b1b4879cd510..323b3a561060eacaad37832f44d0cdb9e4a1a2dc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1292,10 +1292,16 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index dc84da6d6036802792cf9a31bb219cc24bb9e57b..9ac9a40e442a30b785ba79e015389f3308ae37c3 100644
+index fc48c03fa4f3c7e2463ef2ce477ce1e71d1e3faf..15cb9a1dc2426dd87dc4bc4961812523ed9f639f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0103-Add-setting-for-proxy-online-mode-status.patch

@@ -43,7 +43,7 @@ index da98f074ccd5a40c635824112c97fd174c393cb1..6599f874d9f97e9ef4862039ecad7277
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc0bff6f06a74e2bb3f00fac2fdcc543bc970c2f..0b9eccd6bfb90fe282a9ce48dbf6379c717ec83a 100644
+index 0953f4555bc18176f35d91754ad308143899a8a7..bbc9f231d658dfe8cb62a6c632e5373c97ac2a75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1735,7 +1735,7 @@ public final class CraftServer implements Server {

patches/server/0110-Allow-Reloading-of-Command-Aliases.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b9eccd6bfb90fe282a9ce48dbf6379c717ec83a..3d6c25424c859f63c8f4661b39c82c269c3837fb 100644
+index bbc9f231d658dfe8cb62a6c632e5373c97ac2a75..3fff803c44c013dbcc2e639a08067d7ba3576a6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2629,5 +2629,24 @@ public final class CraftServer implements Server {

patches/server/0114-Optimize-World.isLoaded-BlockPosition-Z.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9ac9a40e442a30b785ba79e015389f3308ae37c3..2bf5dffc7f392278bff9f07e97bef95ba786a916 100644
+index 15cb9a1dc2426dd87dc4bc4961812523ed9f639f..94716983899730facb74461eaa2d89c67f999643 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -343,6 +343,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0118-String-based-Action-Bar-API.patch

@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 55715c017e4e08a0e3db95dea5b8ec4fd4acf00d..2dc0233821172a91f471bf7099f2c051c11331e6 100644
+index 877f82735c407c1d567628fafc7c7fd6adebb410..1cccc331222b24ac99ad7f6897a81ecd383ce7d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -289,6 +289,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0119-Properly-fix-item-duplication-bug.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d834b6570c9a45fb415afc19262c8735463c27d9..8b35e6804aba52865bda5d9f17ca5cb8576fba6f 100644
+index 95d9824ad7a00e8d75ce243403004193d0bee605..681e351b276798e2a70010e769e6aa0ed4fdbcd5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2350,7 +2350,7 @@ public class ServerPlayer extends Player {

patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2bf5dffc7f392278bff9f07e97bef95ba786a916..3d04a9f0e9dd14e34c82c0b6225a6ee6d464ee5c 100644
+index 94716983899730facb74461eaa2d89c67f999643..f36467dbcb4c39cdc3fa6f7f690d0e1fe7db4160 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -116,7 +116,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0123-Enforce-Sync-Player-Saves.patch

@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1fa3e06326a871d2d9562433c31e3b17a80fd08c..985b23356a7b5a18b358b5bedd21c5fdd57d6504 100644
+index ebbe5fb5d22cc6a7a2f131ab8fa209ff47c0c92a..d50334e6cacd9d751135d253ac96b9cdf4aee213 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1069,11 +1069,13 @@ public abstract class PlayerList {

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

@@ -64,7 +64,7 @@ index 857cc4fcc586f7a8ea5baeeae69da62ebfdac77a..e292035cf361c8efa8845450b72a6986
          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 985b23356a7b5a18b358b5bedd21c5fdd57d6504..d28f662d4a935994525118a403f3dc39cfa81a49 100644
+index d50334e6cacd9d751135d253ac96b9cdf4aee213..ea5f6b55aa10f8f821df92a204e923ac4f270e6a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1181,8 +1181,15 @@ public abstract class PlayerList {

patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3d6c25424c859f63c8f4661b39c82c269c3837fb..12c36e02e271cc8e13b20059fbfb30f4e8172023 100644
+index 3fff803c44c013dbcc2e639a08067d7ba3576a6d..6c49aa90c8d3d5871bbcdab92f7fd544e5c93e3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2648,5 +2648,10 @@ public final class CraftServer implements Server {

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

@@ -222,7 +222,7 @@ index a9cf8960d487ee71385341285a4b1618007d06dc..95f39630c9b4d2a41d8469d0d53da92e
          System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
          System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d28f662d4a935994525118a403f3dc39cfa81a49..9089a25ce49e7e192f7e1c3de46ffe1f93c69bc5 100644
+index ea5f6b55aa10f8f821df92a204e923ac4f270e6a..d3a63c2e42f46d07904a6d950aca40ef96f18882 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -169,8 +169,7 @@ public abstract class PlayerList {
@@ -236,7 +236,7 @@ index d28f662d4a935994525118a403f3dc39cfa81a49..9089a25ce49e7e192f7e1c3de46ffe1f
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 12c36e02e271cc8e13b20059fbfb30f4e8172023..adc35bbaa95f852a7ff28eeaa974c30ad4d22baa 100644
+index 6c49aa90c8d3d5871bbcdab92f7fd544e5c93e3b..1f4027021d94fa9356f218c93092bd5ebd29a95d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -42,7 +42,6 @@ import java.util.logging.Level;

patches/server/0134-Item-canEntityPickup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2dc21048b968e7aa63b5b28cacdd1ae407c06958..fec33a79fc9681ef51899a92ebb43c27126bd7ac 100644
+index 3500fd0045ad670de818dc170d9c68da643592e0..1f050f1c133e116e861e4e5f7e59875387543659 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -668,6 +668,11 @@ public abstract class Mob extends LivingEntity implements Targeting {

patches/server/0138-Add-UnknownCommandEvent.patch

@@ -83,7 +83,7 @@ index 2fdfc17ef3daf9fb5cc32c807292c71e256d5356..e3394864e29357fec036f9e616472aea
  
                  b1 = 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index adc35bbaa95f852a7ff28eeaa974c30ad4d22baa..6b8e5200300f2c667002bb6dc7bb359638565338 100644
+index 1f4027021d94fa9356f218c93092bd5ebd29a95d..36ef8a5d4a09dfa8a896df5464dedfe01a0fb8ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -523,6 +523,7 @@ public final class CraftServer implements Server {

patches/server/0139-Basic-PlayerProfile-API.patch

@@ -631,7 +631,7 @@ index 4038bb76339d43f18770624bd7fecc79b8d7f2a9..2456edc11b29a92b1648937cd3dd6a9a
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b8e5200300f2c667002bb6dc7bb359638565338..ef42288a9e8b195201415732cae5024a2ae070e6 100644
+index 36ef8a5d4a09dfa8a896df5464dedfe01a0fb8ae..1a2ef9476bd25b9cde3b0b9c1bb32ce77c5a9b92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -258,6 +258,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;

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 9089a25ce49e7e192f7e1c3de46ffe1f93c69bc5..3ab02a68d1cca67507cdf5e10f39199278d957ee 100644
+index d3a63c2e42f46d07904a6d950aca40ef96f18882..6b1b6af16d5c951780ffb1c633f9033042cc1589 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -646,9 +646,9 @@ public abstract class PlayerList {

patches/server/0155-Add-PlayerJumpEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5f79819a8168592138e0b2297825402502c6b54d..a50e9ceec700921b26e238068ac4c07e8a5903da 100644
+index 39d1304506abe361213fc6436c5ae25f000f8aee..177c26ac1853d3a0834bb2eb5e7a0b656775a663 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1285,7 +1285,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch

@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a50e9ceec700921b26e238068ac4c07e8a5903da..58b700a32d833e277da488fc3fc1ea8692f85361 100644
+index 177c26ac1853d3a0834bb2eb5e7a0b656775a663..8ff49b7ea0671c4126ea24d03267b53cfa66b84c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3101,14 +3101,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

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

@@ -90,7 +90,7 @@ index 77d7f070cce1a47e41b5d4f5a1cc8c778352a126..a3b610cb1ed97a635677bc46ccdf0463
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2dc0233821172a91f471bf7099f2c051c11331e6..e93fca6b851170232cdffc0e38bae86791ae6815 100644
+index 1cccc331222b24ac99ad7f6897a81ecd383ce7d3..5af1f24c42e61ce159a3f6221411d01bdc4178c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -233,6 +233,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0158-revert-serverside-behavior-of-keepalives.patch

@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 58b700a32d833e277da488fc3fc1ea8692f85361..547f39b4e3c8e13e8d3d8c6abdfa0e2786b7c50a 100644
+index 8ff49b7ea0671c4126ea24d03267b53cfa66b84c..a0777e65e0dcc2511c13ee32bfde9e2cfd6aafaa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -259,7 +259,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0160-Add-PlayerArmorChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a266f06422ddf52666eb11663cbf287279245596..bb5cff4ddf9c442f93a87dff8ab2aeb16a0f7c04 100644
+index e173f7f020bc25ba68bc5c4e82cbcb7abd6c7d75..c3ad63e1882d53f4207f4f08b55088d175360e8d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@

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

@@ -5,7 +5,7 @@ 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 3d04a9f0e9dd14e34c82c0b6225a6ee6d464ee5c..eb2078ed63b818beb96a7c41b0868db2dfe6b736 100644
+index f36467dbcb4c39cdc3fa6f7f690d0e1fe7db4160..40752609f9582fc5d0783535d024ed36290510a1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -716,6 +716,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

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 eb2078ed63b818beb96a7c41b0868db2dfe6b736..eb2f9464b15f4e6e25c419761c055b6ee4c03279 100644
+index 40752609f9582fc5d0783535d024ed36290510a1..a34be79fa1767c581fbfbff5deb747729bd9e5da 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,7 +154,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0165-AsyncTabCompleteEvent.patch

@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 547f39b4e3c8e13e8d3d8c6abdfa0e2786b7c50a..8abd8d7e1bbdd59338725ae075117ec26d567a86 100644
+index a0777e65e0dcc2511c13ee32bfde9e2cfd6aafaa..528ef2cb78ece52e389578e5ed36287ac395b824 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -788,27 +788,58 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -87,7 +87,7 @@ index 547f39b4e3c8e13e8d3d8c6abdfa0e2786b7c50a..8abd8d7e1bbdd59338725ae075117ec2
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ef42288a9e8b195201415732cae5024a2ae070e6..495d904c24c13419675e94c4ecc9beca266f9ce6 100644
+index 1a2ef9476bd25b9cde3b0b9c1bb32ce77c5a9b92..976e4814f9b395a011d5687a86ba187392ee52ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2116,7 +2116,7 @@ public final class CraftServer implements Server {

patches/server/0166-PlayerPickupExperienceEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 558b09a482da3035e37c108e60e9d08849017a8d..74e86c76631f779d7edb92de4d2a94c4ccca4afb 100644
+index af2c8db71b9306da9cae9fa0e56dd7716811cbac..ea2e30e405426ed0d3b6b912512f5c4332d91b1d 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -310,7 +310,7 @@ public class ExperienceOrb extends Entity {

patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch

@@ -60,7 +60,7 @@ index fc1afda5a60ab0f3c275f849d8af08d308b36c3f..d0330d1baf89f949c05b2380ce875366
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8b35e6804aba52865bda5d9f17ca5cb8576fba6f..4a16b00058ce985c3080af9212a9d0331a5e5c62 100644
+index 681e351b276798e2a70010e769e6aa0ed4fdbcd5..92b69b38394ff50ca7692fa8794cc2b50acb8b66 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@

patches/server/0181-getPlayerUniqueId-API.patch

@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 495d904c24c13419675e94c4ecc9beca266f9ce6..3798a78a48047bde4e78072b271ba0a22c0ba579 100644
+index 976e4814f9b395a011d5687a86ba187392ee52ab..3b66e86e1d7b9803a3a725febc79476c52b371cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1738,6 +1738,25 @@ public final class CraftServer implements Server {

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 407a037ae43c8cd209a9ce18359b5e0a15d9a88f..ffdff5ac16903f7632347db883cd2f09c3cf0547 100644
+index dd81b001288c4a9144defb297a6a877b4464d0ab..e49199dc6f841f30f87242735c55aba9ec382aaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0206-PlayerReadyArrowEvent.patch

@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f5662c9b8dfd3251be6bf57e7bc13aeb54fe30c2..16345738be241e5858a8df189a3c5c1d7b772353 100644
+index 10dd06a23b34b7c8515c9ccc3988a9e8182c460d..48ba8f67b93bed0cfa540d7cb94199b633a349e6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2260,18 +2260,29 @@ public abstract class Player extends LivingEntity {

patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch

@@ -33,7 +33,7 @@ index 40cfaee167c3991392e7a82094b8e28361b65581..2032b98a1571846b28fd18cdb3ae96f2
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 74c3762ebcb17d3836991f0293f02f5c42081715..eeeaf05cb49e3440bfa3ab94048653f75e6a42da 100644
+index f894ffb7c9575d7337353ab8aaaf0b9607a92146..221fa0ca2f1c6e099da5b47ba42548262132d6de 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1494,7 +1494,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -83,7 +83,7 @@ index 74c3762ebcb17d3836991f0293f02f5c42081715..eeeaf05cb49e3440bfa3ab94048653f7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fec33a79fc9681ef51899a92ebb43c27126bd7ac..8151da761dd2dd561384181576321c71197a84e1 100644
+index 1f050f1c133e116e861e4e5f7e59875387543659..e1f2bb40ca7868671a869745de66f87ef3a49408 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1633,7 +1633,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -161,7 +161,7 @@ index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..004382377ee364143a34287e7b6546ae
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 16345738be241e5858a8df189a3c5c1d7b772353..71cca9c0e7742992661e857686aa2908e3474d21 100644
+index 48ba8f67b93bed0cfa540d7cb94199b633a349e6..734d00e84ec0bcef91a12546873de64e33e14d0c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1284,9 +1284,9 @@ public abstract class Player extends LivingEntity {

patches/server/0213-InventoryCloseEvent-Reason-API.patch

@@ -29,7 +29,7 @@ index 34ffc34d853e7d38189597d258d80442624915e3..0612151976fe8bca5bdda27980d7e35e
              }
              // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4a16b00058ce985c3080af9212a9d0331a5e5c62..4885dd69d6f63666a38b6d8d859c1dd858d38ad0 100644
+index 92b69b38394ff50ca7692fa8794cc2b50acb8b66..2eff7e1f6b63a3a72e1595a089e9ee47f42bba06 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -640,7 +640,7 @@ public class ServerPlayer extends Player {
@@ -75,7 +75,7 @@ index 4a16b00058ce985c3080af9212a9d0331a5e5c62..4885dd69d6f63666a38b6d8d859c1dd8
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86e6e6ffdd5d8391b7a8f17bbad9b49a62339a8a..7f5f15c3542b308b9269a4e2194de2077fef82f5 100644
+index a72d0b6add00ba03bec76c1e22bfdb94730fe73e..b901331246d77dac3210caa26df6e53007964fbf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -220,6 +220,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -104,7 +104,7 @@ index 86e6e6ffdd5d8391b7a8f17bbad9b49a62339a8a..7f5f15c3542b308b9269a4e2194de207
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3ab02a68d1cca67507cdf5e10f39199278d957ee..58a808e2ccf366eca8358529ed7c02080a4948b0 100644
+index 6b1b6af16d5c951780ffb1c633f9033042cc1589..4bb7587dab0b6a7208218a2c523f0d4afaec1b3b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -533,7 +533,7 @@ public abstract class PlayerList {
@@ -117,7 +117,7 @@ index 3ab02a68d1cca67507cdf5e10f39199278d957ee..58a808e2ccf366eca8358529ed7c0208
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 71cca9c0e7742992661e857686aa2908e3474d21..577cb4537296edebd0d48680171859e852ac1032 100644
+index 734d00e84ec0bcef91a12546873de64e33e14d0c..c7bcbc3f0542a74c30e29bded3bfc0e94daeab25 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -269,7 +269,7 @@ public abstract class Player extends LivingEntity {
@@ -173,7 +173,7 @@ index db27f88cc2fcb2835a5ef03519c75a176426b9fa..20aa0ad8e056ebb8d352c69da2a2ed04
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ffdff5ac16903f7632347db883cd2f09c3cf0547..8a3b62dd565ed69132af3c0d3fb0919aebe58c7e 100644
+index e49199dc6f841f30f87242735c55aba9ec382aaf..122b9cda546be16cc14473887dbba71319b68224 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1170,7 +1170,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch

@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f5f15c3542b308b9269a4e2194de2077fef82f5..eb83098f1cc176b57cacb3833ae00585099b7a36 100644
+index b901331246d77dac3210caa26df6e53007964fbf..225274027b6db1138f7d28bff967f26b2544be18 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2554,6 +2554,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0223-Vanished-players-don-t-have-rights.patch

@@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..e68b7a1b03783e4f9de24c5ae8773fc3
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 823121fdfe99db01e3e995a50dbc8e241bcebe9c..99bc511425cf079303716a5b12c913bc48ce775a 100644
+index 42e16101ad20d8e94f17f1db0f682c5cbbce35b4..4fc15278a8ab239ca5f5076664a6e2fe60459691 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -273,6 +273,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0231-Fix-NBT-type-issues.patch

@@ -8,7 +8,7 @@ Addresses two issues:
 - Allay duplication cooldown is saved and exposed as a long, but loaded as an int
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 74e86c76631f779d7edb92de4d2a94c4ccca4afb..600acd102086050d63b1471b30fed0468cecfaf9 100644
+index ea2e30e405426ed0d3b6b912512f5c4332d91b1d..000c13afc6bb3acb68b9adcaeefb7bb1cb703702 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -293,7 +293,7 @@ public class ExperienceOrb extends Entity {

patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -85,7 +85,7 @@ index 96a4fb8f0fe5e8c3ec8172e5c1f49f16455f3853..b1697cf2501f75620bf82d3b9eb8ca81
          if (this.bukkitEntity == null) {
              this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 99bc511425cf079303716a5b12c913bc48ce775a..9f64020550a721ae01f9ffbe870b75762bfbd423 100644
+index 4fc15278a8ab239ca5f5076664a6e2fe60459691..cfe740eda3ca22c0046325ff0e78765ba92e3579 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -150,6 +150,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch

@@ -33,7 +33,7 @@ index 95f39630c9b4d2a41d8469d0d53da92e5578c347..f93664b2d27f74c26dc4618bcd09fb14
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3798a78a48047bde4e78072b271ba0a22c0ba579..56d090f5635a790bc856438edc16153b2e1f66f9 100644
+index 3b66e86e1d7b9803a3a725febc79476c52b371cd..feaf03146d94e9aaf9352b8f05a15d1c2c4fd15a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -924,6 +924,7 @@ public final class CraftServer implements Server {

patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch

@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 58a808e2ccf366eca8358529ed7c02080a4948b0..2167303e425b5921240e35757dc634c561875e8b 100644
+index 4bb7587dab0b6a7208218a2c523f0d4afaec1b3b..0e542faad09d7c0ba201f560e5e527eb7c488924 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,7 +649,7 @@ public abstract class PlayerList {

patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8a3b62dd565ed69132af3c0d3fb0919aebe58c7e..e193632f4b795d16a62e074e082a2fd5f10b1330 100644
+index 122b9cda546be16cc14473887dbba71319b68224..51ca4232a00f0b38050967c60aaae22366b1bc8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2732,6 +2732,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0261-Add-LivingEntity-getTargetEntity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index daedfacb24f74f9487a8c89db5c8b20cf0bc742d..8c4be74a973add0028ba3180d04c6b0a23b625b2 100644
+index 5b093a5c4ac0218dbadd6d7045266a164fcf834c..919f5229ac494961a8cb25b375f27753555ed52c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -117,6 +117,7 @@ import net.minecraft.world.level.storage.loot.LootTable;

patches/server/0264-Call-player-spectator-target-events-and-improve-impl.patch

@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e41abf22992d9348cc3c63866b01a5dbf02d6a2c..a15eca1b3280495b71012b42d94f5ad0b53d9e24 100644
+index 35bf922f7995074dd875474cc3d5577dbdb72dad..47a7b3171917b520eead0932eec821f1eff788c3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1936,6 +1936,19 @@ public class ServerPlayer extends Player {

patches/server/0269-Reset-players-airTicks-on-respawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a15eca1b3280495b71012b42d94f5ad0b53d9e24..069aebb9297b4d77524481d891fa35fb71b8183c 100644
+index 47a7b3171917b520eead0932eec821f1eff788c3..785b32a1b2d578614e69378cdfcf0a4917a2b335 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2412,6 +2412,7 @@ public class ServerPlayer extends Player {

patches/server/0276-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -59,7 +59,7 @@ index 0d72be376615f84934b031243ef283b6efc0bd13..562534d15f6f70ff286be90fb512b807
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ad1fa44281b8ce907fd7434a13d29c3717296877..294e12ac06a5292eda818aabbf3a019f35ca50e0 100644
+index 9a9479337e23b8971b9a6d2ab2d4f3c79214a0c9..82c17575d6be5a63d1ea45e2aa16aad30f3fc07a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1652,6 +1652,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0277-Make-the-default-permission-message-configurable.patch

@@ -18,7 +18,7 @@ index a52e6e8be323863ece6624a8ae7f9455279bdc23..ae046aff4b9d2ced37ee3e8e908780a8
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 56d090f5635a790bc856438edc16153b2e1f66f9..9020f6ab2391e67670333bb4bdf0125cd392f4ee 100644
+index feaf03146d94e9aaf9352b8f05a15d1c2c4fd15a..8cbc5172a7b226a6db1c93b3bc4688bbf14ff450 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2689,6 +2689,16 @@ public final class CraftServer implements Server {

patches/server/0280-force-entity-dismount-during-teleportation.patch

@@ -72,7 +72,7 @@ index b1697cf2501f75620bf82d3b9eb8ca81491baff0..53559c8cbf6df35255cb231b5eaa6cd4
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6be24dea49918cb377cd21e55927c304e288ed2b..724e4a870d0bbe4c1895ea6a745972ebdd9f5c52 100644
+index 919f5229ac494961a8cb25b375f27753555ed52c..088a0944793032eb1dc499e0c9255f3738aefc98 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3445,9 +3445,15 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0281-Add-more-Zombie-API.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Add more Zombie API
 public net.minecraft.world.entity.monster.Zombie isSunSensitive()Z
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index d07e321a3836a15058f11c88cc0deedb124bb407..69c54b68b364f58a3319154cd984069dd5b6c901 100644
+index 86dc8bdfdc4eabef2266f3409366b373fb0ae13d..fed8b065172f40a2a5c251f46303fc4d72c9653a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -95,6 +95,7 @@ public class Zombie extends Monster {

patches/server/0282-Book-Size-Limits.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 294e12ac06a5292eda818aabbf3a019f35ca50e0..013341102d81cbd03f6da5f702acd90191560e94 100644
+index 82c17575d6be5a63d1ea45e2aa16aad30f3fc07a..874d097254c8f0170e5106afd6a8b8acf83271ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1117,6 +1117,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0285-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 069aebb9297b4d77524481d891fa35fb71b8183c..561b02d0dfbf3d20bf8f318bdb883ab35c634b4f 100644
+index 785b32a1b2d578614e69378cdfcf0a4917a2b335..e043d61c8e82367f055da0c078995c65fa86752d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -243,6 +243,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 069aebb9297b4d77524481d891fa35fb71b8183c..561b02d0dfbf3d20bf8f318bdb883ab3
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2167303e425b5921240e35757dc634c561875e8b..2aaa8b4f89ce5c2d2e3d931e1c16b630e7863cc4 100644
+index 0e542faad09d7c0ba201f560e5e527eb7c488924..05ffcc50a727b9d62067ef1e1340ff11148f57f5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -189,6 +189,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a33262e0bcc98321cb7acef533973629de5278a6..52de6df905babf9e7546f1428fd39df988812fe4 100644
+index fe3f5c4f3f4f5c42e4067e05f0a8bee97661c9a1..224e4c2039255950f964882b38ba6251b1d18d74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -183,6 +183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0286-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 561b02d0dfbf3d20bf8f318bdb883ab35c634b4f..04ce33975b8ed83c3d803cd319228bcadf94f1de 100644
+index e043d61c8e82367f055da0c078995c65fa86752d..ae17ae92ff6d4d6e1e9fb1666ad4f1703aa240a8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1602,6 +1602,13 @@ public class ServerPlayer extends Player {

patches/server/0287-Block-Entity-remove-from-being-called-on-Players.patch

@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 52de6df905babf9e7546f1428fd39df988812fe4..0ee73b66c47767f734dee86b0ba5fb9501ab811a 100644
+index 224e4c2039255950f964882b38ba6251b1d18d74..1e2c102ca0d2012344451610e83372840d8d4a74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2779,6 +2779,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0288-BlockDestroyEvent.patch

@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9f64020550a721ae01f9ffbe870b75762bfbd423..1fa76e005c39698a48068baa430a9c1f48e1bb85 100644
+index cfe740eda3ca22c0046325ff0e78765ba92e3579..36b16da36908b22e2abcdc963480390d102d91a0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -30,6 +30,7 @@ import net.minecraft.nbt.CompoundTag;

patches/server/0290-Implement-Brigadier-Mojang-API.patch

@@ -131,7 +131,7 @@ index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 013341102d81cbd03f6da5f702acd90191560e94..7468c3b92f76bde9259f817370be5106ecb3887a 100644
+index 874d097254c8f0170e5106afd6a8b8acf83271ef..f07c2fdfe8520a6e5257f502f0f017acc6047dd9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -833,8 +833,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0292-Limit-Client-Sign-length-more.patch

@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7468c3b92f76bde9259f817370be5106ecb3887a..73af810aa0fe6c17244a23585a92e3cad97b7ab3 100644
+index f07c2fdfe8520a6e5257f502f0f017acc6047dd9..474633f28a5f9dfb5768c8c5fdaceb0b30bb6324 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -300,6 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0294-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2aaa8b4f89ce5c2d2e3d931e1c16b630e7863cc4..84e26b03c74ae977dc53cf8f27b20a27fa7382d2 100644
+index 05ffcc50a727b9d62067ef1e1340ff11148f57f5..35c9b72ee20b248a5af43e2372f82bd92aa83c1e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {

patches/server/0295-Entity-getEntitySpawnReason.patch

@@ -22,7 +22,7 @@ index 7a1587ef175e075d7748604cf33db7e3d514479f..0601c61a66c7db633c6f26439eaf53ce
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 84e26b03c74ae977dc53cf8f27b20a27fa7382d2..a01f2f56fb8cd10475b7e42d0c7f75d0bc49c64a 100644
+index 35c9b72ee20b248a5af43e2372f82bd92aa83c1e..917199cf9ca537a73094ab545220b5d33762c4f0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -233,6 +233,11 @@ public abstract class PlayerList {

patches/server/0297-Implement-PlayerPostRespawnEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a01f2f56fb8cd10475b7e42d0c7f75d0bc49c64a..405d574f9515c8239faf1e7f996446fbb2c66e11 100644
+index 917199cf9ca537a73094ab545220b5d33762c4f0..cf8e64106f443a8fa27c2cbee997f4d17fd88604 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -758,9 +758,14 @@ public abstract class PlayerList {

patches/server/0298-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 04b4c7af20d6aa9924fb1d345f11cb51dcadc708..6938f996e7e6d394a54ef6dda2e09acb2021d87f 100644
+index 3bd7f52030ea5b603bba5e4a8e1d28194f89fa7f..21773aea4d5e5f3946202e03afdc00f7bb109618 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -121,6 +121,7 @@ public class ItemEntity extends Entity implements TraceableEntity {

patches/server/0300-PlayerDeathEvent-getItemsToKeep.patch

@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 04ce33975b8ed83c3d803cd319228bcadf94f1de..ec841a36977c20389a8ab158b942d066e6cad346 100644
+index ae17ae92ff6d4d6e1e9fb1666ad4f1703aa240a8..09120de3b685b52e6ebf060394648952817a04eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -805,6 +805,46 @@ public class ServerPlayer extends Player {

patches/server/0301-Optimize-Captured-TileEntity-Lookup.patch

@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1fa76e005c39698a48068baa430a9c1f48e1bb85..c0920dfe011ec9b3be1018df3e8b13bea16dee87 100644
+index 36b16da36908b22e2abcdc963480390d102d91a0..32c2744eb14dab4219ea47d4fe58d58953a1b9c0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -893,9 +893,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0304-Fix-CB-call-to-changed-postToMainThread-method.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 73af810aa0fe6c17244a23585a92e3cad97b7ab3..a8f154f5eb74b8a2a60f245144bcf9996cf5fe5e 100644
+index 474633f28a5f9dfb5768c8c5fdaceb0b30bb6324..093eaae15344b39e217978e4c0bdbc37b83f6799 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -515,7 +515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0309-Expose-the-internal-current-tick.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9020f6ab2391e67670333bb4bdf0125cd392f4ee..621ac87b0ae04d3a2decc1f653b346978946577d 100644
+index 8cbc5172a7b226a6db1c93b3bc4688bbf14ff450..05af8ba7b1f3ca7a6264f38ad514b8b9cb3b33b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2730,5 +2730,10 @@ public final class CraftServer implements Server {

patches/server/0315-Fix-MC-158900.patch

@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 405d574f9515c8239faf1e7f996446fbb2c66e11..94fbe7f2b0f18c3a533de3a4e486e985aa6f5153 100644
+index cf8e64106f443a8fa27c2cbee997f4d17fd88604..eb020acbead65c189861898f5dc35978fef6aa9e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -642,8 +642,10 @@ public abstract class PlayerList {

patches/server/0316-Prevent-consuming-the-wrong-itemstack.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 724e4a870d0bbe4c1895ea6a745972ebdd9f5c52..f565b9a3643d0b457d10cc8a909aa975994f77fc 100644
+index 088a0944793032eb1dc499e0c9255f3738aefc98..a897ed99e7a643244fbe6f0ba1afc1bc15bb8d8d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3658,9 +3658,14 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0323-PlayerDeathEvent-shouldDropExperience.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ec841a36977c20389a8ab158b942d066e6cad346..47d4fa864531684135dc1856ae9a4ff76c0328bd 100644
+index 09120de3b685b52e6ebf060394648952817a04eb..e00a40e8637f0b73aba04b5b47bcb021c3d7e952 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -925,7 +925,7 @@ public class ServerPlayer extends Player {

patches/server/0327-Fix-items-not-falling-correctly.patch

@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 6938f996e7e6d394a54ef6dda2e09acb2021d87f..b85d0c7252a32210e4cb29c3e4fff4c080537451 100644
+index 21773aea4d5e5f3946202e03afdc00f7bb109618..080b574d28b07e59b234a927a50ba8972d410664 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -149,7 +149,7 @@ public class ItemEntity extends Entity implements TraceableEntity {