Prepare for updating server patches

1193 files changed, 300 insertions, 361 deletions

diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt
index 286aeeaaa9..b8740198d8 100644
--- a/build-data/dev-imports.txt
+++ b/build-data/dev-imports.txt
@@ -9,3 +9,4 @@
 #     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
 #     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
 
+minecraft net.minecraft.network.protocol.game.ClientboundLoginPacket
diff --git a/build-data/paper.at b/build-data/paper.at
index 5f1aa5b282..1417e2a6ce 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -9,6 +9,10 @@
 # Remap/Decompile fix (unclear why this is happening)
 public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
 
+# AT remap issue? todo 1.18
+public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
+
 # Paper config files
 public org.spigotmc.SpigotWorldConfig getBoolean(Ljava/lang/String;Z)Z
 public org.spigotmc.SpigotWorldConfig getDouble(Ljava/lang/String;)D
diff --git a/build.gradle.kts b/build.gradle.kts
index e9a60b8526..95b8082e4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,7 +48,7 @@ repositories {
 dependencies {
     paramMappings("net.fabricmc:yarn:1.18-pre5+build.4:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
-    decompiler("org.quiltmc:quiltflower:1.6.0")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.22")
     paperclip("io.papermc:paperclip:2.0.1")
 }
 
@@ -58,7 +58,7 @@ paperweight {
 
     paramMappingsRepo.set("https://maven.fabricmc.net/")
     remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://maven.quiltmc.org/repository/release/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
 
     paper {
         spigotApiPatchDir.set(layout.projectDirectory.dir("patches/api"))
diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
index 40a9672a42..dd9b593b45 100644
--- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8cabc75b2272dbb448c1f04a0ef6b0339d9f6b17..3a395a44ff50a77895341bbbfb8c81deede41b8b 100644
+index 430fa84c1de3eae24f48f915031c1a0265ad7e43..0f34457a5f18df3ba99f1168b99442d59df65e7b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,6 +18,7 @@ dependencies {
      api("net.md-5:bungeecord-chat:1.16-R0.4")
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
-+    api("it.unimi.dsi:fastutil:8.2.2")
++    api("it.unimi.dsi:fastutil:8.5.6")
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
diff --git a/patches/removed/1.18/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch b/patches/removed/1.18/No longer needed/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 5ef0fe3665..5ef0fe3665 100644
--- a/patches/removed/1.18/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/patches/removed/1.18/No longer needed/0078-Fix-reducedDebugInfo-not-initialized-on-client.patch
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index e28a888275..2b6e6bc5b4 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b4534df4812
+index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b70fe1b4c2
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,145 @@
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.util.*
@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +        // This includes junit transitively for whatever reason
 +        isTransitive = false
 +    }
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
-+    runtimeOnly("mysql:mysql-connector-java:5.1.49")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
++    runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -105,35 +105,10 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +
 +relocation {
 +    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
-+    val packageVersion = "1_17_R1"
++    val packageVersion = "1_18_R1"
 +    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
 +        exclude("org.bukkit.craftbukkit.Main*")
 +    }
-+
-+    fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
-+
-+    relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
-+    sequenceOf(
-+        "commons-codec:commons-codec" to "org.apache.commons.codec",
-+        "commons-io:commons-io" to "org.apache.commons.io",
-+        "it.unimi.dsi:fastutil" to "it.unimi",
-+        "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-+        "org.ow2.asm:asm" to "org.objectweb.asm"
-+    ).forEach { (owner, pack) ->
-+        relocate(owner, pack to cb(pack))
-+    }
-+
-+    // runtimeOnly dependencies don't need an owner attached
-+    // owner is used for dev bundle generation, runtimeOnly deps are not included in dev bundle
-+    sequenceOf(
-+        "org.apache.http",
-+        "org.apache.maven",
-+        "org.codehaus.plexus",
-+        "org.eclipse.aether",
-+        "org.eclipse.sisu"
-+    ).forEach { pack ->
-+        relocate(pack to cb(pack))
-+    }
 +}
 +
 +tasks.shadowJar {
@@ -166,7 +141,7 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +    if (rootProject.childProjects["test-plugin"] != null) {
 +        val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
 +        inputs.file(testPluginJar)
-+        args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
++        // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
 +    }
 +
 +    args("--nogui")
@@ -204,36 +179,44 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index c936167e107ab76cfb21febb9534353f481a95d3..0000000000000000000000000000000000000000
+index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,472 +0,0 @@
+@@ -1,539 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.17.1-R0.1-SNAPSHOT</version>
+-    <version>1.18-pre5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
+-    <parent>
+-        <groupId>org.spigotmc</groupId>
+-        <artifactId>spigot-parent</artifactId>
+-        <version>dev-SNAPSHOT</version>
+-        <relativePath>../pom.xml</relativePath>
+-    </parent>
+-
 -    <properties>
 -        <skipTests>true</skipTests>
 -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -        <api.version>unknown</api.version>
 -        <bt.name>git</bt.name>
--        <minecraft_version>1_17_R1</minecraft_version>
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
+-        <minecraft_version>1_18_R1</minecraft_version>
+-        <maven.compiler.source>16</maven.compiler.source>
+-        <maven.compiler.target>16</maven.compiler.target>
 -    </properties>
 -
--    <parent>
--        <groupId>org.spigotmc</groupId>
--        <artifactId>spigot-parent</artifactId>
--        <version>dev-SNAPSHOT</version>
--        <relativePath>../pom.xml</relativePath>
--    </parent>
+-    <repositories>
+-        <repository>
+-            <id>minecraft-libraries</id>
+-            <name>Minecraft Libraries</name>
+-            <url>https://libraries.minecraft.net/</url>
+-        </repository>
+-    </repositories>
 -
 -    <dependencies>
 -        <dependency>
@@ -259,13 +242,6 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <artifactId>log4j-iostreams</artifactId>
 -            <version>2.14.1</version>
 -            <scope>compile</scope>
--            <exclusions>
--                <!-- included in minecraft-server -->
--                <exclusion>
--                    <groupId>org.apache.logging.log4j</groupId>
--                    <artifactId>log4j-api</artifactId>
--                </exclusion>
--            </exclusions>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
@@ -273,6 +249,85 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <version>9.2</version>
 -            <scope>compile</scope>
 -        </dependency>
+-        <!-- Mojang depends -->
+-        <dependency>
+-            <groupId>com.github.oshi</groupId>
+-            <artifactId>oshi-core</artifactId>
+-            <version>5.8.2</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>authlib</artifactId>
+-            <version>3.2.38</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>brigadier</artifactId>
+-            <version>1.0.18</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>datafixerupper</artifactId>
+-            <version>4.0.26</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>javabridge</artifactId>
+-            <version>1.2.24</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>commons-io</groupId>
+-            <artifactId>commons-io</artifactId>
+-            <version>2.11.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.netty</groupId>
+-            <artifactId>netty-all</artifactId>
+-            <version>4.1.68.Final</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>it.unimi.dsi</groupId>
+-            <artifactId>fastutil</artifactId>
+-            <version>8.5.6</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>net.sf.jopt-simple</groupId>
+-            <artifactId>jopt-simple</artifactId>
+-            <version>5.0.4</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.commons</groupId>
+-            <artifactId>commons-lang3</artifactId>
+-            <version>3.12.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-core</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-slf4j18-impl</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-            <version>1.8.0-beta4</version>
+-            <scope>compile</scope>
+-        </dependency>
 -        <!-- deprecated API depend -->
 -        <dependency>
 -            <groupId>com.googlecode.json-simple</groupId>
@@ -283,13 +338,13 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.34.0</version>
+-            <version>3.36.0.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>mysql</groupId>
 -            <artifactId>mysql-connector-java</artifactId>
--            <version>5.1.49</version>
+-            <version>8.0.27</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -439,87 +494,21 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                        </goals>
 -                        <configuration>
 -                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <filters>
--                                <filter>
--                                    <artifact>org.spigotmc:minecraft-server</artifact>
--                                    <excludes>
--                                        <exclude>com/google/common/**</exclude>
--                                        <exclude>com/google/gson/**</exclude>
--                                        <exclude>com/google/thirdparty/**</exclude>
--                                    </excludes>
--                                </filter>
--                                <filter>
--                                    <artifact>org.eclipse.sisu:org.eclipse.sisu.inject</artifact>
--                                    <excludes>
--                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
--                                    </excludes>
--                                </filter>
--                            </filters>
+-                            <artifactSet>
+-                                <includes>
+-                                    <include>org.spigotmc:minecraft-server</include>
+-                                </includes>
+-                            </artifactSet>
 -                            <relocations>
--                                <!-- Cannot be relocated as it breaks translation property keys -->
--                                <!--
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
--                                -->
--                                <relocation>
--                                    <pattern>jline</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>it.unimi</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.codec</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.io</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.io</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.lang3</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.lang3</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.http</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.http</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.maven</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.maven</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.codehaus.plexus</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.codehaus.plexus</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.aether</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.aether</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.sisu</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.sisu</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.objectweb.asm</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.objectweb.asm</shadedPattern>
--                                </relocation>
 -                                <relocation>
 -                                    <pattern>org.bukkit.craftbukkit</pattern>
 -                                    <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
 -                                    <excludes>
+-                                        <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
 -                                        <exclude>org.bukkit.craftbukkit.Main*</exclude>
 -                                    </excludes>
 -                                </relocation>
 -                            </relocations>
--                            <transformers>
--                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
--                                    <resource>META-INF/services/java.sql.Driver</resource>
--                                </transformer>
--                            </transformers>
 -                        </configuration>
 -                    </execution>
 -                </executions>
@@ -527,22 +516,75 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>1.2.2</version>
+-                <version>1.2.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>remap</goal>
 -                        </goals>
--                        <id>remap-fields</id>
+-                        <id>remap-members</id>
 -                        <configuration>
--                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-fields</srgIn>
+-                            <logFile>${project.build.directory}/server.txt</logFile>
+-                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
 -                            <reverse>true</reverse>
 -                        </configuration>
 -                    </execution>
 -                </executions>
 -            </plugin>
 -            <plugin>
+-                <groupId>net.nicoulaj.maven.plugins</groupId>
+-                <artifactId>checksum-maven-plugin</artifactId>
+-                <version>1.11</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>artifacts</goal>
+-                            <goal>dependencies</goal>
+-                        </goals>
+-                        <configuration>
+-                            <algorithms>
+-                                <algorithm>SHA-256</algorithm>
+-                            </algorithms>
+-                            <scopes>
+-                                <scope>compile</scope>
+-                                <scope>runtime</scope>
+-                            </scopes>
+-                            <shasumSummary>true</shasumSummary>
+-                            <transitive>true</transitive>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-assembly-plugin</artifactId>
+-                <version>3.3.0</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>single</goal>
+-                        </goals>
+-                        <configuration>
+-                            <appendAssemblyId>false</appendAssemblyId>
+-                            <archive>
+-                                <manifest>
+-                                    <addDefaultEntries>false</addDefaultEntries>
+-                                </manifest>
+-                                <manifestEntries>
+-                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
+-                                </manifestEntries>
+-                            </archive>
+-                            <descriptors>
+-                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
+-                            </descriptors>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.8.1</version>
@@ -559,7 +601,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.eclipse.jdt</groupId>
 -                        <artifactId>ecj</artifactId>
--                        <version>3.26.0</version>
+-                        <version>3.27.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
@@ -612,7 +654,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                            <dependency>
 -                                <groupId>com.puppycrawl.tools</groupId>
 -                                <artifactId>checkstyle</artifactId>
--                                <version>8.44</version>
+-                                <version>8.45.1</version>
 -                            </dependency>
 -                        </dependencies>
 -                    </plugin>
@@ -624,7 +666,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                            <execution>
 -                                <phase>process-classes</phase>
 -                                <goals>
--                                    <goal>check</goal>
+-                                    <!--<goal>check</goal>-->
 -                                </goals>
 -                            </execution>
 -                        </executions>
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index f848a868fd..72fb568a5c 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/server/0002-Remap-fixes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remap fixes
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 1bd6ef643b17b059eb525035496b816a098279c4..754e65f322ded875ae7614066bab30a8da2aa4a9 100644
+index a492a3ff23a6e4bd1a47bdfbe295163ac3ef66c9..dc88152a1458dadd102989d4fc5ffd5bbc7eb523 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -270,9 +270,11 @@ public class BlockPos extends Vec3i {
@@ -42,10 +42,10 @@ index 1bd6ef643b17b059eb525035496b816a098279c4..754e65f322ded875ae7614066bab30a8
                          }
  
 diff --git a/src/main/java/net/minecraft/server/commands/SummonCommand.java b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-index 71c22f72b6e7507e85ecb6be3166b809b7409ab2..0821cd15071ac10c88f0bcfd869c27cadbe778ba 100644
+index bb57dacc71711abfd9fb22a395ff798920564e5a..f6aed91482d9c7bf8b56fb7c53f938a4f37b9605 100644
 --- a/src/main/java/net/minecraft/server/commands/SummonCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-@@ -54,9 +54,9 @@ public class SummonCommand {
+@@ -53,9 +53,9 @@ public class SummonCommand {
  
              nbttagcompound1.putString("id", entity.toString());
              ServerLevel worldserver = source.getLevel();
@@ -59,35 +59,26 @@ index 71c22f72b6e7507e85ecb6be3166b809b7409ab2..0821cd15071ac10c88f0bcfd869c27ca
  
              if (entity1 == null) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index 88a8c2bc4aa30f478122a05fd119486a0107db82..ef17f21574ce37b9ce6f72b9585034db473502c7 100644
+index b925f8e74cad0214c57b2c5cb75502dce3f23e15..28fbdc53dd983e462db50261164f522d1996f50d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -169,8 +169,8 @@ public class BehaviorUtils {
+@@ -172,11 +172,11 @@ public class BehaviorUtils {
  
          return optional.map((uuid) -> {
              return ((ServerLevel) entity.level).getEntity(uuid);
 -        }).map((entity) -> {
--            return entity instanceof LivingEntity ? (LivingEntity) entity : null;
-+        }).map((entity2) -> { // Paper - remap fix
-+            return entity2 instanceof LivingEntity ? (LivingEntity) entity2 : null; // Paper - remap fix
-         });
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 296d4ab3dace530cab03c787051c9f2c2626228f..7cbb16646c6c83d443deedaf425d18d6de76e314 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -522,7 +522,7 @@ public class Phantom extends FlyingMob implements Enemy {
-                 List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
++        }).map((entity1) -> { // Paper - remap fix
+             LivingEntity entityliving1;
  
-                 if (!list.isEmpty()) {
--                    list.sort(Comparator.comparing(Entity::getY).reversed());
-+                    list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
-                     Iterator iterator = list.iterator();
+-            if (entity instanceof LivingEntity) {
+-                LivingEntity entityliving2 = (LivingEntity) entity;
++            if (entity1 instanceof LivingEntity) { // Paper - remap fix
++                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
  
-                     while (iterator.hasNext()) {
+                 entityliving1 = entityliving2;
+             } else {
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index efb37470d4927def456c382420775a815594aa58..38dd114fbfa07a18987cd774ae05060d723247e4 100644
+index c0694fef35bc000a5212e377a285dfd1dd94ca07..2e2bc7213b7e19e945eba885ff5614f809c81db0 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -172,7 +172,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
@@ -129,19 +120,6 @@ index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d
          assertThat(color, is(Color.fromRGB(nmsColor)));
      }
  }
-diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
-index 90baf6e3329d64495da9edd580d5fbc80df8c165..e2fb8a0183885b4ad81d5284297be7a35946aa9c 100644
---- a/src/test/java/org/bukkit/PerMaterialTest.java
-+++ b/src/test/java/org/bukkit/PerMaterialTest.java
-@@ -221,7 +221,7 @@ public class PerMaterialTest extends AbstractTestingBase {
-         if (this.material.isBlock()) {
-             assertThat(this.material.isInteractable(),
-                     is(!CraftMagicNumbers.getBlock(material).getClass()
--                            .getMethod("interact", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class)
-+                            .getMethod("use", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class) // Paper - remap fix
-                             .getDeclaringClass().equals(BlockBehaviour.class)));
-         } else {
-             assertFalse(this.material.isInteractable());
 diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
 index 8c4ad718e113f24a30fd11b345d34d6ca1ef73b0..1e84f541683ddb619c2a8dfcd2a141fba2bd851d 100644
 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 3c805c2a99..62ff5824bd 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68ff602a310 100644
+index 273746fe476a9a09ebca01c6ecd814b70fe1b4c2..6cab6b2f348366e7e0357638ac11df5961a7388d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,21 +17,23 @@ repositories {
+@@ -17,10 +17,9 @@ repositories {
  dependencies {
      implementation(project(":Paper-API"))
      implementation("jline:jline:2.12.1")
@@ -16,27 +16,12 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 -    }
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
-+    implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
      implementation("org.ow2.asm:asm:9.2")
 +    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
      implementation("com.googlecode.json-simple:json-simple:1.1.1") {
          // This includes junit transitively for whatever reason
          isTransitive = false
-     }
-     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
--    runtimeOnly("mysql:mysql-connector-java:5.1.49")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
- 
-+    implementation("io.netty:netty-all:4.1.65.Final") // Paper
-+
-     testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
- }
-@@ -52,6 +54,7 @@ tasks.jar {
+@@ -52,6 +51,7 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -44,16 +29,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -82,7 +85,7 @@ relocation {
-     sequenceOf(
-         "commons-codec:commons-codec" to "org.apache.commons.codec",
-         "commons-io:commons-io" to "org.apache.commons.io",
--        "it.unimi.dsi:fastutil" to "it.unimi",
-+        //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
-         "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-         "org.ow2.asm:asm" to "org.objectweb.asm"
-     ).forEach { (owner, pack) ->
-@@ -102,9 +105,17 @@ relocation {
+@@ -77,9 +77,17 @@ relocation {
      }
  }
  
@@ -72,7 +48,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
          relocate(relocation.fromPackage, relocation.toPackage) {
              for (exclude in relocation.excludes) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1338f52370dafbb8820a67cc4528eb20e0b9155c..90af1b123722bac1c4c5956465a153ec1ea998ff 100644
+index 189c262b22cad352fc87565ff499a5340d92b4e4..09c33e8613d31f4519109f29b44cfea754184c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -190,7 +190,7 @@ public class Main {
@@ -83,7 +59,7 @@ index 1338f52370dafbb8820a67cc4528eb20e0b9155c..90af1b123722bac1c4c5956465a153ec
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -28);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index 80a1e546f2..4fbd4807b3 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -585,10 +585,10 @@ index 0000000000000000000000000000000000000000..6cb3a37612240d4150d7c62628f4b744
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce03bca018 100644
+index dc2cb18ec926e2eed1caa8e2106e70bcb04f6c0f..a497b281d03c097587b21e9f141a6a66f36e4dad 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -101,6 +101,12 @@ public class Main {
+@@ -106,6 +106,12 @@ public class Main {
              DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
              dedicatedserversettings.forceSave();
@@ -601,7 +601,7 @@ index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce
              Path path1 = Paths.get("eula.txt");
              Eula eula = new Eula(path1);
  
-@@ -251,6 +257,20 @@ public class Main {
+@@ -261,6 +267,20 @@ public class Main {
  
      }
  
@@ -619,26 +619,26 @@ index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce
 +    }
 +    // Paper end
 +
-     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<DimensionType>> worlds) { // CraftBukkit
+     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier continueCheck, WorldGenSettings generatorOptions) {
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
-         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
+         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f393503204cf219c60dbae868172a29a0d23d5f..9f3d7089d066bda13af8b4b714a0ebd0c3403e4f 100644
+index cf64088cbf19ef17943fdfd51fc543d4acc0e794..6e97d5101be851518461df440d8160a2710afc0d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -609,6 +609,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -601,6 +601,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
 +            worldserver.paperConfig.removeOldValues(); // Paper - callback for clearing old config options, after any migrations have taken place
-             this.loadSpawn(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
+             this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
              worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index cd65a5bb6da734a39b0bb6e9a0571455d19ceac4..fac993d58bd6e3bb19fd69881092a863c8952c65 100644
+index 2599fbabd5e5c0d10d0c915016f7cc982bda0e20..4dd57007af218ba1c0e666117a49939c5884f2c6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          org.spigotmc.SpigotConfig.init((java.io.File) options.valueOf("spigot-settings"));
          org.spigotmc.SpigotConfig.registerCommands();
          // Spigot end
@@ -655,7 +655,7 @@ index cd65a5bb6da734a39b0bb6e9a0571455d19ceac4..fac993d58bd6e3bb19fd69881092a863
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 1ff471fb8a4f69f02debe9c40b13cc1e8b8045d7..9591f50922343283597bad6d9ac17c175d8ae230 100644
+index c44dfc1044a5dfe39fad3906d1a4455ffc5dbe89..a551683bc73db23d82bd2ca1e2c7c83e31e3c834 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -334,6 +334,12 @@ public class ServerChunkCache extends ChunkSource {
@@ -669,36 +669,28 @@ index 1ff471fb8a4f69f02debe9c40b13cc1e8b8045d7..9591f50922343283597bad6d9ac17c17
 +    // Paper end
 +
      public boolean isPositionTicking(long pos) {
-         return this.checkChunkFuture(pos, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error
-     }
+         ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 067216078c7b50390957d1fcfbfbaaeb81cfba21..7f3d83d3d071f6b441ad119b1c93be035e911e70 100644
+index 1bee6fc5b9fa70adf2f7cac792778f5ed203d291..e688949fc2f3031dc9c9817bc59554e9f5a436af 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet;
- import java.util.List;
- import java.util.Optional;
- import java.util.Spliterator;
-+import java.util.Set; // Paper
- import java.util.UUID;
- import java.util.function.Consumer;
- import java.util.function.Function;
-@@ -666,4 +667,10 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
+@@ -664,4 +664,10 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
  
          T create(EntityType<T> type, Level world);
      }
 +
 +    // Paper start
-+    public static Set<ResourceLocation> getEntityNameList() {
++    public static java.util.Set<ResourceLocation> getEntityNameList() {
 +        return Registry.ENTITY_TYPE.keySet();
 +    }
 +    // 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 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8e49d7a3d 100644
+index f705a40fad19e218669857ffccc3589e074c94b7..90d1567aa49ca6005f956f7e3c1cb14ac4cf9c22 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -148,6 +148,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -149,6 +149,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean populating;
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
@@ -707,7 +699,7 @@ index 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8
      public final SpigotTimings.WorldTimingsHandler timings; // Spigot
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -168,6 +170,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -169,6 +171,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
@@ -716,10 +708,10 @@ index 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5043a4448 100644
+index 70ec18340b9e9bde6784fc5929a1db61ccb39b34..0cd31f82fcaab925db6dcada3e9b42a48fe04c67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -835,6 +835,7 @@ public final class CraftServer implements Server {
+@@ -844,6 +844,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -727,7 +719,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
          for (ServerLevel world : this.console.getAllLevels()) {
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
-@@ -874,12 +875,14 @@ public final class CraftServer implements Server {
+@@ -883,12 +884,14 @@ public final class CraftServer implements Server {
                  world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -742,7 +734,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2284,4 +2287,35 @@ public final class CraftServer implements Server {
+@@ -2296,4 +2299,35 @@ public final class CraftServer implements Server {
          return this.spigot;
      }
      // Spigot end
@@ -779,7 +771,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 90af1b123722bac1c4c5956465a153ec1ea998ff..11d1bc56439ff867224ef1c2058aee67ba0ee332 100644
+index 09c33e8613d31f4519109f29b44cfea754184c3f..aa4b21c9d3c4af08c4d3a309f948692cc585c9c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -129,6 +129,14 @@ public class Main {
diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 583f5eafd1..bf08273da9 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index b61eaf223acd703d9c259fb2cd3852481213f93a..771e4b72589d7117a154ab6917bd4a56d55f19db 100644
+index 486d01f5cb69c58878ad7d2fa06ee1154486e55d..58dbe9077fc12964477d6a6fb57d67c41865412c 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -306,7 +306,7 @@ public class Util {
+@@ -345,7 +345,7 @@ public class Util {
      }
  
      public static <K> Strategy<K> identityStrategy() {
@@ -18,10 +18,10 @@ index b61eaf223acd703d9c259fb2cd3852481213f93a..771e4b72589d7117a154ab6917bd4a56
  
      public static <V> CompletableFuture<List<V>> sequence(List<? extends CompletableFuture<? extends V>> futures) {
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 754e65f322ded875ae7614066bab30a8da2aa4a9..59240bb0ce088a14f8ccb62de8b69bc7bf313975 100644
+index dc88152a1458dadd102989d4fc5ffd5bbc7eb523..53f438b3747ff20dd18bc757b5b672aaa9db7b81 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -369,12 +369,12 @@ public class BlockPos extends Vec3i {
+@@ -375,12 +375,12 @@ public class BlockPos extends Vec3i {
                      if (this.index == l) {
                          return this.endOfData();
                      } else {
@@ -40,16 +40,15 @@ index 754e65f322ded875ae7614066bab30a8da2aa4a9..59240bb0ce088a14f8ccb62de8b69bc7
                  }
              };
 diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index 2f8443ba50d34ff961ae5345c470e809c720fd29..88bac72edf19c578902f49d20353989ed4d96f8f 100644
+index 8c37ed1d70c5874bb1bd96fe33b087d4ddc2d68e..ea68b26e506e48d8238b7ee4266e61b211d52bd2 100644
 --- a/src/main/java/net/minecraft/nbt/ListTag.java
 +++ b/src/main/java/net/minecraft/nbt/ListTag.java
-@@ -2,9 +2,13 @@ package net.minecraft.nbt;
+@@ -2,9 +2,12 @@ package net.minecraft.nbt;
  
  import com.google.common.collect.Iterables;
  import com.google.common.collect.Lists;
 +import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet;
 +import it.unimi.dsi.fastutil.bytes.ByteSet;
-+
  import java.io.DataInput;
  import java.io.DataOutput;
  import java.io.IOException;
@@ -57,53 +56,19 @@ index 2f8443ba50d34ff961ae5345c470e809c720fd29..88bac72edf19c578902f49d20353989e
  import java.util.List;
  import java.util.Objects;
  
-@@ -45,6 +49,7 @@ public class ListTag extends CollectionTag<Tag> {
+@@ -102,6 +105,7 @@ public class ListTag extends CollectionTag<Tag> {
              return "TAG_List";
          }
      };
-+    private static final ByteSet INLINE_ELEMENT_TYPES = new ByteOpenHashSet(Arrays.asList((byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6)); // Paper - decompiler fix
++    private static final ByteSet INLINE_ELEMENT_TYPES = new ByteOpenHashSet(Arrays.asList((byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, (byte) 6)); // Paper - decompiler fix // todo: what is this
      private final List<Tag> list;
      private byte type;
  
-diff --git a/src/main/java/net/minecraft/nbt/NbtIo.java b/src/main/java/net/minecraft/nbt/NbtIo.java
-index 58443139562d1f90465be43e9be42f5cca7fc80d..0f4d9e94438d62cb5eeb9ca0e430d8dd7ba54ef7 100644
---- a/src/main/java/net/minecraft/nbt/NbtIo.java
-+++ b/src/main/java/net/minecraft/nbt/NbtIo.java
-@@ -19,6 +19,7 @@ import javax.annotation.Nullable;
- import net.minecraft.CrashReport;
- import net.minecraft.CrashReportCategory;
- import net.minecraft.ReportedException;
-+import io.netty.buffer.ByteBufInputStream; // Paper
- 
- public class NbtIo {
- 
-@@ -180,7 +181,7 @@ public class NbtIo {
- 
-     public static CompoundTag read(DataInput input, NbtAccounter tracker) throws IOException {
-         // Spigot start
--        if ( input instanceof io.netty.buffer.ByteBufInputStream )
-+        if ( input instanceof ByteBufInputStream) // Paper
-         {
-             input = new DataInputStream(new org.spigotmc.LimitStream((InputStream) input, tracker));
-         }
-diff --git a/src/main/java/net/minecraft/nbt/Tag.java b/src/main/java/net/minecraft/nbt/Tag.java
-index 440aa82b4488ed20f9fcf60f1e87cc84ea74e370..08a0327feacd81c6e4c66182cee926c6068b8aa8 100644
---- a/src/main/java/net/minecraft/nbt/Tag.java
-+++ b/src/main/java/net/minecraft/nbt/Tag.java
-@@ -33,7 +33,7 @@ public interface Tag {
- 
-     TagType<?> getType();
- 
--    Tag copy();
-+    public Tag copy(); // Paper - decompile fix
- 
-     default String getAsString() {
-         return (new StringTagVisitor()).visit(this);
 diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
-index 3db1f50262df75dc99fd5a1224985cd9f5f14c9f..6611aebafb14b83bce3eeb87701e2edc8a0828ab 100644
+index 1f70fdaf08541ad57b2046e85e156be9446b372d..ea69f11e3cd9775998679baaccdaf980ee8fd498 100644
 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
 +++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java
-@@ -12,6 +12,7 @@ import javax.annotation.Nullable;
+@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
  import net.minecraft.Util;
  import net.minecraft.network.protocol.Packet;
  import net.minecraft.network.protocol.PacketFlow;
@@ -111,7 +76,7 @@ index 3db1f50262df75dc99fd5a1224985cd9f5f14c9f..6611aebafb14b83bce3eeb87701e2edc
  import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
  import net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket;
  import net.minecraft.network.protocol.game.ClientboundAddMobPacket;
-@@ -113,6 +114,7 @@ import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
+@@ -117,6 +118,7 @@ import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
  import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
@@ -119,7 +84,7 @@ index 3db1f50262df75dc99fd5a1224985cd9f5f14c9f..6611aebafb14b83bce3eeb87701e2edc
  import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
  import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
  import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
-@@ -159,25 +161,32 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
+@@ -163,26 +165,33 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
  import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
  import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
  import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
@@ -140,32 +105,71 @@ index 3db1f50262df75dc99fd5a1224985cd9f5f14c9f..6611aebafb14b83bce3eeb87701e2edc
 +import net.minecraft.network.protocol.status.ServerStatusPacketListener;
  import net.minecraft.network.protocol.status.ServerboundPingRequestPacket;
  import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
+ import net.minecraft.util.VisibleForDebug;
  import org.apache.logging.log4j.LogManager;
  
  public enum ConnectionProtocol {
 -    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
--    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkPacket.class, ClientboundLevelChunkPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
+-    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 -    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 -    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
 +    // Paper start - fix decompile error - add correct generic packet listeners (e.g. ServerHandshakePacketListener) to PacketSet's generic type, matching the packet flow direction
 +    HANDSHAKING(-1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerHandshakePacketListener>()).addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new))),
-+    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkPacket.class, ClientboundLevelChunkPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
++    PLAY(0, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientGamePacketListener>()).addPacket(ClientboundAddEntityPacket.class, ClientboundAddEntityPacket::new).addPacket(ClientboundAddExperienceOrbPacket.class, ClientboundAddExperienceOrbPacket::new).addPacket(ClientboundAddMobPacket.class, ClientboundAddMobPacket::new).addPacket(ClientboundAddPaintingPacket.class, ClientboundAddPaintingPacket::new).addPacket(ClientboundAddPlayerPacket.class, ClientboundAddPlayerPacket::new).addPacket(ClientboundAddVibrationSignalPacket.class, ClientboundAddVibrationSignalPacket::new).addPacket(ClientboundAnimatePacket.class, ClientboundAnimatePacket::new).addPacket(ClientboundAwardStatsPacket.class, ClientboundAwardStatsPacket::new).addPacket(ClientboundBlockBreakAckPacket.class, ClientboundBlockBreakAckPacket::new).addPacket(ClientboundBlockDestructionPacket.class, ClientboundBlockDestructionPacket::new).addPacket(ClientboundBlockEntityDataPacket.class, ClientboundBlockEntityDataPacket::new).addPacket(ClientboundBlockEventPacket.class, ClientboundBlockEventPacket::new).addPacket(ClientboundBlockUpdatePacket.class, ClientboundBlockUpdatePacket::new).addPacket(ClientboundBossEventPacket.class, ClientboundBossEventPacket::new).addPacket(ClientboundChangeDifficultyPacket.class, ClientboundChangeDifficultyPacket::new).addPacket(ClientboundChatPacket.class, ClientboundChatPacket::new).addPacket(ClientboundClearTitlesPacket.class, ClientboundClearTitlesPacket::new).addPacket(ClientboundCommandSuggestionsPacket.class, ClientboundCommandSuggestionsPacket::new).addPacket(ClientboundCommandsPacket.class, ClientboundCommandsPacket::new).addPacket(ClientboundContainerClosePacket.class, ClientboundContainerClosePacket::new).addPacket(ClientboundContainerSetContentPacket.class, ClientboundContainerSetContentPacket::new).addPacket(ClientboundContainerSetDataPacket.class, ClientboundContainerSetDataPacket::new).addPacket(ClientboundContainerSetSlotPacket.class, ClientboundContainerSetSlotPacket::new).addPacket(ClientboundCooldownPacket.class, ClientboundCooldownPacket::new).addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new).addPacket(ClientboundCustomSoundPacket.class, ClientboundCustomSoundPacket::new).addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new).addPacket(ClientboundEntityEventPacket.class, ClientboundEntityEventPacket::new).addPacket(ClientboundExplodePacket.class, ClientboundExplodePacket::new).addPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new).addPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new).addPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new).addPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new).addPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new).addPacket(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkWithLightPacket::new).addPacket(ClientboundLevelEventPacket.class, ClientboundLevelEventPacket::new).addPacket(ClientboundLevelParticlesPacket.class, ClientboundLevelParticlesPacket::new).addPacket(ClientboundLightUpdatePacket.class, ClientboundLightUpdatePacket::new).addPacket(ClientboundLoginPacket.class, ClientboundLoginPacket::new).addPacket(ClientboundMapItemDataPacket.class, ClientboundMapItemDataPacket::new).addPacket(ClientboundMerchantOffersPacket.class, ClientboundMerchantOffersPacket::new).addPacket(ClientboundMoveEntityPacket.Pos.class, ClientboundMoveEntityPacket.Pos::read).addPacket(ClientboundMoveEntityPacket.PosRot.class, ClientboundMoveEntityPacket.PosRot::read).addPacket(ClientboundMoveEntityPacket.Rot.class, ClientboundMoveEntityPacket.Rot::read).addPacket(ClientboundMoveVehiclePacket.class, ClientboundMoveVehiclePacket::new).addPacket(ClientboundOpenBookPacket.class, ClientboundOpenBookPacket::new).addPacket(ClientboundOpenScreenPacket.class, ClientboundOpenScreenPacket::new).addPacket(ClientboundOpenSignEditorPacket.class, ClientboundOpenSignEditorPacket::new).addPacket(ClientboundPingPacket.class, ClientboundPingPacket::new).addPacket(ClientboundPlaceGhostRecipePacket.class, ClientboundPlaceGhostRecipePacket::new).addPacket(ClientboundPlayerAbilitiesPacket.class, ClientboundPlayerAbilitiesPacket::new).addPacket(ClientboundPlayerCombatEndPacket.class, ClientboundPlayerCombatEndPacket::new).addPacket(ClientboundPlayerCombatEnterPacket.class, ClientboundPlayerCombatEnterPacket::new).addPacket(ClientboundPlayerCombatKillPacket.class, ClientboundPlayerCombatKillPacket::new).addPacket(ClientboundPlayerInfoPacket.class, ClientboundPlayerInfoPacket::new).addPacket(ClientboundPlayerLookAtPacket.class, ClientboundPlayerLookAtPacket::new).addPacket(ClientboundPlayerPositionPacket.class, ClientboundPlayerPositionPacket::new).addPacket(ClientboundRecipePacket.class, ClientboundRecipePacket::new).addPacket(ClientboundRemoveEntitiesPacket.class, ClientboundRemoveEntitiesPacket::new).addPacket(ClientboundRemoveMobEffectPacket.class, ClientboundRemoveMobEffectPacket::new).addPacket(ClientboundResourcePackPacket.class, ClientboundResourcePackPacket::new).addPacket(ClientboundRespawnPacket.class, ClientboundRespawnPacket::new).addPacket(ClientboundRotateHeadPacket.class, ClientboundRotateHeadPacket::new).addPacket(ClientboundSectionBlocksUpdatePacket.class, ClientboundSectionBlocksUpdatePacket::new).addPacket(ClientboundSelectAdvancementsTabPacket.class, ClientboundSelectAdvancementsTabPacket::new).addPacket(ClientboundSetActionBarTextPacket.class, ClientboundSetActionBarTextPacket::new).addPacket(ClientboundSetBorderCenterPacket.class, ClientboundSetBorderCenterPacket::new).addPacket(ClientboundSetBorderLerpSizePacket.class, ClientboundSetBorderLerpSizePacket::new).addPacket(ClientboundSetBorderSizePacket.class, ClientboundSetBorderSizePacket::new).addPacket(ClientboundSetBorderWarningDelayPacket.class, ClientboundSetBorderWarningDelayPacket::new).addPacket(ClientboundSetBorderWarningDistancePacket.class, ClientboundSetBorderWarningDistancePacket::new).addPacket(ClientboundSetCameraPacket.class, ClientboundSetCameraPacket::new).addPacket(ClientboundSetCarriedItemPacket.class, ClientboundSetCarriedItemPacket::new).addPacket(ClientboundSetChunkCacheCenterPacket.class, ClientboundSetChunkCacheCenterPacket::new).addPacket(ClientboundSetChunkCacheRadiusPacket.class, ClientboundSetChunkCacheRadiusPacket::new).addPacket(ClientboundSetDefaultSpawnPositionPacket.class, ClientboundSetDefaultSpawnPositionPacket::new).addPacket(ClientboundSetDisplayObjectivePacket.class, ClientboundSetDisplayObjectivePacket::new).addPacket(ClientboundSetEntityDataPacket.class, ClientboundSetEntityDataPacket::new).addPacket(ClientboundSetEntityLinkPacket.class, ClientboundSetEntityLinkPacket::new).addPacket(ClientboundSetEntityMotionPacket.class, ClientboundSetEntityMotionPacket::new).addPacket(ClientboundSetEquipmentPacket.class, ClientboundSetEquipmentPacket::new).addPacket(ClientboundSetExperiencePacket.class, ClientboundSetExperiencePacket::new).addPacket(ClientboundSetHealthPacket.class, ClientboundSetHealthPacket::new).addPacket(ClientboundSetObjectivePacket.class, ClientboundSetObjectivePacket::new).addPacket(ClientboundSetPassengersPacket.class, ClientboundSetPassengersPacket::new).addPacket(ClientboundSetPlayerTeamPacket.class, ClientboundSetPlayerTeamPacket::new).addPacket(ClientboundSetScorePacket.class, ClientboundSetScorePacket::new).addPacket(ClientboundSetSimulationDistancePacket.class, ClientboundSetSimulationDistancePacket::new).addPacket(ClientboundSetSubtitleTextPacket.class, ClientboundSetSubtitleTextPacket::new).addPacket(ClientboundSetTimePacket.class, ClientboundSetTimePacket::new).addPacket(ClientboundSetTitleTextPacket.class, ClientboundSetTitleTextPacket::new).addPacket(ClientboundSetTitlesAnimationPacket.class, ClientboundSetTitlesAnimationPacket::new).addPacket(ClientboundSoundEntityPacket.class, ClientboundSoundEntityPacket::new).addPacket(ClientboundSoundPacket.class, ClientboundSoundPacket::new).addPacket(ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new).addPacket(ClientboundTabListPacket.class, ClientboundTabListPacket::new).addPacket(ClientboundTagQueryPacket.class, ClientboundTagQueryPacket::new).addPacket(ClientboundTakeItemEntityPacket.class, ClientboundTakeItemEntityPacket::new).addPacket(ClientboundTeleportEntityPacket.class, ClientboundTeleportEntityPacket::new).addPacket(ClientboundUpdateAdvancementsPacket.class, ClientboundUpdateAdvancementsPacket::new).addPacket(ClientboundUpdateAttributesPacket.class, ClientboundUpdateAttributesPacket::new).addPacket(ClientboundUpdateMobEffectPacket.class, ClientboundUpdateMobEffectPacket::new).addPacket(ClientboundUpdateRecipesPacket.class, ClientboundUpdateRecipesPacket::new).addPacket(ClientboundUpdateTagsPacket.class, ClientboundUpdateTagsPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerGamePacketListener>()).addPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new).addPacket(ServerboundBlockEntityTagQuery.class, ServerboundBlockEntityTagQuery::new).addPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new).addPacket(ServerboundChatPacket.class, ServerboundChatPacket::new).addPacket(ServerboundClientCommandPacket.class, ServerboundClientCommandPacket::new).addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new).addPacket(ServerboundCommandSuggestionPacket.class, ServerboundCommandSuggestionPacket::new).addPacket(ServerboundContainerButtonClickPacket.class, ServerboundContainerButtonClickPacket::new).addPacket(ServerboundContainerClickPacket.class, ServerboundContainerClickPacket::new).addPacket(ServerboundContainerClosePacket.class, ServerboundContainerClosePacket::new).addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new).addPacket(ServerboundEditBookPacket.class, ServerboundEditBookPacket::new).addPacket(ServerboundEntityTagQuery.class, ServerboundEntityTagQuery::new).addPacket(ServerboundInteractPacket.class, ServerboundInteractPacket::new).addPacket(ServerboundJigsawGeneratePacket.class, ServerboundJigsawGeneratePacket::new).addPacket(ServerboundKeepAlivePacket.class, ServerboundKeepAlivePacket::new).addPacket(ServerboundLockDifficultyPacket.class, ServerboundLockDifficultyPacket::new).addPacket(ServerboundMovePlayerPacket.Pos.class, ServerboundMovePlayerPacket.Pos::read).addPacket(ServerboundMovePlayerPacket.PosRot.class, ServerboundMovePlayerPacket.PosRot::read).addPacket(ServerboundMovePlayerPacket.Rot.class, ServerboundMovePlayerPacket.Rot::read).addPacket(ServerboundMovePlayerPacket.StatusOnly.class, ServerboundMovePlayerPacket.StatusOnly::read).addPacket(ServerboundMoveVehiclePacket.class, ServerboundMoveVehiclePacket::new).addPacket(ServerboundPaddleBoatPacket.class, ServerboundPaddleBoatPacket::new).addPacket(ServerboundPickItemPacket.class, ServerboundPickItemPacket::new).addPacket(ServerboundPlaceRecipePacket.class, ServerboundPlaceRecipePacket::new).addPacket(ServerboundPlayerAbilitiesPacket.class, ServerboundPlayerAbilitiesPacket::new).addPacket(ServerboundPlayerActionPacket.class, ServerboundPlayerActionPacket::new).addPacket(ServerboundPlayerCommandPacket.class, ServerboundPlayerCommandPacket::new).addPacket(ServerboundPlayerInputPacket.class, ServerboundPlayerInputPacket::new).addPacket(ServerboundPongPacket.class, ServerboundPongPacket::new).addPacket(ServerboundRecipeBookChangeSettingsPacket.class, ServerboundRecipeBookChangeSettingsPacket::new).addPacket(ServerboundRecipeBookSeenRecipePacket.class, ServerboundRecipeBookSeenRecipePacket::new).addPacket(ServerboundRenameItemPacket.class, ServerboundRenameItemPacket::new).addPacket(ServerboundResourcePackPacket.class, ServerboundResourcePackPacket::new).addPacket(ServerboundSeenAdvancementsPacket.class, ServerboundSeenAdvancementsPacket::new).addPacket(ServerboundSelectTradePacket.class, ServerboundSelectTradePacket::new).addPacket(ServerboundSetBeaconPacket.class, ServerboundSetBeaconPacket::new).addPacket(ServerboundSetCarriedItemPacket.class, ServerboundSetCarriedItemPacket::new).addPacket(ServerboundSetCommandBlockPacket.class, ServerboundSetCommandBlockPacket::new).addPacket(ServerboundSetCommandMinecartPacket.class, ServerboundSetCommandMinecartPacket::new).addPacket(ServerboundSetCreativeModeSlotPacket.class, ServerboundSetCreativeModeSlotPacket::new).addPacket(ServerboundSetJigsawBlockPacket.class, ServerboundSetJigsawBlockPacket::new).addPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new).addPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new).addPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new).addPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new).addPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new).addPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new))),
 +    STATUS(1, protocol().addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerStatusPacketListener>()).addPacket(ServerboundStatusRequestPacket.class, ServerboundStatusRequestPacket::new).addPacket(ServerboundPingRequestPacket.class, ServerboundPingRequestPacket::new)).addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientStatusPacketListener>()).addPacket(ClientboundStatusResponsePacket.class, ClientboundStatusResponsePacket::new).addPacket(ClientboundPongResponsePacket.class, ClientboundPongResponsePacket::new))),
 +    LOGIN(2, protocol().addFlow(PacketFlow.CLIENTBOUND, (new ConnectionProtocol.PacketSet<ClientLoginPacketListener>()).addPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new).addPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new).addPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new).addPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new).addPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)).addFlow(PacketFlow.SERVERBOUND, (new ConnectionProtocol.PacketSet<ServerLoginPacketListener>()).addPacket(ServerboundHelloPacket.class, ServerboundHelloPacket::new).addPacket(ServerboundKeyPacket.class, ServerboundKeyPacket::new).addPacket(ServerboundCustomQueryPacket.class, ServerboundCustomQueryPacket::new)));
 +    // Paper end
  
      private static final int MIN_PROTOCOL_ID = -1;
      private static final int MAX_PROTOCOL_ID = 2;
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+index a444455e8b216f9d1a34089c5793788923eec916..5b08eaaf42566827e1cb755710736f1306ef04db 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java
+@@ -12,32 +12,13 @@ import net.minecraft.world.level.GameType;
+ import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.dimension.DimensionType;
+ 
+-public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType gameType, GameType previousGameType, Set<ResourceKey<Level>> levels, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> dimension, long seed, int maxPlayers, int chunkRadius, int simulationDistance, boolean reducedDebugInfo, boolean showDeathScreen, boolean isDebug, boolean isFlat) implements Packet {
++public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType gameType, GameType previousGameType, Set<ResourceKey<Level>> levels, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> dimension, long seed, int maxPlayers, int chunkRadius, int simulationDistance, boolean reducedDebugInfo, boolean showDeathScreen, boolean isDebug, boolean isFlat) implements Packet<ClientGamePacketListener> { // Paper - fix missing generic
+     public ClientboundLoginPacket(FriendlyByteBuf buf) {
+         this(buf.readInt(), buf.readBoolean(), GameType.byId(buf.readByte()), GameType.byNullableId(buf.readByte()), buf.readCollection(Sets::newHashSetWithExpectedSize, (b) -> {
+             return ResourceKey.create(Registry.DIMENSION_REGISTRY, b.readResourceLocation());
+         }), buf.readWithCodec(RegistryAccess.RegistryHolder.NETWORK_CODEC), buf.readWithCodec(DimensionType.CODEC).get(), ResourceKey.create(Registry.DIMENSION_REGISTRY, buf.readResourceLocation()), buf.readLong(), buf.readVarInt(), buf.readVarInt(), buf.readVarInt(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean());
+     }
+ 
+-    public ClientboundLoginPacket(int playerEntityId, boolean bl, GameType previousGameMode, @Nullable GameType gameType, Set<ResourceKey<Level>> set, RegistryAccess.RegistryHolder registryHolder, DimensionType dimensionType, ResourceKey<Level> resourceKey, long l, int maxPlayers, int chunkLoadDistance, int i, boolean bl2, boolean bl3, boolean bl4, boolean bl5) {
+-        this.playerId = playerEntityId;
+-        this.hardcore = bl;
+-        this.gameType = previousGameMode;
+-        this.previousGameType = gameType;
+-        this.levels = set;
+-        this.registryHolder = registryHolder;
+-        this.dimensionType = dimensionType;
+-        this.dimension = resourceKey;
+-        this.seed = l;
+-        this.maxPlayers = maxPlayers;
+-        this.chunkRadius = chunkLoadDistance;
+-        this.simulationDistance = i;
+-        this.reducedDebugInfo = bl2;
+-        this.showDeathScreen = bl3;
+-        this.isDebug = bl4;
+-        this.isFlat = bl5;
+-    }
+-
+     @Override
+     public void write(FriendlyByteBuf buf) {
+         buf.writeInt(this.playerId);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 53db2468b3bde473fd90a218047db8149c4e7755..8be15a63be90720ce34a7c0cb696a59d864396f8 100644
+index 6e97d5101be851518461df440d8160a2710afc0d..b06105d3920f68bcedb81359b0f62925421b338d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1784,7 +1784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1724,7 +1724,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              PackRepository resourcepackrepository = this.packRepository;
  
              Objects.requireNonNull(this.packRepository);
 -            return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
-+            return stream.<Pack>map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error
++            return stream.<Pack>map(resourcepackrepository::getPack).filter(Objects::nonNull).map(Pack::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error // Paper - decompile error // todo: is this needed anymore?
          }, this).thenCompose((immutablelist) -> {
              return ServerResources.loadResources(immutablelist, this.registryHolder, this.isDedicatedServer() ? Commands.CommandSelection.DEDICATED : Commands.CommandSelection.INTEGRATED, this.getFunctionCompilationLevel(), this.executor, this);
          }).thenAcceptAsync((datapackresources) -> {
@@ -182,19 +186,6 @@ index 062da1bddd9704f5fbc46e974e13e60cd500bbe2..ffc43e5d3d0563c9e9c171064511b2c6
          }
      }
  
-diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index ee5bb1a8edb812d48d5af45ea8485f574dcb2ad5..9f3355dbbbab1ab88cf2b7034130c2888e38d7a7 100644
---- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -206,7 +206,7 @@ public class ServerStatsCounter extends StatsCounter {
-         ObjectIterator objectiterator = this.stats.object2IntEntrySet().iterator();
- 
-         while (objectiterator.hasNext()) {
--            it.unimi.dsi.fastutil.objects.Object2IntMap.Entry<Stat<?>> it_unimi_dsi_fastutil_objects_object2intmap_entry = (it.unimi.dsi.fastutil.objects.Object2IntMap.Entry) objectiterator.next();
-+            Object2IntMap.Entry<Stat<?>> it_unimi_dsi_fastutil_objects_object2intmap_entry = (Object2IntMap.Entry) objectiterator.next(); // Paper - decompile fix
-             Stat<?> statistic = (Stat) it_unimi_dsi_fastutil_objects_object2intmap_entry.getKey();
- 
-             ((JsonObject) map.computeIfAbsent(statistic.getType(), (statisticwrapper) -> {
 diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java
 index d0f6eb3981a171c0f34870cb0472599d6cca9642..d1b2ba24ef54e01c6249c3b2ca16e80f03c001a6 100644
 --- a/src/main/java/net/minecraft/util/SortedArraySet.java
@@ -208,21 +199,8 @@ index d0f6eb3981a171c0f34870cb0472599d6cca9642..d1b2ba24ef54e01c6249c3b2ca16e80f
      }
  
      public static <T> SortedArraySet<T> create(Comparator<T> comparator) {
-diff --git a/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java b/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-index a2bab5980a8fd6d98c20aa601ba0ce97044ce996..d7cc7e12d265a47564c3f1d4af27a3ec8cba284a 100644
---- a/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-+++ b/src/main/java/net/minecraft/util/thread/ProcessorMailbox.java
-@@ -93,7 +93,7 @@ public class ProcessorMailbox<T> implements ProfilerMeasured, ProcessorHandle<T>
-     @Override
-     public void run() {
-         try {
--            this.pollUntil((i) -> {
-+            this.pollUntil((int i) -> { // Paper - decompile fix
-                 return i == 0;
-             });
-         } finally {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-index 75c1c4671fedb425dea20dc4fb0c6cb2304dee83..5a86bc6f552913e2978c61233148db22e3a240f1 100644
+index 4c56628f7a930e1d46e486a957551425e25b0508..6514401da53772301be2b3abc827504903e43644 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 @@ -30,7 +30,7 @@ public class PoiSection {
@@ -235,7 +213,7 @@ index 75c1c4671fedb425dea20dc4fb0c6cb2304dee83..5a86bc6f552913e2978c61233148db22
                  return poiSet.isValid;
              }), PoiRecord.codec(updateListener).listOf().fieldOf("Records").forGetter((poiSet) -> {
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index 38dd114fbfa07a18987cd774ae05060d723247e4..057b92a2948543644618c63abd3f61d1120db4dd 100644
+index 2e2bc7213b7e19e945eba885ff5614f809c81db0..b4edadc980c8305613bb4277c7028e2588653857 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -75,7 +75,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
@@ -243,7 +221,7 @@ index 38dd114fbfa07a18987cd774ae05060d723247e4..057b92a2948543644618c63abd3f61d1
  
          this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> {
 -            return (entry1.getValue()); // CraftBukkit
-+            return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally*
++            return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally* // todo: is this needed anymore?
          }));
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
      }
@@ -261,10 +239,10 @@ index eb07e63f3c40fd8914cde50dfa789b1ed20b755a..3af31dc2c82c11ee78d497c5777615c1
          }).thenComparing((tickNextTickData) -> {
              return tickNextTickData.priority;
 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747a5634603 100644
+index 3c20bd9405f7844d92fdb42a49efd260bff7c7a0..315a6bbdfa59d85be721735cfe727d34b28fc0ad 100644
 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
 +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -53,8 +53,40 @@ import org.apache.logging.log4j.Logger;
+@@ -39,8 +39,32 @@ import org.apache.logging.log4j.Logger;
  
  public final class Biome {
      public static final Logger LOGGER = LogManager.getLogger();
@@ -276,10 +254,6 @@ index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747
 +            return biome.climateSettings;
 +        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 +            return biome.biomeCategory;
-+        }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
-+            return biome.depth;
-+        }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
-+            return biome.scale;
 +        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 +            return biome.specialEffects;
 +        }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
@@ -293,21 +267,17 @@ index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747
 +            return biome.climateSettings;
 +        }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 +            return biome.biomeCategory;
-+        }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
-+            return biome.depth;
-+        }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
-+            return biome.scale;
 +        }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 +            return biome.specialEffects;
-+        })).apply(instance, (climateSettings, biomeCategory, float_, float2, biomeSpecialEffects) -> {
-+            return new Biome(climateSettings, biomeCategory, float_, float2, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
++        })).apply(instance, (climateSettings, biomeCategory, biomeSpecialEffects) -> {
++            return new Biome(climateSettings, biomeCategory, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
 +        });
 +    });
 +    // Paper end
      public static final Codec<Supplier<Biome>> CODEC = RegistryFileCodec.create(Registry.BIOME_REGISTRY, DIRECT_CODEC);
      public static final Codec<List<Supplier<Biome>>> LIST_CODEC = RegistryFileCodec.homogeneousList(Registry.BIOME_REGISTRY, DIRECT_CODEC);
-     private final Map<Integer, List<StructureFeature<?>>> structuresByStep = Registry.STRUCTURE_FEATURE.stream().collect(Collectors.groupingBy((structureFeature) -> {
-@@ -336,41 +368,6 @@ public final class Biome {
+     private static final PerlinSimplexNoise TEMPERATURE_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(1234L)), ImmutableList.of(0));
+@@ -242,33 +266,6 @@ public final class Biome {
          return resourceLocation == null ? super.toString() : resourceLocation.toString();
      }
  
@@ -317,10 +287,6 @@ index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747
 -                return biome.climateSettings;
 -            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 -                return biome.biomeCategory;
--            }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
--                return biome.depth;
--            }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
--                return biome.scale;
 -            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 -                return biome.specialEffects;
 -            }), BiomeGenerationSettings.CODEC.forGetter((biome) -> {
@@ -334,14 +300,10 @@ index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747
 -                return biome.climateSettings;
 -            }), Biome.BiomeCategory.CODEC.fieldOf("category").forGetter((biome) -> {
 -                return biome.biomeCategory;
--            }), Codec.FLOAT.fieldOf("depth").forGetter((biome) -> {
--                return biome.depth;
--            }), Codec.FLOAT.fieldOf("scale").forGetter((biome) -> {
--                return biome.scale;
 -            }), BiomeSpecialEffects.CODEC.fieldOf("effects").forGetter((biome) -> {
 -                return biome.specialEffects;
--            })).apply(instance, (climateSettings, biomeCategory, float_, float2, biomeSpecialEffects) -> {
--                return new Biome(climateSettings, biomeCategory, float_, float2, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
+-            })).apply(instance, (climateSettings, biomeCategory, biomeSpecialEffects) -> {
+-                return new Biome(climateSettings, biomeCategory, biomeSpecialEffects, BiomeGenerationSettings.EMPTY, MobSpawnSettings.EMPTY);
 -            });
 -        });
 -    }
@@ -349,23 +311,3 @@ index eb870fba1d54201664f4a384fa45db99b65a252f..3f3b4e4ea8231fdcc799bd9de3e20747
      public static class BiomeBuilder {
          @Nullable
          private Biome.Precipitation precipitation;
-diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-index f1ba8da158963f01c63412370a31aec617e0c7da..e76591dec764d92e1a760c5208714f3c80ea8fc7 100644
---- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java
-@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import java.util.Arrays;
- import java.util.Collection;
-+import java.util.Iterator;
- import java.util.Map;
- import java.util.Optional;
- import java.util.function.Predicate;
-@@ -19,6 +20,7 @@ public class EnumProperty<T extends Enum<T> & StringRepresentable> extends Prope
-     protected EnumProperty(String name, Class<T> type, Collection<T> values) {
-         super(name, type);
-         this.values = ImmutableSet.copyOf(values);
-+        Iterator<T> iterator = values.iterator(); // Paper - decompile fix
- 
-         for(T enum_ : values) {
-             String string = enum_.getSerializedName();
diff --git a/patches/api/0006-Timings-v2.patch b/patches/unapplied/api/0006-Timings-v2.patch
index 633794390b..633794390b 100644
--- a/patches/api/0006-Timings-v2.patch
+++ b/patches/unapplied/api/0006-Timings-v2.patch
diff --git a/patches/api/0007-Adventure.patch b/patches/unapplied/api/0007-Adventure.patch
index dad4b7acb7..578ce99912 100644
--- a/patches/api/0007-Adventure.patch
+++ b/patches/unapplied/api/0007-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index be1e7b4a57cae34f5cda768a6760e1e1245c8774..b73d9f834e8e50c4cee8592e1e3867bbde8132fe 100644
+index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f78b15635 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -10,6 +10,19 @@ java {
@@ -33,7 +33,7 @@ index be1e7b4a57cae34f5cda768a6760e1e1245c8774..b73d9f834e8e50c4cee8592e1e3867bb
 @@ -19,6 +32,11 @@ dependencies {
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
-     api("it.unimi.dsi:fastutil:8.2.2")
+     api("it.unimi.dsi:fastutil:8.5.6")
 +    apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
 +    apiAndDocs("net.kyori:adventure-api")
 +    apiAndDocs("net.kyori:adventure-text-serializer-gson")
diff --git a/patches/api/0008-Player-affects-spawning-API.patch b/patches/unapplied/api/0008-Player-affects-spawning-API.patch
index 1b3ace796e..1b3ace796e 100644
--- a/patches/api/0008-Player-affects-spawning-API.patch
+++ b/patches/unapplied/api/0008-Player-affects-spawning-API.patch
diff --git a/patches/api/0009-Add-getTPS-method.patch b/patches/unapplied/api/0009-Add-getTPS-method.patch
index 51a7b901d3..51a7b901d3 100644
--- a/patches/api/0009-Add-getTPS-method.patch
+++ b/patches/unapplied/api/0009-Add-getTPS-method.patch
diff --git a/patches/api/0010-Entity-Origin-API.patch b/patches/unapplied/api/0010-Entity-Origin-API.patch
index 3feb6b236a..3feb6b236a 100644
--- a/patches/api/0010-Entity-Origin-API.patch
+++ b/patches/unapplied/api/0010-Entity-Origin-API.patch
diff --git a/patches/api/0011-Version-Command-2.0.patch b/patches/unapplied/api/0011-Version-Command-2.0.patch
index c7cc974e1a..c7cc974e1a 100644
--- a/patches/api/0011-Version-Command-2.0.patch
+++ b/patches/unapplied/api/0011-Version-Command-2.0.patch
diff --git a/patches/api/0012-Add-PlayerLocaleChangeEvent.patch b/patches/unapplied/api/0012-Add-PlayerLocaleChangeEvent.patch
index 10593168ec..10593168ec 100644
--- a/patches/api/0012-Add-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/api/0012-Add-PlayerLocaleChangeEvent.patch
diff --git a/patches/api/0013-Add-view-distance-API.patch b/patches/unapplied/api/0013-Add-view-distance-API.patch
index 7e5aec02a8..7e5aec02a8 100644
--- a/patches/api/0013-Add-view-distance-API.patch
+++ b/patches/unapplied/api/0013-Add-view-distance-API.patch
diff --git a/patches/api/0014-Add-BeaconEffectEvent.patch b/patches/unapplied/api/0014-Add-BeaconEffectEvent.patch
index 43af3c3828..43af3c3828 100644
--- a/patches/api/0014-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/api/0014-Add-BeaconEffectEvent.patch
diff --git a/patches/api/0015-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/api/0015-Add-PlayerInitialSpawnEvent.patch
index 44ff48c323..44ff48c323 100644
--- a/patches/api/0015-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/api/0015-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch b/patches/unapplied/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
index fcf406e1d2..fcf406e1d2 100644
--- a/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/patches/unapplied/api/0016-Automatically-disable-plugins-that-fail-to-load.patch
diff --git a/patches/api/0017-Expose-server-CommandMap.patch b/patches/unapplied/api/0017-Expose-server-CommandMap.patch
index f1bd7894bb..f1bd7894bb 100644
--- a/patches/api/0017-Expose-server-CommandMap.patch
+++ b/patches/unapplied/api/0017-Expose-server-CommandMap.patch
diff --git a/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/unapplied/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index c692f183a3..c692f183a3 100644
--- a/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/unapplied/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
diff --git a/patches/api/0019-Add-exception-reporting-event.patch b/patches/unapplied/api/0019-Add-exception-reporting-event.patch
index 0b5258ca98..0b5258ca98 100644
--- a/patches/api/0019-Add-exception-reporting-event.patch
+++ b/patches/unapplied/api/0019-Add-exception-reporting-event.patch
diff --git a/patches/api/0020-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/api/0020-Player-Tab-List-and-Title-APIs.patch
index 22fe4c35e0..22fe4c35e0 100644
--- a/patches/api/0020-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/api/0020-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/unapplied/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
index 87d3369578..87d3369578 100644
--- a/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/patches/unapplied/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/unapplied/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 39b5170da3..39b5170da3 100644
--- a/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/patches/unapplied/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index c2662ea313..c2662ea313 100644
--- a/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/0024-Complete-resource-pack-API.patch b/patches/unapplied/api/0024-Complete-resource-pack-API.patch
index 3545105bb1..3545105bb1 100644
--- a/patches/api/0024-Complete-resource-pack-API.patch
+++ b/patches/unapplied/api/0024-Complete-resource-pack-API.patch
diff --git a/patches/api/0025-Use-ASM-for-event-executors.patch b/patches/unapplied/api/0025-Use-ASM-for-event-executors.patch
index f5bd29806a..f5bd29806a 100644
--- a/patches/api/0025-Use-ASM-for-event-executors.patch
+++ b/patches/unapplied/api/0025-Use-ASM-for-event-executors.patch
diff --git a/patches/api/0026-Add-a-call-helper-to-Event.patch b/patches/unapplied/api/0026-Add-a-call-helper-to-Event.patch
index 4b287bfa56..4b287bfa56 100644
--- a/patches/api/0026-Add-a-call-helper-to-Event.patch
+++ b/patches/unapplied/api/0026-Add-a-call-helper-to-Event.patch
diff --git a/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch b/patches/unapplied/api/0027-Add-sender-name-to-commands.yml-replacement.patch
index 7122fed4a2..7122fed4a2 100644
--- a/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch
+++ b/patches/unapplied/api/0027-Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/unapplied/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
index aefcac4105..aefcac4105 100644
--- a/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/unapplied/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
diff --git a/patches/api/0029-Custom-replacement-for-eaten-items.patch b/patches/unapplied/api/0029-Custom-replacement-for-eaten-items.patch
index 94ff9d88e2..94ff9d88e2 100644
--- a/patches/api/0029-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/api/0029-Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
index 5dc11c88f8..5dc11c88f8 100644
--- a/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/0031-EntityPathfindEvent.patch b/patches/unapplied/api/0031-EntityPathfindEvent.patch
index 697b76661a..697b76661a 100644
--- a/patches/api/0031-EntityPathfindEvent.patch
+++ b/patches/unapplied/api/0031-EntityPathfindEvent.patch
diff --git a/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/unapplied/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index d4674ca2f4..d4674ca2f4 100644
--- a/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/patches/unapplied/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/unapplied/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
index d15d19b316..d15d19b316 100644
--- a/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/patches/unapplied/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/api/0034-Add-PlayerUseUnknownEntityEvent.patch
index 8fa59475c2..8fa59475c2 100644
--- a/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/api/0034-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index eb1703e485..eb1703e485 100644
--- a/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/0036-Arrow-pickup-rule-API.patch b/patches/unapplied/api/0036-Arrow-pickup-rule-API.patch
index fb3753f0e1..fb3753f0e1 100644
--- a/patches/api/0036-Arrow-pickup-rule-API.patch
+++ b/patches/unapplied/api/0036-Arrow-pickup-rule-API.patch
diff --git a/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
index f06ee13d15..f06ee13d15 100644
--- a/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/0038-LootTable-API.patch b/patches/unapplied/api/0038-LootTable-API.patch
index ed6e56042d..ed6e56042d 100644
--- a/patches/api/0038-LootTable-API.patch
+++ b/patches/unapplied/api/0038-LootTable-API.patch
diff --git a/patches/api/0039-Add-EntityZapEvent.patch b/patches/unapplied/api/0039-Add-EntityZapEvent.patch
index 41d603f073..41d603f073 100644
--- a/patches/api/0039-Add-EntityZapEvent.patch
+++ b/patches/unapplied/api/0039-Add-EntityZapEvent.patch
diff --git a/patches/api/0040-Misc-Utils.patch b/patches/unapplied/api/0040-Misc-Utils.patch
index fac858b16c..fac858b16c 100644
--- a/patches/api/0040-Misc-Utils.patch
+++ b/patches/unapplied/api/0040-Misc-Utils.patch
diff --git a/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/api/0041-Allow-Reloading-of-Command-Aliases.patch
index d635ef31e5..d635ef31e5 100644
--- a/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/api/0041-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/api/0042-Add-source-to-PlayerExpChangeEvent.patch
index 675b2be839..675b2be839 100644
--- a/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/api/0042-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/0043-Add-ProjectileCollideEvent.patch b/patches/unapplied/api/0043-Add-ProjectileCollideEvent.patch
index a5c9df18df..a5c9df18df 100644
--- a/patches/api/0043-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/api/0043-Add-ProjectileCollideEvent.patch
diff --git a/patches/api/0044-Add-String-based-Action-Bar-API.patch b/patches/unapplied/api/0044-Add-String-based-Action-Bar-API.patch
index a72960eacb..a72960eacb 100644
--- a/patches/api/0044-Add-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/api/0044-Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5253041ed0..5253041ed0 100644
--- a/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/0046-IllegalPacketEvent.patch b/patches/unapplied/api/0046-IllegalPacketEvent.patch
index 7eb8d61aaa..7eb8d61aaa 100644
--- a/patches/api/0046-IllegalPacketEvent.patch
+++ b/patches/unapplied/api/0046-IllegalPacketEvent.patch
diff --git a/patches/api/0047-Fireworks-API-s.patch b/patches/unapplied/api/0047-Fireworks-API-s.patch
index a0ed753ac6..a0ed753ac6 100644
--- a/patches/api/0047-Fireworks-API-s.patch
+++ b/patches/unapplied/api/0047-Fireworks-API-s.patch
diff --git a/patches/api/0048-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/api/0048-PlayerTeleportEndGatewayEvent.patch
index 664edd24cd..664edd24cd 100644
--- a/patches/api/0048-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/api/0048-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
index 61a57fd0f8..61a57fd0f8 100644
--- a/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 5dadaf640f..5dadaf640f 100644
--- a/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/unapplied/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
index f700226be3..f700226be3 100644
--- a/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/patches/unapplied/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
diff --git a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
index 123d3d08e9..123d3d08e9 100644
--- a/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/unapplied/api/0053-Fix-upstream-javadocs.patch
index 69aacfad4b..69aacfad4b 100644
--- a/patches/api/0053-Fix-upstream-javadocs.patch
+++ b/patches/unapplied/api/0053-Fix-upstream-javadocs.patch
diff --git a/patches/api/0054-Item-canEntityPickup.patch b/patches/unapplied/api/0054-Item-canEntityPickup.patch
index 27894bda93..27894bda93 100644
--- a/patches/api/0054-Item-canEntityPickup.patch
+++ b/patches/unapplied/api/0054-Item-canEntityPickup.patch
diff --git a/patches/api/0055-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/api/0055-PlayerAttemptPickupItemEvent.patch
index 6b504ae688..6b504ae688 100644
--- a/patches/api/0055-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/api/0055-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/0056-Add-UnknownCommandEvent.patch b/patches/unapplied/api/0056-Add-UnknownCommandEvent.patch
index 9e3d997b0d..9e3d997b0d 100644
--- a/patches/api/0056-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/api/0056-Add-UnknownCommandEvent.patch
diff --git a/patches/api/0057-Basic-PlayerProfile-API.patch b/patches/unapplied/api/0057-Basic-PlayerProfile-API.patch
index 82981fc9a7..82981fc9a7 100644
--- a/patches/api/0057-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/api/0057-Basic-PlayerProfile-API.patch
diff --git a/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 353d395911..353d395911 100644
--- a/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/0059-Shoulder-Entities-Release-API.patch b/patches/unapplied/api/0059-Shoulder-Entities-Release-API.patch
index 24c7419ce5..24c7419ce5 100644
--- a/patches/api/0059-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/api/0059-Shoulder-Entities-Release-API.patch
diff --git a/patches/api/0060-Entity-fromMobSpawner.patch b/patches/unapplied/api/0060-Entity-fromMobSpawner.patch
index 222a4c507f..222a4c507f 100644
--- a/patches/api/0060-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/api/0060-Entity-fromMobSpawner.patch
diff --git a/patches/api/0061-Profile-Lookup-Events.patch b/patches/unapplied/api/0061-Profile-Lookup-Events.patch
index 1cdb35476d..1cdb35476d 100644
--- a/patches/api/0061-Profile-Lookup-Events.patch
+++ b/patches/unapplied/api/0061-Profile-Lookup-Events.patch
diff --git a/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/api/0062-Improve-the-Saddle-API-for-Horses.patch
index 85814456bf..85814456bf 100644
--- a/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/api/0062-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/0063-Add-getI18NDisplayName-API.patch b/patches/unapplied/api/0063-Add-getI18NDisplayName-API.patch
index 8af413093e..8af413093e 100644
--- a/patches/api/0063-Add-getI18NDisplayName-API.patch
+++ b/patches/unapplied/api/0063-Add-getI18NDisplayName-API.patch
diff --git a/patches/api/0064-ensureServerConversions-API.patch b/patches/unapplied/api/0064-ensureServerConversions-API.patch
index 82e1a82c86..82e1a82c86 100644
--- a/patches/api/0064-ensureServerConversions-API.patch
+++ b/patches/unapplied/api/0064-ensureServerConversions-API.patch
diff --git a/patches/api/0065-Make-plugins-list-alphabetical.patch b/patches/unapplied/api/0065-Make-plugins-list-alphabetical.patch
index ec1fc9814a..ec1fc9814a 100644
--- a/patches/api/0065-Make-plugins-list-alphabetical.patch
+++ b/patches/unapplied/api/0065-Make-plugins-list-alphabetical.patch
diff --git a/patches/api/0066-LivingEntity-setKiller.patch b/patches/unapplied/api/0066-LivingEntity-setKiller.patch
index 37cb713a6e..37cb713a6e 100644
--- a/patches/api/0066-LivingEntity-setKiller.patch
+++ b/patches/unapplied/api/0066-LivingEntity-setKiller.patch
diff --git a/patches/api/0067-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/api/0067-ProfileWhitelistVerifyEvent.patch
index ff996377f4..ff996377f4 100644
--- a/patches/api/0067-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/api/0067-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
index e61970e72e..e61970e72e 100644
--- a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/unapplied/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/unapplied/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
index 4df160a20b..4df160a20b 100644
--- a/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/patches/unapplied/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/0070-Add-PlayerJumpEvent.patch b/patches/unapplied/api/0070-Add-PlayerJumpEvent.patch
index 18f2c35b4d..18f2c35b4d 100644
--- a/patches/api/0070-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/api/0070-Add-PlayerJumpEvent.patch
diff --git a/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/unapplied/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 958596ad70..958596ad70 100644
--- a/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/patches/unapplied/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/0072-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/api/0072-Add-PlayerArmorChangeEvent.patch
index 4e9d795db3..4e9d795db3 100644
--- a/patches/api/0072-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/api/0072-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
index 26c4c4cc18..26c4c4cc18 100644
--- a/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/api/0074-AsyncTabCompleteEvent.patch b/patches/unapplied/api/0074-AsyncTabCompleteEvent.patch
index e86dd9b401..e86dd9b401 100644
--- a/patches/api/0074-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/api/0074-AsyncTabCompleteEvent.patch
diff --git a/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/0075-Expose-client-protocol-version-and-virtual-host.patch
index 7d1caf10dc..7d1caf10dc 100644
--- a/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/api/0075-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch b/patches/unapplied/api/0076-Display-warning-on-deprecated-recipe-API.patch
index 2b6c78a2c4..2b6c78a2c4 100644
--- a/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch
+++ b/patches/unapplied/api/0076-Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/0077-PlayerPickupExperienceEvent.patch b/patches/unapplied/api/0077-PlayerPickupExperienceEvent.patch
index 906a8ec7c3..906a8ec7c3 100644
--- a/patches/api/0077-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/api/0077-PlayerPickupExperienceEvent.patch
diff --git a/patches/api/0078-ExperienceOrbMergeEvent.patch b/patches/unapplied/api/0078-ExperienceOrbMergeEvent.patch
index 3a4722a776..3a4722a776 100644
--- a/patches/api/0078-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/api/0078-ExperienceOrbMergeEvent.patch
diff --git a/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/api/0079-Ability-to-apply-mending-to-XP-API.patch
index af34682202..af34682202 100644
--- a/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/api/0079-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/0080-PreCreatureSpawnEvent.patch b/patches/unapplied/api/0080-PreCreatureSpawnEvent.patch
index 0090330de9..0090330de9 100644
--- a/patches/api/0080-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/api/0080-PreCreatureSpawnEvent.patch
diff --git a/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
index a6fa8a9b72..a6fa8a9b72 100644
--- a/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/api/0081-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
index 42ffd3f948..42ffd3f948 100644
--- a/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/api/0082-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/0083-Fill-Profile-Property-Events.patch b/patches/unapplied/api/0083-Fill-Profile-Property-Events.patch
index 5511f6449a..5511f6449a 100644
--- a/patches/api/0083-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/api/0083-Fill-Profile-Property-Events.patch
diff --git a/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/api/0084-PlayerAdvancementCriterionGrantEvent.patch
index 5e8eaca58a..5e8eaca58a 100644
--- a/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/api/0084-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/api/0085-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/api/0085-Add-ArmorStand-Item-Meta.patch
index 6287ef49e7..6287ef49e7 100644
--- a/patches/api/0085-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/api/0085-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/0086-Optimize-Hoppers.patch b/patches/unapplied/api/0086-Optimize-Hoppers.patch
index 79c141af55..79c141af55 100644
--- a/patches/api/0086-Optimize-Hoppers.patch
+++ b/patches/unapplied/api/0086-Optimize-Hoppers.patch
diff --git a/patches/api/0087-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/api/0087-Tameable-getOwnerUniqueId-API.patch
index b911542a60..b911542a60 100644
--- a/patches/api/0087-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/api/0087-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index eef7cb2fc8..eef7cb2fc8 100644
--- a/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/api/0089-Add-extended-PaperServerListPingEvent.patch b/patches/unapplied/api/0089-Add-extended-PaperServerListPingEvent.patch
index f35ae4323f..f35ae4323f 100644
--- a/patches/api/0089-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/api/0089-Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/0090-Player.setPlayerProfile-API.patch b/patches/unapplied/api/0090-Player.setPlayerProfile-API.patch
index 8ef5636311..8ef5636311 100644
--- a/patches/api/0090-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/api/0090-Player.setPlayerProfile-API.patch
diff --git a/patches/api/0091-getPlayerUniqueId-API.patch b/patches/unapplied/api/0091-getPlayerUniqueId-API.patch
index 7eaec18b6d..7eaec18b6d 100644
--- a/patches/api/0091-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/api/0091-getPlayerUniqueId-API.patch
diff --git a/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/unapplied/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index f21c766148..f21c766148 100644
--- a/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/patches/unapplied/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/0093-Add-method-to-open-already-placed-sign.patch b/patches/unapplied/api/0093-Add-method-to-open-already-placed-sign.patch
index 4188bded0b..4188bded0b 100644
--- a/patches/api/0093-Add-method-to-open-already-placed-sign.patch
+++ b/patches/unapplied/api/0093-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch b/patches/unapplied/api/0094-Add-Ban-Methods-to-Player-Objects.patch
index 3e729be1ac..3e729be1ac 100644
--- a/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/unapplied/api/0094-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/0095-EndermanEscapeEvent.patch b/patches/unapplied/api/0095-EndermanEscapeEvent.patch
index 82d22fd0ea..82d22fd0ea 100644
--- a/patches/api/0095-EndermanEscapeEvent.patch
+++ b/patches/unapplied/api/0095-EndermanEscapeEvent.patch
diff --git a/patches/api/0096-Enderman.teleportRandomly.patch b/patches/unapplied/api/0096-Enderman.teleportRandomly.patch
index 9c226d009c..9c226d009c 100644
--- a/patches/api/0096-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/api/0096-Enderman.teleportRandomly.patch
diff --git a/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/0097-Additional-world.getNearbyEntities-API-s.patch
index eb246ae5da..eb246ae5da 100644
--- a/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/unapplied/api/0097-Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/api/0098-Location.isChunkLoaded-API.patch b/patches/unapplied/api/0098-Location.isChunkLoaded-API.patch
index 426944c4f9..426944c4f9 100644
--- a/patches/api/0098-Location.isChunkLoaded-API.patch
+++ b/patches/unapplied/api/0098-Location.isChunkLoaded-API.patch
diff --git a/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
index 86fa493562..86fa493562 100644
--- a/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/0100-EndermanAttackPlayerEvent.patch b/patches/unapplied/api/0100-EndermanAttackPlayerEvent.patch
index 9f3e105c9d..9f3e105c9d 100644
--- a/patches/api/0100-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/api/0100-EndermanAttackPlayerEvent.patch
diff --git a/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/unapplied/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
index ae4dc00ba4..ae4dc00ba4 100644
--- a/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/patches/unapplied/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch
diff --git a/patches/api/0102-WitchConsumePotionEvent.patch b/patches/unapplied/api/0102-WitchConsumePotionEvent.patch
index fab6106411..fab6106411 100644
--- a/patches/api/0102-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/api/0102-WitchConsumePotionEvent.patch
diff --git a/patches/api/0103-WitchThrowPotionEvent.patch b/patches/unapplied/api/0103-WitchThrowPotionEvent.patch
index a5dfe42f35..a5dfe42f35 100644
--- a/patches/api/0103-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/api/0103-WitchThrowPotionEvent.patch
diff --git a/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch b/patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch
index 03e2f6215b..03e2f6215b 100644
--- a/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch
+++ b/patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/0105-PotionEffect-clone-methods.patch b/patches/unapplied/api/0105-PotionEffect-clone-methods.patch
index 7f4e064a78..7f4e064a78 100644
--- a/patches/api/0105-PotionEffect-clone-methods.patch
+++ b/patches/unapplied/api/0105-PotionEffect-clone-methods.patch
diff --git a/patches/api/0106-WitchReadyPotionEvent.patch b/patches/unapplied/api/0106-WitchReadyPotionEvent.patch
index 5722426049..5722426049 100644
--- a/patches/api/0106-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/api/0106-WitchReadyPotionEvent.patch
diff --git a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch
index 5a5b635adb..5a5b635adb 100644
--- a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch
index 0422ec9858..0422ec9858 100644
--- a/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/0109-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch
index 7b6e95c4e8..7b6e95c4e8 100644
--- a/patches/api/0109-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 71a82a8eae..71a82a8eae 100644
--- a/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch b/patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch
index 7c85a03490..7c85a03490 100644
--- a/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch
+++ b/patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/0112-PlayerReadyArrowEvent.patch b/patches/unapplied/api/0112-PlayerReadyArrowEvent.patch
index 7ea1740581..7ea1740581 100644
--- a/patches/api/0112-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/api/0112-PlayerReadyArrowEvent.patch
diff --git a/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch b/patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent.patch
index 1620ab68a6..1620ab68a6 100644
--- a/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch
+++ b/patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent.patch
diff --git a/patches/api/0114-Expand-Explosions-API.patch b/patches/unapplied/api/0114-Expand-Explosions-API.patch
index 0895fe036e..0895fe036e 100644
--- a/patches/api/0114-Expand-Explosions-API.patch
+++ b/patches/unapplied/api/0114-Expand-Explosions-API.patch
diff --git a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
index 285bb74979..285bb74979 100644
--- a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
index 85f859eb81..85f859eb81 100644
--- a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/api/0117-RangedEntity-API.patch b/patches/unapplied/api/0117-RangedEntity-API.patch
index 05fc6eb809..05fc6eb809 100644
--- a/patches/api/0117-RangedEntity-API.patch
+++ b/patches/unapplied/api/0117-RangedEntity-API.patch
diff --git a/patches/api/0118-Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch
index 92a50173ce..92a50173ce 100644
--- a/patches/api/0118-Add-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch
diff --git a/patches/api/0119-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch
index 63ddfc1a2d..63ddfc1a2d 100644
--- a/patches/api/0119-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/api/0120-Allow-setting-the-vex-s-summoner.patch b/patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch
index 68b33503be..68b33503be 100644
--- a/patches/api/0120-Allow-setting-the-vex-s-summoner.patch
+++ b/patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/0121-Entity-getChunk-API.patch b/patches/unapplied/api/0121-Entity-getChunk-API.patch
index 87ce3a6577..87ce3a6577 100644
--- a/patches/api/0121-Entity-getChunk-API.patch
+++ b/patches/unapplied/api/0121-Entity-getChunk-API.patch
diff --git a/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/unapplied/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
index d768a18607..d768a18607 100644
--- a/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/patches/unapplied/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch
diff --git a/patches/api/0123-EnderDragon-Events.patch b/patches/unapplied/api/0123-EnderDragon-Events.patch
index 68ed791382..68ed791382 100644
--- a/patches/api/0123-EnderDragon-Events.patch
+++ b/patches/unapplied/api/0123-EnderDragon-Events.patch
diff --git a/patches/api/0124-PlayerElytraBoostEvent.patch b/patches/unapplied/api/0124-PlayerElytraBoostEvent.patch
index c5d8e5ddf3..c5d8e5ddf3 100644
--- a/patches/api/0124-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/api/0124-PlayerElytraBoostEvent.patch
diff --git a/patches/api/0125-PlayerLaunchProjectileEvent.patch b/patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch
index 7524daea92..7524daea92 100644
--- a/patches/api/0125-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/api/0125-PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/0126-EntityTransformedEvent.patch b/patches/unapplied/api/0126-EntityTransformedEvent.patch
index c77c4a8ba6..c77c4a8ba6 100644
--- a/patches/api/0126-EntityTransformedEvent.patch
+++ b/patches/unapplied/api/0126-EntityTransformedEvent.patch
diff --git a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch
index 1bb68e268b..1bb68e268b 100644
--- a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/api/0127-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/0128-SkeletonHorse-Additions.patch b/patches/unapplied/api/0128-SkeletonHorse-Additions.patch
index 8d4dd478ab..8d4dd478ab 100644
--- a/patches/api/0128-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/api/0128-SkeletonHorse-Additions.patch
diff --git a/patches/api/0129-Expand-Location-Manipulation-API.patch b/patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch
index 2251a2d78d..2251a2d78d 100644
--- a/patches/api/0129-Expand-Location-Manipulation-API.patch
+++ b/patches/unapplied/api/0129-Expand-Location-Manipulation-API.patch
diff --git a/patches/api/0130-Expand-ArmorStand-API.patch b/patches/unapplied/api/0130-Expand-ArmorStand-API.patch
index a05dd67b88..a05dd67b88 100644
--- a/patches/api/0130-Expand-ArmorStand-API.patch
+++ b/patches/unapplied/api/0130-Expand-ArmorStand-API.patch
diff --git a/patches/api/0131-AnvilDamageEvent.patch b/patches/unapplied/api/0131-AnvilDamageEvent.patch
index 7561b6a9db..7561b6a9db 100644
--- a/patches/api/0131-AnvilDamageEvent.patch
+++ b/patches/unapplied/api/0131-AnvilDamageEvent.patch
diff --git a/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch b/patches/unapplied/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
index 3f5f5d932c..3f5f5d932c 100644
--- a/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/patches/unapplied/api/0132-Remove-deadlock-risk-in-firing-async-events.patch
diff --git a/patches/api/0133-Add-hand-to-bucket-events.patch b/patches/unapplied/api/0133-Add-hand-to-bucket-events.patch
index 85c5c370f3..85c5c370f3 100644
--- a/patches/api/0133-Add-hand-to-bucket-events.patch
+++ b/patches/unapplied/api/0133-Add-hand-to-bucket-events.patch
diff --git a/patches/api/0134-Add-TNTPrimeEvent.patch b/patches/unapplied/api/0134-Add-TNTPrimeEvent.patch
index 2bddc56f13..2bddc56f13 100644
--- a/patches/api/0134-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/api/0134-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 735997749a..735997749a 100644
--- a/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/unapplied/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/api/0136-Make-EnderDragon-extend-Mob.patch b/patches/unapplied/api/0136-Make-EnderDragon-extend-Mob.patch
index 6779d66171..6779d66171 100644
--- a/patches/api/0136-Make-EnderDragon-extend-Mob.patch
+++ b/patches/unapplied/api/0136-Make-EnderDragon-extend-Mob.patch
diff --git a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 849f81af25..849f81af25 100644
--- a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/unapplied/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index 536fdc2d06..536fdc2d06 100644
--- a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/patches/unapplied/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 42ad1623e3..42ad1623e3 100644
--- a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/unapplied/api/0140-Slime-Pathfinder-Events.patch
index 8d27bd1b14..8d27bd1b14 100644
--- a/patches/api/0140-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/api/0140-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/api/0141-Add-PhantomPreSpawnEvent.patch
index 5ffdc818cb..5ffdc818cb 100644
--- a/patches/api/0141-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/api/0141-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/unapplied/api/0142-Add-More-Creeper-API.patch
index b45e2fbeba..b45e2fbeba 100644
--- a/patches/api/0142-Add-More-Creeper-API.patch
+++ b/patches/unapplied/api/0142-Add-More-Creeper-API.patch
diff --git a/patches/api/0143-isChunkGenerated-API.patch b/patches/unapplied/api/0143-isChunkGenerated-API.patch
index 8e52bb2f93..8e52bb2f93 100644
--- a/patches/api/0143-isChunkGenerated-API.patch
+++ b/patches/unapplied/api/0143-isChunkGenerated-API.patch
diff --git a/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/unapplied/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch
index 9f9e760855..9f9e760855 100644
--- a/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch
+++ b/patches/unapplied/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0145-Inventory-removeItemAnySlot.patch b/patches/unapplied/api/0145-Inventory-removeItemAnySlot.patch
index 4d6f2e9e57..4d6f2e9e57 100644
--- a/patches/api/0145-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/api/0145-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/unapplied/api/0146-Async-Chunks-API.patch
index 1a0153ff86..1a0153ff86 100644
--- a/patches/api/0146-Async-Chunks-API.patch
+++ b/patches/unapplied/api/0146-Async-Chunks-API.patch
diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
index 5fe29b7e3b..5fe29b7e3b 100644
--- a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/api/0148-Expose-attack-cooldown-methods-for-Player.patch
index ee5d412911..ee5d412911 100644
--- a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/api/0148-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0149-Improve-death-events.patch b/patches/unapplied/api/0149-Improve-death-events.patch
index de70d5fff4..de70d5fff4 100644
--- a/patches/api/0149-Improve-death-events.patch
+++ b/patches/unapplied/api/0149-Improve-death-events.patch
diff --git a/patches/api/0150-Mob-Pathfinding-API.patch b/patches/unapplied/api/0150-Mob-Pathfinding-API.patch
index 5a234bb7e6..5a234bb7e6 100644
--- a/patches/api/0150-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/api/0150-Mob-Pathfinding-API.patch
diff --git a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index c5b4ce2e41..c5b4ce2e41 100644
--- a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/unapplied/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
index 6befcec378..6befcec378 100644
--- a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/unapplied/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/unapplied/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
index 1a4eca8cc0..1a4eca8cc0 100644
--- a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/patches/unapplied/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
index 49c255c056..49c255c056 100644
--- a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0155-Material-API-additions.patch b/patches/unapplied/api/0155-Material-API-additions.patch
index 2443a618e8..2443a618e8 100644
--- a/patches/api/0155-Material-API-additions.patch
+++ b/patches/unapplied/api/0155-Material-API-additions.patch
diff --git a/patches/api/0156-PreSpawnerSpawnEvent.patch b/patches/unapplied/api/0156-PreSpawnerSpawnEvent.patch
index dcb362d8bc..dcb362d8bc 100644
--- a/patches/api/0156-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/api/0156-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/unapplied/api/0157-Add-Material-Tags.patch
index cf8acd34f7..cf8acd34f7 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/unapplied/api/0157-Add-Material-Tags.patch
diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/api/0158-Add-LivingEntity-getTargetEntity.patch
index 5ec536beeb..5ec536beeb 100644
--- a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/api/0158-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0159-Add-sun-related-API.patch b/patches/unapplied/api/0159-Add-sun-related-API.patch
index 7f3635a017..7f3635a017 100644
--- a/patches/api/0159-Add-sun-related-API.patch
+++ b/patches/unapplied/api/0159-Add-sun-related-API.patch
diff --git a/patches/api/0160-Here-s-Johnny.patch b/patches/unapplied/api/0160-Here-s-Johnny.patch
index faaadfb5db..faaadfb5db 100644
--- a/patches/api/0160-Here-s-Johnny.patch
+++ b/patches/unapplied/api/0160-Here-s-Johnny.patch
diff --git a/patches/api/0161-Turtle-API.patch b/patches/unapplied/api/0161-Turtle-API.patch
index 06abb703f4..06abb703f4 100644
--- a/patches/api/0161-Turtle-API.patch
+++ b/patches/unapplied/api/0161-Turtle-API.patch
diff --git a/patches/api/0162-Add-spectator-target-events.patch b/patches/unapplied/api/0162-Add-spectator-target-events.patch
index c5d4b7c4db..c5d4b7c4db 100644
--- a/patches/api/0162-Add-spectator-target-events.patch
+++ b/patches/unapplied/api/0162-Add-spectator-target-events.patch
diff --git a/patches/api/0163-Add-more-Witch-API.patch b/patches/unapplied/api/0163-Add-more-Witch-API.patch
index 8fa1dd1e47..8fa1dd1e47 100644
--- a/patches/api/0163-Add-more-Witch-API.patch
+++ b/patches/unapplied/api/0163-Add-more-Witch-API.patch
diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/0164-Make-the-default-permission-message-configurable.patch
index 93fbacfef7..93fbacfef7 100644
--- a/patches/api/0164-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/api/0164-Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/unapplied/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 6eec419672..6eec419672 100644
--- a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/unapplied/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0166-Add-more-Zombie-API.patch b/patches/unapplied/api/0166-Add-more-Zombie-API.patch
index ec2c93dc46..ec2c93dc46 100644
--- a/patches/api/0166-Add-more-Zombie-API.patch
+++ b/patches/unapplied/api/0166-Add-more-Zombie-API.patch
diff --git a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/unapplied/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
index fa3de62864..fa3de62864 100644
--- a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/unapplied/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/api/0168-Add-PlayerConnectionCloseEvent.patch
index f1a017f4fb..f1a017f4fb 100644
--- a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/api/0168-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index ec2b79af2d..ec2b79af2d 100644
--- a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0170-BlockDestroyEvent.patch b/patches/unapplied/api/0170-BlockDestroyEvent.patch
index 4ad73d8ef1..4ad73d8ef1 100644
--- a/patches/api/0170-BlockDestroyEvent.patch
+++ b/patches/unapplied/api/0170-BlockDestroyEvent.patch
diff --git a/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/unapplied/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
index 9b2dfc0c72..9b2dfc0c72 100644
--- a/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/unapplied/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0172-Add-WhitelistToggleEvent.patch b/patches/unapplied/api/0172-Add-WhitelistToggleEvent.patch
index 4bb54b5c92..4bb54b5c92 100644
--- a/patches/api/0172-Add-WhitelistToggleEvent.patch
+++ b/patches/unapplied/api/0172-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0173-Annotation-Test-changes.patch b/patches/unapplied/api/0173-Annotation-Test-changes.patch
index 799c94ca49..799c94ca49 100644
--- a/patches/api/0173-Annotation-Test-changes.patch
+++ b/patches/unapplied/api/0173-Annotation-Test-changes.patch
diff --git a/patches/api/0174-Entity-getEntitySpawnReason.patch b/patches/unapplied/api/0174-Entity-getEntitySpawnReason.patch
index dbe7998a9a..dbe7998a9a 100644
--- a/patches/api/0174-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/api/0174-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0175-Add-GS4-Query-event.patch b/patches/unapplied/api/0175-Add-GS4-Query-event.patch
index ffab49a92a..ffab49a92a 100644
--- a/patches/api/0175-Add-GS4-Query-event.patch
+++ b/patches/unapplied/api/0175-Add-GS4-Query-event.patch
diff --git a/patches/api/0176-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/api/0176-Add-PlayerPostRespawnEvent.patch
index 54352474f1..54352474f1 100644
--- a/patches/api/0176-Add-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/api/0176-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch b/patches/unapplied/api/0177-Ignore-package-private-methods-for-nullability-annot.patch
index 2b621fed5e..2b621fed5e 100644
--- a/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch
+++ b/patches/unapplied/api/0177-Ignore-package-private-methods-for-nullability-annot.patch
diff --git a/patches/api/0178-Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/0178-Fix-Spigot-annotation-mistakes.patch
index 55cea0d383..55cea0d383 100644
--- a/patches/api/0178-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/unapplied/api/0178-Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/api/0179-Server-Tick-Events.patch b/patches/unapplied/api/0179-Server-Tick-Events.patch
index 9cb8b9a4c0..9cb8b9a4c0 100644
--- a/patches/api/0179-Server-Tick-Events.patch
+++ b/patches/unapplied/api/0179-Server-Tick-Events.patch
diff --git a/patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/api/0180-PlayerDeathEvent-getItemsToKeep.patch
index e41136bc7f..e41136bc7f 100644
--- a/patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/api/0180-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0181-Add-Heightmap-API.patch b/patches/unapplied/api/0181-Add-Heightmap-API.patch
index 8ef3a8afb6..8ef3a8afb6 100644
--- a/patches/api/0181-Add-Heightmap-API.patch
+++ b/patches/unapplied/api/0181-Add-Heightmap-API.patch
diff --git a/patches/api/0182-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/api/0182-Mob-Spawner-API-Enhancements.patch
index 2bbe92cbe9..2bbe92cbe9 100644
--- a/patches/api/0182-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/api/0182-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0183-Add-BlockSoundGroup-interface.patch b/patches/unapplied/api/0183-Add-BlockSoundGroup-interface.patch
index 566c91565a..566c91565a 100644
--- a/patches/api/0183-Add-BlockSoundGroup-interface.patch
+++ b/patches/unapplied/api/0183-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/unapplied/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/unapplied/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0185-Increase-custom-payload-channel-message-size.patch b/patches/unapplied/api/0185-Increase-custom-payload-channel-message-size.patch
index 24aacd2b29..24aacd2b29 100644
--- a/patches/api/0185-Increase-custom-payload-channel-message-size.patch
+++ b/patches/unapplied/api/0185-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0186-Expose-the-internal-current-tick.patch b/patches/unapplied/api/0186-Expose-the-internal-current-tick.patch
index 8c8cbca927..8c8cbca927 100644
--- a/patches/api/0186-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/api/0186-Expose-the-internal-current-tick.patch
diff --git a/patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/0187-PlayerDeathEvent-shouldDropExperience.patch
index cc31e67473..cc31e67473 100644
--- a/patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/api/0187-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0188-Add-effect-to-block-break-naturally.patch b/patches/unapplied/api/0188-Add-effect-to-block-break-naturally.patch
index a137ba158d..a137ba158d 100644
--- a/patches/api/0188-Add-effect-to-block-break-naturally.patch
+++ b/patches/unapplied/api/0188-Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/0189-Add-ThrownEggHatchEvent.patch b/patches/unapplied/api/0189-Add-ThrownEggHatchEvent.patch
index f605a2a11b..f605a2a11b 100644
--- a/patches/api/0189-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/api/0189-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0190-Entity-Jump-API.patch b/patches/unapplied/api/0190-Entity-Jump-API.patch
index 6e14c963f0..6e14c963f0 100644
--- a/patches/api/0190-Entity-Jump-API.patch
+++ b/patches/unapplied/api/0190-Entity-Jump-API.patch
diff --git a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
index f15b482d62..f15b482d62 100644
--- a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0192-Add-tick-times-API.patch b/patches/unapplied/api/0192-Add-tick-times-API.patch
index 191e9f1ca8..191e9f1ca8 100644
--- a/patches/api/0192-Add-tick-times-API.patch
+++ b/patches/unapplied/api/0192-Add-tick-times-API.patch
diff --git a/patches/api/0193-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/0193-Expose-MinecraftServer-isRunning.patch
index 77c11d43f8..77c11d43f8 100644
--- a/patches/api/0193-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/api/0193-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
index 55d10224f5..55d10224f5 100644
--- a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/unapplied/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
index 6018c18f9b..6018c18f9b 100644
--- a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
+++ b/patches/unapplied/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch b/patches/unapplied/api/0196-Make-JavaPluginLoader-thread-safe.patch
index be66a6a695..be66a6a695 100644
--- a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch
+++ b/patches/unapplied/api/0196-Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/0197-Add-Player-Client-Options-API.patch b/patches/unapplied/api/0197-Add-Player-Client-Options-API.patch
index 474e3dde2c..474e3dde2c 100644
--- a/patches/api/0197-Add-Player-Client-Options-API.patch
+++ b/patches/unapplied/api/0197-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
index 15fa2db392..15fa2db392 100644
--- a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
index 9b8668727b..9b8668727b 100644
--- a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/patches/unapplied/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0200-Add-item-slot-convenience-methods.patch b/patches/unapplied/api/0200-Add-item-slot-convenience-methods.patch
index cec52f20bc..cec52f20bc 100644
--- a/patches/api/0200-Add-item-slot-convenience-methods.patch
+++ b/patches/unapplied/api/0200-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0201-Villager-Restocks-API.patch b/patches/unapplied/api/0201-Villager-Restocks-API.patch
index 689bd35b3c..689bd35b3c 100644
--- a/patches/api/0201-Villager-Restocks-API.patch
+++ b/patches/unapplied/api/0201-Villager-Restocks-API.patch
diff --git a/patches/api/0202-Add-Mob-Goal-API.patch b/patches/unapplied/api/0202-Add-Mob-Goal-API.patch
index 079bdd13bd..079bdd13bd 100644
--- a/patches/api/0202-Add-Mob-Goal-API.patch
+++ b/patches/unapplied/api/0202-Add-Mob-Goal-API.patch
diff --git a/patches/api/0203-Expose-game-version.patch b/patches/unapplied/api/0203-Expose-game-version.patch
index 91ea56bc74..91ea56bc74 100644
--- a/patches/api/0203-Expose-game-version.patch
+++ b/patches/unapplied/api/0203-Expose-game-version.patch
diff --git a/patches/api/0204-Add-villager-reputation-API.patch b/patches/unapplied/api/0204-Add-villager-reputation-API.patch
index 44b6a6f422..44b6a6f422 100644
--- a/patches/api/0204-Add-villager-reputation-API.patch
+++ b/patches/unapplied/api/0204-Add-villager-reputation-API.patch
diff --git a/patches/api/0205-Spawn-Reason-API.patch b/patches/unapplied/api/0205-Spawn-Reason-API.patch
index 8ddcbaa4df..8ddcbaa4df 100644
--- a/patches/api/0205-Spawn-Reason-API.patch
+++ b/patches/unapplied/api/0205-Spawn-Reason-API.patch
diff --git a/patches/api/0206-Potential-bed-API.patch b/patches/unapplied/api/0206-Potential-bed-API.patch
index 0a28d99471..0a28d99471 100644
--- a/patches/api/0206-Potential-bed-API.patch
+++ b/patches/unapplied/api/0206-Potential-bed-API.patch
diff --git a/patches/api/0207-Prioritise-own-classes-where-possible.patch b/patches/unapplied/api/0207-Prioritise-own-classes-where-possible.patch
index 8b251555d5..8b251555d5 100644
--- a/patches/api/0207-Prioritise-own-classes-where-possible.patch
+++ b/patches/unapplied/api/0207-Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch b/patches/unapplied/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
index 698d53a3af..698d53a3af 100644
--- a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
+++ b/patches/unapplied/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
index 5b633e50af..5b633e50af 100644
--- a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0210-Expose-Arrow-getItemStack.patch b/patches/unapplied/api/0210-Expose-Arrow-getItemStack.patch
index e718e0e598..e718e0e598 100644
--- a/patches/api/0210-Expose-Arrow-getItemStack.patch
+++ b/patches/unapplied/api/0210-Expose-Arrow-getItemStack.patch
diff --git a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 93bd233b85..93bd233b85 100644
--- a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0212-Support-components-in-ItemMeta.patch b/patches/unapplied/api/0212-Support-components-in-ItemMeta.patch
index 1b51f21c69..1b51f21c69 100644
--- a/patches/api/0212-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/api/0212-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/unapplied/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 747470a546..747470a546 100644
--- a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/unapplied/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0214-Add-entity-liquid-API.patch b/patches/unapplied/api/0214-Add-entity-liquid-API.patch
index 7411e3493d..7411e3493d 100644
--- a/patches/api/0214-Add-entity-liquid-API.patch
+++ b/patches/unapplied/api/0214-Add-entity-liquid-API.patch
diff --git a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/unapplied/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 5dc61d601d..5dc61d601d 100644
--- a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/unapplied/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
index a72342a3b8..a72342a3b8 100644
--- a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0217-Support-hex-colors-in-getLastColors.patch b/patches/unapplied/api/0217-Support-hex-colors-in-getLastColors.patch
index a3117a4377..a3117a4377 100644
--- a/patches/api/0217-Support-hex-colors-in-getLastColors.patch
+++ b/patches/unapplied/api/0217-Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/0218-Add-setMaxPlayers-API.patch b/patches/unapplied/api/0218-Add-setMaxPlayers-API.patch
index 9e468bd86c..9e468bd86c 100644
--- a/patches/api/0218-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/api/0218-Add-setMaxPlayers-API.patch
diff --git a/patches/api/0219-Add-moon-phase-API.patch b/patches/unapplied/api/0219-Add-moon-phase-API.patch
index 7eddf3f9c7..7eddf3f9c7 100644
--- a/patches/api/0219-Add-moon-phase-API.patch
+++ b/patches/unapplied/api/0219-Add-moon-phase-API.patch
diff --git a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
index 1416b1373a..1416b1373a 100644
--- a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0221-Add-BellRingEvent.patch b/patches/unapplied/api/0221-Add-BellRingEvent.patch
index 7862ad8c88..7862ad8c88 100644
--- a/patches/api/0221-Add-BellRingEvent.patch
+++ b/patches/unapplied/api/0221-Add-BellRingEvent.patch
diff --git a/patches/api/0222-Brand-support.patch b/patches/unapplied/api/0222-Brand-support.patch
index 1f460de4b0..1f460de4b0 100644
--- a/patches/api/0222-Brand-support.patch
+++ b/patches/unapplied/api/0222-Brand-support.patch
diff --git a/patches/api/0223-Add-more-Evoker-API.patch b/patches/unapplied/api/0223-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0223-Add-more-Evoker-API.patch
+++ b/patches/unapplied/api/0223-Add-more-Evoker-API.patch
diff --git a/patches/api/0224-Add-methods-to-get-translation-keys.patch b/patches/unapplied/api/0224-Add-methods-to-get-translation-keys.patch
index f58b047a71..f58b047a71 100644
--- a/patches/api/0224-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/api/0224-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
index 982d892402..982d892402 100644
--- a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
index a1edb0f80a..a1edb0f80a 100644
--- a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index a92a435f5a..a92a435f5a 100644
--- a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0228-Entity-isTicking.patch b/patches/unapplied/api/0228-Entity-isTicking.patch
index de2af45358..de2af45358 100644
--- a/patches/api/0228-Entity-isTicking.patch
+++ b/patches/unapplied/api/0228-Entity-isTicking.patch
diff --git a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/unapplied/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
index f34361722e..f34361722e 100644
--- a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
+++ b/patches/unapplied/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0230-Villager-resetOffers.patch b/patches/unapplied/api/0230-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0230-Villager-resetOffers.patch
+++ b/patches/unapplied/api/0230-Villager-resetOffers.patch
diff --git a/patches/api/0231-Player-elytra-boost-API.patch b/patches/unapplied/api/0231-Player-elytra-boost-API.patch
index 15882b1b59..15882b1b59 100644
--- a/patches/api/0231-Player-elytra-boost-API.patch
+++ b/patches/unapplied/api/0231-Player-elytra-boost-API.patch
diff --git a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/0232-Add-getOfflinePlayerIfCached-String.patch
index 4e026a3098..4e026a3098 100644
--- a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/api/0232-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0233-Add-ignore-discounts-API.patch b/patches/unapplied/api/0233-Add-ignore-discounts-API.patch
index 492c998c91..492c998c91 100644
--- a/patches/api/0233-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/api/0233-Add-ignore-discounts-API.patch
diff --git a/patches/api/0234-Item-no-age-no-player-pickup.patch b/patches/unapplied/api/0234-Item-no-age-no-player-pickup.patch
index 142a8b5202..142a8b5202 100644
--- a/patches/api/0234-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/api/0234-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0235-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/api/0235-Beacon-API-custom-effect-ranges.patch
index ff56b99ebf..ff56b99ebf 100644
--- a/patches/api/0235-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/api/0235-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0236-Add-API-for-quit-reason.patch b/patches/unapplied/api/0236-Add-API-for-quit-reason.patch
index 63d864224b..63d864224b 100644
--- a/patches/api/0236-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/api/0236-Add-API-for-quit-reason.patch
diff --git a/patches/api/0237-Add-Destroy-Speed-API.patch b/patches/unapplied/api/0237-Add-Destroy-Speed-API.patch
index 44f150d6fc..44f150d6fc 100644
--- a/patches/api/0237-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/api/0237-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/api/0238-Add-LivingEntity-clearActiveItem.patch
index 2855c9e780..2855c9e780 100644
--- a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/api/0238-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0239-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/api/0239-Add-PlayerItemCooldownEvent.patch
index b971d51cb6..b971d51cb6 100644
--- a/patches/api/0239-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/api/0239-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0240-More-lightning-API.patch b/patches/unapplied/api/0240-More-lightning-API.patch
index b37ee0ebd0..b37ee0ebd0 100644
--- a/patches/api/0240-More-lightning-API.patch
+++ b/patches/unapplied/api/0240-More-lightning-API.patch
diff --git a/patches/api/0241-Add-PlayerShearBlockEvent.patch b/patches/unapplied/api/0241-Add-PlayerShearBlockEvent.patch
index 051544b4a9..051544b4a9 100644
--- a/patches/api/0241-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/api/0241-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0242-Enable-multi-release-plugin-jars.patch b/patches/unapplied/api/0242-Enable-multi-release-plugin-jars.patch
index 53da5ebe06..53da5ebe06 100644
--- a/patches/api/0242-Enable-multi-release-plugin-jars.patch
+++ b/patches/unapplied/api/0242-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/api/0243-Player-Chunk-Load-Unload-Events.patch
index e2ce87ec9d..e2ce87ec9d 100644
--- a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/api/0243-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/api/0244-Expose-LivingEntity-hurt-direction.patch
index a6f7ce6054..a6f7ce6054 100644
--- a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/api/0244-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0246-Added-PlayerTradeEvent.patch b/patches/unapplied/api/0246-Added-PlayerTradeEvent.patch
index e09b088160..e09b088160 100644
--- a/patches/api/0246-Added-PlayerTradeEvent.patch
+++ b/patches/unapplied/api/0246-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0247-Add-TargetHitEvent-API.patch b/patches/unapplied/api/0247-Add-TargetHitEvent-API.patch
index 247421fb61..247421fb61 100644
--- a/patches/api/0247-Add-TargetHitEvent-API.patch
+++ b/patches/unapplied/api/0247-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0248-Additional-Block-Material-API-s.patch b/patches/unapplied/api/0248-Additional-Block-Material-API-s.patch
index 41ccd7fbbd..41ccd7fbbd 100644
--- a/patches/api/0248-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/api/0248-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index 839f32ab71..839f32ab71 100644
--- a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/unapplied/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
index d9cd5a9f01..d9cd5a9f01 100644
--- a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0251-Zombie-API-breaking-doors.patch b/patches/unapplied/api/0251-Zombie-API-breaking-doors.patch
index c064453dfc..c064453dfc 100644
--- a/patches/api/0251-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/api/0251-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/api/0252-Add-EntityLoadCrossbowEvent.patch
index f484d40cca..f484d40cca 100644
--- a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/api/0252-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/api/0253-Added-WorldGameRuleChangeEvent.patch
index 8ef5f7efcd..8ef5f7efcd 100644
--- a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/api/0253-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/api/0254-Added-ServerResourcesReloadedEvent.patch
index de081bbae7..de081bbae7 100644
--- a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/api/0254-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0255-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/api/0255-Add-BlockFailedDispenseEvent.patch
index 126714b965..126714b965 100644
--- a/patches/api/0255-Add-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/api/0255-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/api/0256-Added-PlayerLecternPageChangeEvent.patch
index 2b65c3a245..2b65c3a245 100644
--- a/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/api/0256-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/api/0257-Added-PlayerLoomPatternSelectEvent.patch
index 5677026956..5677026956 100644
--- a/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/api/0257-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0258-Better-AnnotationTest-printout.patch b/patches/unapplied/api/0258-Better-AnnotationTest-printout.patch
index d8884cfe79..d8884cfe79 100644
--- a/patches/api/0258-Better-AnnotationTest-printout.patch
+++ b/patches/unapplied/api/0258-Better-AnnotationTest-printout.patch
diff --git a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/unapplied/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index afc3f45d28..afc3f45d28 100644
--- a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/unapplied/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0260-Add-sendOpLevel-API.patch b/patches/unapplied/api/0260-Add-sendOpLevel-API.patch
index 64b20c1a29..64b20c1a29 100644
--- a/patches/api/0260-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/api/0260-Add-sendOpLevel-API.patch
diff --git a/patches/api/0261-Add-StructureLocateEvent.patch b/patches/unapplied/api/0261-Add-StructureLocateEvent.patch
index 88c14d8ea6..88c14d8ea6 100644
--- a/patches/api/0261-Add-StructureLocateEvent.patch
+++ b/patches/unapplied/api/0261-Add-StructureLocateEvent.patch
diff --git a/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch
index e7986f5bb1..e7986f5bb1 100644
--- a/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0263-Add-BlockPreDispenseEvent.patch b/patches/unapplied/api/0263-Add-BlockPreDispenseEvent.patch
index fb0b89a4ee..fb0b89a4ee 100644
--- a/patches/api/0263-Add-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/api/0263-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0264-Added-Vanilla-Entity-Tags.patch b/patches/unapplied/api/0264-Added-Vanilla-Entity-Tags.patch
index 6228580f98..6228580f98 100644
--- a/patches/api/0264-Added-Vanilla-Entity-Tags.patch
+++ b/patches/unapplied/api/0264-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/api/0265-added-Wither-API.patch b/patches/unapplied/api/0265-added-Wither-API.patch
index dbfc15a42c..dbfc15a42c 100644
--- a/patches/api/0265-added-Wither-API.patch
+++ b/patches/unapplied/api/0265-added-Wither-API.patch
diff --git a/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/api/0266-Added-PlayerChangeBeaconEffectEvent.patch
index 4331e880bb..4331e880bb 100644
--- a/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/api/0266-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 7352667dab..7352667dab 100644
--- a/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0269-EntityMoveEvent.patch b/patches/unapplied/api/0269-EntityMoveEvent.patch
index 2855c3bdef..2855c3bdef 100644
--- a/patches/api/0269-EntityMoveEvent.patch
+++ b/patches/unapplied/api/0269-EntityMoveEvent.patch
diff --git a/patches/api/0270-add-DragonEggFormEvent.patch b/patches/unapplied/api/0270-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0270-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/api/0270-add-DragonEggFormEvent.patch
diff --git a/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 430f5aa541..430f5aa541 100644
--- a/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0273-living-entity-allow-attribute-registration.patch b/patches/unapplied/api/0273-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0273-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/api/0273-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0274-Add-missing-effects.patch b/patches/unapplied/api/0274-Add-missing-effects.patch
index 8f72589e1e..8f72589e1e 100644
--- a/patches/api/0274-Add-missing-effects.patch
+++ b/patches/unapplied/api/0274-Add-missing-effects.patch
diff --git a/patches/api/0275-Expose-Tracked-Players.patch b/patches/unapplied/api/0275-Expose-Tracked-Players.patch
index a1fbc0833a..a1fbc0833a 100644
--- a/patches/api/0275-Expose-Tracked-Players.patch
+++ b/patches/unapplied/api/0275-Expose-Tracked-Players.patch
diff --git a/patches/api/0276-Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/0276-Cache-the-result-of-Material-isBlock.patch
index 24348cb303..24348cb303 100644
--- a/patches/api/0276-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/unapplied/api/0276-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0277-Add-worldborder-events.patch b/patches/unapplied/api/0277-Add-worldborder-events.patch
index 09c3770e16..09c3770e16 100644
--- a/patches/api/0277-Add-worldborder-events.patch
+++ b/patches/unapplied/api/0277-Add-worldborder-events.patch
diff --git a/patches/api/0278-added-PlayerNameEntityEvent.patch b/patches/unapplied/api/0278-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0278-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/api/0278-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0279-Add-recipe-to-cook-events.patch b/patches/unapplied/api/0279-Add-recipe-to-cook-events.patch
index b0b34773c0..b0b34773c0 100644
--- a/patches/api/0279-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/api/0279-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0280-Add-Block-isValidTool.patch b/patches/unapplied/api/0280-Add-Block-isValidTool.patch
index be5e123195..be5e123195 100644
--- a/patches/api/0280-Add-Block-isValidTool.patch
+++ b/patches/unapplied/api/0280-Add-Block-isValidTool.patch
diff --git a/patches/api/0281-Implement-Keyed-on-World.patch b/patches/unapplied/api/0281-Implement-Keyed-on-World.patch
index 16191d92cd..16191d92cd 100644
--- a/patches/api/0281-Implement-Keyed-on-World.patch
+++ b/patches/unapplied/api/0281-Implement-Keyed-on-World.patch
diff --git a/patches/api/0282-fix-Inventory-getContents-null-annotations.patch b/patches/unapplied/api/0282-fix-Inventory-getContents-null-annotations.patch
index 4d216020ec..4d216020ec 100644
--- a/patches/api/0282-fix-Inventory-getContents-null-annotations.patch
+++ b/patches/unapplied/api/0282-fix-Inventory-getContents-null-annotations.patch
diff --git a/patches/api/0283-Item-Rarity-API.patch b/patches/unapplied/api/0283-Item-Rarity-API.patch
index 5179af6dfc..5179af6dfc 100644
--- a/patches/api/0283-Item-Rarity-API.patch
+++ b/patches/unapplied/api/0283-Item-Rarity-API.patch
diff --git a/patches/api/0284-Expose-protocol-version.patch b/patches/unapplied/api/0284-Expose-protocol-version.patch
index f48647617e..f48647617e 100644
--- a/patches/api/0284-Expose-protocol-version.patch
+++ b/patches/unapplied/api/0284-Expose-protocol-version.patch
diff --git a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 7167a3ebbf..7167a3ebbf 100644
--- a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/unapplied/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/api/0286-add-isDeeplySleeping-to-HumanEntity.patch
index 90704b46d5..90704b46d5 100644
--- a/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/api/0286-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..6c8b681cd9 100644
--- a/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch
index 83995d7a94..83995d7a94 100644
--- a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0289-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/api/0289-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0289-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/api/0289-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0290-More-World-API.patch b/patches/unapplied/api/0290-More-World-API.patch
index 8705695a40..8705695a40 100644
--- a/patches/api/0290-More-World-API.patch
+++ b/patches/unapplied/api/0290-More-World-API.patch
diff --git a/patches/api/0291-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/api/0291-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0291-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/api/0291-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/api/0292-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/api/0292-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0293-PlayerMoveEvent-Improvements.patch b/patches/unapplied/api/0293-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0293-PlayerMoveEvent-Improvements.patch
+++ b/patches/unapplied/api/0293-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 63b477d865..63b477d865 100644
--- a/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0295-Add-more-WanderingTrader-API.patch b/patches/unapplied/api/0295-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0295-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/api/0295-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/api/0296-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/api/0296-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 655cc86658..655cc86658 100644
--- a/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0299-Inventory-close.patch b/patches/unapplied/api/0299-Inventory-close.patch
index 550e287fa6..550e287fa6 100644
--- a/patches/api/0299-Inventory-close.patch
+++ b/patches/unapplied/api/0299-Inventory-close.patch
diff --git a/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index fd69383d96..fd69383d96 100644
--- a/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0301-Add-basic-Datapack-API.patch b/patches/unapplied/api/0301-Add-basic-Datapack-API.patch
index acdf2fa9e2..acdf2fa9e2 100644
--- a/patches/api/0301-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/api/0301-Add-basic-Datapack-API.patch
diff --git a/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/api/0302-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/api/0302-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0303-ItemStack-repair-check-API.patch b/patches/unapplied/api/0303-ItemStack-repair-check-API.patch
index a42235e468..a42235e468 100644
--- a/patches/api/0303-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/api/0303-ItemStack-repair-check-API.patch
diff --git a/patches/api/0304-More-Enchantment-API.patch b/patches/unapplied/api/0304-More-Enchantment-API.patch
index 504aeb1f51..504aeb1f51 100644
--- a/patches/api/0304-More-Enchantment-API.patch
+++ b/patches/unapplied/api/0304-More-Enchantment-API.patch
diff --git a/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 2ca48ec230..2ca48ec230 100644
--- a/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch b/patches/unapplied/api/0306-List-all-missing-hard-depends-not-just-first.patch
index 995528e860..995528e860 100644
--- a/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch
+++ b/patches/unapplied/api/0306-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0307-Add-Mob-lookAt-API.patch b/patches/unapplied/api/0307-Add-Mob-lookAt-API.patch
index 26177f2369..26177f2369 100644
--- a/patches/api/0307-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/api/0307-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0308-ItemStack-editMeta.patch b/patches/unapplied/api/0308-ItemStack-editMeta.patch
index dcc9218856..dcc9218856 100644
--- a/patches/api/0308-ItemStack-editMeta.patch
+++ b/patches/unapplied/api/0308-ItemStack-editMeta.patch
diff --git a/patches/api/0309-Add-EntityInsideBlockEvent.patch b/patches/unapplied/api/0309-Add-EntityInsideBlockEvent.patch
index 26c188e7a0..26c188e7a0 100644
--- a/patches/api/0309-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/api/0309-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0310-Attributes-API-for-item-defaults.patch b/patches/unapplied/api/0310-Attributes-API-for-item-defaults.patch
index e773df8287..e773df8287 100644
--- a/patches/api/0310-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/api/0310-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0312-More-Lidded-Block-API.patch b/patches/unapplied/api/0312-More-Lidded-Block-API.patch
index ca6b5ed744..ca6b5ed744 100644
--- a/patches/api/0312-More-Lidded-Block-API.patch
+++ b/patches/unapplied/api/0312-More-Lidded-Block-API.patch
diff --git a/patches/api/0313-Add-PlayerKickEvent-causes.patch b/patches/unapplied/api/0313-Add-PlayerKickEvent-causes.patch
index a0b077ea0b..a0b077ea0b 100644
--- a/patches/api/0313-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/api/0313-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0314-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/api/0314-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0314-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/api/0314-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0315-Add-BellRevealRaiderEvent.patch b/patches/unapplied/api/0315-Add-BellRevealRaiderEvent.patch
index 8b0ee3e5b4..8b0ee3e5b4 100644
--- a/patches/api/0315-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/api/0315-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/api/0316-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/api/0316-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0317-Add-more-line-of-sight-methods.patch b/patches/unapplied/api/0317-Add-more-line-of-sight-methods.patch
index 78592605fd..78592605fd 100644
--- a/patches/api/0317-Add-more-line-of-sight-methods.patch
+++ b/patches/unapplied/api/0317-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0318-Add-more-LimitedRegion-API.patch b/patches/unapplied/api/0318-Add-more-LimitedRegion-API.patch
index 6dbdcd3da3..6dbdcd3da3 100644
--- a/patches/api/0318-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/api/0318-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0319-Missing-Entity-Behavior-API.patch b/patches/unapplied/api/0319-Missing-Entity-Behavior-API.patch
index f2f7bbea36..f2f7bbea36 100644
--- a/patches/api/0319-Missing-Entity-Behavior-API.patch
+++ b/patches/unapplied/api/0319-Missing-Entity-Behavior-API.patch
diff --git a/patches/api/0320-Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/0320-Add-Git-information-to-version-command-on-startup.patch
index 170e756a47..170e756a47 100644
--- a/patches/api/0320-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/unapplied/api/0320-Add-Git-information-to-version-command-on-startup.patch
diff --git a/patches/api/0321-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/api/0321-Adds-PlayerArmSwingEvent.patch
index 75e45a71f8..75e45a71f8 100644
--- a/patches/api/0321-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/api/0321-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0322-Add-PlayerSignCommandPreprocessEvent.patch b/patches/unapplied/api/0322-Add-PlayerSignCommandPreprocessEvent.patch
index fd095653a3..fd095653a3 100644
--- a/patches/api/0322-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/unapplied/api/0322-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0323-fix-empty-array-elements-in-command-arguments.patch b/patches/unapplied/api/0323-fix-empty-array-elements-in-command-arguments.patch
index 0a2b106d87..0a2b106d87 100644
--- a/patches/api/0323-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/unapplied/api/0323-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0324-Stinger-API.patch b/patches/unapplied/api/0324-Stinger-API.patch
index 12373dc546..12373dc546 100644
--- a/patches/api/0324-Stinger-API.patch
+++ b/patches/unapplied/api/0324-Stinger-API.patch
diff --git a/patches/api/0325-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/api/0325-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 3b26e965c6..3b26e965c6 100644
--- a/patches/api/0325-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/api/0325-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0326-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/api/0326-Add-PlayerSetSpawnEvent.patch
index 9144c45497..9144c45497 100644
--- a/patches/api/0326-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/api/0326-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0327-Added-EntityDamageItemEvent.patch b/patches/unapplied/api/0327-Added-EntityDamageItemEvent.patch
index 8bbe79f9f3..8bbe79f9f3 100644
--- a/patches/api/0327-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/api/0327-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0328-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/api/0328-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0328-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/api/0328-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0329-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/api/0329-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0329-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/api/0329-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0330-Add-BlockBreakBlockEvent.patch b/patches/unapplied/api/0330-Add-BlockBreakBlockEvent.patch
index dfd13b1355..dfd13b1355 100644
--- a/patches/api/0330-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/api/0330-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0331-Add-helpers-for-left-right-hand-to-Action.patch b/patches/unapplied/api/0331-Add-helpers-for-left-right-hand-to-Action.patch
index 075287e318..075287e318 100644
--- a/patches/api/0331-Add-helpers-for-left-right-hand-to-Action.patch
+++ b/patches/unapplied/api/0331-Add-helpers-for-left-right-hand-to-Action.patch
diff --git a/patches/api/0332-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/api/0332-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 0a0b5515e3..0a0b5515e3 100644
--- a/patches/api/0332-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/api/0332-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0333-More-CommandBlock-API.patch b/patches/unapplied/api/0333-More-CommandBlock-API.patch
index 242270eb12..242270eb12 100644
--- a/patches/api/0333-More-CommandBlock-API.patch
+++ b/patches/unapplied/api/0333-More-CommandBlock-API.patch
diff --git a/patches/api/0334-Fix-plugin-provides-load-order.patch b/patches/unapplied/api/0334-Fix-plugin-provides-load-order.patch
index 83c8568dff..83c8568dff 100644
--- a/patches/api/0334-Fix-plugin-provides-load-order.patch
+++ b/patches/unapplied/api/0334-Fix-plugin-provides-load-order.patch
diff --git a/patches/api/0335-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/api/0335-Add-missing-team-sidebar-display-slots.patch
index 1d400fa49e..1d400fa49e 100644
--- a/patches/api/0335-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/api/0335-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0336-add-back-EntityPortalExitEvent.patch b/patches/unapplied/api/0336-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0336-add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/api/0336-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0337-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/api/0337-Add-methods-to-find-targets-for-lightning-strikes.patch
index c8e5b8b6c9..c8e5b8b6c9 100644
--- a/patches/api/0337-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/api/0337-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0338-Get-entity-default-attributes.patch b/patches/unapplied/api/0338-Get-entity-default-attributes.patch
index ea43532bae..ea43532bae 100644
--- a/patches/api/0338-Get-entity-default-attributes.patch
+++ b/patches/unapplied/api/0338-Get-entity-default-attributes.patch
diff --git a/patches/api/0339-Left-handed-API.patch b/patches/unapplied/api/0339-Left-handed-API.patch
index c6c9f1b39f..c6c9f1b39f 100644
--- a/patches/api/0339-Left-handed-API.patch
+++ b/patches/unapplied/api/0339-Left-handed-API.patch
diff --git a/patches/api/0340-Add-advancement-display-API.patch b/patches/unapplied/api/0340-Add-advancement-display-API.patch
index fc21e58ed8..fc21e58ed8 100644
--- a/patches/api/0340-Add-advancement-display-API.patch
+++ b/patches/unapplied/api/0340-Add-advancement-display-API.patch
diff --git a/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/api/0341-Add-ItemFactory-getMonsterEgg-API.patch
index 601e2fc956..601e2fc956 100644
--- a/patches/api/0341-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/unapplied/api/0341-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/api/0342-Add-critical-damage-API.patch b/patches/unapplied/api/0342-Add-critical-damage-API.patch
index 3a9d1f8070..3a9d1f8070 100644
--- a/patches/api/0342-Add-critical-damage-API.patch
+++ b/patches/unapplied/api/0342-Add-critical-damage-API.patch
diff --git a/patches/api/0343-Fix-issues-with-mob-conversion.patch b/patches/unapplied/api/0343-Fix-issues-with-mob-conversion.patch
index 8ee1c49162..8ee1c49162 100644
--- a/patches/api/0343-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/api/0343-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0344-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/api/0344-Add-isCollidable-methods-to-various-places.patch
index 05cb37047e..05cb37047e 100644
--- a/patches/api/0344-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/api/0344-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0345-Goat-ram-API.patch b/patches/unapplied/api/0345-Goat-ram-API.patch
index 69694887ac..69694887ac 100644
--- a/patches/api/0345-Goat-ram-API.patch
+++ b/patches/unapplied/api/0345-Goat-ram-API.patch
diff --git a/patches/api/0346-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/0346-Add-Raw-Byte-Entity-Serialization.patch
index 188c6c9cf7..188c6c9cf7 100644
--- a/patches/api/0346-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/api/0346-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0347-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/api/0347-Add-API-for-resetting-a-single-score.patch
index 997ebf42f6..997ebf42f6 100644
--- a/patches/api/0347-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/api/0347-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0006-MC-Utils.patch b/patches/unapplied/server/0006-MC-Utils.patch
index d0f971437c..d0f971437c 100644
--- a/patches/server/0006-MC-Utils.patch
+++ b/patches/unapplied/server/0006-MC-Utils.patch
diff --git a/patches/server/0007-Not-implemeneted.patch b/patches/unapplied/server/0007-Not-implemeneted.patch
index 4c0c7c371b..4c0c7c371b 100644
--- a/patches/server/0007-Not-implemeneted.patch
+++ b/patches/unapplied/server/0007-Not-implemeneted.patch
diff --git a/patches/server/0008-Paper-Metrics.patch b/patches/unapplied/server/0008-Paper-Metrics.patch
index a209b93e95..a209b93e95 100644
--- a/patches/server/0008-Paper-Metrics.patch
+++ b/patches/unapplied/server/0008-Paper-Metrics.patch
diff --git a/patches/server/0009-Add-MinecraftKey-Information-to-Objects.patch b/patches/unapplied/server/0009-Add-MinecraftKey-Information-to-Objects.patch
index 76cde33920..76cde33920 100644
--- a/patches/server/0009-Add-MinecraftKey-Information-to-Objects.patch
+++ b/patches/unapplied/server/0009-Add-MinecraftKey-Information-to-Objects.patch
diff --git a/patches/server/0010-Timings-v2.patch b/patches/unapplied/server/0010-Timings-v2.patch
index 1c78ea9fdc..1c78ea9fdc 100644
--- a/patches/server/0010-Timings-v2.patch
+++ b/patches/unapplied/server/0010-Timings-v2.patch
diff --git a/patches/server/0011-Adventure.patch b/patches/unapplied/server/0011-Adventure.patch
index 755337e4b0..755337e4b0 100644
--- a/patches/server/0011-Adventure.patch
+++ b/patches/unapplied/server/0011-Adventure.patch
diff --git a/patches/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 4b4086602f..4b4086602f 100644
--- a/patches/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/unapplied/server/0012-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0013-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0013-Configurable-baby-zombie-movement-speed.patch
index 0297ec242e..0297ec242e 100644
--- a/patches/server/0013-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/unapplied/server/0013-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0014-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0014-Configurable-fishing-time-ranges.patch
index a81515675d..a81515675d 100644
--- a/patches/server/0014-Configurable-fishing-time-ranges.patch
+++ b/patches/unapplied/server/0014-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index a58e654c30..a58e654c30 100644
--- a/patches/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/unapplied/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch
index d73ee30d71..d73ee30d71 100644
--- a/patches/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/unapplied/server/0016-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0017-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0017-Allow-for-toggling-of-spawn-chunks.patch
index 597d0ad05e..597d0ad05e 100644
--- a/patches/server/0017-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/unapplied/server/0017-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index f311dfff3a..f311dfff3a 100644
--- a/patches/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/unapplied/server/0018-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 423e9cb4e6..423e9cb4e6 100644
--- a/patches/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/unapplied/server/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0020-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0020-Implement-Paper-VersionChecker.patch
index 384583ab15..384583ab15 100644
--- a/patches/server/0020-Implement-Paper-VersionChecker.patch
+++ b/patches/unapplied/server/0020-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0021-Add-version-history-to-version-command.patch b/patches/unapplied/server/0021-Add-version-history-to-version-command.patch
index c5cb5499fa..c5cb5499fa 100644
--- a/patches/server/0021-Add-version-history-to-version-command.patch
+++ b/patches/unapplied/server/0021-Add-version-history-to-version-command.patch
diff --git a/patches/server/0022-Player-affects-spawning-API.patch b/patches/unapplied/server/0022-Player-affects-spawning-API.patch
index 69e7e39255..69e7e39255 100644
--- a/patches/server/0022-Player-affects-spawning-API.patch
+++ b/patches/unapplied/server/0022-Player-affects-spawning-API.patch
diff --git a/patches/server/0023-Remove-invalid-mob-spawner-tile-entities.patch b/patches/unapplied/server/0023-Remove-invalid-mob-spawner-tile-entities.patch
index 3b8417254f..3b8417254f 100644
--- a/patches/server/0023-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/patches/unapplied/server/0023-Remove-invalid-mob-spawner-tile-entities.patch
diff --git a/patches/server/0024-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0024-Further-improve-server-tick-loop.patch
index 0be837a750..0be837a750 100644
--- a/patches/server/0024-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0024-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0025-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0025-Only-refresh-abilities-if-needed.patch
index c86f6f99a6..c86f6f99a6 100644
--- a/patches/server/0025-Only-refresh-abilities-if-needed.patch
+++ b/patches/unapplied/server/0025-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0026-Entity-Origin-API.patch b/patches/unapplied/server/0026-Entity-Origin-API.patch
index e66b279ea8..e66b279ea8 100644
--- a/patches/server/0026-Entity-Origin-API.patch
+++ b/patches/unapplied/server/0026-Entity-Origin-API.patch
diff --git a/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0027-Prevent-tile-entity-and-entity-crashes.patch
index f6652583de..f6652583de 100644
--- a/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/unapplied/server/0027-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0028-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0028-Configurable-top-of-nether-void-damage.patch
index 5a183d8476..5a183d8476 100644
--- a/patches/server/0028-Configurable-top-of-nether-void-damage.patch
+++ b/patches/unapplied/server/0028-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch
index cc4f224bfd..cc4f224bfd 100644
--- a/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/unapplied/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0030-Always-tick-falling-blocks.patch b/patches/unapplied/server/0030-Always-tick-falling-blocks.patch
index 204256a0af..204256a0af 100644
--- a/patches/server/0030-Always-tick-falling-blocks.patch
+++ b/patches/unapplied/server/0030-Always-tick-falling-blocks.patch
diff --git a/patches/server/0031-Configurable-end-credits.patch b/patches/unapplied/server/0031-Configurable-end-credits.patch
index 71719049e1..71719049e1 100644
--- a/patches/server/0031-Configurable-end-credits.patch
+++ b/patches/unapplied/server/0031-Configurable-end-credits.patch
diff --git a/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch
index 27f5cd7600..27f5cd7600 100644
--- a/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/unapplied/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0033-Optimize-explosions.patch b/patches/unapplied/server/0033-Optimize-explosions.patch
index a3957b870e..a3957b870e 100644
--- a/patches/server/0033-Optimize-explosions.patch
+++ b/patches/unapplied/server/0033-Optimize-explosions.patch
diff --git a/patches/server/0034-Disable-explosion-knockback.patch b/patches/unapplied/server/0034-Disable-explosion-knockback.patch
index f6054b58ed..f6054b58ed 100644
--- a/patches/server/0034-Disable-explosion-knockback.patch
+++ b/patches/unapplied/server/0034-Disable-explosion-knockback.patch
diff --git a/patches/server/0035-Disable-thunder.patch b/patches/unapplied/server/0035-Disable-thunder.patch
index 91d0751893..91d0751893 100644
--- a/patches/server/0035-Disable-thunder.patch
+++ b/patches/unapplied/server/0035-Disable-thunder.patch
diff --git a/patches/server/0036-Disable-ice-and-snow.patch b/patches/unapplied/server/0036-Disable-ice-and-snow.patch
index a22aeb19f4..a22aeb19f4 100644
--- a/patches/server/0036-Disable-ice-and-snow.patch
+++ b/patches/unapplied/server/0036-Disable-ice-and-snow.patch
diff --git a/patches/server/0037-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0037-Configurable-mob-spawner-tick-rate.patch
index d808814fc6..d808814fc6 100644
--- a/patches/server/0037-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/unapplied/server/0037-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0038-Per-Player-View-Distance-API-placeholders.patch b/patches/unapplied/server/0038-Per-Player-View-Distance-API-placeholders.patch
index 3a8ce85204..3a8ce85204 100644
--- a/patches/server/0038-Per-Player-View-Distance-API-placeholders.patch
+++ b/patches/unapplied/server/0038-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0039-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0039-Add-BeaconEffectEvent.patch
index 16a674c5ba..16a674c5ba 100644
--- a/patches/server/0039-Add-BeaconEffectEvent.patch
+++ b/patches/unapplied/server/0039-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0040-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0040-Configurable-container-update-tick-rate.patch
index 1a8fbd08e2..1a8fbd08e2 100644
--- a/patches/server/0040-Configurable-container-update-tick-rate.patch
+++ b/patches/unapplied/server/0040-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0041-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0041-Use-UserCache-for-player-heads.patch
index e13ca0bfd5..e13ca0bfd5 100644
--- a/patches/server/0041-Use-UserCache-for-player-heads.patch
+++ b/patches/unapplied/server/0041-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0042-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0042-Disable-spigot-tick-limiters.patch
index 11a27b0b3e..11a27b0b3e 100644
--- a/patches/server/0042-Disable-spigot-tick-limiters.patch
+++ b/patches/unapplied/server/0042-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0043-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0043-Add-PlayerInitialSpawnEvent.patch
index f93891e85f..f93891e85f 100644
--- a/patches/server/0043-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/unapplied/server/0043-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0044-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0044-Configurable-Disabling-Cat-Chest-Detection.patch
index 0f8878ac2f..0f8878ac2f 100644
--- a/patches/server/0044-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/unapplied/server/0044-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0045-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0045-Ensure-commands-are-not-ran-async.patch
index df03292404..df03292404 100644
--- a/patches/server/0045-Ensure-commands-are-not-ran-async.patch
+++ b/patches/unapplied/server/0045-Ensure-commands-are-not-ran-async.patch
diff --git a/patches/server/0046-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
index f8bfb49cec..f8bfb49cec 100644
--- a/patches/server/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/unapplied/server/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0047-Expose-server-CommandMap.patch b/patches/unapplied/server/0047-Expose-server-CommandMap.patch
index 0483e1b87f..0483e1b87f 100644
--- a/patches/server/0047-Expose-server-CommandMap.patch
+++ b/patches/unapplied/server/0047-Expose-server-CommandMap.patch
diff --git a/patches/server/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 9a40eefbe0..9a40eefbe0 100644
--- a/patches/server/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/unapplied/server/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0049-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0049-Player-Tab-List-and-Title-APIs.patch
index 53d80b2972..53d80b2972 100644
--- a/patches/server/0049-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/unapplied/server/0049-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/0050-Ensure-inv-drag-is-in-bounds.patch
index feb38782e8..feb38782e8 100644
--- a/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/unapplied/server/0050-Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/0051-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0051-Add-configurable-portal-search-radius.patch
index a7c37fd431..a7c37fd431 100644
--- a/patches/server/0051-Add-configurable-portal-search-radius.patch
+++ b/patches/unapplied/server/0051-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0052-Add-velocity-warnings.patch b/patches/unapplied/server/0052-Add-velocity-warnings.patch
index 394dc3b2d5..394dc3b2d5 100644
--- a/patches/server/0052-Add-velocity-warnings.patch
+++ b/patches/unapplied/server/0052-Add-velocity-warnings.patch
diff --git a/patches/server/0053-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0053-Configurable-inter-world-teleportation-safety.patch
index 055cf61f75..055cf61f75 100644
--- a/patches/server/0053-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/unapplied/server/0053-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0054-Add-exception-reporting-event.patch b/patches/unapplied/server/0054-Add-exception-reporting-event.patch
index 3af36c42b3..3af36c42b3 100644
--- a/patches/server/0054-Add-exception-reporting-event.patch
+++ b/patches/unapplied/server/0054-Add-exception-reporting-event.patch
diff --git a/patches/server/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 0fbaf13f1e..0fbaf13f1e 100644
--- a/patches/server/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/unapplied/server/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0056-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0056-Disable-Scoreboards-for-non-players-by-default.patch
index eb9b07c40f..eb9b07c40f 100644
--- a/patches/server/0056-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/unapplied/server/0056-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b74b44968c..b74b44968c 100644
--- a/patches/server/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/unapplied/server/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0058-Complete-resource-pack-API.patch b/patches/unapplied/server/0058-Complete-resource-pack-API.patch
index e43190654c..e43190654c 100644
--- a/patches/server/0058-Complete-resource-pack-API.patch
+++ b/patches/unapplied/server/0058-Complete-resource-pack-API.patch
diff --git a/patches/server/0059-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0059-Chunk-Save-Reattempt.patch
index 60ea3d5f32..60ea3d5f32 100644
--- a/patches/server/0059-Chunk-Save-Reattempt.patch
+++ b/patches/unapplied/server/0059-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0060-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0060-Default-loading-permissions.yml-before-plugins.patch
index eef7b43230..eef7b43230 100644
--- a/patches/server/0060-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/unapplied/server/0060-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0061-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0061-Allow-Reloading-of-Custom-Permissions.patch
index 4b3c5f66c6..4b3c5f66c6 100644
--- a/patches/server/0061-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/unapplied/server/0061-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0062-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0062-Remove-Metadata-on-reload.patch
index f3ec634683..f3ec634683 100644
--- a/patches/server/0062-Remove-Metadata-on-reload.patch
+++ b/patches/unapplied/server/0062-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0063-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0063-Handle-Item-Meta-Inconsistencies.patch
index 0bb14e9956..0bb14e9956 100644
--- a/patches/server/0063-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/unapplied/server/0063-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index ff43f5c3e8..ff43f5c3e8 100644
--- a/patches/server/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/unapplied/server/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0065-Add-World-Util-Methods.patch b/patches/unapplied/server/0065-Add-World-Util-Methods.patch
index 546038f583..546038f583 100644
--- a/patches/server/0065-Add-World-Util-Methods.patch
+++ b/patches/unapplied/server/0065-Add-World-Util-Methods.patch
diff --git a/patches/server/0066-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0066-Custom-replacement-for-eaten-items.patch
index 0f4d9466bf..0f4d9466bf 100644
--- a/patches/server/0066-Custom-replacement-for-eaten-items.patch
+++ b/patches/unapplied/server/0066-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index d78558fcc9..d78558fcc9 100644
--- a/patches/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/unapplied/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0068-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0068-Use-a-Shared-Random-for-Entities.patch
index 771b86a797..771b86a797 100644
--- a/patches/server/0068-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/unapplied/server/0068-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0069-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0069-Configurable-spawn-chances-for-skeleton-horses.patch
index 17dfc2d740..17dfc2d740 100644
--- a/patches/server/0069-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/unapplied/server/0069-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/patches/unapplied/server/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index ec49f16575..ec49f16575 100644
--- a/patches/server/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/patches/unapplied/server/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
diff --git a/patches/server/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 8703fd5a5e..8703fd5a5e 100644
--- a/patches/server/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/unapplied/server/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0072-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0072-Entity-AddTo-RemoveFrom-World-Events.patch
index 8c7af1f4f6..8c7af1f4f6 100644
--- a/patches/server/0072-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/unapplied/server/0072-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0073-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0073-Configurable-Chunk-Inhabited-Time.patch
index 2c00f8faf1..2c00f8faf1 100644
--- a/patches/server/0073-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/unapplied/server/0073-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0074-EntityPathfindEvent.patch b/patches/unapplied/server/0074-EntityPathfindEvent.patch
index 659852876c..659852876c 100644
--- a/patches/server/0074-EntityPathfindEvent.patch
+++ b/patches/unapplied/server/0074-EntityPathfindEvent.patch
diff --git a/patches/server/0075-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0075-Sanitise-RegionFileCache-and-make-configurable.patch
index 28d810a737..28d810a737 100644
--- a/patches/server/0075-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/unapplied/server/0075-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0076-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0076-Do-not-load-chunks-for-Pathfinding.patch
index b00c5e68b8..b00c5e68b8 100644
--- a/patches/server/0076-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/unapplied/server/0076-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0077-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0077-Add-PlayerUseUnknownEntityEvent.patch
index 845e110f98..845e110f98 100644
--- a/patches/server/0077-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/server/0077-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0079-Configurable-Grass-Spread-Tick-Rate.patch
index 23fe5593a7..23fe5593a7 100644
--- a/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/unapplied/server/0079-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 3065ca23c6..3065ca23c6 100644
--- a/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/unapplied/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0081-Optimize-DataBits.patch b/patches/unapplied/server/0081-Optimize-DataBits.patch
index bc958e222a..bc958e222a 100644
--- a/patches/server/0081-Optimize-DataBits.patch
+++ b/patches/unapplied/server/0081-Optimize-DataBits.patch
diff --git a/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index b1735679de..b1735679de 100644
--- a/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/unapplied/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0083-Workaround-for-setting-passengers-on-players.patch b/patches/unapplied/server/0083-Workaround-for-setting-passengers-on-players.patch
index 419cbbe8c9..419cbbe8c9 100644
--- a/patches/server/0083-Workaround-for-setting-passengers-on-players.patch
+++ b/patches/unapplied/server/0083-Workaround-for-setting-passengers-on-players.patch
diff --git a/patches/server/0084-Configurable-Player-Collision.patch b/patches/unapplied/server/0084-Configurable-Player-Collision.patch
index cdb3307063..cdb3307063 100644
--- a/patches/server/0084-Configurable-Player-Collision.patch
+++ b/patches/unapplied/server/0084-Configurable-Player-Collision.patch
diff --git a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 9ba4220aed..9ba4220aed 100644
--- a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0086-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0086-Configurable-RCON-IP-address.patch
index 4e2ebf57fb..4e2ebf57fb 100644
--- a/patches/server/0086-Configurable-RCON-IP-address.patch
+++ b/patches/unapplied/server/0086-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0087-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0087-Implement-PlayerLocaleChangeEvent.patch
index 4c0640ba40..4c0640ba40 100644
--- a/patches/server/0087-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/unapplied/server/0087-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
index 75ad755312..75ad755312 100644
--- a/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
index 9a4eb52cc2..9a4eb52cc2 100644
--- a/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/unapplied/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0090-remove-null-possibility-for-getServer-singleton.patch
index b8035304aa..b8035304aa 100644
--- a/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/unapplied/server/0090-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 7fda0f533d..7fda0f533d 100644
--- a/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
index 46f8c0e11f..46f8c0e11f 100644
--- a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/unapplied/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index f3cdb92ebc..f3cdb92ebc 100644
--- a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/unapplied/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0094-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0094-System-property-for-disabling-watchdoge.patch
index 8d880e6928..8d880e6928 100644
--- a/patches/server/0094-System-property-for-disabling-watchdoge.patch
+++ b/patches/unapplied/server/0094-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0095-Optimize-UserCache-Thread-Safe.patch b/patches/unapplied/server/0095-Optimize-UserCache-Thread-Safe.patch
index 8342bfa0aa..8342bfa0aa 100644
--- a/patches/server/0095-Optimize-UserCache-Thread-Safe.patch
+++ b/patches/unapplied/server/0095-Optimize-UserCache-Thread-Safe.patch
diff --git a/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0096-Optional-TNT-doesn-t-move-in-water.patch
index 89efd03fe1..89efd03fe1 100644
--- a/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/unapplied/server/0096-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
index 61a6a4b909..61a6a4b909 100644
--- a/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/unapplied/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0098-Add-server-name-parameter.patch b/patches/unapplied/server/0098-Add-server-name-parameter.patch
index 10727a66b6..10727a66b6 100644
--- a/patches/server/0098-Add-server-name-parameter.patch
+++ b/patches/unapplied/server/0098-Add-server-name-parameter.patch
diff --git a/patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/unapplied/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index aeeb3ffa6c..aeeb3ffa6c 100644
--- a/patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/unapplied/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0100-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0100-Fix-Old-Sign-Conversion.patch
index 75343aaf14..75343aaf14 100644
--- a/patches/server/0100-Fix-Old-Sign-Conversion.patch
+++ b/patches/unapplied/server/0100-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
index a23cfb9f34..a23cfb9f34 100644
--- a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/unapplied/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index ebbc54a189..ebbc54a189 100644
--- a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/unapplied/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0103-Add-setting-for-proxy-online-mode-status.patch
index 6fb1f34b9e..6fb1f34b9e 100644
--- a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/unapplied/server/0103-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0104-Optimise-BlockState-s-hashCode-equals.patch
index 1223b0ff35..1223b0ff35 100644
--- a/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/unapplied/server/0104-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0105-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0105-Configurable-packet-in-spam-threshold.patch
index de9749ed92..de9749ed92 100644
--- a/patches/server/0105-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0105-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0106-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0106-Configurable-flying-kick-messages.patch
index 2561f917a6..2561f917a6 100644
--- a/patches/server/0106-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0106-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/unapplied/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 26fc5942ba..26fc5942ba 100644
--- a/patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/patches/unapplied/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch b/patches/unapplied/server/0108-Option-to-remove-corrupt-tile-entities.patch
index a013f028bd..a013f028bd 100644
--- a/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
+++ b/patches/unapplied/server/0108-Option-to-remove-corrupt-tile-entities.patch
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/unapplied/server/0109-Add-EntityZapEvent.patch
index 04342ff5ea..04342ff5ea 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/unapplied/server/0109-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index a3315a1d98..a3315a1d98 100644
--- a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0111-Cache-user-authenticator-threads.patch
index 9f44dec0b7..9f44dec0b7 100644
--- a/patches/server/0111-Cache-user-authenticator-threads.patch
+++ b/patches/unapplied/server/0111-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch
index 8da9ad6a6d..8da9ad6a6d 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch
index d49c315769..d49c315769 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch b/patches/unapplied/server/0114-Don-t-let-fishinghooks-use-portals.patch
index 9ce90e316b..9ce90e316b 100644
--- a/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
+++ b/patches/unapplied/server/0114-Don-t-let-fishinghooks-use-portals.patch
diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
index d0487f914b..d0487f914b 100644
--- a/patches/server/0115-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
index d72a1ed447..d72a1ed447 100644
--- a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index 85cfec76b0..85cfec76b0 100644
--- a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
index ff7bd30c61..ff7bd30c61 100644
--- a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
index c1b8e1616d..c1b8e1616d 100644
--- a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0120-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch
index 04fec9b9f2..04fec9b9f2 100644
--- a/patches/server/0120-Optimize-ItemStack.isEmpty.patch
+++ b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
index f8389dd8b1..f8389dd8b1 100644
--- a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch
index 26480a9094..26480a9094 100644
--- a/patches/server/0122-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch
diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch
index 2bc365640f..2bc365640f 100644
--- a/patches/server/0123-Properly-fix-item-duplication-bug.patch
+++ b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0124-Firework-API-s.patch b/patches/unapplied/server/0124-Firework-API-s.patch
index 38e7294cc8..38e7294cc8 100644
--- a/patches/server/0124-Firework-API-s.patch
+++ b/patches/unapplied/server/0124-Firework-API-s.patch
diff --git a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch
index 3f16cce5be..3f16cce5be 100644
--- a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
index b5cafb7a8a..b5cafb7a8a 100644
--- a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0127-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch
index 7b0c161eed..7b0c161eed 100644
--- a/patches/server/0127-Enforce-Sync-Player-Saves.patch
+++ b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
index d86d318c16..d86d318c16 100644
--- a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index ef93baf58c..ef93baf58c 100644
--- a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch
index 253956dbe8..253956dbe8 100644
--- a/patches/server/0130-Cap-Entity-Collisions.patch
+++ b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch
diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/unapplied/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 63623f4616..63623f4616 100644
--- a/patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/patches/unapplied/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/0133-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0133-Do-not-let-armorstands-drown.patch
index 7eb2b35fdb..7eb2b35fdb 100644
--- a/patches/server/0133-Do-not-let-armorstands-drown.patch
+++ b/patches/unapplied/server/0133-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
index e171b117b0..e171b117b0 100644
--- a/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index ff14af5cc3..ff14af5cc3 100644
--- a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/unapplied/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
index f81e685ad8..f81e685ad8 100644
--- a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
index bd1f81b203..bd1f81b203 100644
--- a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/unapplied/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
diff --git a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
index 83f643cee0..83f643cee0 100644
--- a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/unapplied/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0139-Item-canEntityPickup.patch b/patches/unapplied/server/0139-Item-canEntityPickup.patch
index b7f706195b..b7f706195b 100644
--- a/patches/server/0139-Item-canEntityPickup.patch
+++ b/patches/unapplied/server/0139-Item-canEntityPickup.patch
diff --git a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
index fd524d8436..fd524d8436 100644
--- a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/unapplied/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0141-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0141-PlayerAttemptPickupItemEvent.patch
index 34d1b804a7..34d1b804a7 100644
--- a/patches/server/0141-PlayerAttemptPickupItemEvent.patch
+++ b/patches/unapplied/server/0141-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch
index 4e5e0b9c50..4e5e0b9c50 100644
--- a/patches/server/0142-Add-UnknownCommandEvent.patch
+++ b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch
index b1f7472bb0..b1f7472bb0 100644
--- a/patches/server/0143-Basic-PlayerProfile-API.patch
+++ b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch
index 60877715d3..60877715d3 100644
--- a/patches/server/0144-Shoulder-Entities-Release-API.patch
+++ b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/unapplied/server/0145-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0145-Profile-Lookup-Events.patch
+++ b/patches/unapplied/server/0145-Profile-Lookup-Events.patch
diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch
index 580ab5cfaa..580ab5cfaa 100644
--- a/patches/server/0146-Block-player-logins-during-server-shutdown.patch
+++ b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch
index 62491676a9..62491676a9 100644
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch
diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch
index 4f3f3977fc..4f3f3977fc 100644
--- a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch
index 94b99fef75..94b99fef75 100644
--- a/patches/server/0149-Implement-ensureServerConversions-API.patch
+++ b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch
index faa80f60e6..faa80f60e6 100644
--- a/patches/server/0150-Implement-getI18NDisplayName.patch
+++ b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch
index 7cd51b90d8..7cd51b90d8 100644
--- a/patches/server/0151-ProfileWhitelistVerifyEvent.patch
+++ b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch
index 4e41b743b8..4e41b743b8 100644
--- a/patches/server/0152-Fix-this-stupid-bullshit.patch
+++ b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/unapplied/server/0153-LivingEntity-setKiller.patch
index dd3fcb3f3e..dd3fcb3f3e 100644
--- a/patches/server/0153-LivingEntity-setKiller.patch
+++ b/patches/unapplied/server/0153-LivingEntity-setKiller.patch
diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 99b191f939..99b191f939 100644
--- a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 2a03c3c449..2a03c3c449 100644
--- a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
index 4b61263779..4b61263779 100644
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 51d4906e60..51d4906e60 100644
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch
index 9a463aaf1b..9a463aaf1b 100644
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch b/patches/unapplied/server/0160-handle-PacketPlayInKeepAlive-async.patch
index 591fa74961..591fa74961 100644
--- a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/unapplied/server/0160-handle-PacketPlayInKeepAlive-async.patch
diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch
index 8e44d3ae50..8e44d3ae50 100644
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch
index 7f70824139..7f70824139 100644
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index ef5bce286a..ef5bce286a 100644
--- a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch
index b169db109d..b169db109d 100644
--- a/patches/server/0164-Add-PlayerArmorChangeEvent.patch
+++ b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
index 8203995b86..8203995b86 100644
--- a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 1e9c0d3d98..1e9c0d3d98 100644
--- a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
index 425f83d26a..425f83d26a 100644
--- a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
index 74b7560eb7..74b7560eb7 100644
--- a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch
index b815fca051..b815fca051 100644
--- a/patches/server/0169-AsyncTabCompleteEvent.patch
+++ b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch
index 2121564c8a..2121564c8a 100644
--- a/patches/server/0170-PlayerPickupExperienceEvent.patch
+++ b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch
index 39418bbb91..39418bbb91 100644
--- a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0172-Make-max-squid-spawn-height-configurable.patch b/patches/unapplied/server/0172-Make-max-squid-spawn-height-configurable.patch
index 7bddcdc088..7bddcdc088 100644
--- a/patches/server/0172-Make-max-squid-spawn-height-configurable.patch
+++ b/patches/unapplied/server/0172-Make-max-squid-spawn-height-configurable.patch
diff --git a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
index 4df4e523a5..4df4e523a5 100644
--- a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/unapplied/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch
index 0911762aa5..0911762aa5 100644
--- a/patches/server/0174-PreCreatureSpawnEvent.patch
+++ b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
index 86c66f7731..86c66f7731 100644
--- a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/unapplied/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0176-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0176-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0176-Fill-Profile-Property-Events.patch
+++ b/patches/unapplied/server/0176-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0177-PlayerAdvancementCriterionGrantEvent.patch
index 2db6d486c2..2db6d486c2 100644
--- a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/unapplied/server/0177-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0178-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0178-Add-ArmorStand-Item-Meta.patch
index 16543c136b..16543c136b 100644
--- a/patches/server/0178-Add-ArmorStand-Item-Meta.patch
+++ b/patches/unapplied/server/0178-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0179-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0179-Extend-Player-Interact-cancellation.patch
index ab571f3eba..ab571f3eba 100644
--- a/patches/server/0179-Extend-Player-Interact-cancellation.patch
+++ b/patches/unapplied/server/0179-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0180-Tameable-getOwnerUniqueId-API.patch
index d872f6cd13..d872f6cd13 100644
--- a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/unapplied/server/0180-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 021e939029..021e939029 100644
--- a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/unapplied/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
index 195d040170..195d040170 100644
--- a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/unapplied/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0183-Implement-extended-PaperServerListPingEvent.patch
index 198702591f..198702591f 100644
--- a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0183-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0184-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0184-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0184-Improved-Async-Task-Scheduler.patch
+++ b/patches/unapplied/server/0184-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index aaff9116c1..aaff9116c1 100644
--- a/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/unapplied/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0186-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0186-Player.setPlayerProfile-API.patch
index 0188ea6b65..0188ea6b65 100644
--- a/patches/server/0186-Player.setPlayerProfile-API.patch
+++ b/patches/unapplied/server/0186-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0187-getPlayerUniqueId-API.patch b/patches/unapplied/server/0187-getPlayerUniqueId-API.patch
index 6ce4f8af98..6ce4f8af98 100644
--- a/patches/server/0187-getPlayerUniqueId-API.patch
+++ b/patches/unapplied/server/0187-getPlayerUniqueId-API.patch
diff --git a/patches/server/0188-Upstream-config-migrations.patch b/patches/unapplied/server/0188-Upstream-config-migrations.patch
index 973d563d1b..973d563d1b 100644
--- a/patches/server/0188-Upstream-config-migrations.patch
+++ b/patches/unapplied/server/0188-Upstream-config-migrations.patch
diff --git a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0189-Make-legacy-ping-handler-more-reliable.patch
index f529d88f16..f529d88f16 100644
--- a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0189-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 459475062d..459475062d 100644
--- a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0191-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0191-Flag-to-disable-the-channel-limit.patch
index a6d5244d2d..a6d5244d2d 100644
--- a/patches/server/0191-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0191-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0192-Add-method-to-open-already-placed-sign.patch b/patches/unapplied/server/0192-Add-method-to-open-already-placed-sign.patch
index 94e5533d2d..94e5533d2d 100644
--- a/patches/server/0192-Add-method-to-open-already-placed-sign.patch
+++ b/patches/unapplied/server/0192-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0193-Configurable-sprint-interruption-on-attack.patch
index a701f0e7ec..a701f0e7ec 100644
--- a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0193-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index ae082f810d..ae082f810d 100644
--- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0195-EndermanEscapeEvent.patch b/patches/unapplied/server/0195-EndermanEscapeEvent.patch
index 37bc0c9d94..37bc0c9d94 100644
--- a/patches/server/0195-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0195-EndermanEscapeEvent.patch
diff --git a/patches/server/0196-Enderman.teleportRandomly.patch b/patches/unapplied/server/0196-Enderman.teleportRandomly.patch
index b2f1516786..b2f1516786 100644
--- a/patches/server/0196-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0196-Enderman.teleportRandomly.patch
diff --git a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0197-Block-Enderpearl-Travel-Exploit.patch
index 527e4cefc6..527e4cefc6 100644
--- a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0197-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
index a7cd52b852..a7cd52b852 100644
--- a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 4b233954b2..4b233954b2 100644
--- a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0200-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0200-EndermanAttackPlayerEvent.patch
index ca135c6695..ca135c6695 100644
--- a/patches/server/0200-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0200-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0201-WitchConsumePotionEvent.patch b/patches/unapplied/server/0201-WitchConsumePotionEvent.patch
index e1effd06b4..e1effd06b4 100644
--- a/patches/server/0201-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0201-WitchConsumePotionEvent.patch
diff --git a/patches/server/0202-WitchThrowPotionEvent.patch b/patches/unapplied/server/0202-WitchThrowPotionEvent.patch
index 3c46661a47..3c46661a47 100644
--- a/patches/server/0202-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0202-WitchThrowPotionEvent.patch
diff --git a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 84db4c2d46..84db4c2d46 100644
--- a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0204-WitchReadyPotionEvent.patch b/patches/unapplied/server/0204-WitchReadyPotionEvent.patch
index 03f3251f9d..03f3251f9d 100644
--- a/patches/server/0204-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0204-WitchReadyPotionEvent.patch
diff --git a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0205-ItemStack-getMaxItemUseDuration.patch
index 87e1f660fd..87e1f660fd 100644
--- a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0205-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
index 799a6a0d3e..799a6a0d3e 100644
--- a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index bfe771aea0..bfe771aea0 100644
--- a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0208-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0208-Fix-CraftEntity-hashCode.patch
index c6c09ac16b..c6c09ac16b 100644
--- a/patches/server/0208-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0208-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
index 7158830477..7158830477 100644
--- a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
index eed7562471..eed7562471 100644
--- a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0211-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0211-Make-shield-blocking-delay-configurable.patch
index eafea99093..eafea99093 100644
--- a/patches/server/0211-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0211-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0212-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0212-Improve-EntityShootBowEvent.patch
index 802e7d64a7..802e7d64a7 100644
--- a/patches/server/0212-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0212-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0213-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0213-PlayerReadyArrowEvent.patch
index 97529695c3..97529695c3 100644
--- a/patches/server/0213-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0213-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/0214-Implement-EntityKnockbackByEntityEvent.patch
index a7c93e58ec..a7c93e58ec 100644
--- a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/unapplied/server/0214-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/0215-Expand-Explosions-API.patch b/patches/unapplied/server/0215-Expand-Explosions-API.patch
index 50f7d179c1..50f7d179c1 100644
--- a/patches/server/0215-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0215-Expand-Explosions-API.patch
diff --git a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
index a188095b1c..a188095b1c 100644
--- a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0217-RangedEntity-API.patch b/patches/unapplied/server/0217-RangedEntity-API.patch
index 7773bd986d..7773bd986d 100644
--- a/patches/server/0217-RangedEntity-API.patch
+++ b/patches/unapplied/server/0217-RangedEntity-API.patch
diff --git a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
index a4a727ed19..a4a727ed19 100644
--- a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0219-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0219-Implement-World.getEntity-UUID-API.patch
index 4468c3bd83..4468c3bd83 100644
--- a/patches/server/0219-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0219-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0220-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0220-InventoryCloseEvent-Reason-API.patch
index 6349f18945..6349f18945 100644
--- a/patches/server/0220-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0220-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0221-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0221-Vex-get-setSummoner-API.patch
index ec419aa9d5..ec419aa9d5 100644
--- a/patches/server/0221-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0221-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 4bad4fa0b6..4bad4fa0b6 100644
--- a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/unapplied/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index ef92cd2b92..ef92cd2b92 100644
--- a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/unapplied/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index b3cd47759e..b3cd47759e 100644
--- a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0225-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0225-add-more-information-to-Entity.toString.patch
index 31553ec0f3..31553ec0f3 100644
--- a/patches/server/0225-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0225-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index 67ebf3e194..67ebf3e194 100644
--- a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/unapplied/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0227-EnderDragon-Events.patch b/patches/unapplied/server/0227-EnderDragon-Events.patch
index f59ce271f5..f59ce271f5 100644
--- a/patches/server/0227-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0227-EnderDragon-Events.patch
diff --git a/patches/server/0228-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0228-PlayerElytraBoostEvent.patch
index 00826b935f..00826b935f 100644
--- a/patches/server/0228-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0228-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0229-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0229-PlayerLaunchProjectileEvent.patch
index 7b5f4c3d40..7b5f4c3d40 100644
--- a/patches/server/0229-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0229-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0230-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0230-Improve-BlockPosition-inlining.patch
index ac4eb44c6a..ac4eb44c6a 100644
--- a/patches/server/0230-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0230-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/unapplied/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
index 9eeaac8ad2..9eeaac8ad2 100644
--- a/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
+++ b/patches/unapplied/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
diff --git a/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 3b7dbf2c46..3b7dbf2c46 100644
--- a/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0233-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0233-Vanished-players-don-t-have-rights.patch
index 827af70ffa..827af70ffa 100644
--- a/patches/server/0233-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0233-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0234-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0234-Allow-disabling-armour-stand-ticking.patch
index 0c5a3b814a..0c5a3b814a 100644
--- a/patches/server/0234-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0234-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0235-SkeletonHorse-Additions.patch b/patches/unapplied/server/0235-SkeletonHorse-Additions.patch
index 764fb5eb4c..764fb5eb4c 100644
--- a/patches/server/0235-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0235-SkeletonHorse-Additions.patch
diff --git a/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 6327eec23e..6327eec23e 100644
--- a/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0237-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0237-Implement-Expanded-ArmorStand-API.patch
index ace889510d..ace889510d 100644
--- a/patches/server/0237-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0237-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0238-AnvilDamageEvent.patch b/patches/unapplied/server/0238-AnvilDamageEvent.patch
index f180555c22..f180555c22 100644
--- a/patches/server/0238-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0238-AnvilDamageEvent.patch
diff --git a/patches/server/0239-Add-hand-to-bucket-events.patch b/patches/unapplied/server/0239-Add-hand-to-bucket-events.patch
index f3723fe1e8..f3723fe1e8 100644
--- a/patches/server/0239-Add-hand-to-bucket-events.patch
+++ b/patches/unapplied/server/0239-Add-hand-to-bucket-events.patch
diff --git a/patches/server/0240-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0240-Add-TNTPrimeEvent.patch
index 44e01554cf..44e01554cf 100644
--- a/patches/server/0240-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0240-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
index 1eda770e77..1eda770e77 100644
--- a/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch b/patches/unapplied/server/0242-MC-135506-Experience-should-save-as-Integers.patch
index f21e8609c8..f21e8609c8 100644
--- a/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/unapplied/server/0242-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch b/patches/unapplied/server/0243-Fix-client-rendering-skulls-from-same-user.patch
index ac7687061a..ac7687061a 100644
--- a/patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch
+++ b/patches/unapplied/server/0243-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 32c918a5c3..32c918a5c3 100644
--- a/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
index 89e9f34909..89e9f34909 100644
--- a/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0246-Make-EnderDragon-implement-Mob.patch b/patches/unapplied/server/0246-Make-EnderDragon-implement-Mob.patch
index 8392dc7bad..8392dc7bad 100644
--- a/patches/server/0246-Make-EnderDragon-implement-Mob.patch
+++ b/patches/unapplied/server/0246-Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
index 09b16e4007..09b16e4007 100644
--- a/patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0248-Use-a-Queue-for-Queueing-Commands.patch
index f0320af252..f0320af252 100644
--- a/patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0248-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 8490b9fa93..8490b9fa93 100644
--- a/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0250-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0250-Optimize-BlockPosition-helper-methods.patch
index 7da7f6e1d1..7da7f6e1d1 100644
--- a/patches/server/0250-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0250-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/unapplied/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
index 22843d43ee..22843d43ee 100644
--- a/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
+++ b/patches/unapplied/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
diff --git a/patches/server/0252-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0252-Slime-Pathfinder-Events.patch
index c7b7672a75..c7b7672a75 100644
--- a/patches/server/0252-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0252-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
index 63c3aa266e..63c3aa266e 100644
--- a/patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0254-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0254-Optimize-CraftBlockData-Creation.patch
index 92327300b9..92327300b9 100644
--- a/patches/server/0254-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0254-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0255-Optimize-MappedRegistry.patch b/patches/unapplied/server/0255-Optimize-MappedRegistry.patch
index 047b65a8df..047b65a8df 100644
--- a/patches/server/0255-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0255-Optimize-MappedRegistry.patch
diff --git a/patches/server/0256-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0256-Add-PhantomPreSpawnEvent.patch
index a16956ca3c..a16956ca3c 100644
--- a/patches/server/0256-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0256-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0257-Add-More-Creeper-API.patch b/patches/unapplied/server/0257-Add-More-Creeper-API.patch
index ce701d671b..ce701d671b 100644
--- a/patches/server/0257-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0257-Add-More-Creeper-API.patch
diff --git a/patches/server/0258-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0258-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0258-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0258-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 8de0121b8c..8de0121b8c 100644
--- a/patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/unapplied/server/0260-Asynchronous-chunk-IO-and-loading.patch
index 8ac9baec88..8ac9baec88 100644
--- a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/unapplied/server/0260-Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
index ecad384394..ecad384394 100644
--- a/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0262-Expose-attack-cooldown-methods-for-Player.patch
index 0bf7308870..0bf7308870 100644
--- a/patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/unapplied/server/0262-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0263-Improve-death-events.patch b/patches/unapplied/server/0263-Improve-death-events.patch
index b554873581..b554873581 100644
--- a/patches/server/0263-Improve-death-events.patch
+++ b/patches/unapplied/server/0263-Improve-death-events.patch
diff --git a/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
index c30af9bad4..c30af9bad4 100644
--- a/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/unapplied/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0265-Mob-Pathfinding-API.patch b/patches/unapplied/server/0265-Mob-Pathfinding-API.patch
index ebe42603c8..ebe42603c8 100644
--- a/patches/server/0265-Mob-Pathfinding-API.patch
+++ b/patches/unapplied/server/0265-Mob-Pathfinding-API.patch
diff --git a/patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 0a3719ca71..0a3719ca71 100644
--- a/patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/unapplied/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 7f8d0e6dc2..7f8d0e6dc2 100644
--- a/patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/unapplied/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 6165cd6338..6165cd6338 100644
--- a/patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/unapplied/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
index f2712fc3f5..f2712fc3f5 100644
--- a/patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/unapplied/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
index 9e195897f9..9e195897f9 100644
--- a/patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/unapplied/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
index d23a3f4d1c..d23a3f4d1c 100644
--- a/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/unapplied/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0272-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0272-Honor-EntityAgeable.ageLock.patch
index 369899cfee..369899cfee 100644
--- a/patches/server/0272-Honor-EntityAgeable.ageLock.patch
+++ b/patches/unapplied/server/0272-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0273-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0273-Configurable-connection-throttle-kick-message.patch
index 73bbdac9ba..73bbdac9ba 100644
--- a/patches/server/0273-Configurable-connection-throttle-kick-message.patch
+++ b/patches/unapplied/server/0273-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0274-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0274-Hook-into-CB-plugin-rewrites.patch
index 3f5cb35595..3f5cb35595 100644
--- a/patches/server/0274-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/unapplied/server/0274-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0275-Add-sun-related-API.patch b/patches/unapplied/server/0275-Add-sun-related-API.patch
index e7fc1454cf..e7fc1454cf 100644
--- a/patches/server/0275-Add-sun-related-API.patch
+++ b/patches/unapplied/server/0275-Add-sun-related-API.patch
diff --git a/patches/server/0276-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0276-Add-LivingEntity-getTargetEntity.patch
index 8a49b6613e..8a49b6613e 100644
--- a/patches/server/0276-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/unapplied/server/0276-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0277-Turtle-API.patch b/patches/unapplied/server/0277-Turtle-API.patch
index ebd098adad..ebd098adad 100644
--- a/patches/server/0277-Turtle-API.patch
+++ b/patches/unapplied/server/0277-Turtle-API.patch
diff --git a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index a248ef80d1..a248ef80d1 100644
--- a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/unapplied/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
index 982fcef989..982fcef989 100644
--- a/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/unapplied/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0280-Add-Velocity-IP-Forwarding-Support.patch
index ce581a9965..ce581a9965 100644
--- a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/unapplied/server/0280-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0281-Add-more-Witch-API.patch b/patches/unapplied/server/0281-Add-more-Witch-API.patch
index ce30836286..ce30836286 100644
--- a/patches/server/0281-Add-more-Witch-API.patch
+++ b/patches/unapplied/server/0281-Add-more-Witch-API.patch
diff --git a/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
index 10fd039a07..10fd039a07 100644
--- a/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/unapplied/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0283-Here-s-Johnny.patch b/patches/unapplied/server/0283-Here-s-Johnny.patch
index fb2a745aa8..fb2a745aa8 100644
--- a/patches/server/0283-Here-s-Johnny.patch
+++ b/patches/unapplied/server/0283-Here-s-Johnny.patch
diff --git a/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 3b574fa165..3b574fa165 100644
--- a/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/unapplied/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0285-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0285-Reset-players-airTicks-on-respawn.patch
index 9e80e607c7..9e80e607c7 100644
--- a/patches/server/0285-Reset-players-airTicks-on-respawn.patch
+++ b/patches/unapplied/server/0285-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 01be147e24..01be147e24 100644
--- a/patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/unapplied/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index a21cc9744c..a21cc9744c 100644
--- a/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/unapplied/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0288-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0288-Optimize-World-Time-Updates.patch
index b0e88e4f78..b0e88e4f78 100644
--- a/patches/server/0288-Optimize-World-Time-Updates.patch
+++ b/patches/unapplied/server/0288-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0289-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0289-Restore-custom-InventoryHolder-support.patch
index 3a5cb7251b..3a5cb7251b 100644
--- a/patches/server/0289-Restore-custom-InventoryHolder-support.patch
+++ b/patches/unapplied/server/0289-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0290-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0290-Use-Vanilla-Minecart-Speeds.patch
index 2e4b0f1cde..2e4b0f1cde 100644
--- a/patches/server/0290-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/unapplied/server/0290-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0291-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0291-Fix-SpongeAbsortEvent-handling.patch
index f8f4c2c7fe..f8f4c2c7fe 100644
--- a/patches/server/0291-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/unapplied/server/0291-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0292-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0292-PreSpawnerSpawnEvent.patch
index ef07bb5353..ef07bb5353 100644
--- a/patches/server/0292-PreSpawnerSpawnEvent.patch
+++ b/patches/unapplied/server/0292-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
index b7f1851d9d..b7f1851d9d 100644
--- a/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/unapplied/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0294-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0294-Make-the-default-permission-message-configurable.patch
index 2517cfdd2d..2517cfdd2d 100644
--- a/patches/server/0294-Make-the-default-permission-message-configurable.patch
+++ b/patches/unapplied/server/0294-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0295-Prevent-rayTrace-from-loading-chunks.patch
index 7043bbb004..7043bbb004 100644
--- a/patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/unapplied/server/0295-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0296-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0296-Handle-Large-Packets-disconnecting-client.patch
index 8f495a8a20..8f495a8a20 100644
--- a/patches/server/0296-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/unapplied/server/0296-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0297-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0297-force-entity-dismount-during-teleportation.patch
index 934cde4f2c..934cde4f2c 100644
--- a/patches/server/0297-force-entity-dismount-during-teleportation.patch
+++ b/patches/unapplied/server/0297-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0298-Add-more-Zombie-API.patch b/patches/unapplied/server/0298-Add-more-Zombie-API.patch
index d0824299bd..d0824299bd 100644
--- a/patches/server/0298-Add-more-Zombie-API.patch
+++ b/patches/unapplied/server/0298-Add-more-Zombie-API.patch
diff --git a/patches/server/0299-Book-Size-Limits.patch b/patches/unapplied/server/0299-Book-Size-Limits.patch
index d1cafc09eb..d1cafc09eb 100644
--- a/patches/server/0299-Book-Size-Limits.patch
+++ b/patches/unapplied/server/0299-Book-Size-Limits.patch
diff --git a/patches/server/0300-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0300-Add-PlayerConnectionCloseEvent.patch
index 69c8fa01ed..69c8fa01ed 100644
--- a/patches/server/0300-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/unapplied/server/0300-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0301-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0301-Prevent-Enderman-from-loading-chunks.patch
index 65ca01c50c..65ca01c50c 100644
--- a/patches/server/0301-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/unapplied/server/0301-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index c6372bbdaf..c6372bbdaf 100644
--- a/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/unapplied/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 9919e18aa0..9919e18aa0 100644
--- a/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/unapplied/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/unapplied/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index e6dd1bd4fb..e6dd1bd4fb 100644
--- a/patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/patches/unapplied/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
index bfeb067354..bfeb067354 100644
--- a/patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/unapplied/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0306-BlockDestroyEvent.patch b/patches/unapplied/server/0306-BlockDestroyEvent.patch
index 9703875c7a..9703875c7a 100644
--- a/patches/server/0306-BlockDestroyEvent.patch
+++ b/patches/unapplied/server/0306-BlockDestroyEvent.patch
diff --git a/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 408be3ab4b..408be3ab4b 100644
--- a/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/unapplied/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0308-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0308-Limit-Client-Sign-length-more.patch
index bbf5fc414c..bbf5fc414c 100644
--- a/patches/server/0308-Limit-Client-Sign-length-more.patch
+++ b/patches/unapplied/server/0308-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 5032a2a1f6..5032a2a1f6 100644
--- a/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/unapplied/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 2f21dd2316..2f21dd2316 100644
--- a/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
index f02716ec0e..f02716ec0e 100644
--- a/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/unapplied/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/unapplied/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index b5f853a89b..b5f853a89b 100644
--- a/patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/patches/unapplied/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/unapplied/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 5663954325..5663954325 100644
--- a/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/unapplied/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 6d6b263d39..6d6b263d39 100644
--- a/patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/unapplied/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/unapplied/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index bb182f5de4..bb182f5de4 100644
--- a/patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/patches/unapplied/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0316-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0316-Entity-getEntitySpawnReason.patch
index 091e61f26e..091e61f26e 100644
--- a/patches/server/0316-Entity-getEntitySpawnReason.patch
+++ b/patches/unapplied/server/0316-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch b/patches/unapplied/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
index 6b2699267a..6b2699267a 100644
--- a/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/unapplied/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0318-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0318-Fire-event-on-GS4-query.patch
index 5b78abf70c..5b78abf70c 100644
--- a/patches/server/0318-Fire-event-on-GS4-query.patch
+++ b/patches/unapplied/server/0318-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0319-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0319-Implement-PlayerPostRespawnEvent.patch
index 1706ae51ae..1706ae51ae 100644
--- a/patches/server/0319-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0319-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 48f380970f..48f380970f 100644
--- a/patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/unapplied/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0321-Server-Tick-Events.patch b/patches/unapplied/server/0321-Server-Tick-Events.patch
index 0415691d31..0415691d31 100644
--- a/patches/server/0321-Server-Tick-Events.patch
+++ b/patches/unapplied/server/0321-Server-Tick-Events.patch
diff --git a/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0322-PlayerDeathEvent-getItemsToKeep.patch
index 812b708bf0..812b708bf0 100644
--- a/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/unapplied/server/0322-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0323-Optimize-Captured-TileEntity-Lookup.patch
index 07d16c35ca..07d16c35ca 100644
--- a/patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/unapplied/server/0323-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0324-Add-Heightmap-API.patch b/patches/unapplied/server/0324-Add-Heightmap-API.patch
index a6cdaf00ef..a6cdaf00ef 100644
--- a/patches/server/0324-Add-Heightmap-API.patch
+++ b/patches/unapplied/server/0324-Add-Heightmap-API.patch
diff --git a/patches/server/0325-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0325-Mob-Spawner-API-Enhancements.patch
index 7cd5c3a51d..7cd5c3a51d 100644
--- a/patches/server/0325-Mob-Spawner-API-Enhancements.patch
+++ b/patches/unapplied/server/0325-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
index c34e6820f9..c34e6820f9 100644
--- a/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/unapplied/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 25c0eca233..25c0eca233 100644
--- a/patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/unapplied/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/unapplied/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index f76cd1cdf6..f76cd1cdf6 100644
--- a/patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/unapplied/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0329-improve-CraftWorld-isChunkLoaded.patch b/patches/unapplied/server/0329-improve-CraftWorld-isChunkLoaded.patch
index 2bbad4841a..2bbad4841a 100644
--- a/patches/server/0329-improve-CraftWorld-isChunkLoaded.patch
+++ b/patches/unapplied/server/0329-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 6214a7bea2..6214a7bea2 100644
--- a/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/unapplied/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0331-ChunkMapDistance-CME.patch b/patches/unapplied/server/0331-ChunkMapDistance-CME.patch
index 30c7cf101f..30c7cf101f 100644
--- a/patches/server/0331-ChunkMapDistance-CME.patch
+++ b/patches/unapplied/server/0331-ChunkMapDistance-CME.patch
diff --git a/patches/server/0332-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0332-Implement-CraftBlockSoundGroup.patch
index c2009b9bf5..c2009b9bf5 100644
--- a/patches/server/0332-Implement-CraftBlockSoundGroup.patch
+++ b/patches/unapplied/server/0332-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0333-Chunk-debug-command.patch b/patches/unapplied/server/0333-Chunk-debug-command.patch
index fafa15af72..fafa15af72 100644
--- a/patches/server/0333-Chunk-debug-command.patch
+++ b/patches/unapplied/server/0333-Chunk-debug-command.patch
diff --git a/patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0334-Allow-Saving-of-Oversized-Chunks.patch
index bd5b4ebbee..bd5b4ebbee 100644
--- a/patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/0334-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0335-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0335-Expose-the-internal-current-tick.patch
index beaa10a655..beaa10a655 100644
--- a/patches/server/0335-Expose-the-internal-current-tick.patch
+++ b/patches/unapplied/server/0335-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0336-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0336-Fix-World-isChunkGenerated-calls.patch
index 2e2439fb4f..2e2439fb4f 100644
--- a/patches/server/0336-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/0336-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch
index 53a62a1dee..53a62a1dee 100644
--- a/patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/unapplied/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 61ebe8391f..61ebe8391f 100644
--- a/patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/unapplied/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0339-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0339-Configurable-projectile-relative-velocity.patch
index 8d179dfbc2..8d179dfbc2 100644
--- a/patches/server/0339-Configurable-projectile-relative-velocity.patch
+++ b/patches/unapplied/server/0339-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0340-offset-item-frame-ticking.patch b/patches/unapplied/server/0340-offset-item-frame-ticking.patch
index 5c65f244d8..5c65f244d8 100644
--- a/patches/server/0340-offset-item-frame-ticking.patch
+++ b/patches/unapplied/server/0340-offset-item-frame-ticking.patch
diff --git a/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/unapplied/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 20fda6529d..20fda6529d 100644
--- a/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/patches/unapplied/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/patches/server/0342-Fix-MC-158900.patch b/patches/unapplied/server/0342-Fix-MC-158900.patch
index fd07fdf38a..fd07fdf38a 100644
--- a/patches/server/0342-Fix-MC-158900.patch
+++ b/patches/unapplied/server/0342-Fix-MC-158900.patch
diff --git a/patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0343-Prevent-consuming-the-wrong-itemstack.patch
index e3390da758..e3390da758 100644
--- a/patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/unapplied/server/0343-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0344-Generator-Settings.patch b/patches/unapplied/server/0344-Generator-Settings.patch
index 00dc6a25f3..00dc6a25f3 100644
--- a/patches/server/0344-Generator-Settings.patch
+++ b/patches/unapplied/server/0344-Generator-Settings.patch
diff --git a/patches/server/0345-Fix-MC-161754.patch b/patches/unapplied/server/0345-Fix-MC-161754.patch
index c88f364510..c88f364510 100644
--- a/patches/server/0345-Fix-MC-161754.patch
+++ b/patches/unapplied/server/0345-Fix-MC-161754.patch
diff --git a/patches/server/0346-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0346-Dont-send-unnecessary-sign-update.patch
index 1565c5c289..1565c5c289 100644
--- a/patches/server/0346-Dont-send-unnecessary-sign-update.patch
+++ b/patches/unapplied/server/0346-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/unapplied/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 4a2b54e390..4a2b54e390 100644
--- a/patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/patches/unapplied/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/patches/server/0348-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0348-Add-option-to-disable-pillager-patrols.patch
index ca60037978..ca60037978 100644
--- a/patches/server/0348-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/unapplied/server/0348-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/unapplied/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index d7d99ca938..d7d99ca938 100644
--- a/patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/unapplied/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 7409939936..7409939936 100644
--- a/patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/unapplied/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 1a271b143b..1a271b143b 100644
--- a/patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/unapplied/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0352-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0352-Duplicate-UUID-Resolve-Option.patch
index a333a7e297..a333a7e297 100644
--- a/patches/server/0352-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/unapplied/server/0352-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0353-Optimize-Hoppers.patch b/patches/unapplied/server/0353-Optimize-Hoppers.patch
index 1a31d6b231..1a31d6b231 100644
--- a/patches/server/0353-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/0353-Optimize-Hoppers.patch
diff --git a/patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0354-PlayerDeathEvent-shouldDropExperience.patch
index 66374a57a5..66374a57a5 100644
--- a/patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/unapplied/server/0354-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch
index fe6a29860b..fe6a29860b 100644
--- a/patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/unapplied/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index d646992d77..d646992d77 100644
--- a/patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/unapplied/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch
index 391e5d38f6..391e5d38f6 100644
--- a/patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/unapplied/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/unapplied/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch
index d6d629d088..d6d629d088 100644
--- a/patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/unapplied/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0359-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0359-Fix-items-not-falling-correctly.patch
index 8eba5c8d55..8eba5c8d55 100644
--- a/patches/server/0359-Fix-items-not-falling-correctly.patch
+++ b/patches/unapplied/server/0359-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0360-Lag-compensate-eating.patch b/patches/unapplied/server/0360-Lag-compensate-eating.patch
index d8f5ced945..d8f5ced945 100644
--- a/patches/server/0360-Lag-compensate-eating.patch
+++ b/patches/unapplied/server/0360-Lag-compensate-eating.patch
diff --git a/patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0361-Optimize-call-to-getFluid-for-explosions.patch
index d0ec9f2fef..d0ec9f2fef 100644
--- a/patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/unapplied/server/0361-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 50ec050594..50ec050594 100644
--- a/patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/unapplied/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0363-Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/0363-Add-effect-to-block-break-naturally.patch
index e639827b6e..e639827b6e 100644
--- a/patches/server/0363-Add-effect-to-block-break-naturally.patch
+++ b/patches/unapplied/server/0363-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0364-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0364-Entity-Activation-Range-2.0.patch
index 92ea7bcf6b..92ea7bcf6b 100644
--- a/patches/server/0364-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/0364-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0365-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0365-Increase-Light-Queue-Size.patch
index 874192865f..874192865f 100644
--- a/patches/server/0365-Increase-Light-Queue-Size.patch
+++ b/patches/unapplied/server/0365-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0366-Fix-Light-Command.patch b/patches/unapplied/server/0366-Fix-Light-Command.patch
index 4221f308db..4221f308db 100644
--- a/patches/server/0366-Fix-Light-Command.patch
+++ b/patches/unapplied/server/0366-Fix-Light-Command.patch
diff --git a/patches/server/0367-Anti-Xray.patch b/patches/unapplied/server/0367-Anti-Xray.patch
index ae99811884..ae99811884 100644
--- a/patches/server/0367-Anti-Xray.patch
+++ b/patches/unapplied/server/0367-Anti-Xray.patch
diff --git a/patches/server/0368-No-Tick-view-distance-implementation.patch b/patches/unapplied/server/0368-No-Tick-view-distance-implementation.patch
index ecb7448c18..ecb7448c18 100644
--- a/patches/server/0368-No-Tick-view-distance-implementation.patch
+++ b/patches/unapplied/server/0368-No-Tick-view-distance-implementation.patch
diff --git a/patches/server/0369-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0369-Implement-alternative-item-despawn-rate.patch
index f4b0423545..f4b0423545 100644
--- a/patches/server/0369-Implement-alternative-item-despawn-rate.patch
+++ b/patches/unapplied/server/0369-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0370-Tracking-Range-Improvements.patch b/patches/unapplied/server/0370-Tracking-Range-Improvements.patch
index b2916d203e..b2916d203e 100644
--- a/patches/server/0370-Tracking-Range-Improvements.patch
+++ b/patches/unapplied/server/0370-Tracking-Range-Improvements.patch
diff --git a/patches/server/0371-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0371-Fix-items-vanishing-through-end-portal.patch
index 78871721e3..78871721e3 100644
--- a/patches/server/0371-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/unapplied/server/0371-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0372-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0372-implement-optional-per-player-mob-spawns.patch
index b847b14857..b847b14857 100644
--- a/patches/server/0372-implement-optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/0372-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/unapplied/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch
index 3134342179..3134342179 100644
--- a/patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/unapplied/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index ca3aaf364e..ca3aaf364e 100644
--- a/patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/unapplied/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 28d4d369d3..28d4d369d3 100644
--- a/patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/unapplied/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0376-Add-debug-for-sync-chunk-loads.patch
index 121bed55e4..121bed55e4 100644
--- a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/unapplied/server/0376-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0377-Allow-overriding-the-java-version-check.patch b/patches/unapplied/server/0377-Allow-overriding-the-java-version-check.patch
index 7df6cca91f..7df6cca91f 100644
--- a/patches/server/0377-Allow-overriding-the-java-version-check.patch
+++ b/patches/unapplied/server/0377-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0378-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0378-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0378-Add-ThrownEggHatchEvent.patch
+++ b/patches/unapplied/server/0378-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0379-Entity-Jump-API.patch b/patches/unapplied/server/0379-Entity-Jump-API.patch
index 82f946b3c5..82f946b3c5 100644
--- a/patches/server/0379-Entity-Jump-API.patch
+++ b/patches/unapplied/server/0379-Entity-Jump-API.patch
diff --git a/patches/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch
index b79c451f32..b79c451f32 100644
--- a/patches/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/unapplied/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0381-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0381-Make-the-GUI-graph-fancier.patch
index 202d52ab06..202d52ab06 100644
--- a/patches/server/0381-Make-the-GUI-graph-fancier.patch
+++ b/patches/unapplied/server/0381-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0382-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0382-add-hand-to-BlockMultiPlaceEvent.patch
index ca7db3b7f0..ca7db3b7f0 100644
--- a/patches/server/0382-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/unapplied/server/0382-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0383-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0383-Prevent-teleporting-dead-entities.patch
index 9bfafffc9a..9bfafffc9a 100644
--- a/patches/server/0383-Prevent-teleporting-dead-entities.patch
+++ b/patches/unapplied/server/0383-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0384-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0384-Validate-tripwire-hook-placement-before-update.patch
index 37fe80e7fc..37fe80e7fc 100644
--- a/patches/server/0384-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/unapplied/server/0384-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 25b2ec11ca..25b2ec11ca 100644
--- a/patches/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/unapplied/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0386-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0386-Configurable-chance-of-villager-zombie-infection.patch
index 91bdbf894a..91bdbf894a 100644
--- a/patches/server/0386-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/unapplied/server/0386-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0387-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0387-Optimise-Chunk-getFluid.patch
index fa026e2273..fa026e2273 100644
--- a/patches/server/0387-Optimise-Chunk-getFluid.patch
+++ b/patches/unapplied/server/0387-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch b/patches/unapplied/server/0388-Optimise-TickListServer-by-rewriting-it.patch
index 5796e956f0..5796e956f0 100644
--- a/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch
+++ b/patches/unapplied/server/0388-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/patches/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 79a0b65b08..79a0b65b08 100644
--- a/patches/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/unapplied/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 85da045b99..85da045b99 100644
--- a/patches/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/unapplied/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index d2ab46a55d..d2ab46a55d 100644
--- a/patches/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/unapplied/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 7a65429fce..7a65429fce 100644
--- a/patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/unapplied/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0393-Optimize-Collision-to-not-load-chunks.patch
index f26dcb563a..f26dcb563a 100644
--- a/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/0393-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0394-Don-t-tick-dead-players.patch b/patches/unapplied/server/0394-Don-t-tick-dead-players.patch
index 85b1f297aa..85b1f297aa 100644
--- a/patches/server/0394-Don-t-tick-dead-players.patch
+++ b/patches/unapplied/server/0394-Don-t-tick-dead-players.patch
diff --git a/patches/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 7a4bf27b80..7a4bf27b80 100644
--- a/patches/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/unapplied/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0396-Don-t-move-existing-players-to-world-spawn.patch
index b66c23f309..b66c23f309 100644
--- a/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/unapplied/server/0396-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0397-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0397-Add-tick-times-API-and-mspt-command.patch
index a9131c8cef..a9131c8cef 100644
--- a/patches/server/0397-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/unapplied/server/0397-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0398-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0398-Expose-MinecraftServer-isRunning.patch
index 15d49d0c63..15d49d0c63 100644
--- a/patches/server/0398-Expose-MinecraftServer-isRunning.patch
+++ b/patches/unapplied/server/0398-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
index 657e963f3e..657e963f3e 100644
--- a/patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/unapplied/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0400-Remove-streams-from-Mob-AI-System.patch b/patches/unapplied/server/0400-Remove-streams-from-Mob-AI-System.patch
index f546485714..f546485714 100644
--- a/patches/server/0400-Remove-streams-from-Mob-AI-System.patch
+++ b/patches/unapplied/server/0400-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0401-Async-command-map-building.patch b/patches/unapplied/server/0401-Async-command-map-building.patch
index 96c3da6fb3..96c3da6fb3 100644
--- a/patches/server/0401-Async-command-map-building.patch
+++ b/patches/unapplied/server/0401-Async-command-map-building.patch
diff --git a/patches/server/0402-Improved-Watchdog-Support.patch b/patches/unapplied/server/0402-Improved-Watchdog-Support.patch
index 466d96eea9..466d96eea9 100644
--- a/patches/server/0402-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/0402-Improved-Watchdog-Support.patch
diff --git a/patches/server/0403-Optimize-Pathfinding.patch b/patches/unapplied/server/0403-Optimize-Pathfinding.patch
index 5f0b3f1a77..5f0b3f1a77 100644
--- a/patches/server/0403-Optimize-Pathfinding.patch
+++ b/patches/unapplied/server/0403-Optimize-Pathfinding.patch
diff --git a/patches/server/0404-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0404-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0404-Reduce-Either-Optional-allocation.patch
+++ b/patches/unapplied/server/0404-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0405-Remove-streams-from-PairedQueue.patch b/patches/unapplied/server/0405-Remove-streams-from-PairedQueue.patch
index 91f6f25ab6..91f6f25ab6 100644
--- a/patches/server/0405-Remove-streams-from-PairedQueue.patch
+++ b/patches/unapplied/server/0405-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
index 3bc485c91d..3bc485c91d 100644
--- a/patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/unapplied/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0407-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0407-Prevent-opening-inventories-when-frozen.patch
index e9c771ae86..e9c771ae86 100644
--- a/patches/server/0407-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/unapplied/server/0407-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0408-Optimise-ArraySetSorted-removeIf.patch b/patches/unapplied/server/0408-Optimise-ArraySetSorted-removeIf.patch
index 1f9f1e2e4e..1f9f1e2e4e 100644
--- a/patches/server/0408-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/unapplied/server/0408-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
index 384947eab1..384947eab1 100644
--- a/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/unapplied/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/unapplied/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
index b0ce748234..b0ce748234 100644
--- a/patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
+++ b/patches/unapplied/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0411-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0411-Implement-Player-Client-Options-API.patch
index 38a6ef177b..38a6ef177b 100644
--- a/patches/server/0411-Implement-Player-Client-Options-API.patch
+++ b/patches/unapplied/server/0411-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/unapplied/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 36601a92d5..36601a92d5 100644
--- a/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/unapplied/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 324693d286..324693d286 100644
--- a/patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/unapplied/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0414-Broadcast-join-message-to-console.patch b/patches/unapplied/server/0414-Broadcast-join-message-to-console.patch
index 1f8a36b70f..1f8a36b70f 100644
--- a/patches/server/0414-Broadcast-join-message-to-console.patch
+++ b/patches/unapplied/server/0414-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 07a151d234..07a151d234 100644
--- a/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/unapplied/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0416-Load-Chunks-for-Login-Asynchronously.patch
index 524bed692e..524bed692e 100644
--- a/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/unapplied/server/0416-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 59e186206b..59e186206b 100644
--- a/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/unapplied/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
index 343e379a58..343e379a58 100644
--- a/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/unapplied/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 53781b7ce1..53781b7ce1 100644
--- a/patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/unapplied/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0420-Add-phantom-creative-and-insomniac-controls.patch
index 465bec7a65..465bec7a65 100644
--- a/patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/unapplied/server/0420-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 9dd3452ca9..9dd3452ca9 100644
--- a/patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/unapplied/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0422-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0422-Implement-Brigadier-Mojang-API.patch
index 61654d81fd..61654d81fd 100644
--- a/patches/server/0422-Implement-Brigadier-Mojang-API.patch
+++ b/patches/unapplied/server/0422-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0423-Villager-Restocks-API.patch b/patches/unapplied/server/0423-Villager-Restocks-API.patch
index 405b36f5d2..405b36f5d2 100644
--- a/patches/server/0423-Villager-Restocks-API.patch
+++ b/patches/unapplied/server/0423-Villager-Restocks-API.patch
diff --git a/patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 7647f74659..7647f74659 100644
--- a/patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/unapplied/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0425-Expose-game-version.patch b/patches/unapplied/server/0425-Expose-game-version.patch
index 3edddb010a..3edddb010a 100644
--- a/patches/server/0425-Expose-game-version.patch
+++ b/patches/unapplied/server/0425-Expose-game-version.patch
diff --git a/patches/server/0426-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0426-Optimize-Voxel-Shape-Merging.patch
index 2ef4cbd94e..2ef4cbd94e 100644
--- a/patches/server/0426-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/0426-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index e0a1bf15fe..e0a1bf15fe 100644
--- a/patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/unapplied/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0428-misc-debugging-dumps.patch b/patches/unapplied/server/0428-misc-debugging-dumps.patch
index becb2a0359..becb2a0359 100644
--- a/patches/server/0428-misc-debugging-dumps.patch
+++ b/patches/unapplied/server/0428-misc-debugging-dumps.patch
diff --git a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 9e9d97141d..9e9d97141d 100644
--- a/patches/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/unapplied/server/0429-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0430-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0430-Implement-Mob-Goal-API.patch
index 9c72336d8c..9c72336d8c 100644
--- a/patches/server/0430-Implement-Mob-Goal-API.patch
+++ b/patches/unapplied/server/0430-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
index d7150647b4..d7150647b4 100644
--- a/patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/unapplied/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
index 66bffb1df0..66bffb1df0 100644
--- a/patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/patches/unapplied/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/0433-Add-villager-reputation-API.patch b/patches/unapplied/server/0433-Add-villager-reputation-API.patch
index 22bcc36142..22bcc36142 100644
--- a/patches/server/0433-Add-villager-reputation-API.patch
+++ b/patches/unapplied/server/0433-Add-villager-reputation-API.patch
diff --git a/patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
index 11f4b43a25..11f4b43a25 100644
--- a/patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/unapplied/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0435-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0435-ExperienceOrbMergeEvent.patch
index 254b5ba238..254b5ba238 100644
--- a/patches/server/0435-ExperienceOrbMergeEvent.patch
+++ b/patches/unapplied/server/0435-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
index b9e0ada09f..b9e0ada09f 100644
--- a/patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/unapplied/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0437-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0437-Optimize-brigadier-child-sorting-performance.patch
index 3dd2ebd6a4..3dd2ebd6a4 100644
--- a/patches/server/0437-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/unapplied/server/0437-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0438-Potential-bed-API.patch b/patches/unapplied/server/0438-Potential-bed-API.patch
index c6e55d9ea3..c6e55d9ea3 100644
--- a/patches/server/0438-Potential-bed-API.patch
+++ b/patches/unapplied/server/0438-Potential-bed-API.patch
diff --git a/patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
index a40d5605b3..a40d5605b3 100644
--- a/patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/unapplied/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index a2bb268386..a2bb268386 100644
--- a/patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/unapplied/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 1b510a2c5f..1b510a2c5f 100644
--- a/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/unapplied/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/unapplied/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 760558e610..760558e610 100644
--- a/patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0444-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0444-Ensure-safe-gateway-teleport.patch
index 1b95afaf36..1b95afaf36 100644
--- a/patches/server/0444-Ensure-safe-gateway-teleport.patch
+++ b/patches/unapplied/server/0444-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0445-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0445-Add-option-for-console-having-all-permissions.patch
index 9c144c5e8e..9c144c5e8e 100644
--- a/patches/server/0445-Add-option-for-console-having-all-permissions.patch
+++ b/patches/unapplied/server/0445-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/unapplied/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch
index 252fada602..252fada602 100644
--- a/patches/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/unapplied/server/0446-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/unapplied/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
index 3d77324202..3d77324202 100644
--- a/patches/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
+++ b/patches/unapplied/server/0447-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/unapplied/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 87d789feb9..87d789feb9 100644
--- a/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/patches/unapplied/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0449-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0449-Fix-villager-trading-demand-MC-163962.patch
index 6e2a6230a6..6e2a6230a6 100644
--- a/patches/server/0449-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/unapplied/server/0449-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0450-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0450-Maps-shouldn-t-load-chunks.patch
index a0db1e61cc..a0db1e61cc 100644
--- a/patches/server/0450-Maps-shouldn-t-load-chunks.patch
+++ b/patches/unapplied/server/0450-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 4ef1fa7dbe..4ef1fa7dbe 100644
--- a/patches/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/unapplied/server/0451-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/unapplied/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 7cfe4b244d..7cfe4b244d 100644
--- a/patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/unapplied/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0453-Optimize-Bit-Operations-by-inlining.patch
index db577042d8..db577042d8 100644
--- a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/0453-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index d05a7239ba..d05a7239ba 100644
--- a/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/unapplied/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0455-incremental-chunk-saving.patch b/patches/unapplied/server/0455-incremental-chunk-saving.patch
index 9eba7113bd..9eba7113bd 100644
--- a/patches/server/0455-incremental-chunk-saving.patch
+++ b/patches/unapplied/server/0455-incremental-chunk-saving.patch
diff --git a/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
index 0cfdc16188..0cfdc16188 100644
--- a/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/unapplied/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/unapplied/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
index 98980618db..98980618db 100644
--- a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/unapplied/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0459-Fix-sand-duping.patch b/patches/unapplied/server/0459-Fix-sand-duping.patch
index dd7057e3d7..dd7057e3d7 100644
--- a/patches/server/0459-Fix-sand-duping.patch
+++ b/patches/unapplied/server/0459-Fix-sand-duping.patch
diff --git a/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
index ebae03640a..ebae03640a 100644
--- a/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/unapplied/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
index dca3e657db..dca3e657db 100644
--- a/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/unapplied/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0462-Expose-Arrow-getItemStack.patch b/patches/unapplied/server/0462-Expose-Arrow-getItemStack.patch
index 38c157797a..38c157797a 100644
--- a/patches/server/0462-Expose-Arrow-getItemStack.patch
+++ b/patches/unapplied/server/0462-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 3fd4febeea..3fd4febeea 100644
--- a/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/unapplied/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0464-Hide-sync-chunk-writes-behind-flag.patch
index 71a50c1e91..71a50c1e91 100644
--- a/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/unapplied/server/0464-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0465-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0465-Add-permission-for-command-blocks.patch
index 85ced8804f..85ced8804f 100644
--- a/patches/server/0465-Add-permission-for-command-blocks.patch
+++ b/patches/unapplied/server/0465-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
index 8d20d86499..8d20d86499 100644
--- a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/unapplied/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/unapplied/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
index e138e957ad..e138e957ad 100644
--- a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/patches/unapplied/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index fdda158be5..fdda158be5 100644
--- a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/unapplied/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0469-Paper-dumpitem-command.patch b/patches/unapplied/server/0469-Paper-dumpitem-command.patch
index be0e942b1b..be0e942b1b 100644
--- a/patches/server/0469-Paper-dumpitem-command.patch
+++ b/patches/unapplied/server/0469-Paper-dumpitem-command.patch
diff --git a/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
index 1117d64336..1117d64336 100644
--- a/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/unapplied/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0471-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0471-Improve-Legacy-Component-serialization-size.patch
index 8d30b49c6b..8d30b49c6b 100644
--- a/patches/server/0471-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/unapplied/server/0471-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 37247d74e2..37247d74e2 100644
--- a/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/unapplied/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0473-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0473-Support-old-UUID-format-for-NBT.patch
index f7ac9b6542..f7ac9b6542 100644
--- a/patches/server/0473-Support-old-UUID-format-for-NBT.patch
+++ b/patches/unapplied/server/0473-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
index 811c919be7..811c919be7 100644
--- a/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/unapplied/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
index 373747c12d..373747c12d 100644
--- a/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/unapplied/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0476-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0476-Remove-some-streams-from-structures.patch
index 072f341f2a..072f341f2a 100644
--- a/patches/server/0476-Remove-some-streams-from-structures.patch
+++ b/patches/unapplied/server/0476-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
index 3281f024d6..3281f024d6 100644
--- a/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/unapplied/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/unapplied/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
index 6c66543ad7..6c66543ad7 100644
--- a/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
+++ b/patches/unapplied/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0479-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0479-Support-components-in-ItemMeta.patch
index 0e5f9fd243..0e5f9fd243 100644
--- a/patches/server/0479-Support-components-in-ItemMeta.patch
+++ b/patches/unapplied/server/0479-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index f01efcda2b..f01efcda2b 100644
--- a/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/unapplied/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0481-Add-entity-liquid-API.patch b/patches/unapplied/server/0481-Add-entity-liquid-API.patch
index 7ad6c6e8c3..7ad6c6e8c3 100644
--- a/patches/server/0481-Add-entity-liquid-API.patch
+++ b/patches/unapplied/server/0481-Add-entity-liquid-API.patch
diff --git a/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0482-Update-itemstack-legacy-name-and-lore.patch
index 335e79f32e..335e79f32e 100644
--- a/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/unapplied/server/0482-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0483-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0483-Spawn-player-in-correct-world-on-login.patch
index bb38fbd9c4..bb38fbd9c4 100644
--- a/patches/server/0483-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/unapplied/server/0483-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0484-Add-PrepareResultEvent.patch b/patches/unapplied/server/0484-Add-PrepareResultEvent.patch
index ba54754ac2..ba54754ac2 100644
--- a/patches/server/0484-Add-PrepareResultEvent.patch
+++ b/patches/unapplied/server/0484-Add-PrepareResultEvent.patch
diff --git a/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
index e21ced551f..e21ced551f 100644
--- a/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/unapplied/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index c3db540373..c3db540373 100644
--- a/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/unapplied/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/unapplied/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 85a91c5afa..85a91c5afa 100644
--- a/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/unapplied/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch b/patches/unapplied/server/0488-Improve-Chunk-Status-Transition-Speed.patch
index bf1e35568a..bf1e35568a 100644
--- a/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/unapplied/server/0488-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0489-Optimize-NetworkManager-Exception-Handling.patch
index 0297498d3d..0297498d3d 100644
--- a/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/unapplied/server/0489-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
index f60ffe8b92..f60ffe8b92 100644
--- a/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/unapplied/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0491-Fix-arrows-never-despawning-MC-125757.patch
index a82f3afb6a..a82f3afb6a 100644
--- a/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/unapplied/server/0491-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
index b219e7748b..b219e7748b 100644
--- a/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/unapplied/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0493-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0493-Move-range-check-for-block-placing-up.patch
index d0cdb3e21f..d0cdb3e21f 100644
--- a/patches/server/0493-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0493-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0494-Fix-SPIGOT-5989.patch
index 2e8006326a..2e8006326a 100644
--- a/patches/server/0494-Fix-SPIGOT-5989.patch
+++ b/patches/unapplied/server/0494-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 057ecc45bd..057ecc45bd 100644
--- a/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/unapplied/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 6de50899f7..6de50899f7 100644
--- a/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/unapplied/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 0711bd7fa0..0711bd7fa0 100644
--- a/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/unapplied/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 4f3e56f286..4f3e56f286 100644
--- a/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/unapplied/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0499-Incremental-player-saving.patch b/patches/unapplied/server/0499-Incremental-player-saving.patch
index 5c84c67c69..5c84c67c69 100644
--- a/patches/server/0499-Incremental-player-saving.patch
+++ b/patches/unapplied/server/0499-Incremental-player-saving.patch
diff --git a/patches/server/0500-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0500-Fix-some-rails-connecting-improperly.patch
index 43207ba7bc..43207ba7bc 100644
--- a/patches/server/0500-Fix-some-rails-connecting-improperly.patch
+++ b/patches/unapplied/server/0500-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0501-Fix-MC-187716-Use-configured-height.patch b/patches/unapplied/server/0501-Fix-MC-187716-Use-configured-height.patch
index 17c3ae1ba3..17c3ae1ba3 100644
--- a/patches/server/0501-Fix-MC-187716-Use-configured-height.patch
+++ b/patches/unapplied/server/0501-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/unapplied/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
index e879c27518..e879c27518 100644
--- a/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/unapplied/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0504-Brand-support.patch b/patches/unapplied/server/0504-Brand-support.patch
index 2a407b24cf..2a407b24cf 100644
--- a/patches/server/0504-Brand-support.patch
+++ b/patches/unapplied/server/0504-Brand-support.patch
diff --git a/patches/server/0505-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0505-Add-setMaxPlayers-API.patch
index ad2a5bcffd..ad2a5bcffd 100644
--- a/patches/server/0505-Add-setMaxPlayers-API.patch
+++ b/patches/unapplied/server/0505-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
index 06092a1219..06092a1219 100644
--- a/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/unapplied/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0507-Don-t-require-FACING-data.patch b/patches/unapplied/server/0507-Don-t-require-FACING-data.patch
index ca355d45a1..ca355d45a1 100644
--- a/patches/server/0507-Don-t-require-FACING-data.patch
+++ b/patches/unapplied/server/0507-Don-t-require-FACING-data.patch
diff --git a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index c3772bb881..c3772bb881 100644
--- a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/unapplied/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0509-Add-moon-phase-API.patch b/patches/unapplied/server/0509-Add-moon-phase-API.patch
index 19a7b380fe..19a7b380fe 100644
--- a/patches/server/0509-Add-moon-phase-API.patch
+++ b/patches/unapplied/server/0509-Add-moon-phase-API.patch
diff --git a/patches/server/0510-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0510-Prevent-headless-pistons-from-being-created.patch
index 694f4bcdf9..694f4bcdf9 100644
--- a/patches/server/0510-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/unapplied/server/0510-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0511-Add-BellRingEvent.patch b/patches/unapplied/server/0511-Add-BellRingEvent.patch
index e101aa373c..e101aa373c 100644
--- a/patches/server/0511-Add-BellRingEvent.patch
+++ b/patches/unapplied/server/0511-Add-BellRingEvent.patch
diff --git a/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0512-Add-zombie-targets-turtle-egg-config.patch
index 826551f5e7..826551f5e7 100644
--- a/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/unapplied/server/0512-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0513-Buffer-joins-to-world.patch b/patches/unapplied/server/0513-Buffer-joins-to-world.patch
index 6c7060c6c8..6c7060c6c8 100644
--- a/patches/server/0513-Buffer-joins-to-world.patch
+++ b/patches/unapplied/server/0513-Buffer-joins-to-world.patch
diff --git a/patches/server/0514-Optimize-redstone-algorithm.patch b/patches/unapplied/server/0514-Optimize-redstone-algorithm.patch
index e83f454d63..e83f454d63 100644
--- a/patches/server/0514-Optimize-redstone-algorithm.patch
+++ b/patches/unapplied/server/0514-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
index ae103d20a7..ae103d20a7 100644
--- a/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/unapplied/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
index 5ea110b360..5ea110b360 100644
--- a/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/unapplied/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0517-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0517-Fix-CraftTeam-null-check.patch
index 61de747dfd..61de747dfd 100644
--- a/patches/server/0517-Fix-CraftTeam-null-check.patch
+++ b/patches/unapplied/server/0517-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0518-Add-more-Evoker-API.patch b/patches/unapplied/server/0518-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0518-Add-more-Evoker-API.patch
+++ b/patches/unapplied/server/0518-Add-more-Evoker-API.patch
diff --git a/patches/server/0519-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0519-Add-methods-to-get-translation-keys.patch
index 3177ac1369..3177ac1369 100644
--- a/patches/server/0519-Add-methods-to-get-translation-keys.patch
+++ b/patches/unapplied/server/0519-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
index 3a415bc680..3a415bc680 100644
--- a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/unapplied/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0521-Cache-block-data-strings.patch b/patches/unapplied/server/0521-Cache-block-data-strings.patch
index 64953f18ae..64953f18ae 100644
--- a/patches/server/0521-Cache-block-data-strings.patch
+++ b/patches/unapplied/server/0521-Cache-block-data-strings.patch
diff --git a/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 5ff3b3009a..5ff3b3009a 100644
--- a/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/unapplied/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
index b7632ae14c..b7632ae14c 100644
--- a/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/unapplied/server/0523-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index a02addc375..a02addc375 100644
--- a/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/unapplied/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
index beff1740a2..beff1740a2 100644
--- a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/unapplied/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/unapplied/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index a08e406923..a08e406923 100644
--- a/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/unapplied/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 835ba5b5b4..835ba5b5b4 100644
--- a/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/unapplied/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
index 57028e8a9a..57028e8a9a 100644
--- a/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/unapplied/server/0528-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0529-Entity-isTicking.patch b/patches/unapplied/server/0529-Entity-isTicking.patch
index da19a06e1c..da19a06e1c 100644
--- a/patches/server/0529-Entity-isTicking.patch
+++ b/patches/unapplied/server/0529-Entity-isTicking.patch
diff --git a/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index f80b07acdc..f80b07acdc 100644
--- a/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/unapplied/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch b/patches/unapplied/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
index 99a7a4b014..99a7a4b014 100644
--- a/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/patches/unapplied/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index c91bcad15a..c91bcad15a 100644
--- a/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/unapplied/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0533-Fix-for-large-move-vectors-crashing-server.patch
index 36f1043fa5..36f1043fa5 100644
--- a/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/unapplied/server/0533-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0534-Optimise-getType-calls.patch b/patches/unapplied/server/0534-Optimise-getType-calls.patch
index 99be2ad7e8..99be2ad7e8 100644
--- a/patches/server/0534-Optimise-getType-calls.patch
+++ b/patches/unapplied/server/0534-Optimise-getType-calls.patch
diff --git a/patches/server/0535-Villager-resetOffers.patch b/patches/unapplied/server/0535-Villager-resetOffers.patch
index d82060745c..d82060745c 100644
--- a/patches/server/0535-Villager-resetOffers.patch
+++ b/patches/unapplied/server/0535-Villager-resetOffers.patch
diff --git a/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index eee823a9c2..eee823a9c2 100644
--- a/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/unapplied/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
index d1dae3b7d3..d1dae3b7d3 100644
--- a/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/unapplied/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
index 9fbe5ebecc..9fbe5ebecc 100644
--- a/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/unapplied/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0539-Fix-item-locations-dropped-from-campfires.patch
index 30515883c1..30515883c1 100644
--- a/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/unapplied/server/0539-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0540-Player-elytra-boost-API.patch b/patches/unapplied/server/0540-Player-elytra-boost-API.patch
index da08085dd0..da08085dd0 100644
--- a/patches/server/0540-Player-elytra-boost-API.patch
+++ b/patches/unapplied/server/0540-Player-elytra-boost-API.patch
diff --git a/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0541-Fixed-TileEntityBell-memory-leak.patch
index 673852d44b..673852d44b 100644
--- a/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/unapplied/server/0541-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 3ffcccab2e..3ffcccab2e 100644
--- a/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/unapplied/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0543-Add-getOfflinePlayerIfCached-String.patch
index 5ae4754cbb..5ae4754cbb 100644
--- a/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/unapplied/server/0543-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0544-Add-ignore-discounts-API.patch b/patches/unapplied/server/0544-Add-ignore-discounts-API.patch
index 55a1ac4273..55a1ac4273 100644
--- a/patches/server/0544-Add-ignore-discounts-API.patch
+++ b/patches/unapplied/server/0544-Add-ignore-discounts-API.patch
diff --git a/patches/server/0545-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0545-Toggle-for-removing-existing-dragon.patch
index ab1dafcec6..ab1dafcec6 100644
--- a/patches/server/0545-Toggle-for-removing-existing-dragon.patch
+++ b/patches/unapplied/server/0545-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0546-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0546-Fix-client-lag-on-advancement-loading.patch
index f66ea6fcf9..f66ea6fcf9 100644
--- a/patches/server/0546-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/unapplied/server/0546-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0547-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0547-Item-no-age-no-player-pickup.patch
index a121c378e3..a121c378e3 100644
--- a/patches/server/0547-Item-no-age-no-player-pickup.patch
+++ b/patches/unapplied/server/0547-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 8f3ad390b4..8f3ad390b4 100644
--- a/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0549-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0549-Beacon-API-custom-effect-ranges.patch
index ba5b29b8d5..ba5b29b8d5 100644
--- a/patches/server/0549-Beacon-API-custom-effect-ranges.patch
+++ b/patches/unapplied/server/0549-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0550-Add-API-for-quit-reason.patch b/patches/unapplied/server/0550-Add-API-for-quit-reason.patch
index 9e267c361c..9e267c361c 100644
--- a/patches/server/0550-Add-API-for-quit-reason.patch
+++ b/patches/unapplied/server/0550-Add-API-for-quit-reason.patch
diff --git a/patches/server/0551-Seed-based-feature-search.patch b/patches/unapplied/server/0551-Seed-based-feature-search.patch
index 80e5bda521..80e5bda521 100644
--- a/patches/server/0551-Seed-based-feature-search.patch
+++ b/patches/unapplied/server/0551-Seed-based-feature-search.patch
diff --git a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
index 3c84b3665b..3c84b3665b 100644
--- a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/unapplied/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0553-Significantly-improve-performance-of-the-end-generat.patch
index a6386a6a1c..a6386a6a1c 100644
--- a/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/unapplied/server/0553-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0554-Expose-world-spawn-angle.patch b/patches/unapplied/server/0554-Expose-world-spawn-angle.patch
index 9ff3ea8dfe..9ff3ea8dfe 100644
--- a/patches/server/0554-Expose-world-spawn-angle.patch
+++ b/patches/unapplied/server/0554-Expose-world-spawn-angle.patch
diff --git a/patches/server/0555-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0555-Add-Destroy-Speed-API.patch
index 4ea9ee5e19..4ea9ee5e19 100644
--- a/patches/server/0555-Add-Destroy-Speed-API.patch
+++ b/patches/unapplied/server/0555-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index ccf24cf36a..ccf24cf36a 100644
--- a/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/unapplied/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0557-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0557-Add-LivingEntity-clearActiveItem.patch
index 7fe7e594b8..7fe7e594b8 100644
--- a/patches/server/0557-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/unapplied/server/0557-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0558-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0558-Add-PlayerItemCooldownEvent.patch
index 01259836dd..01259836dd 100644
--- a/patches/server/0558-Add-PlayerItemCooldownEvent.patch
+++ b/patches/unapplied/server/0558-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0559-More-lightning-API.patch b/patches/unapplied/server/0559-More-lightning-API.patch
index 4d6ed605b2..4d6ed605b2 100644
--- a/patches/server/0559-More-lightning-API.patch
+++ b/patches/unapplied/server/0559-More-lightning-API.patch
diff --git a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
index c8a88b5795..c8a88b5795 100644
--- a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/unapplied/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0561-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0561-Added-missing-default-perms-for-commands.patch
index e9e468da5e..e9e468da5e 100644
--- a/patches/server/0561-Added-missing-default-perms-for-commands.patch
+++ b/patches/unapplied/server/0561-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0562-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0562-Add-PlayerShearBlockEvent.patch
index 0fde3c457f..0fde3c457f 100644
--- a/patches/server/0562-Add-PlayerShearBlockEvent.patch
+++ b/patches/unapplied/server/0562-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 814f2805e2..814f2805e2 100644
--- a/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/unapplied/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
index cc985dd925..cc985dd925 100644
--- a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/unapplied/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0565-Limit-recipe-packets.patch b/patches/unapplied/server/0565-Limit-recipe-packets.patch
index 570b251e15..570b251e15 100644
--- a/patches/server/0565-Limit-recipe-packets.patch
+++ b/patches/unapplied/server/0565-Limit-recipe-packets.patch
diff --git a/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0566-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/0566-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0567-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0567-MC-4-Fix-item-position-desync.patch
index e5b59a19fe..e5b59a19fe 100644
--- a/patches/server/0567-MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/0567-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch
index ca82401340..ca82401340 100644
--- a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0570-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch
index 42601ba828..42601ba828 100644
--- a/patches/server/0570-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index ab7f8e1268..ab7f8e1268 100644
--- a/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index f8e8f443d3..f8e8f443d3 100644
--- a/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index db386dbadd..db386dbadd 100644
--- a/patches/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0574-Implement-TargetHitEvent.patch b/patches/unapplied/server/0574-Implement-TargetHitEvent.patch
index bc52d9f716..bc52d9f716 100644
--- a/patches/server/0574-Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/0574-Implement-TargetHitEvent.patch
diff --git a/patches/server/0575-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0575-Additional-Block-Material-API-s.patch
index c0525f18f5..c0525f18f5 100644
--- a/patches/server/0575-Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/0575-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0576-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0576-Fix-harming-potion-dupe.patch
index c8bd7c539a..c8bd7c539a 100644
--- a/patches/server/0576-Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/0576-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 756fb6afc4..756fb6afc4 100644
--- a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0578-Cache-burn-durations.patch b/patches/unapplied/server/0578-Cache-burn-durations.patch
index f51482573d..f51482573d 100644
--- a/patches/server/0578-Cache-burn-durations.patch
+++ b/patches/unapplied/server/0578-Cache-burn-durations.patch
diff --git a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 9707c173c2..9707c173c2 100644
--- a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
index 7aac87fe22..7aac87fe22 100644
--- a/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
index 47bd79fb9d..47bd79fb9d 100644
--- a/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/unapplied/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0583-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0583-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0583-Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/0583-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0584-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0584-Fix-nerfed-slime-when-splitting.patch
index 6dfe020a1e..6dfe020a1e 100644
--- a/patches/server/0584-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/0584-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0585-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0585-Add-EntityLoadCrossbowEvent.patch
index 7ebc7fa15c..7ebc7fa15c 100644
--- a/patches/server/0585-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/0585-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0586-Guardian-beam-workaround.patch b/patches/unapplied/server/0586-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0586-Guardian-beam-workaround.patch
+++ b/patches/unapplied/server/0586-Guardian-beam-workaround.patch
diff --git a/patches/server/0587-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0587-Added-WorldGameRuleChangeEvent.patch
index e3c97e4c67..e3c97e4c67 100644
--- a/patches/server/0587-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/0587-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0588-Added-ServerResourcesReloadedEvent.patch
index 452282437a..452282437a 100644
--- a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0588-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
index 6c8c05eb95..6c8c05eb95 100644
--- a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0590-Implemented-BlockFailedDispenseEvent.patch
index 34b1b6a512..34b1b6a512 100644
--- a/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/0590-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0591-Added-PlayerLecternPageChangeEvent.patch
index cd550d08ad..cd550d08ad 100644
--- a/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/0591-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0592-Added-PlayerLoomPatternSelectEvent.patch
index 919de7b39b..919de7b39b 100644
--- a/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/0592-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0593-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0593-Configurable-door-breaking-difficulty.patch
index 6f3d91abbe..6f3d91abbe 100644
--- a/patches/server/0593-Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/0593-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0594-Empty-commands-shall-not-be-dispatched.patch
index 206f188b92..206f188b92 100644
--- a/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/0594-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0595-Implement-API-to-expose-exact-interaction-point.patch
index 22825802a9..22825802a9 100644
--- a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/unapplied/server/0595-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0596-Remove-stale-POIs.patch b/patches/unapplied/server/0596-Remove-stale-POIs.patch
index 504745e97c..504745e97c 100644
--- a/patches/server/0596-Remove-stale-POIs.patch
+++ b/patches/unapplied/server/0596-Remove-stale-POIs.patch
diff --git a/patches/server/0597-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0597-Fix-villager-boat-exploit.patch
index 9bad49e1ee..9bad49e1ee 100644
--- a/patches/server/0597-Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/0597-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0598-Add-sendOpLevel-API.patch b/patches/unapplied/server/0598-Add-sendOpLevel-API.patch
index df6f3e50dd..df6f3e50dd 100644
--- a/patches/server/0598-Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/0598-Add-sendOpLevel-API.patch
diff --git a/patches/server/0599-Add-StructureLocateEvent.patch b/patches/unapplied/server/0599-Add-StructureLocateEvent.patch
index ce604f303c..ce604f303c 100644
--- a/patches/server/0599-Add-StructureLocateEvent.patch
+++ b/patches/unapplied/server/0599-Add-StructureLocateEvent.patch
diff --git a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0600-Collision-option-for-requiring-a-player-participant.patch
index 538bee5cd3..538bee5cd3 100644
--- a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/0600-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 8ce2f9276b..8ce2f9276b 100644
--- a/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
index 638baedf50..638baedf50 100644
--- a/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0603-Make-schedule-command-per-world.patch b/patches/unapplied/server/0603-Make-schedule-command-per-world.patch
index 29b047cfa5..29b047cfa5 100644
--- a/patches/server/0603-Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/0603-Make-schedule-command-per-world.patch
diff --git a/patches/server/0604-Configurable-max-leash-distance.patch b/patches/unapplied/server/0604-Configurable-max-leash-distance.patch
index f557bcf8e0..f557bcf8e0 100644
--- a/patches/server/0604-Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/0604-Configurable-max-leash-distance.patch
diff --git a/patches/server/0605-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0605-Implement-BlockPreDispenseEvent.patch
index d85e167ea5..d85e167ea5 100644
--- a/patches/server/0605-Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/0605-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0606-Added-Vanilla-Entity-Tags.patch b/patches/unapplied/server/0606-Added-Vanilla-Entity-Tags.patch
index 78073c1c32..78073c1c32 100644
--- a/patches/server/0606-Added-Vanilla-Entity-Tags.patch
+++ b/patches/unapplied/server/0606-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0607-added-Wither-API.patch b/patches/unapplied/server/0607-added-Wither-API.patch
index 1995967f84..1995967f84 100644
--- a/patches/server/0607-added-Wither-API.patch
+++ b/patches/unapplied/server/0607-added-Wither-API.patch
diff --git a/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index d83a1ff8cb..d83a1ff8cb 100644
--- a/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
index d4d11bbaa4..d4d11bbaa4 100644
--- a/patches/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/0609-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
index b3564670a1..b3564670a1 100644
--- a/patches/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/0610-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index a44fd00d40..a44fd00d40 100644
--- a/patches/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/0611-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch b/patches/unapplied/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
index 114cc0dd04..114cc0dd04 100644
--- a/patches/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/unapplied/server/0612-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0613-Reset-shield-blocking-on-dimension-change.patch
index 5883da964b..5883da964b 100644
--- a/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/0613-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0614-add-DragonEggFormEvent.patch b/patches/unapplied/server/0614-add-DragonEggFormEvent.patch
index 101f4aaef4..101f4aaef4 100644
--- a/patches/server/0614-add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/0614-add-DragonEggFormEvent.patch
diff --git a/patches/server/0615-EntityMoveEvent.patch b/patches/unapplied/server/0615-EntityMoveEvent.patch
index d08300cf38..d08300cf38 100644
--- a/patches/server/0615-EntityMoveEvent.patch
+++ b/patches/unapplied/server/0615-EntityMoveEvent.patch
diff --git a/patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
index 5050fb908a..5050fb908a 100644
--- a/patches/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/unapplied/server/0616-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0617-Inline-shift-direction-fields.patch b/patches/unapplied/server/0617-Inline-shift-direction-fields.patch
index 5be0e06548..5be0e06548 100644
--- a/patches/server/0617-Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/0617-Inline-shift-direction-fields.patch
diff --git a/patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
index 724f4fae17..724f4fae17 100644
--- a/patches/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/0618-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/0619-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0620-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0620-living-entity-allow-attribute-registration.patch
index 6c6f1d7498..6c6f1d7498 100644
--- a/patches/server/0620-living-entity-allow-attribute-registration.patch
+++ b/patches/unapplied/server/0620-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0621-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0621-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0621-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/unapplied/server/0621-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
index ff19ec2fa8..ff19ec2fa8 100644
--- a/patches/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/0622-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0623-Add-support-for-hex-color-codes-in-console.patch
index c56b164a8e..c56b164a8e 100644
--- a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/unapplied/server/0623-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0624-Expose-Tracked-Players.patch b/patches/unapplied/server/0624-Expose-Tracked-Players.patch
index a7b6532874..a7b6532874 100644
--- a/patches/server/0624-Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/0624-Expose-Tracked-Players.patch
diff --git a/patches/server/0625-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0625-Remove-streams-from-SensorNearest.patch
index 3ef5964d12..3ef5964d12 100644
--- a/patches/server/0625-Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/0625-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/unapplied/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
index bae1c53a29..bae1c53a29 100644
--- a/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
+++ b/patches/unapplied/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
index 90d3ad5a77..90d3ad5a77 100644
--- a/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/unapplied/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0628-Improve-ServerGUI.patch b/patches/unapplied/server/0628-Improve-ServerGUI.patch
index 2ddf152c7a..2ddf152c7a 100644
--- a/patches/server/0628-Improve-ServerGUI.patch
+++ b/patches/unapplied/server/0628-Improve-ServerGUI.patch
diff --git a/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/unapplied/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0630-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0630-fix-converting-txt-to-json-file.patch
index e9cc3d0fc4..e9cc3d0fc4 100644
--- a/patches/server/0630-fix-converting-txt-to-json-file.patch
+++ b/patches/unapplied/server/0630-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0631-Add-worldborder-events.patch b/patches/unapplied/server/0631-Add-worldborder-events.patch
index 2d18fe0db7..2d18fe0db7 100644
--- a/patches/server/0631-Add-worldborder-events.patch
+++ b/patches/unapplied/server/0631-Add-worldborder-events.patch
diff --git a/patches/server/0632-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0632-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0632-added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/0632-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0633-Prevent-grindstones-from-overstacking-items.patch
index 076382b095..076382b095 100644
--- a/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/0633-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0634-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0634-Add-recipe-to-cook-events.patch
index be4e4e1e6e..be4e4e1e6e 100644
--- a/patches/server/0634-Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/0634-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0635-Add-Block-isValidTool.patch b/patches/unapplied/server/0635-Add-Block-isValidTool.patch
index c737ea1e10..c737ea1e10 100644
--- a/patches/server/0635-Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/0635-Add-Block-isValidTool.patch
diff --git a/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0636-Allow-using-signs-inside-spawn-protection.patch
index 335ba0243b..335ba0243b 100644
--- a/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/0636-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0637-Implement-Keyed-on-World.patch b/patches/unapplied/server/0637-Implement-Keyed-on-World.patch
index b9a0012162..b9a0012162 100644
--- a/patches/server/0637-Implement-Keyed-on-World.patch
+++ b/patches/unapplied/server/0637-Implement-Keyed-on-World.patch
diff --git a/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..d2a627b5b6 100644
--- a/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0639-Item-Rarity-API.patch b/patches/unapplied/server/0639-Item-Rarity-API.patch
index 4fd3604153..4fd3604153 100644
--- a/patches/server/0639-Item-Rarity-API.patch
+++ b/patches/unapplied/server/0639-Item-Rarity-API.patch
diff --git a/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 3b492ed107..3b492ed107 100644
--- a/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0641-copy-TESign-isEditable-from-snapshots.patch
index 990f7cec9b..990f7cec9b 100644
--- a/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/unapplied/server/0641-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0642-Drop-carried-item-when-player-has-disconnected.patch
index aab90fb874..aab90fb874 100644
--- a/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/0642-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0643-forced-whitelist-use-configurable-kick-message.patch
index 6d32877eaa..6d32877eaa 100644
--- a/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/unapplied/server/0643-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 3c1bd329f4..3c1bd329f4 100644
--- a/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0645-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0645-Entity-load-save-limit-per-chunk.patch
index f69353f8da..f69353f8da 100644
--- a/patches/server/0645-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/0645-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch b/patches/unapplied/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
index 604eba9f27..604eba9f27 100644
--- a/patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
+++ b/patches/unapplied/server/0646-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0647-Expose-protocol-version.patch b/patches/unapplied/server/0647-Expose-protocol-version.patch
index b89e447d2f..b89e447d2f 100644
--- a/patches/server/0647-Expose-protocol-version.patch
+++ b/patches/unapplied/server/0647-Expose-protocol-version.patch
diff --git a/patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index fa03440342..fa03440342 100644
--- a/patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/unapplied/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
index 7b7a51d6ca..7b7a51d6ca 100644
--- a/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 7454a65a68..7454a65a68 100644
--- a/patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0651-Add-bypass-host-check.patch b/patches/unapplied/server/0651-Add-bypass-host-check.patch
index 80d7b918c3..80d7b918c3 100644
--- a/patches/server/0651-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0651-Add-bypass-host-check.patch
diff --git a/patches/server/0652-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0652-Set-area-affect-cloud-rotation.patch
index 2fa381a6bb..2fa381a6bb 100644
--- a/patches/server/0652-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0652-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
index ebc683e112..ebc683e112 100644
--- a/patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0653-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/unapplied/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
index 153a8d5d91..153a8d5d91 100644
--- a/patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/unapplied/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
index a3a171977b..a3a171977b 100644
--- a/patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
index 68a1657631..68a1657631 100644
--- a/patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0657-fix-PigZombieAngerEvent-cancellation.patch
index 77e163dcf8..77e163dcf8 100644
--- a/patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0657-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
index be52471779..be52471779 100644
--- a/patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/unapplied/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
index 31589946a8..31589946a8 100644
--- a/patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0660-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0660-Added-PlayerDeepSleepEvent.patch
index 15aace75b7..15aace75b7 100644
--- a/patches/server/0660-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0660-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0661-More-World-API.patch b/patches/unapplied/server/0661-More-World-API.patch
index 3d057c88bd..3d057c88bd 100644
--- a/patches/server/0661-More-World-API.patch
+++ b/patches/unapplied/server/0661-More-World-API.patch
diff --git a/patches/server/0662-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0662-Added-PlayerBedFailEnterEvent.patch
index 7a0c482e84..7a0c482e84 100644
--- a/patches/server/0662-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0662-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
index 20d49eb991..20d49eb991 100644
--- a/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0663-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index a813226f7d..a813226f7d 100644
--- a/patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0665-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0665-Introduce-beacon-activation-deactivation-events.patch
index 4a65983954..4a65983954 100644
--- a/patches/server/0665-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0665-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 41c7d33e80..41c7d33e80 100644
--- a/patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0667-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0667-Add-Channel-initialization-listeners.patch
index 6273f14af0..6273f14af0 100644
--- a/patches/server/0667-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0667-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
index 5836e13df7..5836e13df7 100644
--- a/patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0669-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0669-Add-more-WanderingTrader-API.patch
index fd2be763ca..fd2be763ca 100644
--- a/patches/server/0669-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0669-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0670-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0670-Add-EntityBlockStorage-clearEntities.patch
index f909777765..f909777765 100644
--- a/patches/server/0670-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0670-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 35efeab74a..35efeab74a 100644
--- a/patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index fb86dabe48..fb86dabe48 100644
--- a/patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0673-Inventory-close.patch b/patches/unapplied/server/0673-Inventory-close.patch
index e21cf25bc1..e21cf25bc1 100644
--- a/patches/server/0673-Inventory-close.patch
+++ b/patches/unapplied/server/0673-Inventory-close.patch
diff --git a/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch b/patches/unapplied/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
index 50681372f3..50681372f3 100644
--- a/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/unapplied/server/0674-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index ab592c6b38..ab592c6b38 100644
--- a/patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0676-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0676-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0676-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/0676-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0677-Add-basic-Datapack-API.patch b/patches/unapplied/server/0677-Add-basic-Datapack-API.patch
index d7b2f28b7d..d7b2f28b7d 100644
--- a/patches/server/0677-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0677-Add-basic-Datapack-API.patch
diff --git a/patches/server/0678-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0678-Add-environment-variable-to-disable-server-gui.patch
index 875c5e6c83..875c5e6c83 100644
--- a/patches/server/0678-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0678-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0679-additions-to-PlayerGameModeChangeEvent.patch
index 5c4820cda9..5c4820cda9 100644
--- a/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0679-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0680-ItemStack-repair-check-API.patch b/patches/unapplied/server/0680-ItemStack-repair-check-API.patch
index a6ad9965f4..a6ad9965f4 100644
--- a/patches/server/0680-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0680-ItemStack-repair-check-API.patch
diff --git a/patches/server/0681-More-Enchantment-API.patch b/patches/unapplied/server/0681-More-Enchantment-API.patch
index 7d17e1458f..7d17e1458f 100644
--- a/patches/server/0681-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0681-More-Enchantment-API.patch
diff --git a/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 5966712d5a..5966712d5a 100644
--- a/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/unapplied/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0683-Fix-and-optimise-world-force-upgrading.patch
index 1b2d426e71..1b2d426e71 100644
--- a/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/unapplied/server/0683-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0684-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0684-Add-Mob-lookAt-API.patch
index d65c61ac74..d65c61ac74 100644
--- a/patches/server/0684-Add-Mob-lookAt-API.patch
+++ b/patches/unapplied/server/0684-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0685-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0685-Add-Unix-domain-socket-support.patch
index d9c7a6b290..d9c7a6b290 100644
--- a/patches/server/0685-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0685-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0686-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0686-Add-EntityInsideBlockEvent.patch
index 05454b8f33..05454b8f33 100644
--- a/patches/server/0686-Add-EntityInsideBlockEvent.patch
+++ b/patches/unapplied/server/0686-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0687-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0687-Attributes-API-for-item-defaults.patch
index aa8ce911c8..aa8ce911c8 100644
--- a/patches/server/0687-Attributes-API-for-item-defaults.patch
+++ b/patches/unapplied/server/0687-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch
index f4e6d5680d..f4e6d5680d 100644
--- a/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/unapplied/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0689-More-Lidded-Block-API.patch b/patches/unapplied/server/0689-More-Lidded-Block-API.patch
index fec21741ed..fec21741ed 100644
--- a/patches/server/0689-More-Lidded-Block-API.patch
+++ b/patches/unapplied/server/0689-More-Lidded-Block-API.patch
diff --git a/patches/server/0690-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0690-Limit-item-frame-cursors-on-maps.patch
index 269f37df00..269f37df00 100644
--- a/patches/server/0690-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/unapplied/server/0690-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0691-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0691-Add-PufferFishStateChangeEvent.patch
index 14a8a30708..14a8a30708 100644
--- a/patches/server/0691-Add-PufferFishStateChangeEvent.patch
+++ b/patches/unapplied/server/0691-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0692-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0692-Add-PlayerKickEvent-causes.patch
index 234bd66561..234bd66561 100644
--- a/patches/server/0692-Add-PlayerKickEvent-causes.patch
+++ b/patches/unapplied/server/0692-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 8745cea687..8745cea687 100644
--- a/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/unapplied/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/unapplied/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index 2584559a0d..2584559a0d 100644
--- a/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/unapplied/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0695-Add-option-to-fix-items-merging-through-walls.patch
index ffc5ef9a2d..ffc5ef9a2d 100644
--- a/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/unapplied/server/0695-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0696-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0696-Add-BellRevealRaiderEvent.patch
index c434ce8f0f..c434ce8f0f 100644
--- a/patches/server/0696-Add-BellRevealRaiderEvent.patch
+++ b/patches/unapplied/server/0696-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0697-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0697-Fix-invulnerable-end-crystals.patch
index 43723b53eb..43723b53eb 100644
--- a/patches/server/0697-Fix-invulnerable-end-crystals.patch
+++ b/patches/unapplied/server/0697-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0698-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/unapplied/server/0698-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0699-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0699-Fix-dangerous-end-portal-logic.patch
index 8ace1656e0..8ace1656e0 100644
--- a/patches/server/0699-Fix-dangerous-end-portal-logic.patch
+++ b/patches/unapplied/server/0699-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 14e1c84060..14e1c84060 100644
--- a/patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/unapplied/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0701-Make-item-validations-configurable.patch b/patches/unapplied/server/0701-Make-item-validations-configurable.patch
index a45ed7c3ff..a45ed7c3ff 100644
--- a/patches/server/0701-Make-item-validations-configurable.patch
+++ b/patches/unapplied/server/0701-Make-item-validations-configurable.patch
diff --git a/patches/server/0702-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0702-Line-Of-Sight-Changes.patch
index 6ff2325313..6ff2325313 100644
--- a/patches/server/0702-Line-Of-Sight-Changes.patch
+++ b/patches/unapplied/server/0702-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0703-add-per-world-spawn-limits.patch b/patches/unapplied/server/0703-add-per-world-spawn-limits.patch
index 9255b3cf0d..9255b3cf0d 100644
--- a/patches/server/0703-add-per-world-spawn-limits.patch
+++ b/patches/unapplied/server/0703-add-per-world-spawn-limits.patch
diff --git a/patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56322b5744..56322b5744 100644
--- a/patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/unapplied/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/unapplied/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
index 096c6fb001..096c6fb001 100644
--- a/patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
+++ b/patches/unapplied/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
diff --git a/patches/server/0706-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0706-Add-more-LimitedRegion-API.patch
index d8e81bbe73..d8e81bbe73 100644
--- a/patches/server/0706-Add-more-LimitedRegion-API.patch
+++ b/patches/unapplied/server/0706-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch
index ee8f0cb904..ee8f0cb904 100644
--- a/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/unapplied/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0708-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0708-Missing-Entity-Behavior-API.patch
index 65f1fb5a12..65f1fb5a12 100644
--- a/patches/server/0708-Missing-Entity-Behavior-API.patch
+++ b/patches/unapplied/server/0708-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index d5944587d3..d5944587d3 100644
--- a/patches/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch b/patches/unapplied/server/0710-Add-git-branch-and-commit-to-manifest.patch
index 50009c0457..50009c0457 100644
--- a/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch
+++ b/patches/unapplied/server/0710-Add-git-branch-and-commit-to-manifest.patch
diff --git a/patches/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 4d91346ab0..4d91346ab0 100644
--- a/patches/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/unapplied/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch
index 231f69e991..231f69e991 100644
--- a/patches/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/unapplied/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0713-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0713-Fix-commands-from-signs-not-firing-command-events.patch
index dae35eee03..dae35eee03 100644
--- a/patches/server/0713-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/unapplied/server/0713-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0714-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0714-Adds-PlayerArmSwingEvent.patch
index 6c29c118d5..6c29c118d5 100644
--- a/patches/server/0714-Adds-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0714-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch
index d4134e70b1..d4134e70b1 100644
--- a/patches/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0716-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0716-Add-config-for-mobs-immune-to-default-effects.patch
index 5bab0b4f9b..5bab0b4f9b 100644
--- a/patches/server/0716-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/unapplied/server/0716-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0717-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0717-Fix-incorrect-message-for-outdated-client.patch
index e5f39a1485..e5f39a1485 100644
--- a/patches/server/0717-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/unapplied/server/0717-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/unapplied/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
index 19bb554a65..19bb554a65 100644
--- a/patches/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
+++ b/patches/unapplied/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
diff --git a/patches/server/0719-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0719-Don-t-apply-cramming-damage-to-players.patch
index 4a716a3650..4a716a3650 100644
--- a/patches/server/0719-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0719-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 87cd7d7bca..87cd7d7bca 100644
--- a/patches/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 946acb8cc9..946acb8cc9 100644
--- a/patches/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0722-Stinger-API.patch b/patches/unapplied/server/0722-Stinger-API.patch
index bfc4b49704..bfc4b49704 100644
--- a/patches/server/0722-Stinger-API.patch
+++ b/patches/unapplied/server/0722-Stinger-API.patch
diff --git a/patches/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 70e9fed431..70e9fed431 100644
--- a/patches/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0724-Add-System.out-err-catcher.patch b/patches/unapplied/server/0724-Add-System.out-err-catcher.patch
index 4753e9648c..4753e9648c 100644
--- a/patches/server/0724-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0724-Add-System.out-err-catcher.patch
diff --git a/patches/server/0725-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0725-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0725-Fix-test-not-bootstrapping.patch
+++ b/patches/unapplied/server/0725-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0727-Improve-boat-collision-performance.patch b/patches/unapplied/server/0727-Improve-boat-collision-performance.patch
index 1f77e7c704..1f77e7c704 100644
--- a/patches/server/0727-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0727-Improve-boat-collision-performance.patch
diff --git a/patches/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch
index 513a5b76aa..513a5b76aa 100644
--- a/patches/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch
index 5fd98bcbe3..5fd98bcbe3 100644
--- a/patches/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0730-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0730-Add-PlayerSetSpawnEvent.patch
index 930f537aee..930f537aee 100644
--- a/patches/server/0730-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0730-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch
index 89d3828c77..89d3828c77 100644
--- a/patches/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0732-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0732-Optimize-entity-tracker-passenger-checks.patch
index c20bb842d0..c20bb842d0 100644
--- a/patches/server/0732-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0732-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0733-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0733-Config-option-for-Piglins-guarding-chests.patch
index 9042e5a3f6..9042e5a3f6 100644
--- a/patches/server/0733-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0733-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0734-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0734-Added-EntityDamageItemEvent.patch
index cac035b7b6..cac035b7b6 100644
--- a/patches/server/0734-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0734-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0735-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0735-Optimize-indirect-passenger-iteration.patch
index 0d1bb74c9a..0d1bb74c9a 100644
--- a/patches/server/0735-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0735-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch
index 021db6980b..021db6980b 100644
--- a/patches/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/unapplied/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0737-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0737-Configurable-item-frame-map-cursor-update-interval.patch
index 6761088ef6..6761088ef6 100644
--- a/patches/server/0737-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0737-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0738-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0738-Make-EntityUnleashEvent-cancellable.patch
index d76f60ac65..d76f60ac65 100644
--- a/patches/server/0738-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0738-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0739-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0739-Clear-bucket-NBT-after-dispense.patch
index 68c30c4446..68c30c4446 100644
--- a/patches/server/0739-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0739-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/unapplied/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
index 4a7c6f9fc7..4a7c6f9fc7 100644
--- a/patches/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
+++ b/patches/unapplied/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
diff --git a/patches/server/0741-Respect-despawn-rate-in-item-merge-check.patch b/patches/unapplied/server/0741-Respect-despawn-rate-in-item-merge-check.patch
index 2b374d388a..2b374d388a 100644
--- a/patches/server/0741-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/unapplied/server/0741-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/unapplied/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch
index ab755b8fb7..ab755b8fb7 100644
--- a/patches/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch
+++ b/patches/unapplied/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch
diff --git a/patches/server/0743-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0743-Change-EnderEye-target-without-changing-other-things.patch
index 5f7821d0a6..5f7821d0a6 100644
--- a/patches/server/0743-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0743-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0744-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0744-Add-BlockBreakBlockEvent.patch
index 5360c87687..5360c87687 100644
--- a/patches/server/0744-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0744-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0745-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0745-Vanilla-command-permission-fixes.patch
index 46e803d4e5..46e803d4e5 100644
--- a/patches/server/0745-Vanilla-command-permission-fixes.patch
+++ b/patches/unapplied/server/0745-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0746-Make-CallbackExecutor-strict-again.patch b/patches/unapplied/server/0746-Make-CallbackExecutor-strict-again.patch
index 92205e8c6d..92205e8c6d 100644
--- a/patches/server/0746-Make-CallbackExecutor-strict-again.patch
+++ b/patches/unapplied/server/0746-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/unapplied/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index b95a4cdfea..b95a4cdfea 100644
--- a/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/unapplied/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/unapplied/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 6adcb35aef..6adcb35aef 100644
--- a/patches/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/unapplied/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/unapplied/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 834f48a1c9..834f48a1c9 100644
--- a/patches/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/unapplied/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 3ccfde3cd9..3ccfde3cd9 100644
--- a/patches/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/unapplied/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/unapplied/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch
index 850a20267c..850a20267c 100644
--- a/patches/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/unapplied/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/unapplied/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch
index b5bd2f63c9..b5bd2f63c9 100644
--- a/patches/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/unapplied/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/unapplied/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 2f37de0d73..2f37de0d73 100644
--- a/patches/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/unapplied/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/unapplied/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index b270fb651b..b270fb651b 100644
--- a/patches/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/unapplied/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index a636b5f2f5..a636b5f2f5 100644
--- a/patches/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/unapplied/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0756-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0756-Log-when-the-async-catcher-is-tripped.patch
index 7006040b25..7006040b25 100644
--- a/patches/server/0756-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/unapplied/server/0756-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0757-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0757-Sanitize-ResourceLocation-error-logging.patch
index 1f990a622a..1f990a622a 100644
--- a/patches/server/0757-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/unapplied/server/0757-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0758-Fix-and-optimize-legacy-world-conversion.patch b/patches/unapplied/server/0758-Fix-and-optimize-legacy-world-conversion.patch
index ba0f43086d..ba0f43086d 100644
--- a/patches/server/0758-Fix-and-optimize-legacy-world-conversion.patch
+++ b/patches/unapplied/server/0758-Fix-and-optimize-legacy-world-conversion.patch
diff --git a/patches/server/0759-Optimise-general-POI-access.patch b/patches/unapplied/server/0759-Optimise-general-POI-access.patch
index d7a3900e0e..d7a3900e0e 100644
--- a/patches/server/0759-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/0759-Optimise-general-POI-access.patch
diff --git a/patches/server/0760-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0760-Allow-controlled-flushing-for-network-manager.patch
index 447bf41386..447bf41386 100644
--- a/patches/server/0760-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/unapplied/server/0760-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0761-Add-more-async-catchers.patch b/patches/unapplied/server/0761-Add-more-async-catchers.patch
index 6dba1f42b8..6dba1f42b8 100644
--- a/patches/server/0761-Add-more-async-catchers.patch
+++ b/patches/unapplied/server/0761-Add-more-async-catchers.patch
diff --git a/patches/server/0762-Rewrite-the-light-engine.patch b/patches/unapplied/server/0762-Rewrite-the-light-engine.patch
index 214c76a928..214c76a928 100644
--- a/patches/server/0762-Rewrite-the-light-engine.patch
+++ b/patches/unapplied/server/0762-Rewrite-the-light-engine.patch
diff --git a/patches/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/unapplied/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch
index d80d218906..d80d218906 100644
--- a/patches/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/unapplied/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index fcfb420703..fcfb420703 100644
--- a/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/unapplied/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0765-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0765-Optimise-chunk-tick-iteration.patch
index 7ca2497335..7ca2497335 100644
--- a/patches/server/0765-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/0765-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0766-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0766-Execute-chunk-tasks-mid-tick.patch
index a1266038ec..a1266038ec 100644
--- a/patches/server/0766-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/0766-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index dbf1b0db95..dbf1b0db95 100644
--- a/patches/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/unapplied/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0768-Do-not-copy-visible-chunks.patch b/patches/unapplied/server/0768-Do-not-copy-visible-chunks.patch
index 09bbc5118f..09bbc5118f 100644
--- a/patches/server/0768-Do-not-copy-visible-chunks.patch
+++ b/patches/unapplied/server/0768-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0769-Replace-player-chunk-loader-system.patch b/patches/unapplied/server/0769-Replace-player-chunk-loader-system.patch
index ef546632f7..ef546632f7 100644
--- a/patches/server/0769-Replace-player-chunk-loader-system.patch
+++ b/patches/unapplied/server/0769-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0770-Replace-ticket-level-propagator.patch b/patches/unapplied/server/0770-Replace-ticket-level-propagator.patch
index 5ed73f61e6..5ed73f61e6 100644
--- a/patches/server/0770-Replace-ticket-level-propagator.patch
+++ b/patches/unapplied/server/0770-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index a0bc2c19ec..a0bc2c19ec 100644
--- a/patches/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch
index acc5535802..acc5535802 100644
--- a/patches/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0773-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0773-Detail-more-information-in-watchdog-dumps.patch
index 7af32a532d..7af32a532d 100644
--- a/patches/server/0773-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/0773-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch
index b99cdf62ed..b99cdf62ed 100644
--- a/patches/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0775-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0775-Manually-inline-methods-in-BlockPosition.patch
index 547ad97708..547ad97708 100644
--- a/patches/server/0775-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/unapplied/server/0775-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0776-Distance-manager-tick-timings.patch b/patches/unapplied/server/0776-Distance-manager-tick-timings.patch
index 8825901f21..8825901f21 100644
--- a/patches/server/0776-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/0776-Distance-manager-tick-timings.patch
diff --git a/patches/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/unapplied/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index f395f91274..f395f91274 100644
--- a/patches/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/unapplied/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0779-Add-packet-limiter-config.patch b/patches/unapplied/server/0779-Add-packet-limiter-config.patch
index a273c156dd..a273c156dd 100644
--- a/patches/server/0779-Add-packet-limiter-config.patch
+++ b/patches/unapplied/server/0779-Add-packet-limiter-config.patch
diff --git a/patches/server/0780-Lag-compensate-block-breaking.patch b/patches/unapplied/server/0780-Lag-compensate-block-breaking.patch
index 18f58cddec..18f58cddec 100644
--- a/patches/server/0780-Lag-compensate-block-breaking.patch
+++ b/patches/unapplied/server/0780-Lag-compensate-block-breaking.patch
diff --git a/patches/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch b/patches/unapplied/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch
index 568e3dbe25..568e3dbe25 100644
--- a/patches/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch
+++ b/patches/unapplied/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch
diff --git a/patches/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 0e44c24f7b..0e44c24f7b 100644
--- a/patches/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/unapplied/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch
index bf4e1f243f..bf4e1f243f 100644
--- a/patches/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/unapplied/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0784-Time-scoreboard-search.patch b/patches/unapplied/server/0784-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0784-Time-scoreboard-search.patch
+++ b/patches/unapplied/server/0784-Time-scoreboard-search.patch
diff --git a/patches/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch
index 79c80daacc..79c80daacc 100644
--- a/patches/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0786-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0786-Do-not-run-raytrace-logic-for-AIR.patch
index f8c4d1a7af..f8c4d1a7af 100644
--- a/patches/server/0786-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/unapplied/server/0786-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0787-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0787-Oprimise-map-impl-for-tracked-players.patch
index 62ec327fe7..62ec327fe7 100644
--- a/patches/server/0787-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/unapplied/server/0787-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch
index a3213ee164..a3213ee164 100644
--- a/patches/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/unapplied/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/unapplied/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/unapplied/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0790-Optimise-random-block-ticking.patch b/patches/unapplied/server/0790-Optimise-random-block-ticking.patch
index c03d323b51..c03d323b51 100644
--- a/patches/server/0790-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/0790-Optimise-random-block-ticking.patch
diff --git a/patches/server/0791-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0791-Optimise-non-flush-packet-sending.patch
index c5f1223f87..c5f1223f87 100644
--- a/patches/server/0791-Optimise-non-flush-packet-sending.patch
+++ b/patches/unapplied/server/0791-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0792-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0792-Optimise-nearby-player-lookups.patch
index 7ac99c624f..7ac99c624f 100644
--- a/patches/server/0792-Optimise-nearby-player-lookups.patch
+++ b/patches/unapplied/server/0792-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0793-Fix-Codec-log-spam.patch b/patches/unapplied/server/0793-Fix-Codec-log-spam.patch
index 56249884d3..56249884d3 100644
--- a/patches/server/0793-Fix-Codec-log-spam.patch
+++ b/patches/unapplied/server/0793-Fix-Codec-log-spam.patch
diff --git a/patches/server/0794-Optimise-WorldServer-notify.patch b/patches/unapplied/server/0794-Optimise-WorldServer-notify.patch
index 8657ce3d53..8657ce3d53 100644
--- a/patches/server/0794-Optimise-WorldServer-notify.patch
+++ b/patches/unapplied/server/0794-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0795-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0795-Remove-streams-for-villager-AI.patch
index 227d34f188..227d34f188 100644
--- a/patches/server/0795-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/0795-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0796-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0796-Rewrite-dataconverter-system.patch
index cc35e27dfc..cc35e27dfc 100644
--- a/patches/server/0796-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0796-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0797-Use-Velocity-compression-and-cipher-natives.patch
index 2d7569820c..2d7569820c 100644
--- a/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/0797-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index 263c8c5693..263c8c5693 100644
--- a/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/unapplied/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5b9fbcac1f..5b9fbcac1f 100644
--- a/patches/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/unapplied/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0800-Configurable-feature-seeds.patch b/patches/unapplied/server/0800-Configurable-feature-seeds.patch
index 60f93a8baa..60f93a8baa 100644
--- a/patches/server/0800-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0800-Configurable-feature-seeds.patch
diff --git a/patches/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/unapplied/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 12edb886b9..12edb886b9 100644
--- a/patches/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/unapplied/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0802-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0802-Prevent-softlocked-end-exit-portal-generation.patch
index 42e617cf5f..42e617cf5f 100644
--- a/patches/server/0802-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/unapplied/server/0802-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch
index b03a1ed147..b03a1ed147 100644
--- a/patches/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/unapplied/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/unapplied/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0805-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0805-Don-t-log-debug-logging-being-disabled.patch
index 6ff8025b3b..6ff8025b3b 100644
--- a/patches/server/0805-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/unapplied/server/0805-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/unapplied/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index ee3bb34c33..ee3bb34c33 100644
--- a/patches/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/unapplied/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0807-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0807-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0807-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/unapplied/server/0807-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0808-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0808-Ensure-valid-vehicle-status.patch
index cb45c347b6..cb45c347b6 100644
--- a/patches/server/0808-Ensure-valid-vehicle-status.patch
+++ b/patches/unapplied/server/0808-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0809-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0809-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 788db2c022..788db2c022 100644
--- a/patches/server/0809-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0809-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0810-More-CommmandBlock-API.patch b/patches/unapplied/server/0810-More-CommmandBlock-API.patch
index f7ef8c10d6..f7ef8c10d6 100644
--- a/patches/server/0810-More-CommmandBlock-API.patch
+++ b/patches/unapplied/server/0810-More-CommmandBlock-API.patch
diff --git a/patches/server/0811-Preserve-overstacked-loot.patch b/patches/unapplied/server/0811-Preserve-overstacked-loot.patch
index e5cd46277b..e5cd46277b 100644
--- a/patches/server/0811-Preserve-overstacked-loot.patch
+++ b/patches/unapplied/server/0811-Preserve-overstacked-loot.patch
diff --git a/patches/server/0812-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0812-Update-head-rotation-in-missing-places.patch
index dfc0762eca..dfc0762eca 100644
--- a/patches/server/0812-Update-head-rotation-in-missing-places.patch
+++ b/patches/unapplied/server/0812-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0813-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0813-prevent-unintended-light-block-manipulation.patch
index ba7dcc0e94..ba7dcc0e94 100644
--- a/patches/server/0813-prevent-unintended-light-block-manipulation.patch
+++ b/patches/unapplied/server/0813-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0814-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0814-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0814-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0814-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0815-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/unapplied/server/0815-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 351633a78e..351633a78e 100644
--- a/patches/server/0815-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/unapplied/server/0815-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0816-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0816-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0816-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/unapplied/server/0816-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0817-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0817-Add-back-EntityPortalExitEvent.patch
index 36ceb88a14..36ceb88a14 100644
--- a/patches/server/0817-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0817-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0818-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0818-Fix-upstreams-block-state-factories.patch
index 3a4d1c9bc6..3a4d1c9bc6 100644
--- a/patches/server/0818-Fix-upstreams-block-state-factories.patch
+++ b/patches/unapplied/server/0818-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0819-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
index e4c7591bd0..e4c7591bd0 100644
--- a/patches/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/unapplied/server/0819-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
index 37fb358660..37fb358660 100644
--- a/patches/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0820-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/unapplied/server/0821-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0822-Add-root-admin-user-detection.patch b/patches/unapplied/server/0822-Add-root-admin-user-detection.patch
index 053e03ef52..053e03ef52 100644
--- a/patches/server/0822-Add-root-admin-user-detection.patch
+++ b/patches/unapplied/server/0822-Add-root-admin-user-detection.patch
diff --git a/patches/server/0823-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0823-Always-allow-item-changing-in-Fireball.patch
index 1bb4c5dd5b..1bb4c5dd5b 100644
--- a/patches/server/0823-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/unapplied/server/0823-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 136d0c2f97..136d0c2f97 100644
--- a/patches/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/unapplied/server/0824-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/unapplied/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index ab7e4fb93f..ab7e4fb93f 100644
--- a/patches/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/unapplied/server/0825-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch
index 1fdfe05599..1fdfe05599 100644
--- a/patches/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/unapplied/server/0826-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0827-Get-entity-default-attributes.patch b/patches/unapplied/server/0827-Get-entity-default-attributes.patch
index 98147486b9..98147486b9 100644
--- a/patches/server/0827-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0827-Get-entity-default-attributes.patch
diff --git a/patches/server/0828-Left-handed-API.patch b/patches/unapplied/server/0828-Left-handed-API.patch
index 099fa6769c..099fa6769c 100644
--- a/patches/server/0828-Left-handed-API.patch
+++ b/patches/unapplied/server/0828-Left-handed-API.patch
diff --git a/patches/server/0829-Add-advancement-display-API.patch b/patches/unapplied/server/0829-Add-advancement-display-API.patch
index 844b192d18..844b192d18 100644
--- a/patches/server/0829-Add-advancement-display-API.patch
+++ b/patches/unapplied/server/0829-Add-advancement-display-API.patch
diff --git a/patches/server/0830-Add-ItemFactory-getMonsterEgg-API.patch b/patches/unapplied/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
index a7a82e297a..a7a82e297a 100644
--- a/patches/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/unapplied/server/0830-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0831-Add-critical-damage-API.patch b/patches/unapplied/server/0831-Add-critical-damage-API.patch
index 549054d680..549054d680 100644
--- a/patches/server/0831-Add-critical-damage-API.patch
+++ b/patches/unapplied/server/0831-Add-critical-damage-API.patch
diff --git a/patches/server/0832-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0832-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0832-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/unapplied/server/0832-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 4fc21d4b21..4fc21d4b21 100644
--- a/patches/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0833-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0834-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0834-don-t-attempt-to-teleport-dead-entities.patch
index 8b1157986f..8b1157986f 100644
--- a/patches/server/0834-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/unapplied/server/0834-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0835-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0835-Async-catch-modifications-to-critical-entity-state.patch
index 48b3a5b713..48b3a5b713 100644
--- a/patches/server/0835-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/unapplied/server/0835-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0836-Cache-palette-array.patch b/patches/unapplied/server/0836-Cache-palette-array.patch
index 2c787bbbc6..2c787bbbc6 100644
--- a/patches/server/0836-Cache-palette-array.patch
+++ b/patches/unapplied/server/0836-Cache-palette-array.patch
diff --git a/patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/unapplied/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0838-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0838-Fix-issues-with-mob-conversion.patch
index ce962e6de7..ce962e6de7 100644
--- a/patches/server/0838-Fix-issues-with-mob-conversion.patch
+++ b/patches/unapplied/server/0838-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0839-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0839-Add-isCollidable-methods-to-various-places.patch
index 84c0379606..84c0379606 100644
--- a/patches/server/0839-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/unapplied/server/0839-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0840-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0840-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0840-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/unapplied/server/0840-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0841-Goat-ram-API.patch b/patches/unapplied/server/0841-Goat-ram-API.patch
index 8491164ccb..8491164ccb 100644
--- a/patches/server/0841-Goat-ram-API.patch
+++ b/patches/unapplied/server/0841-Goat-ram-API.patch
diff --git a/patches/server/0842-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0842-Add-Raw-Byte-Entity-Serialization.patch
index f600a0f9f3..f600a0f9f3 100644
--- a/patches/server/0842-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/unapplied/server/0842-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0843-Call-onRemove-logic-for-breakNaturally.patch b/patches/unapplied/server/0843-Call-onRemove-logic-for-breakNaturally.patch
index 4db123eba9..4db123eba9 100644
--- a/patches/server/0843-Call-onRemove-logic-for-breakNaturally.patch
+++ b/patches/unapplied/server/0843-Call-onRemove-logic-for-breakNaturally.patch
diff --git a/patches/server/0844-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0844-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0844-Add-API-for-resetting-a-single-score.patch
+++ b/patches/unapplied/server/0844-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0845-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/unapplied/server/0845-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index 1ee105facf..1ee105facf 100644
--- a/patches/server/0845-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/unapplied/server/0845-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d6037036b6..1514614884 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,11 @@ pluginManagement {
 
 rootProject.name = "Paper"
 
-include("Paper-API", "Paper-Server", "Paper-MojangAPI")
+include(
+    "Paper-API",
+    "Paper-Server",
+    // "Paper-MojangAPI", // todo
+)
 
 val testPlugin = file("test-plugin.settings.gradle.kts")
 if (testPlugin.exists()) {
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index bdff4f9499..0e5df46f8e 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -6,7 +6,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":Paper-API"))
-    compileOnly(project(":Paper-MojangAPI"))
+    // compileOnly(project(":Paper-MojangAPI")) // todo
 }
 
 tasks.processResources {