Prepare for 1.20.3 dev

patches/server/0001-Setup-Gradle-project.patch

@@ -1,782 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <kyle@denwav.dev>
-Date: Thu, 10 Dec 2020 20:54:19 -0800
-Subject: [PATCH] Setup Gradle project
-
-The pom.xml file is deleted in this patch so the patch will fail to
-apply if there are changes made to it from upstream - thus notifying us
-that changes were made.
-
-diff --git a/.gitignore b/.gitignore
-index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f7f570448 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,3 +1,6 @@
-+.gradle/
-+build/
-+
- # Eclipse stuff
- /.classpath
- /.project
-@@ -39,3 +42,7 @@ dependency-reduced-pom.xml
- 
- /src/main/resources/achievement
- /src/main/resources/lang
-+
-+# vs code
-+/.vscode
-+/.factorypath
-diff --git a/build.gradle.kts b/build.gradle.kts
-new file mode 100644
-index 0000000000000000000000000000000000000000..3be7f53046d821d6777481b92b3aa6e3df51ed8f
---- /dev/null
-+++ b/build.gradle.kts
-@@ -0,0 +1,140 @@
-+import io.papermc.paperweight.util.*
-+
-+plugins {
-+    java
-+    `maven-publish`
-+    id("com.github.johnrengelman.shadow")
-+}
-+
-+dependencies {
-+    implementation(project(":paper-api"))
-+    implementation("jline:jline:2.12.1")
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
-+        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
-+    }
-+    implementation("org.ow2.asm:asm:9.5")
-+    implementation("commons-lang:commons-lang:2.6")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-+    runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-+
-+    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
-+
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-+    testImplementation("org.hamcrest:hamcrest:2.2")
-+    testImplementation("org.mockito:mockito-core:5.5.0")
-+}
-+
-+val craftbukkitPackageVersion = "1_20_R2" // Paper
-+tasks.jar {
-+    archiveClassifier.set("dev")
-+
-+    manifest {
-+        val git = Git(rootProject.layout.projectDirectory.path)
-+        val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
-+        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
-+        val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
-+        attributes(
-+            "Main-Class" to "org.bukkit.craftbukkit.Main",
-+            "Implementation-Title" to "CraftBukkit",
-+            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Vendor" to date, // Paper
-+            "Specification-Title" to "Bukkit",
-+            "Specification-Version" to project.version,
-+            "Specification-Vendor" to "Bukkit Team",
-+        )
-+        for (tld in setOf("net", "com", "org")) {
-+            attributes("$tld/bukkit", "Sealed" to true)
-+        }
-+    }
-+}
-+
-+publishing {
-+    publications.create<MavenPublication>("maven") {
-+        artifact(tasks.shadowJar)
-+    }
-+}
-+
-+relocation {
-+    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
-+    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$craftbukkitPackageVersion") {
-+        exclude("org.bukkit.craftbukkit.Main*")
-+    }
-+}
-+
-+tasks.shadowJar {
-+    configurations = listOf(project.configurations.vanillaServer.get())
-+    archiveClassifier.set("mojang-mapped")
-+
-+    for (relocation in relocation.relocations.get()) {
-+        relocate(relocation.fromPackage, relocation.toPackage) {
-+            for (exclude in relocation.excludes) {
-+                exclude(exclude)
-+            }
-+        }
-+    }
-+}
-+
-+tasks.test {
-+    exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
-+    useJUnitPlatform()
-+}
-+
-+fun TaskContainer.registerRunTask(
-+    name: String,
-+    block: JavaExec.() -> Unit
-+): TaskProvider<JavaExec> = register<JavaExec>(name) {
-+    group = "paper"
-+    mainClass.set("org.bukkit.craftbukkit.Main")
-+    standardInput = System.`in`
-+    workingDir = rootProject.layout.projectDirectory
-+        .dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
-+        .asFile
-+    javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
-+
-+    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("--nogui")
-+    systemProperty("net.kyori.adventure.text.warnWhenLegacyFormattingDetected", true)
-+    if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
-+        systemProperty("disable.watchdog", true)
-+    }
-+    systemProperty("io.papermc.paper.suppress.sout.nags", true)
-+
-+    val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
-+    minHeapSize = "${memoryGb}G"
-+    maxHeapSize = "${memoryGb}G"
-+
-+    doFirst {
-+        workingDir.mkdirs()
-+    }
-+
-+    block(this)
-+}
-+
-+val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatMap { it.elements }
-+    .zip(configurations.vanillaServer.map { it.singleFile.absolutePath }) { runtime, vanilla ->
-+        runtime.filterNot { it.asFile.absolutePath == vanilla }
-+    }
-+
-+tasks.registerRunTask("runShadow") {
-+    description = "Spin up a test server from the shadowJar archiveFile"
-+    classpath(tasks.shadowJar.flatMap { it.archiveFile })
-+    classpath(runtimeClasspathWithoutVanillaServer)
-+}
-+
-+tasks.registerRunTask("runReobf") {
-+    description = "Spin up a test server from the reobfJar output jar"
-+    classpath(tasks.reobfJar.flatMap { it.outputJar })
-+    classpath(runtimeClasspathWithoutVanillaServer)
-+}
-+
-+tasks.registerRunTask("runDev") {
-+    description = "Spin up a non-relocated Mojang-mapped test server"
-+    classpath(sourceSets.main.map { it.runtimeClasspath })
-+}
-diff --git a/pom.xml b/pom.xml
-deleted file mode 100644
-index 2410a3cb98fc8d643043c7e3a85c880d4a9f2aa4..0000000000000000000000000000000000000000
---- a/pom.xml
-+++ /dev/null
-@@ -1,602 +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.20.2-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_20_R2</minecraft_version>
--        <maven.compiler.source>17</maven.compiler.source>
--        <maven.compiler.target>17</maven.compiler.target>
--    </properties>
--
--    <repositories>
--        <repository>
--            <id>minecraft-libraries</id>
--            <name>Minecraft Libraries</name>
--            <url>https://libraries.minecraft.net/</url>
--        </repository>
--    </repositories>
--
--    <dependencies>
--        <dependency>
--            <groupId>org.spigotmc</groupId>
--            <artifactId>spigot-api</artifactId>
--            <version>${project.version}</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.spigotmc</groupId>
--            <artifactId>minecraft-server</artifactId>
--            <version>${project.version}</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>jline</groupId>
--            <artifactId>jline</artifactId>
--            <version>2.12.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-iostreams</artifactId>
--            <version>2.19.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.ow2.asm</groupId>
--            <artifactId>asm</artifactId>
--            <version>9.5</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- Mojang depends -->
--        <dependency>
--            <groupId>com.github.oshi</groupId>
--            <artifactId>oshi-core</artifactId>
--            <version>6.4.5</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>authlib</artifactId>
--            <version>5.0.47</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>brigadier</artifactId>
--            <version>1.1.8</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>datafixerupper</artifactId>
--            <version>6.0.8</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mojang</groupId>
--            <artifactId>logging</artifactId>
--            <version>1.1.1</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>commons-io</groupId>
--            <artifactId>commons-io</artifactId>
--            <version>2.13.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-buffer</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-codec</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-common</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-handler</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-resolver</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-classes-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <classifier>linux-x86_64</classifier>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-epoll</artifactId>
--            <version>4.1.97.Final</version>
--            <classifier>linux-aarch_64</classifier>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>io.netty</groupId>
--            <artifactId>netty-transport-native-unix-common</artifactId>
--            <version>4.1.97.Final</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>it.unimi.dsi</groupId>
--            <artifactId>fastutil</artifactId>
--            <version>8.5.12</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>net.java.dev.jna</groupId>
--            <artifactId>jna</artifactId>
--            <version>5.13.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>net.java.dev.jna</groupId>
--            <artifactId>jna-platform</artifactId>
--            <version>5.13.0</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.13.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-core</artifactId>
--            <version>2.19.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.logging.log4j</groupId>
--            <artifactId>log4j-slf4j2-impl</artifactId>
--            <version>2.19.0</version>
--            <scope>compile</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.slf4j</groupId>
--            <artifactId>slf4j-api</artifactId>
--            <version>2.0.7</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- deprecated API depend -->
--        <dependency>
--            <groupId>commons-lang</groupId>
--            <artifactId>commons-lang</artifactId>
--            <version>2.6</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- deprecated API depend -->
--        <dependency>
--            <groupId>com.googlecode.json-simple</groupId>
--            <artifactId>json-simple</artifactId>
--            <version>1.1.1</version>
--            <scope>runtime</scope>
--            <exclusions>
--                <exclusion>
--                    <groupId>junit</groupId>
--                    <artifactId>junit</artifactId>
--                </exclusion>
--            </exclusions>
--        </dependency>
--        <dependency>
--            <groupId>org.xerial</groupId>
--            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.42.0.1</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>com.mysql</groupId>
--            <artifactId>mysql-connector-j</artifactId>
--            <version>8.1.0</version>
--            <scope>runtime</scope>
--        </dependency>
--        <!-- add these back in as they are not exposed by the API -->
--        <dependency>
--            <groupId>org.apache.maven</groupId>
--            <artifactId>maven-resolver-provider</artifactId>
--            <version>3.8.5</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.maven.resolver</groupId>
--            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.7.3</version>
--            <scope>runtime</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.apache.maven.resolver</groupId>
--            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.7.3</version>
--            <scope>runtime</scope>
--        </dependency>
--        <!-- annotations -->
--        <dependency>
--            <groupId>org.jetbrains</groupId>
--            <artifactId>annotations-java5</artifactId>
--            <version>24.0.1</version>
--            <scope>provided</scope>
--        </dependency>
--        <!-- testing -->
--        <dependency>
--            <groupId>org.junit.jupiter</groupId>
--            <artifactId>junit-jupiter</artifactId>
--            <version>5.10.0</version>
--            <scope>test</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.hamcrest</groupId>
--            <artifactId>hamcrest</artifactId>
--            <version>2.2</version>
--            <scope>test</scope>
--        </dependency>
--        <dependency>
--            <groupId>org.mockito</groupId>
--            <artifactId>mockito-core</artifactId>
--            <version>5.5.0</version>
--            <scope>test</scope>
--        </dependency>
--    </dependencies>
--
--    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
--    <build>
--        <plugins>
--            <plugin>
--                <groupId>net.md-5</groupId>
--                <artifactId>scriptus</artifactId>
--                <version>0.5.0</version>
--                <executions>
--                    <execution>
--                        <id>ex-spigot</id>
--                        <configuration>
--                            <format>${bt.name}-Spigot-%s</format>
--                            <scmDirectory>../</scmDirectory>
--                            <descriptionProperty>spigot.desc</descriptionProperty>
--                        </configuration>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>describe</goal>
--                        </goals>
--                    </execution>
--                    <execution>
--                        <id>ex-craftbukkit</id>
--                        <configuration>
--                            <format>-%s</format>
--                            <scmDirectory>../../CraftBukkit</scmDirectory>
--                            <descriptionProperty>craftbukkit.desc</descriptionProperty>
--                        </configuration>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>describe</goal>
--                        </goals>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-clean-plugin</artifactId>
--                <version>3.2.0</version>
--                <executions>
--                    <execution>
--                        <phase>initialize</phase>
--                        <goals>
--                            <goal>clean</goal>
--                        </goals>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-jar-plugin</artifactId>
--                <version>3.3.0</version>
--                <configuration>
--                    <archive>
--                        <manifest>
--                            <addDefaultEntries>false</addDefaultEntries>
--                        </manifest>
--                        <manifestEntries>
--                            <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
--                            <Implementation-Title>CraftBukkit</Implementation-Title>
--                            <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
--                            <Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
--                            <Specification-Title>Bukkit</Specification-Title>
--                            <Specification-Version>${api.version}</Specification-Version>
--                            <Specification-Vendor>Bukkit Team</Specification-Vendor>
--                            <Multi-Release>true</Multi-Release>
--                        </manifestEntries>
--                        <manifestSections>
--                            <manifestSection>
--                                <name>net/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                            <manifestSection>
--                                <name>com/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                            <manifestSection>
--                                <name>org/bukkit/</name>
--                                <manifestEntries>
--                                    <Sealed>true</Sealed>
--                                </manifestEntries>
--                            </manifestSection>
--                        </manifestSections>
--                    </archive>
--                </configuration>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.5.0</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>shade</goal>
--                        </goals>
--                        <configuration>
--                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <artifactSet>
--                                <includes>
--                                    <include>org.spigotmc:minecraft-server</include>
--                                </includes>
--                            </artifactSet>
--                            <relocations>
--                                <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>
--                        </configuration>
--                    </execution>
--                </executions>
--            </plugin>
--            <plugin>
--                <groupId>net.md-5</groupId>
--                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>2.0.2</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>remap</goal>
--                        </goals>
--                        <id>remap-members</id>
--                        <configuration>
--                            <useProjectDependencies>false</useProjectDependencies>
--                            <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>
--                            <quiet>true</quiet>
--                            <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.6.0</version>
--                <executions>
--                    <execution>
--                        <phase>package</phase>
--                        <goals>
--                            <goal>single</goal>
--                        </goals>
--                        <configuration>
--                            <archive>
--                                <manifest>
--                                    <addDefaultEntries>false</addDefaultEntries>
--                                </manifest>
--                                <manifestEntries>
--                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
--                                </manifestEntries>
--                            </archive>
--                            <attach>false</attach>
--                            <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.11.0</version>
--                <configuration>
--                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
--                    <compilerId>eclipse</compilerId>
--                    <!-- default changed with version 3.11.0 -->
--                    <showWarnings>false</showWarnings>
--                </configuration>
--                <dependencies>
--                    <dependency>
--                        <groupId>org.codehaus.plexus</groupId>
--                        <artifactId>plexus-compiler-eclipse</artifactId>
--                        <version>2.13.0</version>
--                    </dependency>
--                </dependencies>
--            </plugin>
--            <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-surefire-plugin</artifactId>
--                <version>3.1.0</version>
--                <configuration>
--                    <workingDirectory>${basedir}/target/test-server</workingDirectory>
--                    <excludes>
--                        <exclude>org/bukkit/craftbukkit/inventory/ItemStack*Test.java</exclude>
--                    </excludes>
--                </configuration>
--            </plugin>
--        </plugins>
--    </build>
--
--    <profiles>
--        <profile>
--            <id>shadeSourcesJar</id>
--            <properties>
--                <shadeSourcesJar>true</shadeSourcesJar>
--                <shadeSourcesContent>true</shadeSourcesContent>
--            </properties>
--        </profile>
--        <profile>
--            <id>development</id>
--            <properties>
--                <skipTests>false</skipTests>
--            </properties>
--            <build>
--                <plugins>
--                    <plugin>
--                        <groupId>org.apache.maven.plugins</groupId>
--                        <artifactId>maven-checkstyle-plugin</artifactId>
--                        <version>3.3.0</version>
--                        <executions>
--                            <execution>
--                                <phase>test-compile</phase>
--                                <goals>
--                                    <goal>check</goal>
--                                </goals>
--                            </execution>
--                        </executions>
--                        <configuration>
--                            <configLocation>checkstyle.xml</configLocation>
--                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
--                        </configuration>
--                        <dependencies>
--                            <dependency>
--                                <groupId>com.puppycrawl.tools</groupId>
--                                <artifactId>checkstyle</artifactId>
--                                <version>8.45.1</version>
--                            </dependency>
--                        </dependencies>
--                    </plugin>
--                </plugins>
--            </build>
--        </profile>
--        <profile>
--            <id>remapped</id>
--            <build>
--                <plugins>
--                    <plugin>
--                        <groupId>net.md-5</groupId>
--                        <artifactId>specialsource-maven-plugin</artifactId>
--                        <executions>
--                            <execution>
--                                <phase>verify</phase>
--                                <goals>
--                                    <goal>remap</goal>
--                                </goals>
--                                <id>remap-obf</id>
--                                <configuration>
--                                    <useProjectDependencies>false</useProjectDependencies>
--                                    <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot</srgIn>
--                                    <reverse>true</reverse>
--                                    <remappedArtifactAttached>true</remappedArtifactAttached>
--                                    <remappedClassifierName>remapped-obf</remappedClassifierName>
--                                </configuration>
--                            </execution>
--                            <execution>
--                                <phase>verify</phase>
--                                <goals>
--                                    <goal>remap</goal>
--                                </goals>
--                                <id>remap-mojang</id>
--                                <configuration>
--                                    <useProjectDependencies>false</useProjectDependencies>
--                                    <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
--                                    <srgIn>org.spigotmc:minecraft-server:${project.version}:txt:maps-mojang</srgIn>
--                                    <remappedArtifactAttached>true</remappedArtifactAttached>
--                                    <remappedClassifierName>remapped-mojang</remappedClassifierName>
--                                </configuration>
--                            </execution>
--                        </executions>
--                    </plugin>
--                </plugins>
--            </build>
--        </profile>
--    </profiles>
--</project>

patches/server/0002-Remap-fixes.patch

@@ -1,226 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <kyle@denwav.dev>
-Date: Fri, 11 Jun 2021 05:25:03 -0500
-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 ad3035da44c6af2fa7cc53926f33526a43740313..e89fa618fa20e3e843d8de81629e6dc551777823 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -278,9 +278,11 @@ public class BlockPos extends Vec3i {
- 
-     public static Iterable<BlockPos> withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) {
-         int i = rangeX + rangeY + rangeZ;
--        int j = center.getX();
--        int k = center.getY();
--        int l = center.getZ();
-+        // Paper start - rename variables to fix conflict with anonymous class (remap fix)
-+        int centerX = center.getX();
-+        int centerY = center.getY();
-+        int centerZ = center.getZ();
-+        // Paper end
-         return () -> {
-             return new AbstractIterator<BlockPos>() {
-                 private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
-@@ -295,7 +297,7 @@ public class BlockPos extends Vec3i {
-                 protected BlockPos computeNext() {
-                     if (this.zMirror) {
-                         this.zMirror = false;
--                        this.cursor.setZ(l - (this.cursor.getZ() - l));
-+                        this.cursor.setZ(centerZ - (this.cursor.getZ() - centerZ)); // Paper - remap fix
-                         return this.cursor;
-                     } else {
-                         BlockPos blockPos;
-@@ -321,7 +323,7 @@ public class BlockPos extends Vec3i {
-                             int k = this.currentDepth - Math.abs(i) - Math.abs(j);
-                             if (k <= rangeZ) {
-                                 this.zMirror = k != 0;
--                                blockPos = this.cursor.set(j + i, k + j, l + k);
-+                                blockPos = this.cursor.set(centerX + i, centerY + j, centerZ + k); // Paper - remap fix
-                             }
-                         }
- 
-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 3ba785845a63e46a44fc48264d08c96bfc34ab8b..92bd58010e8c89e361e28aec59447349edbbc028 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
-@@ -173,11 +173,11 @@ public class BehaviorUtils {
- 
-         return optional.map((uuid) -> {
-             return ((ServerLevel) entity.level()).getEntity(uuid);
--        }).map((entity) -> {
-+        }).map((entity1) -> { // Paper - remap fix
-             LivingEntity entityliving1;
- 
--            if (entity instanceof LivingEntity) {
--                LivingEntity entityliving2 = (LivingEntity) entity;
-+            if (entity1 instanceof LivingEntity) { // Paper - remap fix
-+                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
- 
-                 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 7918deb55e6ed2e16eba501ab380a456270d9512..a81475d0cd3c5b75b4abe0d1a01389372a4d9ab1 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -197,7 +197,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-         Builder<ResourceLocation, RecipeHolder<?>> builder = ImmutableMap.builder();
- 
-         recipes.forEach((recipeholder) -> {
--            Map<ResourceLocation, RecipeHolder<?>> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
-+            Map<ResourceLocation, RecipeHolder<?>> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes_) -> { // Paper - remap fix
-                 return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
-             });
-             ResourceLocation minecraftkey = recipeholder.id();
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index 95a5ce711150c4c999a9d17f28a497f034638610..214215d203892b8009595539f25ce26e8752debd 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-@@ -251,8 +251,8 @@ public class LootTable {
- 
-     public static class Builder implements FunctionUserBuilder<LootTable.Builder> {
- 
--        private final Builder<LootPool> pools = ImmutableList.builder();
--        private final Builder<LootItemFunction> functions = ImmutableList.builder();
-+        private final ImmutableList.Builder<LootPool> pools = ImmutableList.builder();
-+        private final ImmutableList.Builder<LootItemFunction> functions = ImmutableList.builder();
-         private LootContextParamSet paramSet;
-         private Optional<ResourceLocation> randomSequence;
- 
-diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
-index b70450722da13bc4d358a70d3d1d2f30a2cca2b9..86d86c292bdeeb7f42685691287c3b4bd476ea14 100644
---- a/src/test/java/org/bukkit/DyeColorsTest.java
-+++ b/src/test/java/org/bukkit/DyeColorsTest.java
-@@ -3,7 +3,6 @@ package org.bukkit;
- import static org.bukkit.support.MatcherAssert.*;
- import static org.hamcrest.Matchers.*;
- 
--import net.minecraft.world.item.DyeColor;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.jupiter.params.ParameterizedTest;
- import org.junit.jupiter.params.provider.EnumSource;
-@@ -14,7 +13,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @EnumSource(DyeColor.class)
-     public void checkColor(DyeColor dye) {
-         Color color = dye.getColor();
--        float[] nmsColorArray = DyeColor.byId(dye.getWoolData()).getTextureDiffuseColors();
-+        float[] nmsColorArray = net.minecraft.world.item.DyeColor.byId(dye.getWoolData()).getTextureDiffuseColors(); // Paper - remap fix
-         Color nmsColor = Color.fromRGB((int) (nmsColorArray[0] * 255), (int) (nmsColorArray[1] * 255), (int) (nmsColorArray[2] * 255));
-         assertThat(color, is(nmsColor));
-     }
-@@ -23,7 +22,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @EnumSource(org.bukkit.DyeColor.class)
-     public void checkFireworkColor(org.bukkit.DyeColor dye) {
-         Color color = dye.getFireworkColor();
--        int nmsColor = DyeColor.byId(dye.getWoolData()).getFireworkColor();
-+        int nmsColor = net.minecraft.world.item.DyeColor.byId(dye.getWoolData()).getFireworkColor(); // Paper - remap fix
-         assertThat(color, is(Color.fromRGB(nmsColor)));
-     }
- }
-diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
-index 1edc58410316eaf45858db56897179587e8b22ee..cf6f34e506570e7bb9624c5899fbcdd762d8e0c4 100644
---- a/src/test/java/org/bukkit/ParticleTest.java
-+++ b/src/test/java/org/bukkit/ParticleTest.java
-@@ -231,7 +231,7 @@ public class ParticleTest extends AbstractTestingBase {
-                 Check in CraftParticle if the conversion is still correct.
-                 """, bukkit.getKey()));
- 
--        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
-+        DataResult<Tag> encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
-                 String.format("""
-                         Could not encoded particle param for particle %s.
-                         This can indicated, that the wrong particle param is created in CraftParticle.
-diff --git a/src/test/java/org/bukkit/RegistryConstantsTest.java b/src/test/java/org/bukkit/RegistryConstantsTest.java
-index 6be404dafe1f0ae5ab39a0782e4c3ca7c0923752..545a329a52be0dc1f3cf8ca1315152d8b4a465dd 100644
---- a/src/test/java/org/bukkit/RegistryConstantsTest.java
-+++ b/src/test/java/org/bukkit/RegistryConstantsTest.java
-@@ -19,17 +19,17 @@ public class RegistryConstantsTest extends AbstractTestingBase {
- 
-     @Test
-     public void testTrimMaterial() {
--        this.testExcessConstants(TrimMaterial.class, Registry.TRIM_MATERIAL);
-+        this.testExcessConstants(TrimMaterial.class, org.bukkit.Registry.TRIM_MATERIAL); // Paper - remap fix
-         this.testMissingConstants(TrimMaterial.class, Registries.TRIM_MATERIAL);
-     }
- 
-     @Test
-     public void testTrimPattern() {
--        this.testExcessConstants(TrimPattern.class, Registry.TRIM_PATTERN);
-+        this.testExcessConstants(TrimPattern.class, org.bukkit.Registry.TRIM_PATTERN); // Paper - remap fix
-         this.testMissingConstants(TrimPattern.class, Registries.TRIM_PATTERN);
-     }
- 
--    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<T> registry) {
-+    private <T extends Keyed> void testExcessConstants(Class<T> clazz, org.bukkit.Registry<T> registry) { // Paper - remap fix
-         List<NamespacedKey> excessKeys = new ArrayList<>();
- 
-         for (Field field : clazz.getFields()) {
-diff --git a/src/test/java/org/bukkit/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/RegistryLoadOrderTest.java
-index e4298c14eb793743081cb0088427bb5a50d74b46..194ff80040eec0427acfef644cd85666370902fa 100644
---- a/src/test/java/org/bukkit/RegistryLoadOrderTest.java
-+++ b/src/test/java/org/bukkit/RegistryLoadOrderTest.java
-@@ -20,7 +20,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
- 
-     private static boolean initInterface = false;
-     private static boolean initAbstract = false;
--    private static Registry<Keyed> registry;
-+    private static org.bukkit.Registry<Keyed> registry; // Paper - remap fix
- 
-     public static Stream<Arguments> data() {
-         return Stream.of(
-diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab8a6cc295 100644
---- a/src/test/java/org/bukkit/entity/EntityTypesTest.java
-+++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-@@ -6,7 +6,6 @@ import java.util.Set;
- import java.util.stream.Collectors;
- import net.minecraft.core.registries.BuiltInRegistries;
- import net.minecraft.resources.ResourceLocation;
--import net.minecraft.world.entity.EntityType;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.jupiter.api.Test;
- 
-@@ -16,8 +15,8 @@ public class EntityTypesTest extends AbstractTestingBase {
-     public void testMaps() {
-         Set<EntityType> allBukkit = Arrays.stream(EntityType.values()).filter((b) -> b.getName() != null).collect(Collectors.toSet());
- 
--        for (EntityType<?> nms : BuiltInRegistries.ENTITY_TYPE) {
--            ResourceLocation key = EntityType.getKey(nms);
-+        for (net.minecraft.world.entity.EntityType<?> nms : BuiltInRegistries.ENTITY_TYPE) { // Paper - remap fix
-+            ResourceLocation key = net.minecraft.world.entity.EntityType.getKey(nms); // Paper - remap fix
- 
-             org.bukkit.entity.EntityType bukkit = org.bukkit.entity.EntityType.fromName(key.getPath());
-             assertNotNull(bukkit, "Missing nms->bukkit " + key);
-diff --git a/src/test/java/org/bukkit/entity/PandaGeneTest.java b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b320842de2 100644
---- a/src/test/java/org/bukkit/entity/PandaGeneTest.java
-+++ b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-@@ -2,7 +2,6 @@ package org.bukkit.entity;
- 
- import static org.junit.jupiter.api.Assertions.*;
- 
--import net.minecraft.world.entity.animal.Panda;
- import org.bukkit.craftbukkit.entity.CraftPanda;
- import org.junit.jupiter.api.Test;
- 
-@@ -10,8 +9,8 @@ public class PandaGeneTest {
- 
-     @Test
-     public void testBukkit() {
--        for (Panda.Gene gene : Panda.Gene.values()) {
--            Panda.Gene nms = CraftPanda.toNms(gene);
-+        for (Panda.Gene gene : Panda.Gene.values()) { // Paper - remap fix
-+            net.minecraft.world.entity.animal.Panda.Gene nms = CraftPanda.toNms(gene); // Paper - remap fix
- 
-             assertNotNull(nms, "NMS gene null for " + gene);
-             assertEquals(gene.isRecessive(), nms.isRecessive(), "Recessive status did not match " + gene);
-@@ -21,7 +20,7 @@ public class PandaGeneTest {
- 
-     @Test
-     public void testNMS() {
--        for (Panda.Gene gene : Panda.Gene.values()) {
-+        for (net.minecraft.world.entity.animal.Panda.Gene gene : net.minecraft.world.entity.animal.Panda.Gene.values()) { // Paper - remap fix
-             org.bukkit.entity.Panda.Gene bukkit = CraftPanda.fromNms(gene);
- 
-             assertNotNull(bukkit, "Bukkit gene null for " + gene);

patches/server/0003-Build-system-changes.patch

@@ -1,167 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 20:40:33 -0600
-Subject: [PATCH] Build system changes
-
-== AT ==
-public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/net/URI;)Ljava/nio/file/Path;
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 3be7f53046d821d6777481b92b3aa6e3df51ed8f..ff4d0f970990187e9b46324b5cf051fcc546119f 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,10 +9,9 @@ plugins {
- dependencies {
-     implementation(project(":paper-api"))
-     implementation("jline:jline:2.12.1")
--    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
--        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
--    }
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm:9.5")
-+    implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
-     implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-@@ -35,6 +34,7 @@ tasks.jar {
-         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
-         val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
-         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
-+        val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
-@@ -43,6 +43,9 @@ tasks.jar {
-             "Specification-Title" to "Bukkit",
-             "Specification-Version" to project.version,
-             "Specification-Vendor" to "Bukkit Team",
-+            "Git-Branch" to gitBranch, // Paper
-+            "Git-Commit" to gitHash, // Paper
-+            "CraftBukkit-Package-Version" to craftbukkitPackageVersion, // Paper
-         )
-         for (tld in setOf("net", "com", "org")) {
-             attributes("$tld/bukkit", "Sealed" to true)
-@@ -50,6 +53,11 @@ tasks.jar {
-     }
- }
- 
-+tasks.compileJava {
-+    // incremental compilation is currently broken due to patched files having compiled counterparts already on the compile classpath
-+    options.setIncremental(false)
-+}
-+
- publishing {
-     publications.create<MavenPublication>("maven") {
-         artifact(tasks.shadowJar)
-@@ -76,6 +84,17 @@ tasks.shadowJar {
-     }
- }
- 
-+// Paper start
-+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
-+    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
-+    jarToScan.set(tasks.shadowJar.flatMap { it.archiveFile })
-+    classpath.from(configurations.compileClasspath)
-+}
-+tasks.check {
-+    dependsOn(scanJar)
-+}
-+// Paper end
-+
- tasks.test {
-     exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
-     useJUnitPlatform()
-@@ -134,7 +153,14 @@ tasks.registerRunTask("runReobf") {
-     classpath(runtimeClasspathWithoutVanillaServer)
- }
- 
-+val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
-+    src.runtimeClasspath.elements.map { elements ->
-+        elements.filterNot { file -> file.asFile.endsWith("minecraft.jar") }
-+    }
-+}
- tasks.registerRunTask("runDev") {
-     description = "Spin up a non-relocated Mojang-mapped test server"
--    classpath(sourceSets.main.map { it.runtimeClasspath })
-+    classpath(tasks.filterProjectDir.flatMap { it.outputJar })
-+    classpath(runtimeClasspathForRunDev)
-+    jvmArgs("-DPaper.isRunDev=true")
- }
-diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index 68e3d54c79924d72b22eb3bc142ff47aa1700895..d3300e43523429fdd0e61c5aa9aed2e6bc78e07e 100644
---- a/src/main/java/net/minecraft/resources/ResourceLocation.java
-+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -26,6 +26,7 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
-     public static final char NAMESPACE_SEPARATOR = ':';
-     public static final String DEFAULT_NAMESPACE = "minecraft";
-     public static final String REALMS_NAMESPACE = "realms";
-+    public static final String PAPER_NAMESPACE = "paper"; // Paper
-     private final String namespace;
-     private final String path;
- 
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 84dab998d5b91b9c5690e9e086b17a60b6dec058..2ac60ea28ce722cdef61cfdc69bbbdf391628238 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -107,6 +107,17 @@ public class Main {
-             */ // CraftBukkit end
- 
-         try {
-+            // Paper start
-+            if (Boolean.getBoolean("Paper.isRunDev")) {
-+                net.minecraft.server.packs.VanillaPackResourcesBuilder.developmentConfig = builder -> {
-+                    try {
-+                        builder.pushAssetPath(net.minecraft.server.packs.PackType.SERVER_DATA, net.minecraft.server.packs.VanillaPackResourcesBuilder.safeGetPath(java.util.Objects.requireNonNull(Main.class.getResource("/data/.paperassetsroot"), "Missing required .paperassetsroot file").toURI()).getParent());
-+                    } catch (java.net.URISyntaxException | IOException ex) {
-+                        throw new RuntimeException(ex);
-+                    }
-+                };
-+            }
-+            // Paper end
- 
-             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
- 
-diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-index 7db49f077704f03d1815f8382523199bd6c9a0dc..4ed8f38ba9c7b075b99a0da0e213a1e9d03ac717 100644
---- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-+++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-@@ -32,7 +32,7 @@ public class ServerPacksSource extends BuiltInPackSource {
- 
-     @VisibleForTesting
-     public static VanillaPackResources createVanillaPackSource() {
--        return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft").applyDevelopmentConfig().pushJarResources().build();
-+        return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE).applyDevelopmentConfig().pushJarResources().build(); // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e325cb56f2bafce21ce06bb5c674837abbb676e7..8a30ebbac91a0750c00ebbcb5372e6d2a45c064a 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -209,7 +209,7 @@ public class Main {
-                 }
- 
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
--                    Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
-+                    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, -21);
-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
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-         Properties properties = new Properties();
- 
-         if (stream != null) {
-diff --git a/src/main/resources/data/.paperassetsroot b/src/main/resources/data/.paperassetsroot
-new file mode 100644
-index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391

patches/server/0004-Test-changes.patch

@@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 13 Feb 2023 14:14:56 -0800
-Subject: [PATCH] Test changes
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index ff4d0f970990187e9b46324b5cf051fcc546119f..844eff88c9ad95871900c2d8aa3136b3f2928bf9 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -58,6 +58,12 @@ tasks.compileJava {
-     options.setIncremental(false)
- }
- 
-+// Paper start - compile tests with -parameters for better junit parameterized test names
-+tasks.compileTestJava {
-+    options.compilerArgs.add("-parameters")
-+}
-+// Paper end
-+
- publishing {
-     publications.create<MavenPublication>("maven") {
-         artifact(tasks.shadowJar)
-diff --git a/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java b/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e070aa1bb69859224493d958621389ee757f8752
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/registry/RegistryKeyTest.java
-@@ -0,0 +1,33 @@
-+package io.papermc.paper.registry;
-+
-+import java.util.Optional;
-+import java.util.stream.Stream;
-+import net.minecraft.core.Registry;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.jupiter.api.BeforeAll;
-+import org.junit.jupiter.params.ParameterizedTest;
-+import org.junit.jupiter.params.provider.MethodSource;
-+
-+import static org.junit.jupiter.api.Assertions.assertTrue;
-+
-+class RegistryKeyTest extends AbstractTestingBase {
-+
-+    @BeforeAll
-+    static void before() throws ClassNotFoundException {
-+        Class.forName(RegistryKey.class.getName()); // load all keys so they are found for the test
-+    }
-+
-+    static Stream<RegistryKey<?>> data() {
-+        return RegistryKeyImpl.REGISTRY_KEYS.stream();
-+    }
-+
-+    @ParameterizedTest
-+    @MethodSource("data")
-+    void testApiRegistryKeysExist(final RegistryKey<?> key) {
-+        final Optional<Registry<Object>> registry = AbstractTestingBase.REGISTRY_CUSTOM.registry(ResourceKey.createRegistryKey(new ResourceLocation(key.key().asString())));
-+        assertTrue(registry.isPresent(), "Missing vanilla registry for " + key.key().asString());
-+
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/util/EmptyTag.java b/src/test/java/io/papermc/paper/util/EmptyTag.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6eb95a5e2534974c0e52e2b78b04e7c2b2f28525
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/EmptyTag.java
-@@ -0,0 +1,31 @@
-+package io.papermc.paper.util;
-+
-+import java.util.Collections;
-+import java.util.Set;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Tag;
-+import org.jetbrains.annotations.NotNull;
-+
-+public record EmptyTag(NamespacedKey key) implements Tag<Keyed> {
-+
-+    @SuppressWarnings("deprecation")
-+    public EmptyTag() {
-+        this(NamespacedKey.randomKey());
-+    }
-+
-+    @Override
-+    public @NotNull NamespacedKey getKey() {
-+        return this.key;
-+    }
-+
-+    @Override
-+    public boolean isTagged(@NotNull final Keyed item) {
-+        return false;
-+    }
-+
-+    @Override
-+    public @NotNull Set<Keyed> getValues() {
-+        return Collections.emptySet();
-+    }
-+}
-diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java
-index d96efc9aa90debcca5f237c949ba11b10070223a..d1253a07a90aa4cc29d0140795203a71118c827a 100644
---- a/src/test/java/org/bukkit/support/DummyServer.java
-+++ b/src/test/java/org/bukkit/support/DummyServer.java
-@@ -38,6 +38,15 @@ public final class DummyServer {
- 
-             when(instance.getRegistry(any())).then(mock -> CraftRegistry.createRegistry(mock.getArgument(0), AbstractTestingBase.REGISTRY_CUSTOM));
- 
-+            // Paper start - testing additions
-+            final Thread currentThread = Thread.currentThread();
-+            when(instance.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
-+
-+            final org.bukkit.plugin.PluginManager pluginManager = new org.bukkit.plugin.SimplePluginManager(instance, new org.bukkit.command.SimpleCommandMap(instance));
-+            when(instance.getPluginManager()).thenReturn(pluginManager);
-+            when(instance.getTag(anyString(), any(org.bukkit.NamespacedKey.class), any())).thenAnswer(ignored -> new io.papermc.paper.util.EmptyTag());
-+            // paper end - testing additions
-+
-             Bukkit.setServer(instance);
-         } catch (Throwable t) {
-             throw new Error(t);

patches/server/0008-CB-fixes.patch

@@ -1,129 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 25 Feb 2022 07:14:48 -0800
-Subject: [PATCH] CB fixes
-
-* Missing Level -> LevelStem generic in StructureCheck
-  Need to use the right for injectDatafixingContext (Spottedleaf)
-
-* Removed incorrect parent perm for `minecraft.debugstick.always` (Machine_Maker)
-
-* Fixed method signature of Marker#addPassenger (Machine_Maker)
-
-* Removed unneeded UOE in CustomWorldChunkManager (extends BiomeSource) (Machine_Maker)
-
-* Honor Server#getLootTable method contract (Machine_Maker)
-
-Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 64522a15ecb73087222b33ffb13e29ac048b62a7..82c9886222d49bd03b642c0d9c07d82d1d27896b 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-         long l = minecraftserver.getWorldData().worldGenOptions().seed();
- 
--        this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
-+        this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), this.getTypeKey(), chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer); // Paper - Fix missing CB diff
-         this.structureManager = new StructureManager(this, this.serverLevelData.worldGenOptions(), this.structureCheck); // CraftBukkit
-         if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END
-             this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 869f60e9407ed1c5bee536ef91a21f4d11f8f964..3aa98f7c282cb4884589cb83b1546b924e66f096 100644
---- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -445,9 +445,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-     }
- 
-     @Override
--    protected void actuallyHurt(DamageSource source, float amount) {
-+    protected boolean damageEntity0(DamageSource source, float amount) { // Paper - fix CB method rename issue
-         this.standUpInstantly();
--        super.actuallyHurt(source, amount);
-+        return super.damageEntity0(source, amount); // Paper - fix CB method rename issue
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd769fff36 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-@@ -43,7 +43,7 @@ public class StructureCheck {
-     private final Registry<Biome> biomes;
-     private final Registry<Structure> structureConfigs;
-     private final StructureTemplateManager structureTemplateManager;
--    private final ResourceKey<Level> dimension;
-+    private final ResourceKey<net.minecraft.world.level.dimension.LevelStem> dimension; // Paper - fix missing CB diff
-     private final ChunkGenerator chunkGenerator;
-     private final RandomState randomState;
-     private final LevelHeightAccessor heightAccessor;
-@@ -53,7 +53,7 @@ public class StructureCheck {
-     private final Long2ObjectMap<Object2IntMap<Structure>> loadedChunks = new Long2ObjectOpenHashMap<>();
-     private final Map<Structure, Long2BooleanMap> featureChecks = new HashMap<>();
- 
--    public StructureCheck(ChunkScanAccess chunkIoWorker, RegistryAccess registryManager, StructureTemplateManager structureTemplateManager, ResourceKey<Level> worldKey, ChunkGenerator chunkGenerator, RandomState noiseConfig, LevelHeightAccessor world, BiomeSource biomeSource, long seed, DataFixer dataFixer) {
-+    public StructureCheck(ChunkScanAccess chunkIoWorker, RegistryAccess registryManager, StructureTemplateManager structureTemplateManager, ResourceKey<net.minecraft.world.level.dimension.LevelStem> worldKey, ChunkGenerator chunkGenerator, RandomState noiseConfig, LevelHeightAccessor world, BiomeSource biomeSource, long seed, DataFixer dataFixer) { // Paper - fix missing CB diff
-         this.storageAccess = chunkIoWorker;
-         this.registryAccess = registryManager;
-         this.structureTemplateManager = structureTemplateManager;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-index 6ab2fd523b7f4e5cacef4ebb95f6812f391985d1..85133c388eff009ea1ffa391824b6556f7bf2014 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
-@@ -174,4 +174,11 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
-         org.bukkit.loot.LootTable table = (org.bukkit.loot.LootTable) obj;
-         return table.getKey().equals(this.getKey());
-     }
-+
-+    // Paper start - satisfy equals/hashCode contract
-+    @Override
-+    public int hashCode() {
-+        return java.util.Objects.hash(key);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d1baf686c0a59584a4866490f4f4fe65b3ac6eed..3d2c168d29873c4418bc297740e7032d6020ff52 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2422,7 +2422,13 @@ public final class CraftServer implements Server {
-         Preconditions.checkArgument(key != null, "NamespacedKey key cannot be null");
- 
-         LootDataManager registry = this.getServer().getLootData();
--        return new CraftLootTable(key, registry.getLootTable(CraftNamespacedKey.toMinecraft(key)));
-+        // Paper start - honor method contract
-+        final ResourceLocation lootTableKey = CraftNamespacedKey.toMinecraft(key);
-+        if (registry.getLootTable(lootTableKey) == net.minecraft.world.level.storage.loot.LootTable.EMPTY) {
-+            return null;
-+        }
-+        return new CraftLootTable(key, registry.getLootTable(lootTableKey));
-+        // Paper end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3523f8851472890c97e628e22df883b91ba603fe..b1a1caef59f3ea0fa68ca47040ad6fff9820cc5a 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -122,6 +122,7 @@ public class Main {
- 
-                 this.acceptsAll(Main.asList("forceUpgrade"), "Whether to force a world upgrade");
-                 this.acceptsAll(Main.asList("eraseCache"), "Whether to force cache erase during world upgrade");
-+                this.accepts("safeMode", "Loads level with vanilla datapack only"); // Paper
-                 this.acceptsAll(Main.asList("nogui"), "Disables the graphical console");
- 
-                 this.acceptsAll(Main.asList("nojline"), "Disables jline and emulates the vanilla console");
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-index 5ac25dab93fd4c9e9533c80d1ca3d93446d7a365..245ad120a36b6defca7e6889faae1ca5fc33d0c7 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-@@ -15,7 +15,7 @@ public final class CraftDefaultPermissions {
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".nbt.place", "Gives the user the ability to place restricted blocks with NBT in creative", org.bukkit.permissions.PermissionDefault.OP, parent);
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".nbt.copy", "Gives the user the ability to copy NBT in creative", org.bukkit.permissions.PermissionDefault.TRUE, parent);
-         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick", "Gives the user the ability to use the debug stick in creative", org.bukkit.permissions.PermissionDefault.OP, parent);
--        DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE, parent);
-+        DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE/* , parent */); // Paper - should not have this parent, as it's not a "vanilla" utility
-         // Spigot end
-         parent.recalculatePermissibles();
-     }

patches/server/0011-Paper-command.patch

@@ -1,665 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 29 Feb 2016 21:02:09 -0600
-Subject: [PATCH] Paper command
-
-Co-authored-by: Zach Brown <zach.brown@destroystokyo.com>
-
-diff --git a/src/main/java/io/papermc/paper/command/CallbackCommand.java b/src/main/java/io/papermc/paper/command/CallbackCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fa4202abd13c1c286bd398938103d1103d5443e7
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/CallbackCommand.java
-@@ -0,0 +1,35 @@
-+package io.papermc.paper.command;
-+
-+import io.papermc.paper.adventure.providers.ClickCallbackProviderImpl;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+import java.util.UUID;
-+
-+@DefaultQualifier(NonNull.class)
-+public class CallbackCommand extends Command {
-+
-+    protected CallbackCommand(final String name) {
-+        super(name);
-+        this.description = "ClickEvent callback";
-+        this.usageMessage = "/callback <uuid>";
-+    }
-+
-+    @Override
-+    public boolean execute(final CommandSender sender, final String commandLabel, final String[] args) {
-+        if (args.length != 1) {
-+            return false;
-+        }
-+
-+        final UUID id;
-+        try {
-+            id = UUID.fromString(args[0]);
-+        } catch (final IllegalArgumentException ignored) {
-+            return false;
-+        }
-+
-+        ClickCallbackProviderImpl.CALLBACK_MANAGER.runCallback(sender, id);
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/CommandUtil.java b/src/main/java/io/papermc/paper/command/CommandUtil.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..953c30500892e5f0c55b8597bc708ea85bf56d6e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/CommandUtil.java
-@@ -0,0 +1,69 @@
-+package io.papermc.paper.command;
-+
-+import com.google.common.base.Functions;
-+import com.google.common.collect.Iterables;
-+import com.google.common.collect.Lists;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.Iterator;
-+import java.util.List;
-+import net.minecraft.resources.ResourceLocation;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class CommandUtil {
-+    private CommandUtil() {
-+    }
-+
-+    // Code from Mojang - copyright them
-+    public static List<String> getListMatchingLast(
-+        final CommandSender sender,
-+        final String[] args,
-+        final String... matches
-+    ) {
-+        return getListMatchingLast(sender, args, Arrays.asList(matches));
-+    }
-+
-+    public static boolean matches(final String s, final String s1) {
-+        return s1.regionMatches(true, 0, s, 0, s.length());
-+    }
-+
-+    public static List<String> getListMatchingLast(
-+        final CommandSender sender,
-+        final String[] strings,
-+        final Collection<?> collection
-+    ) {
-+        String last = strings[strings.length - 1];
-+        ArrayList<String> results = Lists.newArrayList();
-+
-+        if (!collection.isEmpty()) {
-+            Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator();
-+
-+            while (iterator.hasNext()) {
-+                String s1 = (String) iterator.next();
-+
-+                if (matches(last, s1) && (sender.hasPermission(PaperCommand.BASE_PERM + s1) || sender.hasPermission("bukkit.command.paper"))) {
-+                    results.add(s1);
-+                }
-+            }
-+
-+            if (results.isEmpty()) {
-+                iterator = collection.iterator();
-+
-+                while (iterator.hasNext()) {
-+                    Object object = iterator.next();
-+
-+                    if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) {
-+                        results.add(String.valueOf(object));
-+                    }
-+                }
-+            }
-+        }
-+
-+        return results;
-+    }
-+    // end copy stuff
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8ccc59473bac983ced6b9e4a57e0ec4ebd2b0f32
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
-@@ -0,0 +1,143 @@
-+package io.papermc.paper.command;
-+
-+import io.papermc.paper.command.subcommands.*;
-+import it.unimi.dsi.fastutil.Pair;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+import net.minecraft.Util;
-+import org.bukkit.Bukkit;
-+import org.bukkit.Location;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.permissions.Permission;
-+import org.bukkit.permissions.PermissionDefault;
-+import org.bukkit.plugin.PluginManager;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class PaperCommand extends Command {
-+    static final String BASE_PERM = "bukkit.command.paper.";
-+    // subcommand label -> subcommand
-+    private static final Map<String, PaperSubcommand> SUBCOMMANDS = Util.make(() -> {
-+        final Map<Set<String>, PaperSubcommand> commands = new HashMap<>();
-+
-+        commands.put(Set.of("heap"), new HeapDumpCommand());
-+        commands.put(Set.of("entity"), new EntityCommand());
-+        commands.put(Set.of("reload"), new ReloadCommand());
-+        commands.put(Set.of("version"), new VersionCommand());
-+
-+        return commands.entrySet().stream()
-+            .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
-+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-+    });
-+    private static final Set<String> COMPLETABLE_SUBCOMMANDS = SUBCOMMANDS.entrySet().stream().filter(entry -> entry.getValue().tabCompletes()).map(Map.Entry::getKey).collect(Collectors.toSet());
-+    // alias -> subcommand label
-+    private static final Map<String, String> ALIASES = Util.make(() -> {
-+        final Map<String, Set<String>> aliases = new HashMap<>();
-+
-+        aliases.put("version", Set.of("ver"));
-+
-+        return aliases.entrySet().stream()
-+            .flatMap(entry -> entry.getValue().stream().map(s -> Map.entry(s, entry.getKey())))
-+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-+    });
-+
-+    public PaperCommand(final String name) {
-+        super(name);
-+        this.description = "Paper related commands";
-+        this.usageMessage = "/paper [" + String.join(" | ", SUBCOMMANDS.keySet()) + "]";
-+        final List<String> permissions = new ArrayList<>();
-+        permissions.add("bukkit.command.paper");
-+        permissions.addAll(SUBCOMMANDS.keySet().stream().map(s -> BASE_PERM + s).toList());
-+        this.setPermission(String.join(";", permissions));
-+        final PluginManager pluginManager = Bukkit.getServer().getPluginManager();
-+        for (final String perm : permissions) {
-+            pluginManager.addPermission(new Permission(perm, PermissionDefault.OP));
-+        }
-+    }
-+
-+    private static boolean testPermission(final CommandSender sender, final String permission) {
-+        if (sender.hasPermission(BASE_PERM + permission) || sender.hasPermission("bukkit.command.paper")) {
-+            return true;
-+        }
-+        sender.sendMessage(text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", RED));
-+        return false;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(
-+        final CommandSender sender,
-+        final String alias,
-+        final String[] args,
-+        final @Nullable Location location
-+    ) throws IllegalArgumentException {
-+        if (args.length <= 1) {
-+            return CommandUtil.getListMatchingLast(sender, args, COMPLETABLE_SUBCOMMANDS);
-+        }
-+
-+        final @Nullable Pair<String, PaperSubcommand> subCommand = resolveCommand(args[0]);
-+        if (subCommand != null) {
-+            return subCommand.second().tabComplete(sender, subCommand.first(), Arrays.copyOfRange(args, 1, args.length));
-+        }
-+
-+        return Collections.emptyList();
-+    }
-+
-+    @Override
-+    public boolean execute(
-+        final CommandSender sender,
-+        final String commandLabel,
-+        final String[] args
-+    ) {
-+        if (!testPermission(sender)) {
-+            return true;
-+        }
-+
-+        if (args.length == 0) {
-+            sender.sendMessage(text("Usage: " + this.usageMessage, RED));
-+            return false;
-+        }
-+        final @Nullable Pair<String, PaperSubcommand> subCommand = resolveCommand(args[0]);
-+
-+        if (subCommand == null) {
-+            sender.sendMessage(text("Usage: " + this.usageMessage, RED));
-+            return false;
-+        }
-+
-+        if (!testPermission(sender, subCommand.first())) {
-+            return true;
-+        }
-+        final String[] choppedArgs = Arrays.copyOfRange(args, 1, args.length);
-+        return subCommand.second().execute(sender, subCommand.first(), choppedArgs);
-+    }
-+
-+    private static @Nullable Pair<String, PaperSubcommand> resolveCommand(String label) {
-+        label = label.toLowerCase(Locale.ENGLISH);
-+        @Nullable PaperSubcommand subCommand = SUBCOMMANDS.get(label);
-+        if (subCommand == null) {
-+            final @Nullable String command = ALIASES.get(label);
-+            if (command != null) {
-+                label = command;
-+                subCommand = SUBCOMMANDS.get(command);
-+            }
-+        }
-+
-+        if (subCommand != null) {
-+            return Pair.of(label, subCommand);
-+        }
-+
-+        return null;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5e5ec700a368cfdaa1ea0b3f0fa82089895d4b92
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
-@@ -0,0 +1,28 @@
-+package io.papermc.paper.command;
-+
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+
-+import java.util.HashMap;
-+import java.util.Map;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class PaperCommands {
-+
-+    private PaperCommands() {
-+    }
-+
-+    private static final Map<String, Command> COMMANDS = new HashMap<>();
-+    static {
-+        COMMANDS.put("paper", new PaperCommand("paper"));
-+        COMMANDS.put("callback", new CallbackCommand("callback"));
-+    }
-+
-+    public static void registerCommands(final MinecraftServer server) {
-+        COMMANDS.forEach((s, command) -> {
-+            server.server.getCommandMap().register(s, "Paper", command);
-+        });
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/PaperSubcommand.java b/src/main/java/io/papermc/paper/command/PaperSubcommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7e9e0ff8639be135bf8575e375cbada5b57164e1
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/PaperSubcommand.java
-@@ -0,0 +1,20 @@
-+package io.papermc.paper.command;
-+
-+import java.util.Collections;
-+import java.util.List;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public interface PaperSubcommand {
-+    boolean execute(CommandSender sender, String subCommand, String[] args);
-+
-+    default List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        return Collections.emptyList();
-+    }
-+
-+    default boolean tabCompletes() {
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
-@@ -0,0 +1,158 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import com.google.common.collect.Maps;
-+import io.papermc.paper.command.CommandUtil;
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.event.HoverEvent;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.level.ServerChunkCache;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.entity.EntityType;
-+import net.minecraft.world.level.ChunkPos;
-+import org.apache.commons.lang3.tuple.MutablePair;
-+import org.apache.commons.lang3.tuple.Pair;
-+import org.bukkit.Bukkit;
-+import org.bukkit.HeightMap;
-+import org.bukkit.World;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.entity.Player;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class EntityCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.listEntities(sender, args);
-+        return true;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
-+        if (args.length == 1) {
-+            return CommandUtil.getListMatchingLast(sender, args, "help", "list");
-+        } else if (args.length == 2) {
-+            return CommandUtil.getListMatchingLast(sender, args, BuiltInRegistries.ENTITY_TYPE.keySet().stream().map(ResourceLocation::toString).sorted().toArray(String[]::new));
-+        }
-+        return Collections.emptyList();
-+    }
-+
-+    /*
-+     * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
-+     */
-+    private void listEntities(final CommandSender sender, final String[] args) {
-+        // help
-+        if (args.length < 1 || !args[0].toLowerCase(Locale.ENGLISH).equals("list")) {
-+            sender.sendMessage(text("Use /paper entity [list] help for more information on a specific command", RED));
-+            return;
-+        }
-+
-+        if ("list".equals(args[0].toLowerCase(Locale.ENGLISH))) {
-+            String filter = "*";
-+            if (args.length > 1) {
-+                if (args[1].toLowerCase(Locale.ENGLISH).equals("help")) {
-+                    sender.sendMessage(text("Use /paper entity list [filter] [worldName] to get entity info that matches the optional filter.", RED));
-+                    return;
-+                }
-+                filter = args[1];
-+            }
-+            final String cleanfilter = filter.replace("?", ".?").replace("*", ".*?");
-+            Set<ResourceLocation> names = BuiltInRegistries.ENTITY_TYPE.keySet().stream()
-+                .filter(n -> n.toString().matches(cleanfilter))
-+                .collect(Collectors.toSet());
-+            if (names.isEmpty()) {
-+                sender.sendMessage(text("Invalid filter, does not match any entities. Use /paper entity list for a proper list", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            String worldName;
-+            if (args.length > 2) {
-+                worldName = args[2];
-+            } else if (sender instanceof Player) {
-+                worldName = ((Player) sender).getWorld().getName();
-+            } else {
-+                sender.sendMessage(text("Please specify the name of a world", RED));
-+                sender.sendMessage(text("To do so without a filter, specify '*' as the filter", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            Map<ResourceLocation, MutablePair<Integer, Map<ChunkPos, Integer>>> list = Maps.newHashMap();
-+            @Nullable World bukkitWorld = Bukkit.getWorld(worldName);
-+            if (bukkitWorld == null) {
-+                sender.sendMessage(text("Could not load world for " + worldName + ". Please select a valid world.", RED));
-+                sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
-+                return;
-+            }
-+            ServerLevel world = ((CraftWorld) bukkitWorld).getHandle();
-+            Map<ResourceLocation, Integer> nonEntityTicking = Maps.newHashMap();
-+            ServerChunkCache chunkProviderServer = world.getChunkSource();
-+            world.getAllEntities().forEach(e -> {
-+                ResourceLocation key = EntityType.getKey(e.getType());
-+
-+                MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
-+                ChunkPos chunk = e.chunkPosition();
-+                info.left++;
-+                info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
-+                if (!chunkProviderServer.isPositionTicking(e)) {
-+                    nonEntityTicking.merge(key, 1, Integer::sum);
-+                }
-+            });
-+            if (names.size() == 1) {
-+                ResourceLocation name = names.iterator().next();
-+                Pair<Integer, Map<ChunkPos, Integer>> info = list.get(name);
-+                int nonTicking = nonEntityTicking.getOrDefault(name, 0);
-+                if (info == null) {
-+                    sender.sendMessage(text("No entities found.", RED));
-+                    return;
-+                }
-+                sender.sendMessage("Entity: " + name + " Total Ticking: " + (info.getLeft() - nonTicking) + ", Total Non-Ticking: " + nonTicking);
-+                info.getRight().entrySet().stream()
-+                    .sorted((a, b) -> !a.getValue().equals(b.getValue()) ? b.getValue() - a.getValue() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                    .limit(10).forEach(e -> {
-+                        final int x = (e.getKey().x << 4) + 8;
-+                        final int z = (e.getKey().z << 4) + 8;
-+                        final Component message = text("  " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z + (chunkProviderServer.isPositionTicking(e.getKey().toLong()) ? " (Ticking)" : " (Non-Ticking)"))
-+                            .hoverEvent(HoverEvent.showText(text("Click to teleport to chunk", GREEN)))
-+                            .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/minecraft:execute as @s in " + world.getWorld().getKey() + " run tp " + x + " " + (world.getWorld().getHighestBlockYAt(x, z, HeightMap.MOTION_BLOCKING) + 1) + " " + z));
-+                        sender.sendMessage(message);
-+                    });
-+            } else {
-+                List<Pair<ResourceLocation, Integer>> info = list.entrySet().stream()
-+                    .filter(e -> names.contains(e.getKey()))
-+                    .map(e -> Pair.of(e.getKey(), e.getValue().left))
-+                    .sorted((a, b) -> !a.getRight().equals(b.getRight()) ? b.getRight() - a.getRight() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                    .toList();
-+
-+                if (info.isEmpty()) {
-+                    sender.sendMessage(text("No entities found.", RED));
-+                    return;
-+                }
-+
-+                int count = info.stream().mapToInt(Pair::getRight).sum();
-+                int nonTickingCount = nonEntityTicking.values().stream().mapToInt(Integer::intValue).sum();
-+                sender.sendMessage("Total Ticking: " + (count - nonTickingCount) + ", Total Non-Ticking: " + nonTickingCount);
-+                info.forEach(e -> {
-+                    int nonTicking = nonEntityTicking.getOrDefault(e.getKey(), 0);
-+                    sender.sendMessage("  " + (e.getValue() - nonTicking) + " (" + nonTicking + ") " + ": " + e.getKey());
-+                });
-+                sender.sendMessage("* First number is ticking entities, second number is non-ticking entities");
-+            }
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java b/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cd2e4d792e972b8bf1e07b8961594a670ae949cf
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/HeapDumpCommand.java
-@@ -0,0 +1,38 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import java.time.LocalDateTime;
-+import java.time.format.DateTimeFormatter;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class HeapDumpCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.dumpHeap(sender);
-+        return true;
-+    }
-+
-+    private void dumpHeap(final CommandSender sender) {
-+        java.nio.file.Path dir = java.nio.file.Paths.get("./dumps");
-+        String name = "heap-dump-" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now());
-+
-+        Command.broadcastCommandMessage(sender, text("Writing JVM heap data...", YELLOW));
-+
-+        java.nio.file.Path file = CraftServer.dumpHeap(dir, name);
-+        if (file != null) {
-+            Command.broadcastCommandMessage(sender, text("Heap dump saved to " + file, GREEN));
-+        } else {
-+            Command.broadcastCommandMessage(sender, text("Failed to write heap dump, see server log for details", RED));
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..bd68139ae635f2ad7ec8e7a21e0056a139c4c62e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/ReloadCommand.java
-@@ -0,0 +1,33 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class ReloadCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        this.doReload(sender);
-+        return true;
-+    }
-+
-+    private void doReload(final CommandSender sender) {
-+        Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", RED));
-+        Command.broadcastCommandMessage(sender, text("If you encounter any issues please use the /stop command to restart your server.", RED));
-+
-+        MinecraftServer server = ((CraftServer) sender.getServer()).getServer();
-+        server.paperConfigurations.reloadConfigs(server);
-+        server.server.reloadCount++;
-+
-+        Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java b/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae60bd96b5284d54676d8e7e4dd5d170b526ec1e
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/command/subcommands/VersionCommand.java
-@@ -0,0 +1,21 @@
-+package io.papermc.paper.command.subcommands;
-+
-+import io.papermc.paper.command.PaperSubcommand;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class VersionCommand implements PaperSubcommand {
-+    @Override
-+    public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
-+        final @Nullable Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
-+        if (ver != null) {
-+            ver.execute(sender, "paper", new String[0]);
-+        }
-+        return true;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 45657deb1ab3ebdfacf2a9bbb591a9a14236840c..7de6d496b40bbef5b628f1f08163ad24bd48c5c5 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -186,6 +186,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         // Paper start
-         paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-+        io.papermc.paper.command.PaperCommands.registerCommands(this);
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61f124c9c607d077cdaa6a1e9b14b323057af52d..b30c5e049d0570c94ca8b8906d9d3afd2c81649e 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -943,6 +943,7 @@ public final class CraftServer implements Server {
-         this.commandMap.clearCommands();
-         this.reloadData();
-         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-+        io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
-         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
-         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
- 
-@@ -2598,6 +2599,34 @@ public final class CraftServer implements Server {
-     // Paper end
- 
-     // Paper start
-+    @SuppressWarnings({"rawtypes", "unchecked"})
-+    public static java.nio.file.Path dumpHeap(java.nio.file.Path dir, String name) {
-+        try {
-+            java.nio.file.Files.createDirectories(dir);
-+
-+            javax.management.MBeanServer server = java.lang.management.ManagementFactory.getPlatformMBeanServer();
-+            java.nio.file.Path file;
-+
-+            try {
-+                Class clazz = Class.forName("openj9.lang.management.OpenJ9DiagnosticsMXBean");
-+                Object openj9Mbean = java.lang.management.ManagementFactory.newPlatformMXBeanProxy(server, "openj9.lang.management:type=OpenJ9Diagnostics", clazz);
-+                java.lang.reflect.Method m = clazz.getMethod("triggerDumpToFile", String.class, String.class);
-+                file = dir.resolve(name + ".phd");
-+                m.invoke(openj9Mbean, "heap", file.toString());
-+            } catch (ClassNotFoundException e) {
-+                Class clazz = Class.forName("com.sun.management.HotSpotDiagnosticMXBean");
-+                Object hotspotMBean = java.lang.management.ManagementFactory.newPlatformMXBeanProxy(server, "com.sun.management:type=HotSpotDiagnostic", clazz);
-+                java.lang.reflect.Method m = clazz.getMethod("dumpHeap", String.class, boolean.class);
-+                file = dir.resolve(name + ".hprof");
-+                m.invoke(hotspotMBean, file.toString(), true);
-+            }
-+
-+            return file;
-+        } catch (Throwable t) {
-+            Bukkit.getLogger().log(Level.SEVERE, "Could not write heap", t);
-+            return null;
-+        }
-+    }
-     private Iterable<? extends net.kyori.adventure.audience.Audience> adventure$audiences;
-     @Override
-     public Iterable<? extends net.kyori.adventure.audience.Audience> audiences() {

patches/server/0012-Paper-Metrics.patch

@@ -1,731 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 24 Mar 2017 23:56:01 -0500
-Subject: [PATCH] Paper Metrics
-
-Removes Spigot's mcstats metrics in favor of a system using bStats
-
-To disable for privacy or other reasons go to the bStats folder in your plugins folder
-and edit the config.yml file present there.
-
-Please keep in mind the data collected is anonymous and collection should have no
-tangible effect on server performance. The data is used to allow the authors of
-PaperMC to track version and platform usage so that we can make better management
-decisions on behalf of the project.
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6aaed8e8bf8c721fc834da5c76ac72a4c3e92458
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -0,0 +1,678 @@
-+package com.destroystokyo.paper;
-+
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+import org.bukkit.configuration.file.YamlConfiguration;
-+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-+import org.bukkit.plugin.Plugin;
-+
-+import org.json.simple.JSONArray;
-+import org.json.simple.JSONObject;
-+
-+import javax.net.ssl.HttpsURLConnection;
-+import java.io.ByteArrayOutputStream;
-+import java.io.DataOutputStream;
-+import java.io.File;
-+import java.io.IOException;
-+import java.net.URL;
-+import java.util.*;
-+import java.util.concurrent.Callable;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.ScheduledExecutorService;
-+import java.util.concurrent.TimeUnit;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+import java.util.zip.GZIPOutputStream;
-+
-+/**
-+ * bStats collects some data for plugin authors.
-+ *
-+ * Check out https://bStats.org/ to learn more about bStats!
-+ */
-+public class Metrics {
-+
-+    // Executor service for requests
-+    // We use an executor service because the Bukkit scheduler is affected by server lags
-+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-+
-+    // The version of this bStats class
-+    public static final int B_STATS_VERSION = 1;
-+
-+    // The url to which the data is sent
-+    private static final String URL = "https://bStats.org/submitData/server-implementation";
-+
-+    // Should failed requests be logged?
-+    private static boolean logFailedRequests = false;
-+
-+    // The logger for the failed requests
-+    private static Logger logger = Logger.getLogger("bStats");
-+
-+    // The name of the server software
-+    private final String name;
-+
-+    // The uuid of the server
-+    private final String serverUUID;
-+
-+    // A list with all custom charts
-+    private final List<CustomChart> charts = new ArrayList<>();
-+
-+    /**
-+     * Class constructor.
-+     *
-+     * @param name              The name of the server software.
-+     * @param serverUUID        The uuid of the server.
-+     * @param logFailedRequests Whether failed requests should be logged or not.
-+     * @param logger            The logger for the failed requests.
-+     */
-+    public Metrics(String name, String serverUUID, boolean logFailedRequests, Logger logger) {
-+        this.name = name;
-+        this.serverUUID = serverUUID;
-+        Metrics.logFailedRequests = logFailedRequests;
-+        Metrics.logger = logger;
-+
-+        // Start submitting the data
-+        startSubmitting();
-+    }
-+
-+    /**
-+     * Adds a custom chart.
-+     *
-+     * @param chart The chart to add.
-+     */
-+    public void addCustomChart(CustomChart chart) {
-+        if (chart == null) {
-+            throw new IllegalArgumentException("Chart cannot be null!");
-+        }
-+        charts.add(chart);
-+    }
-+
-+    /**
-+     * Starts the Scheduler which submits our data every 30 minutes.
-+     */
-+    private void startSubmitting() {
-+        final Runnable submitTask = this::submitData;
-+
-+        // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution of requests on the
-+        // bStats backend. To circumvent this problem, we introduce some randomness into the initial and second delay.
-+        // WARNING: You must not modify any part of this Metrics class, including the submit delay or frequency!
-+        // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it!
-+        long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3));
-+        long secondDelay = (long) (1000 * 60 * (Math.random() * 30));
-+        scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS);
-+        scheduler.scheduleAtFixedRate(submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS);
-+    }
-+
-+    /**
-+     * Gets the plugin specific data.
-+     *
-+     * @return The plugin specific data.
-+     */
-+    private JSONObject getPluginData() {
-+        JSONObject data = new JSONObject();
-+
-+        data.put("pluginName", name); // Append the name of the server software
-+        JSONArray customCharts = new JSONArray();
-+        for (CustomChart customChart : charts) {
-+            // Add the data of the custom charts
-+            JSONObject chart = customChart.getRequestJsonObject();
-+            if (chart == null) { // If the chart is null, we skip it
-+                continue;
-+            }
-+            customCharts.add(chart);
-+        }
-+        data.put("customCharts", customCharts);
-+
-+        return data;
-+    }
-+
-+    /**
-+     * Gets the server specific data.
-+     *
-+     * @return The server specific data.
-+     */
-+    private JSONObject getServerData() {
-+        // OS specific data
-+        String osName = System.getProperty("os.name");
-+        String osArch = System.getProperty("os.arch");
-+        String osVersion = System.getProperty("os.version");
-+        int coreCount = Runtime.getRuntime().availableProcessors();
-+
-+        JSONObject data = new JSONObject();
-+
-+        data.put("serverUUID", serverUUID);
-+
-+        data.put("osName", osName);
-+        data.put("osArch", osArch);
-+        data.put("osVersion", osVersion);
-+        data.put("coreCount", coreCount);
-+
-+        return data;
-+    }
-+
-+    /**
-+     * Collects the data and sends it afterwards.
-+     */
-+    private void submitData() {
-+        final JSONObject data = getServerData();
-+
-+        JSONArray pluginData = new JSONArray();
-+        pluginData.add(getPluginData());
-+        data.put("plugins", pluginData);
-+
-+        try {
-+            // We are still in the Thread of the timer, so nothing get blocked :)
-+            sendData(data);
-+        } catch (Exception e) {
-+            // Something went wrong! :(
-+            if (logFailedRequests) {
-+                logger.log(Level.WARNING, "Could not submit stats of " + name, e);
-+            }
-+        }
-+    }
-+
-+    /**
-+     * Sends the data to the bStats server.
-+     *
-+     * @param data The data to send.
-+     * @throws Exception If the request failed.
-+     */
-+    private static void sendData(JSONObject data) throws Exception {
-+        if (data == null) {
-+            throw new IllegalArgumentException("Data cannot be null!");
-+        }
-+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-+
-+        // Compress the data to save bandwidth
-+        byte[] compressedData = compress(data.toString());
-+
-+        // Add headers
-+        connection.setRequestMethod("POST");
-+        connection.addRequestProperty("Accept", "application/json");
-+        connection.addRequestProperty("Connection", "close");
-+        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
-+        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-+        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
-+        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-+
-+        // Send data
-+        connection.setDoOutput(true);
-+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-+        outputStream.write(compressedData);
-+        outputStream.flush();
-+        outputStream.close();
-+
-+        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
-+    }
-+
-+    /**
-+     * Gzips the given String.
-+     *
-+     * @param str The string to gzip.
-+     * @return The gzipped String.
-+     * @throws IOException If the compression failed.
-+     */
-+    private static byte[] compress(final String str) throws IOException {
-+        if (str == null) {
-+            return null;
-+        }
-+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-+        gzip.write(str.getBytes("UTF-8"));
-+        gzip.close();
-+        return outputStream.toByteArray();
-+    }
-+
-+    /**
-+     * Represents a custom chart.
-+     */
-+    public static abstract class CustomChart {
-+
-+        // The id of the chart
-+        final String chartId;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId The id of the chart.
-+         */
-+        CustomChart(String chartId) {
-+            if (chartId == null || chartId.isEmpty()) {
-+                throw new IllegalArgumentException("ChartId cannot be null or empty!");
-+            }
-+            this.chartId = chartId;
-+        }
-+
-+        private JSONObject getRequestJsonObject() {
-+            JSONObject chart = new JSONObject();
-+            chart.put("chartId", chartId);
-+            try {
-+                JSONObject data = getChartData();
-+                if (data == null) {
-+                    // If the data is null we don't send the chart.
-+                    return null;
-+                }
-+                chart.put("data", data);
-+            } catch (Throwable t) {
-+                if (logFailedRequests) {
-+                    logger.log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
-+                }
-+                return null;
-+            }
-+            return chart;
-+        }
-+
-+        protected abstract JSONObject getChartData() throws Exception;
-+
-+    }
-+
-+    /**
-+     * Represents a custom simple pie.
-+     */
-+    public static class SimplePie extends CustomChart {
-+
-+        private final Callable<String> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SimplePie(String chartId, Callable<String> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            String value = callable.call();
-+            if (value == null || value.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("value", value);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom advanced pie.
-+     */
-+    public static class AdvancedPie extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                if (entry.getValue() == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                values.put(entry.getKey(), entry.getValue());
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom drilldown pie.
-+     */
-+    public static class DrilldownPie extends CustomChart {
-+
-+        private final Callable<Map<String, Map<String, Integer>>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        public JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Map<String, Integer>> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean reallyAllSkipped = true;
-+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-+                JSONObject value = new JSONObject();
-+                boolean allSkipped = true;
-+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-+                    value.put(valueEntry.getKey(), valueEntry.getValue());
-+                    allSkipped = false;
-+                }
-+                if (!allSkipped) {
-+                    reallyAllSkipped = false;
-+                    values.put(entryValues.getKey(), value);
-+                }
-+            }
-+            if (reallyAllSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+    }
-+
-+    /**
-+     * Represents a custom single line chart.
-+     */
-+    public static class SingleLineChart extends CustomChart {
-+
-+        private final Callable<Integer> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SingleLineChart(String chartId, Callable<Integer> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            int value = callable.call();
-+            if (value == 0) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("value", value);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom multi line chart.
-+     */
-+    public static class MultiLineChart extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                if (entry.getValue() == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                values.put(entry.getKey(), entry.getValue());
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom simple bar chart.
-+     */
-+    public static class SimpleBarChart extends CustomChart {
-+
-+        private final Callable<Map<String, Integer>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, Integer> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-+                JSONArray categoryValues = new JSONArray();
-+                categoryValues.add(entry.getValue());
-+                values.put(entry.getKey(), categoryValues);
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    /**
-+     * Represents a custom advanced bar chart.
-+     */
-+    public static class AdvancedBarChart extends CustomChart {
-+
-+        private final Callable<Map<String, int[]>> callable;
-+
-+        /**
-+         * Class constructor.
-+         *
-+         * @param chartId  The id of the chart.
-+         * @param callable The callable which is used to request the chart data.
-+         */
-+        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
-+            super(chartId);
-+            this.callable = callable;
-+        }
-+
-+        @Override
-+        protected JSONObject getChartData() throws Exception {
-+            JSONObject data = new JSONObject();
-+            JSONObject values = new JSONObject();
-+            Map<String, int[]> map = callable.call();
-+            if (map == null || map.isEmpty()) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            boolean allSkipped = true;
-+            for (Map.Entry<String, int[]> entry : map.entrySet()) {
-+                if (entry.getValue().length == 0) {
-+                    continue; // Skip this invalid
-+                }
-+                allSkipped = false;
-+                JSONArray categoryValues = new JSONArray();
-+                for (int categoryValue : entry.getValue()) {
-+                    categoryValues.add(categoryValue);
-+                }
-+                values.put(entry.getKey(), categoryValues);
-+            }
-+            if (allSkipped) {
-+                // Null = skip the chart
-+                return null;
-+            }
-+            data.put("values", values);
-+            return data;
-+        }
-+
-+    }
-+
-+    public static class PaperMetrics {
-+        public static void startMetrics() {
-+            // Get the config file
-+            File configFile = new File(new File((File) MinecraftServer.getServer().options.valueOf("plugins"), "bStats"), "config.yml");
-+            YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-+
-+            // Check if the config file exists
-+            if (!config.isSet("serverUuid")) {
-+
-+                // Add default values
-+                config.addDefault("enabled", true);
-+                // Every server gets it's unique random id.
-+                config.addDefault("serverUuid", UUID.randomUUID().toString());
-+                // Should failed request be logged?
-+                config.addDefault("logFailedRequests", false);
-+
-+                // Inform the server owners about bStats
-+                config.options().header(
-+                        "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
-+                                "To honor their work, you should not disable it.\n" +
-+                                "This has nearly no effect on the server performance!\n" +
-+                                "Check out https://bStats.org/ to learn more :)"
-+                ).copyDefaults(true);
-+                try {
-+                    config.save(configFile);
-+                } catch (IOException ignored) {
-+                }
-+            }
-+            // Load the data
-+            String serverUUID = config.getString("serverUuid");
-+            boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
-+            // Only start Metrics, if it's enabled in the config
-+            if (config.getBoolean("enabled", true)) {
-+                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
-+
-+                metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
-+                    String minecraftVersion = Bukkit.getVersion();
-+                    minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1);
-+                    return minecraftVersion;
-+                }));
-+
-+                metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
-+                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
-+                final String paperVersion;
-+                final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
-+                if (implVersion != null) {
-+                    final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
-+                    paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
-+                } else {
-+                    paperVersion = "unknown";
-+                }
-+                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
-+
-+                metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                    String javaVersion = System.getProperty("java.version");
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(javaVersion, 1);
-+
-+                    // http://openjdk.java.net/jeps/223
-+                    // Java decided to change their versioning scheme and in doing so modified the java.version system
-+                    // property to return $major[.$minor][.$secuity][-ea], as opposed to 1.$major.0_$identifier
-+                    // we can handle pre-9 by checking if the "major" is equal to "1", otherwise, 9+
-+                    String majorVersion = javaVersion.split("\\.")[0];
-+                    String release;
-+
-+                    int indexOf = javaVersion.lastIndexOf('.');
-+
-+                    if (majorVersion.equals("1")) {
-+                        release = "Java " + javaVersion.substring(0, indexOf);
-+                    } else {
-+                        // of course, it really wouldn't be all that simple if they didn't add a quirk, now would it
-+                        // valid strings for the major may potentially include values such as -ea to deannotate a pre release
-+                        Matcher versionMatcher = Pattern.compile("\\d+").matcher(majorVersion);
-+                        if (versionMatcher.find()) {
-+                            majorVersion = versionMatcher.group(0);
-+                        }
-+                        release = "Java " + majorVersion;
-+                    }
-+                    map.put(release, entry);
-+
-+                    return map;
-+                }));
-+
-+                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
-+                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+
-+                    // count legacy plugins
-+                    int legacy = 0;
-+                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-+                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
-+                            legacy++;
-+                        }
-+                    }
-+
-+                    // insert real value as lower dimension
-+                    Map<String, Integer> entry = new HashMap<>();
-+                    entry.put(String.valueOf(legacy), 1);
-+
-+                    // create buckets as higher dimension
-+                    if (legacy == 0) {
-+                        map.put("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    } else if (legacy <= 5) {
-+                        map.put("1-5", entry);
-+                    } else if (legacy <= 10) {
-+                        map.put("6-10", entry);
-+                    } else if (legacy <= 25) {
-+                        map.put("11-25", entry);
-+                    } else if (legacy <= 50) {
-+                        map.put("26-50", entry);
-+                    } else {
-+                        map.put("50+ \uD83D\uDE2D", entry); // :cry:
-+                    }
-+
-+                    return map;
-+                }));
-+            }
-+
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7de6d496b40bbef5b628f1f08163ad24bd48c5c5..672c9d304f448922c5a50c725ac1f0dd988b1853 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -187,6 +187,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-+        com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 1d066ce7dcf5f548c2a34d308d4422ab4fd02e5a..0fca20580d81c461e903c8cbd1cf090f5d5083c6 100644
---- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -83,6 +83,7 @@ public class SpigotConfig
-             MinecraftServer.getServer().server.getCommandMap().register( entry.getKey(), "Spigot", entry.getValue() );
-         }
- 
-+        /* // Paper - Replace with our own
-         if ( SpigotConfig.metrics == null )
-         {
-             try
-@@ -94,6 +95,7 @@ public class SpigotConfig
-                 Bukkit.getServer().getLogger().log( Level.SEVERE, "Could not start metrics service", ex );
-             }
-         }
-+        */ // Paper end
-     }
- 
-     public static void readConfig(Class<?> clazz, Object instance) // Paper - package-private -> public

patches/server/0017-Add-TickThread.patch

@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 3 Mar 2019 20:53:18 -0800
-Subject: [PATCH] Add TickThread
-
-Placeholder patch, to be used by chunksystem rewrite
-
-diff --git a/src/main/java/io/papermc/paper/util/TickThread.java b/src/main/java/io/papermc/paper/util/TickThread.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d59885ee9c8b29d5bac34dce0597e345e5358c77
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/TickThread.java
-@@ -0,0 +1,79 @@
-+package io.papermc.paper.util;
-+
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.entity.Entity;
-+import org.bukkit.Bukkit;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+public final class TickThread extends Thread {
-+
-+    public static final boolean STRICT_THREAD_CHECKS = Boolean.getBoolean("paper.strict-thread-checks");
-+
-+    static {
-+        if (STRICT_THREAD_CHECKS) {
-+            MinecraftServer.LOGGER.warn("Strict thread checks enabled - performance may suffer");
-+        }
-+    }
-+
-+    public static void softEnsureTickThread(final String reason) {
-+        if (!STRICT_THREAD_CHECKS) {
-+            return;
-+        }
-+        ensureTickThread(reason);
-+    }
-+
-+    public static void ensureTickThread(final String reason) {
-+        if (!isTickThread()) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public static void ensureTickThread(final ServerLevel world, final int chunkX, final int chunkZ, final String reason) {
-+        if (!isTickThreadFor(world, chunkX, chunkZ)) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public static void ensureTickThread(final Entity entity, final String reason) {
-+        if (!isTickThreadFor(entity)) {
-+            MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-+            throw new IllegalStateException(reason);
-+        }
-+    }
-+
-+    public final int id; /* We don't override getId as the spec requires that it be unique (with respect to all other threads) */
-+
-+    private static final AtomicInteger ID_GENERATOR = new AtomicInteger();
-+
-+    public TickThread(final String name) {
-+        this(null, name);
-+    }
-+
-+    public TickThread(final Runnable run, final String name) {
-+        this(run, name, ID_GENERATOR.incrementAndGet());
-+    }
-+
-+    private TickThread(final Runnable run, final String name, final int id) {
-+        super(run, name);
-+        this.id = id;
-+    }
-+
-+    public static TickThread getCurrentTickThread() {
-+        return (TickThread)Thread.currentThread();
-+    }
-+
-+    public static boolean isTickThread() {
-+        return Bukkit.isPrimaryThread();
-+    }
-+
-+    public static boolean isTickThreadFor(final ServerLevel world, final int chunkX, final int chunkZ) {
-+        return Bukkit.isPrimaryThread();
-+    }
-+
-+    public static boolean isTickThreadFor(final Entity entity) {
-+        return Bukkit.isPrimaryThread();
-+    }
-+}
-diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index bbf0d9d9c44fe8d7add2f978994ec129420814c7..78669fa035b7537ff7e533cf32aaf2995625424f 100644
---- a/src/main/java/org/spigotmc/AsyncCatcher.java
-+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
-@@ -9,7 +9,7 @@ public class AsyncCatcher
- 
-     public static void catchOp(String reason)
-     {
--        if ( AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().serverThread )
-+        if ( (AsyncCatcher.enabled || io.papermc.paper.util.TickThread.STRICT_THREAD_CHECKS) && Thread.currentThread() != MinecraftServer.getServer().serverThread ) // Paper
-         {
-             throw new IllegalStateException( "Asynchronous " + reason + "!" );
-         }

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

@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 18 May 2021 14:39:44 -0700
-Subject: [PATCH] Add command line option to load extra plugin jars not in the
- plugins folder
-
-ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 819e2238f62b0af747b7e44a72de69a1b79609bf..8dfed6347e5922bdd0083604fc7228eaef86be17 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -431,6 +431,35 @@ public final class CraftServer implements Server {
-         io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.INSTANCE.enter(io.papermc.paper.plugin.entrypoint.Entrypoint.PLUGIN); // Paper - replace implementation
-     }
- 
-+    // Paper start
-+    @Override
-+    public File getPluginsFolder() {
-+        return (File) this.console.options.valueOf("plugins");
-+    }
-+
-+    private List<File> extraPluginJars() {
-+        @SuppressWarnings("unchecked")
-+        final List<File> jars = (List<File>) this.console.options.valuesOf("add-plugin");
-+        final List<File> list = new ArrayList<>();
-+        for (final File file : jars) {
-+            if (!file.exists()) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument does not exist, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            if (!file.isFile()) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument is not a file, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            if (!file.getName().endsWith(".jar")) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("File '{}' specified through 'add-plugin' argument is not a jar file, cannot load a plugin from it!", file.getAbsolutePath());
-+                continue;
-+            }
-+            list.add(file);
-+        }
-+        return list;
-+    }
-+    // Paper end
-+
-     public void enablePlugins(PluginLoadOrder type) {
-         if (type == PluginLoadOrder.STARTUP) {
-             this.helpMap.clear();
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d4b36863c55d3ffb2c71118b078c13ae95fc73d3..306fdc4111a9afeafc540dbf4f0f9dabcec3c3d9 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -160,6 +160,12 @@ public class Main {
-                         .ofType(File.class)
-                         .defaultsTo(new File("paper.yml"))
-                         .describedAs("Yml file");
-+
-+                acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
-+                        .withRequiredArg()
-+                        .ofType(File.class)
-+                        .defaultsTo(new File[] {})
-+                        .describedAs("Jar file");
-                 // Paper end
-             }
-         };

patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch

@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:02:51 -0600
-Subject: [PATCH] Configurable cactus bamboo and reed growth heights
-
-Bamboo - Both the minimum fully-grown heights and the maximum are configurable
-- Machine_Maker
-
-diff --git a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-index 75754c06268d6d1b719742d127516f77ba5c1046..05a508cb457b67078ccb08bd2228a59e73701cf3 100644
---- a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-@@ -130,7 +130,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-             if (random.nextFloat() < (world.spigotConfig.bambooModifier / (100.0f * 3)) && world.isEmptyBlock(pos.above()) && world.getRawBrightness(pos.above(), 0) >= 9) { // Spigot - SPIGOT-7159: Better modifier resolution
-                 int i = this.getHeightBelowUpToMax(world, pos) + 1;
- 
--                if (i < 16) {
-+                if (i < world.paperConfig().maxGrowthHeight.bamboo.max) { // Paper
-                     this.growBamboo(state, world, pos, random, i);
-                 }
-             }
-@@ -161,7 +161,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-         int i = this.getHeightAboveUpToMax(world, pos);
-         int j = this.getHeightBelowUpToMax(world, pos);
- 
--        return i + j + 1 < 16 && (Integer) world.getBlockState(pos.above(i)).getValue(BambooStalkBlock.STAGE) != 1;
-+        return i + j + 1 < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && (Integer) world.getBlockState(pos.above(i)).getValue(BambooStalkBlock.STAGE) != 1; // Paper
-     }
- 
-     @Override
-@@ -180,7 +180,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-             BlockPos blockposition1 = pos.above(i);
-             BlockState iblockdata1 = world.getBlockState(blockposition1);
- 
--            if (k >= 16 || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooStalkBlock.STAGE) == 1 || !world.isEmptyBlock(blockposition1.above())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here
-+            if (k >= world.paperConfig().maxGrowthHeight.bamboo.max || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooStalkBlock.STAGE) == 1 || !world.isEmptyBlock(blockposition1.above())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here // Paper - Configurable cactus bamboo and reed growth heights
-                 return;
-             }
- 
-@@ -221,7 +221,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-         }
- 
-         int j = (Integer) state.getValue(BambooStalkBlock.AGE) != 1 && !iblockdata2.is(Blocks.BAMBOO) ? 0 : 1;
--        int k = (height < 11 || random.nextFloat() >= 0.25F) && height != 15 ? 0 : 1;
-+        int k = (height < world.paperConfig().maxGrowthHeight.bamboo.min || random.nextFloat() >= 0.25F) && height != (world.paperConfig().maxGrowthHeight.bamboo.max - 1) ? 0 : 1; // Paper
- 
-         // CraftBukkit start
-         if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, pos.above(), (BlockState) ((BlockState) ((BlockState) this.defaultBlockState().setValue(BambooStalkBlock.AGE, j)).setValue(BambooStalkBlock.LEAVES, blockpropertybamboosize)).setValue(BambooStalkBlock.STAGE, k), 3)) {
-@@ -236,7 +236,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-     protected int getHeightAboveUpToMax(BlockGetter world, BlockPos pos) {
-         int i;
- 
--        for (i = 0; i < 16 && world.getBlockState(pos.above(i + 1)).is(Blocks.BAMBOO); ++i) {
-+        for (i = 0; i < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && world.getBlockState(pos.above(i + 1)).is(Blocks.BAMBOO); ++i) { // Paper
-             ;
-         }
- 
-@@ -246,7 +246,7 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
-     protected int getHeightBelowUpToMax(BlockGetter world, BlockPos pos) {
-         int i;
- 
--        for (i = 0; i < 16 && world.getBlockState(pos.below(i + 1)).is(Blocks.BAMBOO); ++i) {
-+        for (i = 0; i < ((Level) world).paperConfig().maxGrowthHeight.bamboo.max && world.getBlockState(pos.below(i + 1)).is(Blocks.BAMBOO); ++i) { // Paper
-             ;
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index a7e8be5545ef6c2ff9a056d297d11850d07bdd1c..2c3bbe4f295be9782c11af13c2cf9c05f27313d9 100644
---- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -54,7 +54,7 @@ public class CactusBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+            if (i < world.paperConfig().maxGrowthHeight.cactus) { // Paper - Configurable growth height
-                 int j = (Integer) state.getValue(CactusBlock.AGE);
- 
-                 int modifier = world.spigotConfig.cactusModifier; // Spigot - SPIGOT-7159: Better modifier resolution
-diff --git a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-index 7fbc511eb1cbfedc3bbf5bff7a61e8f74c294140..c3f500580d257e1397f2eb7c47b063a6fe6bb405 100644
---- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-@@ -52,7 +52,7 @@ public class SugarCaneBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+            if (i < world.paperConfig().maxGrowthHeight.reeds) { // Paper - Configurable growth height
-                 int j = (Integer) state.getValue(SugarCaneBlock.AGE);
- 
-                 int modifier = world.spigotConfig.caneModifier; // Spigot - SPIGOT-7159: Better modifier resolution

patches/server/0021-Configurable-baby-zombie-movement-speed.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:09:16 -0600
-Subject: [PATCH] Configurable baby zombie movement speed
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 883a5c7d0c842dc3c497ccd0694a77733bafeb16..9d760f3745efc1248b7817d580e5ceb451fc4096 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -78,6 +78,7 @@ public class Zombie extends Monster {
- 
-     private static final UUID SPEED_MODIFIER_BABY_UUID = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
-     private static final AttributeModifier SPEED_MODIFIER_BABY = new AttributeModifier(Zombie.SPEED_MODIFIER_BABY_UUID, "Baby speed boost", 0.5D, AttributeModifier.Operation.MULTIPLY_BASE);
-+    private final AttributeModifier babyModifier = new net.minecraft.world.entity.ai.attributes.AttributeModifier(SPEED_MODIFIER_BABY.getId(), SPEED_MODIFIER_BABY.getName(), this.level().paperConfig().entities.behavior.babyZombieMovementModifier, SPEED_MODIFIER_BABY.getOperation()); // Paper - Make baby speed configurable
-     private static final EntityDataAccessor<Boolean> DATA_BABY_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
-     private static final EntityDataAccessor<Integer> DATA_SPECIAL_TYPE_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.INT);
-     public static final EntityDataAccessor<Boolean> DATA_DROWNED_CONVERSION_ID = SynchedEntityData.defineId(Zombie.class, EntityDataSerializers.BOOLEAN);
-@@ -186,9 +187,9 @@ public class Zombie extends Monster {
-         if (this.level() != null && !this.level().isClientSide) {
-             AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
- 
--            attributemodifiable.removeModifier(Zombie.SPEED_MODIFIER_BABY.getId());
-+            attributemodifiable.removeModifier(this.babyModifier.getId()); // Paper
-             if (baby) {
--                attributemodifiable.addTransientModifier(Zombie.SPEED_MODIFIER_BABY);
-+                attributemodifiable.addTransientModifier(this.babyModifier); // Paper
-             }
-         }
- 

patches/server/0022-Configurable-fishing-time-ranges.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:14:11 -0600
-Subject: [PATCH] Configurable fishing time ranges
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index e5d9902331e3c4e461e855290a95980b41f5efe2..af6829c25fcd186adc3575d50cab6d46db9a2fac 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -92,6 +92,10 @@ public class FishingHook extends Projectile {
-         this.noCulling = true;
-         this.luck = Math.max(0, luckOfTheSeaLevel);
-         this.lureSpeed = Math.max(0, lureLevel);
-+        // Paper start
-+        minWaitTime = world.paperConfig().fishingTimeRange.minimum;
-+        maxWaitTime = world.paperConfig().fishingTimeRange.maximum;
-+        // Paper end
-     }
- 
-     public FishingHook(EntityType<? extends FishingHook> type, Level world) {
-@@ -409,7 +413,7 @@ public class FishingHook extends Projectile {
-             } else {
-                 // CraftBukkit start - logic to modify fishing wait time
-                 this.timeUntilLured = Mth.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
--                this.timeUntilLured -= (this.applyLure) ? this.lureSpeed * 20 * 5 : 0;
-+                this.timeUntilLured -= (this.applyLure) ? (this.lureSpeed * 20 * 5 >= this.maxWaitTime ? this.timeUntilLured - 1 : this.lureSpeed * 20 * 5) : 0; // Paper - Fix Lure infinite loop
-                 // CraftBukkit end
-             }
-         }

patches/server/0023-Allow-nerfed-mobs-to-jump.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:24:16 -0600
-Subject: [PATCH] Allow nerfed mobs to jump
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ec841a4d9a11f0d9047c202a31f944b340da33c8..6cc544b39b62cf5be582e697a0df13f82fb73a4b 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -111,6 +111,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-     private final BodyRotationControl bodyRotationControl;
-     protected PathNavigation navigation;
-     public GoalSelector goalSelector;
-+    @Nullable public net.minecraft.world.entity.ai.goal.FloatGoal goalFloat; // Paper
-     public GoalSelector targetSelector;
-     @Nullable
-     private LivingEntity target;
-@@ -876,7 +877,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
-     @Override
-     protected final void serverAiStep() {
-         ++this.noActionTime;
--        if (!this.aware) return; // CraftBukkit
-+        // Paper start - Allow nerfed mobs to jump and float
-+        if (!this.aware) {
-+            if (goalFloat != null) {
-+                if (goalFloat.canUse()) goalFloat.tick();
-+                this.getJumpControl().tick();
-+            }
-+            return;
-+        }
-+        // Paper end
-         this.level().getProfiler().push("sensing");
-         this.sensing.tick();
-         this.level().getProfiler().pop();
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-index 01950951ea06e43bedeeede489a112e577617829..7093c62be53fe99ed9880fc8ddaa07440fe4f715 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
-@@ -9,6 +9,7 @@ public class FloatGoal extends Goal {
- 
-     public FloatGoal(Mob mob) {
-         this.mob = mob;
-+        if (mob.getCommandSenderWorld().paperConfig().entities.behavior.spawnerNerfedMobsShouldJump) mob.goalFloat = this; // Paper
-         this.setFlags(EnumSet.of(Goal.Flag.JUMP));
-         mob.getNavigation().setCanFloat(true);
-     }

patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suddenly <suddenly@suddenly.coffee>
-Date: Tue, 1 Mar 2016 13:51:54 -0600
-Subject: [PATCH] Add configurable despawn distances for living entities
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ffd8b35b606452ce5d189f2761aa76eb9b56ccd6..dc9162e8fa4b5649a631d3869be7cd9776f5c7b7 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -852,14 +852,14 @@ public abstract class Mob extends LivingEntity implements Targeting {
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this);
--                int i = this.getType().getCategory().getDespawnDistance();
-+                int i = this.level().paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory()).hard(); // Paper - custom despawn distances
-                 int j = i * i;
- 
-                 if (d0 > (double) j && this.removeWhenFarAway(d0)) {
-                     this.discard();
-                 }
- 
--                int k = this.getType().getCategory().getNoDespawnDistance();
-+                int k = this.level().paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory()).soft(); // Paper - custom despawn distances
-                 int l = k * k;
- 
-                 if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && d0 > (double) l && this.removeWhenFarAway(d0)) {

patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Thu, 3 Mar 2016 03:53:43 -0600
-Subject: [PATCH] Allow for toggling of spawn chunks
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ec31a60fae419fb610f216bd42558e6aa57c2e19..1e57df43ea47f18cc151dc8ad5fd6f18d3615462 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -261,6 +261,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         });
-         // CraftBukkit end
-         this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
-+        this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper
-         this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
-         this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
-     }

patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Tue, 1 Mar 2016 14:14:15 -0600
-Subject: [PATCH] Drop falling block and tnt entities at the specified height
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index fd16e26875ac4adfb76affd81724dedafe5b4130..57323813e26964af991dc9aead35fc86f23b602a 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -142,6 +142,16 @@ public class FallingBlockEntity extends Entity {
-             }
- 
-             this.move(MoverType.SELF, this.getDeltaMovement());
-+            // Paper start - Configurable EntityFallingBlock height nerf
-+            if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
-+                if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-+                    this.spawnAtLocation(block);
-+                }
-+
-+                this.discard();
-+                return;
-+            }
-+            // Paper end
-             if (!this.level().isClientSide) {
-                 BlockPos blockposition = this.blockPosition();
-                 boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index a290daaeebfc110428dd8201f144c2acb06fddfc..415b8822f0dfb14d49bccb2a10ac04025891ddf7 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -69,6 +69,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-         }
- 
-         this.move(MoverType.SELF, this.getDeltaMovement());
-+        // Paper start - Configurable TNT entity height nerf
-+        if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
-+            this.discard();
-+            return;
-+        }
-+        // Paper end
-         this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
-         if (this.onGround()) {
-             this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-index 137f9052701c5b10ff03b01316ced37220dbf280..1f4031cb7a101a7f25d530380974a627cc29bb09 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-@@ -53,6 +53,12 @@ public class MinecartTNT extends AbstractMinecart {
-     public void tick() {
-         super.tick();
-         if (this.fuse > 0) {
-+            // Paper start - Configurable TNT entity height nerf
-+            if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
-+                this.discard();
-+                return;
-+            }
-+            // Paper end
-             --this.fuse;
-             this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
-         } else if (this.fuse == 0) {

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

@@ -1,104 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 14:32:43 -0600
-Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
- stats
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27ab6d2749b89cc5d3fd4e22603daee95634be71..6155d6e3c361bb4a0381e7065a7b603b783a47a6 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1457,7 +1457,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
--        return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8dfed6347e5922bdd0083604fc7228eaef86be17..94278a932c95070a5e478e8cf148406e67ffb99a 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
- import net.md_5.bungee.api.chat.BaseComponent; // Spigot
- 
- public final class CraftServer implements Server {
--    private final String serverName = "CraftBukkit";
-+    private final String serverName = "Paper"; // Paper
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 306fdc4111a9afeafc540dbf4f0f9dabcec3c3d9..be73d6940983672bcccc2b05a9a87b01e0a995b0 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -241,12 +241,25 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -21);
-                     if (buildDate.before(deadline.getTime())) {
-                         System.err.println("*** Error, this build is outdated ***");
--                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
-+                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
-                         System.err.println("*** Server will start in 20 seconds ***");
-                         Thread.sleep(TimeUnit.SECONDS.toMillis(20));
-                     }
-                 }
- 
-+                // Paper start - Log Java and OS versioning to help with debugging plugin issues
-+                java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
-+                java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
-+                if (runtimeMX != null && osMX != null) {
-+                    String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
-+                    String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
-+
-+                    System.out.println("System Info: " + javaInfo + " " + osInfo);
-+                } else {
-+                    System.out.println("Unable to read system info");
-+                }
-+                // Paper end
-+
-                 System.out.println("Loading libraries, please wait...");
-                 net.minecraft.server.Main.main(options);
-             } catch (Throwable t) {
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 7621bf889ef765ed57af221edf95b07346f4ae43..cacbde8ac27a70b5e3bcd76ad90bc667abee3817 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -19,7 +19,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
- 
-     private WatchdogThread(long timeoutTime, boolean restart)
-     {
--        super( "Spigot Watchdog Thread" );
-+        super( "Paper Watchdog Thread" );
-         this.timeoutTime = timeoutTime;
-         this.restart = restart;
-     }
-@@ -65,14 +65,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-             {
-                 Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
-                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
-                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
--                log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--                log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
-+                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
-                 //
-                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
-                 {
-@@ -82,7 +82,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                 }
-                 //
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0028-Implement-Paper-VersionChecker.patch

@@ -1,157 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Mon, 27 May 2019 03:40:05 -0500
-Subject: [PATCH] Implement Paper VersionChecker
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b347a03588
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -0,0 +1,129 @@
-+package com.destroystokyo.paper;
-+
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import com.google.common.base.Charsets;
-+import com.google.common.io.Resources;
-+import com.google.gson.*;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
-+import java.io.*;
-+import java.net.HttpURLConnection;
-+import java.net.URL;
-+import java.util.stream.StreamSupport;
-+
-+public class PaperVersionFetcher implements VersionFetcher {
-+    private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-+    private static final String GITHUB_BRANCH_NAME = "master";
-+    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    private static @Nullable String mcVer;
-+
-+    @Override
-+    public long getCacheTime() {
-+        return 720000;
-+    }
-+
-+    @Nonnull
-+    @Override
-+    public Component getVersionMessage(@Nonnull String serverVersion) {
-+        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
-+        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+    }
-+
-+    private static @Nullable String getMinecraftVersion() {
-+        if (mcVer == null) {
-+            java.util.regex.Matcher matcher = VER_PATTERN.matcher(org.bukkit.Bukkit.getBukkitVersion());
-+            if (matcher.find()) {
-+                String result = matcher.group();
-+                mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
-+            } else {
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
-+                org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
-+                org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
-+            }
-+        }
-+
-+        return mcVer;
-+    }
-+
-+    private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
-+        int distance;
-+        try {
-+            int jenkinsBuild = Integer.parseInt(versionInfo);
-+            distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
-+        } catch (NumberFormatException ignored) {
-+            versionInfo = versionInfo.replace("\"", "");
-+            distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
-+        }
-+
-+        switch (distance) {
-+            case -1:
-+                return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
-+            case 0:
-+                return Component.text("You are running the latest version", NamedTextColor.GREEN);
-+            case -2:
-+                return Component.text("Unknown version", NamedTextColor.YELLOW);
-+            default:
-+                return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
-+                        .append(Component.newline())
-+                        .append(Component.text("Download the new version at: ")
-+                                .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
-+                                        .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
-+                                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
-+        }
-+    }
-+
-+    private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
-+        if (siteApiVersion == null) { return -1; }
-+        try {
-+            try (BufferedReader reader = Resources.asCharSource(
-+                new URL("https://api.papermc.io/v2/projects/paper/versions/" + siteApiVersion),
-+                Charsets.UTF_8
-+            ).openBufferedStream()) {
-+                JsonObject json = new Gson().fromJson(reader, JsonObject.class);
-+                JsonArray builds = json.getAsJsonArray("builds");
-+                int latest = StreamSupport.stream(builds.spliterator(), false)
-+                    .mapToInt(e -> e.getAsInt())
-+                    .max()
-+                    .getAsInt();
-+                return latest - jenkinsBuild;
-+            } catch (JsonSyntaxException ex) {
-+                ex.printStackTrace();
-+                return -1;
-+            }
-+        } catch (IOException e) {
-+            e.printStackTrace();
-+            return -1;
-+        }
-+    }
-+
-+    // Contributed by Techcable <Techcable@outlook.com> in GH-65
-+    private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) {
-+        try {
-+            HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
-+            connection.connect();
-+            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
-+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
-+                JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
-+                String status = obj.get("status").getAsString();
-+                switch (status) {
-+                    case "identical":
-+                        return 0;
-+                    case "behind":
-+                        return obj.get("behind_by").getAsInt();
-+                    default:
-+                        return -1;
-+                }
-+            } catch (JsonSyntaxException | NumberFormatException e) {
-+                e.printStackTrace();
-+                return -1;
-+            }
-+        } catch (IOException e) {
-+            e.printStackTrace();
-+            return -1;
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0a2a6697118833d45ffe95252cee8011b505d566..f967975d641fadce813a34a9344f6294368b797c 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -456,6 +456,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getTimingsServerName() {
-         return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName;
-     }
-+
-+    @Override
-+    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.PaperVersionFetcher();
-+    }
-     // Paper end
- 
-     /**

patches/server/0029-Add-version-history-to-version-command.patch

@@ -1,222 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <kyle@denwav.dev>
-Date: Thu, 1 Mar 2018 19:37:52 -0600
-Subject: [PATCH] Add version history to version command
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 22a55be34fde453fedd987173d95b8b347a03588..9d687da5bdf398bb3f6c84cdf1249a7213d09f2e 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -7,6 +7,8 @@ import com.google.gson.*;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.event.ClickEvent;
- import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import net.kyori.adventure.text.TextComponent;
- 
- import javax.annotation.Nonnull;
- import javax.annotation.Nullable;
-@@ -30,7 +32,10 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
-         String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
--        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        final Component history = getHistory();
-+
-+        return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-     }
- 
-     private static @Nullable String getMinecraftVersion() {
-@@ -126,4 +131,19 @@ public class PaperVersionFetcher implements VersionFetcher {
-             return -1;
-         }
-     }
-+
-+    @Nullable
-+    private Component getHistory() {
-+        final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+        if (data == null) {
-+            return null;
-+        }
-+
-+        final String oldVersion = data.getOldVersion();
-+        if (oldVersion == null) {
-+            return null;
-+        }
-+
-+        return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
-+    }
- }
-diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -0,0 +1,153 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.base.MoreObjects;
-+import com.google.gson.Gson;
-+import com.google.gson.JsonSyntaxException;
-+import java.io.BufferedReader;
-+import java.io.BufferedWriter;
-+import java.io.IOException;
-+import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.StandardOpenOption;
-+import java.util.Objects;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import org.bukkit.Bukkit;
-+
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
-+
-+public enum VersionHistoryManager {
-+    INSTANCE;
-+
-+    private final Gson gson = new Gson();
-+
-+    private final Logger logger = Bukkit.getLogger();
-+
-+    private VersionData currentData = null;
-+
-+    VersionHistoryManager() {
-+        final Path path = Paths.get("version_history.json");
-+
-+        if (Files.exists(path)) {
-+            // Basic file santiy checks
-+            if (!Files.isRegularFile(path)) {
-+                if (Files.isDirectory(path)) {
-+                    logger.severe(path + " is a directory, cannot be used for version history");
-+                } else {
-+                    logger.severe(path + " is not a regular file, cannot be used for version history");
-+                }
-+                // We can't continue
-+                return;
-+            }
-+
-+            try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
-+                currentData = gson.fromJson(reader, VersionData.class);
-+            } catch (final IOException e) {
-+                logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e);
-+                return;
-+            } catch (final JsonSyntaxException e) {
-+                logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e);
-+                return;
-+            }
-+
-+            final String version = Bukkit.getVersion();
-+            if (version == null) {
-+                logger.severe("Failed to retrieve current version");
-+                return;
-+            }
-+
-+            if (currentData == null) {
-+                // Empty file
-+                currentData = new VersionData();
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+                return;
-+            }
-+
-+            if (!version.equals(currentData.getCurrentVersion())) {
-+                // The version appears to have changed
-+                currentData.setOldVersion(currentData.getCurrentVersion());
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+            }
-+        } else {
-+            // File doesn't exist, start fresh
-+            currentData = new VersionData();
-+            // oldVersion is null
-+            currentData.setCurrentVersion(Bukkit.getVersion());
-+            writeFile(path);
-+        }
-+    }
-+
-+    private void writeFile(@Nonnull final Path path) {
-+        try (final BufferedWriter writer = Files.newBufferedWriter(
-+            path,
-+            StandardCharsets.UTF_8,
-+            StandardOpenOption.WRITE,
-+            StandardOpenOption.CREATE,
-+            StandardOpenOption.TRUNCATE_EXISTING
-+        )) {
-+            gson.toJson(currentData, writer);
-+        } catch (final IOException e) {
-+            logger.log(Level.SEVERE, "Failed to write to version history file", e);
-+        }
-+    }
-+
-+    @Nullable
-+    public VersionData getVersionData() {
-+        return currentData;
-+    }
-+
-+    public static class VersionData {
-+        private String oldVersion;
-+
-+        private String currentVersion;
-+
-+        @Nullable
-+        public String getOldVersion() {
-+            return oldVersion;
-+        }
-+
-+        public void setOldVersion(@Nullable String oldVersion) {
-+            this.oldVersion = oldVersion;
-+        }
-+
-+        @Nullable
-+        public String getCurrentVersion() {
-+            return currentVersion;
-+        }
-+
-+        public void setCurrentVersion(@Nullable String currentVersion) {
-+            this.currentVersion = currentVersion;
-+        }
-+
-+        @Override
-+        public String toString() {
-+            return MoreObjects.toStringHelper(this)
-+                .add("oldVersion", oldVersion)
-+                .add("currentVersion", currentVersion)
-+                .toString();
-+        }
-+
-+        @Override
-+        public boolean equals(@Nullable Object o) {
-+            if (this == o) {
-+                return true;
-+            }
-+            if (o == null || getClass() != o.getClass()) {
-+                return false;
-+            }
-+            final VersionData versionData = (VersionData) o;
-+            return Objects.equals(oldVersion, versionData.oldVersion) &&
-+                Objects.equals(currentVersion, versionData.currentVersion);
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            return Objects.hash(oldVersion, currentVersion);
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 64958f6cb9162de791ac90e08b19368a7fc59064..dbe57c172ed57694912ef940024f8f33577e92bd 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -189,6 +189,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
-+        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);

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

@@ -1,160 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Tue, 1 Mar 2016 14:47:52 -0600
-Subject: [PATCH] Player affects spawning API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 984a13267cc1bb960507bc9231359bb4bb837205..668a7c3f36cdbe48e472cb810b27ae4ab39a65d6 100644
---- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -29,6 +29,11 @@ public final class EntitySelector {
-     public static final Predicate<Entity> CAN_BE_COLLIDED_WITH = EntitySelector.NO_SPECTATORS.and(Entity::canBeCollidedWith);
- 
-     private EntitySelector() {}
-+    // Paper start
-+    public static final Predicate<Entity> PLAYER_AFFECTS_SPAWNING = (entity) -> {
-+        return !entity.isSpectator() && entity.isAlive() && entity instanceof Player player && player.affectsSpawning;
-+    };
-+    // Paper end
- 
-     public static Predicate<Entity> withinDistance(double x, double y, double z, double max) {
-         double d4 = max * max;
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 6e4980b0e6505f8da90d1d63584ef69f899896ea..2aa3df6ef2da77fa51c11d64124ac55a3769f567 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -848,7 +848,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         if (this.level().getDifficulty() == Difficulty.PEACEFUL && this.shouldDespawnInPeaceful()) {
-             this.discard();
-         } else if (!this.isPersistenceRequired() && !this.requiresCustomPersistence()) {
--            Player entityhuman = this.level().getNearestPlayer(this, -1.0D);
-+            Player entityhuman = this.level().findNearbyPlayer(this, -1.0D, EntitySelector.PLAYER_AFFECTS_SPAWNING); // Paper
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this);
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-index c7ab59aa0e2fd0f3e7252647ddb25b82ac604830..8f20239f3ef7ebe41fac8ee6e024c36dafec33c4 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-@@ -25,7 +25,7 @@ public class SkeletonTrapGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
--        return this.horse.level().hasNearbyAlivePlayer(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D);
-+        return this.horse.level().hasNearbyAlivePlayerThatAffectsSpawning(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D); // Paper - Affects Spawning API
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 96181e8925aef7f3d0a2010305caf1f6d9bcfcc9..6f452605e9dc9ebd9980eae9fdeea34417a37a88 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -127,7 +127,7 @@ public class Silverfish extends Monster {
-         if (checkAnyLightMonsterSpawnRules(type, world, spawnReason, pos, random)) {
-             Player entityhuman = world.getNearestPlayer((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, 5.0D, true);
- 
--            return entityhuman == null;
-+            return !(entityhuman != null && !entityhuman.affectsSpawning) && entityhuman == null; // Paper - Affects Spawning API
-         } else {
-             return false;
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 37824f2470c7ddb77216ffbf4da02cc10a95a171..0c9a91990376482bc16f74a8b183ebf049ee1949 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -326,7 +326,7 @@ public class Zombie extends Monster {
- 
-                     if (NaturalSpawner.isSpawnPositionOk(entitypositiontypes_surface, this.level(), blockposition, entitytypes) && SpawnPlacements.checkSpawnRules(entitytypes, worldserver, MobSpawnType.REINFORCEMENT, blockposition, this.level().random)) {
-                         entityzombie.setPos((double) i1, (double) j1, (double) k1);
--                        if (!this.level().hasNearbyAlivePlayer((double) i1, (double) j1, (double) k1, 7.0D) && this.level().isUnobstructed(entityzombie) && this.level().noCollision((Entity) entityzombie) && !this.level().containsAnyLiquid(entityzombie.getBoundingBox())) {
-+                        if (!this.level().hasNearbyAlivePlayerThatAffectsSpawning((double) i1, (double) j1, (double) k1, 7.0D) && this.level().isUnobstructed(entityzombie) && this.level().noCollision((Entity) entityzombie) && !this.level().containsAnyLiquid(entityzombie.getBoundingBox())) { // Paper - Affects Spawning API
-                             entityzombie.setTarget(entityliving, EntityTargetEvent.TargetReason.REINFORCEMENT_TARGET, true); // CraftBukkit
-                             entityzombie.finalizeSpawn(worldserver, this.level().getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null, (CompoundTag) null);
-                             worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 37629bf1193e220bcf872c714c55e0708d9fd7e0..45a5baf2f6e868fd5b41be1204bee46fb2e631b5 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -184,6 +184,9 @@ public abstract class Player extends LivingEntity {
-     @Nullable
-     public FishingHook fishing;
-     protected float hurtDir;
-+    // Paper start
-+    public boolean affectsSpawning = true;
-+    // Paper end
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index ad5d8db9fb44f8e47edc82f9ba62872802bfa380..124703a7c043b6c3b651fa1a81c5ba3e99e47938 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -54,7 +54,7 @@ public abstract class BaseSpawner {
-     }
- 
-     public boolean isNearPlayer(Level world, BlockPos pos) {
--        return world.hasNearbyAlivePlayer((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange);
-+        return world.hasNearbyAlivePlayerThatAffectsSpawning((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper - Affects Spawning API
-     }
- 
-     public void clientTick(Level world, BlockPos pos) {
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..36d793b492d9776ee36f8285b5bab09e6463cdce 100644
---- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -82,6 +82,11 @@ public interface EntityGetter {
-         }
-     }
- 
-+    // Paper start
-+    default @Nullable Player findNearbyPlayer(Entity entity, double maxDistance, @Nullable Predicate<Entity> predicate) {
-+        return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, predicate);
-+    }
-+    // Paper end
-     @Nullable
-     default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) {
-         double d = -1.0D;
-@@ -111,6 +116,20 @@ public interface EntityGetter {
-         return this.getNearestPlayer(x, y, z, maxDistance, predicate);
-     }
- 
-+    // Paper start
-+    default boolean hasNearbyAlivePlayerThatAffectsSpawning(double x, double y, double z, double range) {
-+        for (Player player : this.players()) {
-+            if (EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) { // combines NO_SPECTATORS and LIVING_ENTITY_STILL_ALIVE with an "affects spawning" check
-+                double distanceSqr = player.distanceToSqr(x, y, z);
-+                if (range < 0.0D || distanceSqr < range * range) {
-+                    return true;
-+                }
-+            }
-+        }
-+        return false;
-+    }
-+    // Paper end
-+
-     default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
-         for(Player player : this.players()) {
-             if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5e495f89139689ca37982c7b0b79eaf50d444435..ed70dc4b4dfd57af877c42ff579296ce5cebadbd 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2251,6 +2251,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return this.getHandle().language;
-     }
- 
-+    // Paper start
-+    public void setAffectsSpawning(boolean affects) {
-+        this.getHandle().affectsSpawning = affects;
-+    }
-+
-+    @Override
-+    public boolean getAffectsSpawning() {
-+        return this.getHandle().affectsSpawning;
-+    }
-+    // Paper end
-+
-     @Override
-     public void updateCommands() {
-         if (this.getHandle().connection == null) return;

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

@@ -1,237 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 Mar 2016 23:09:29 -0600
-Subject: [PATCH] Further improve server tick loop
-
-Improves how the catchup buffer is handled, allowing it to roll both ways
-increasing the effeciency of the thread sleep so it only will sleep once.
-
-Also increases the buffer of the catchup to ensure server stays at 20 TPS unless extreme conditions
-
-Previous implementation did not calculate TPS correctly.
-Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6155d6e3c361bb4a0381e7065a7b603b783a47a6..d13a0f5a3b95b0d0ca80c760f757087c88eceaeb 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -277,7 +277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public OptionSet options;
-     public org.bukkit.command.ConsoleCommandSender console;
-     public ConsoleReader reader;
--    public static int currentTick = (int) (System.currentTimeMillis() / 50);
-+    public static int currentTick = 0; // Paper - Further improve tick loop
-     public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
-     public int autosavePeriod;
-     public Commands vanillaCommandDispatcher;
-@@ -286,7 +286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     // Spigot start
-     public static final int TPS = 20;
-     public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
--    private static final int SAMPLE_INTERVAL = 100;
-+    private static final int SAMPLE_INTERVAL = 20; // Paper
-     public final double[] recentTps = new double[ 3 ];
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-@@ -933,6 +933,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     {
-         return ( avg * exp ) + ( tps * ( 1 - exp ) );
-     }
-+
-+    // Paper start - Further improve server tick loop
-+    private static final long SEC_IN_NANO = 1000000000;
-+    private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
-+    private long lastTick = 0;
-+    private long catchupTime = 0;
-+    public final RollingAverage tps1 = new RollingAverage(60);
-+    public final RollingAverage tps5 = new RollingAverage(60 * 5);
-+    public final RollingAverage tps15 = new RollingAverage(60 * 15);
-+
-+    public static class RollingAverage {
-+        private final int size;
-+        private long time;
-+        private java.math.BigDecimal total;
-+        private int index = 0;
-+        private final java.math.BigDecimal[] samples;
-+        private final long[] times;
-+
-+        RollingAverage(int size) {
-+            this.size = size;
-+            this.time = size * SEC_IN_NANO;
-+            this.total = dec(TPS).multiply(dec(SEC_IN_NANO)).multiply(dec(size));
-+            this.samples = new java.math.BigDecimal[size];
-+            this.times = new long[size];
-+            for (int i = 0; i < size; i++) {
-+                this.samples[i] = dec(TPS);
-+                this.times[i] = SEC_IN_NANO;
-+            }
-+        }
-+
-+        private static java.math.BigDecimal dec(long t) {
-+            return new java.math.BigDecimal(t);
-+        }
-+        public void add(java.math.BigDecimal x, long t) {
-+            time -= times[index];
-+            total = total.subtract(samples[index].multiply(dec(times[index])));
-+            samples[index] = x;
-+            times[index] = t;
-+            time += t;
-+            total = total.add(x.multiply(dec(t)));
-+            if (++index == size) {
-+                index = 0;
-+            }
-+        }
-+
-+        public double getAverage() {
-+            return total.divide(dec(time), 30, java.math.RoundingMode.HALF_UP).doubleValue();
-+        }
-+    }
-+    private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
-+    // Paper End
-     // Spigot End
- 
-     public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
-@@ -949,7 +1000,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-             // Spigot start
-             Arrays.fill( this.recentTps, 20 );
--            long curTime, tickSection = Util.getMillis(), tickCount = 1;
-+            long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
-+            lastTick = start - TICK_TIME; // Paper
-             while (this.running) {
-                 // Paper start - rewrite chunk system
-                 // guarantee that nothing can stop the server from halting if it can at least still tick
-@@ -957,7 +1009,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     throw this.chunkSystemCrash;
-                 }
-                 // Paper end - rewrite chunk system
--                long i = (curTime = Util.getMillis()) - this.nextTickTime;
-+                long i = ((curTime = System.nanoTime()) / (1000L * 1000L)) - this.nextTickTime; // Paper
- 
-                 if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
-                     long j = i / 50L;
-@@ -969,12 +1021,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 }
- 
-                 ++MinecraftServer.currentTickLong; // Paper
--                if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
-+                if ( ++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0 )
-                 {
--                    double currentTps = 1E3 / ( curTime - tickSection ) * MinecraftServer.SAMPLE_INTERVAL;
--                    this.recentTps[0] = MinecraftServer.calcTps( this.recentTps[0], 0.92, currentTps ); // 1/exp(5sec/1min)
--                    this.recentTps[1] = MinecraftServer.calcTps( this.recentTps[1], 0.9835, currentTps ); // 1/exp(5sec/5min)
--                    this.recentTps[2] = MinecraftServer.calcTps( this.recentTps[2], 0.9945, currentTps ); // 1/exp(5sec/15min)
-+                    final long diff = curTime - tickSection;
-+                    java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
-+                    tps1.add(currentTps, diff);
-+                    tps5.add(currentTps, diff);
-+                    tps15.add(currentTps, diff);
-+                    // Backwards compat with bad plugins
-+                    this.recentTps[0] = tps1.getAverage();
-+                    this.recentTps[1] = tps5.getAverage();
-+                    this.recentTps[2] = tps15.getAverage();
-+                    // Paper end
-                     tickSection = curTime;
-                 }
-                 // Spigot end
-@@ -984,7 +1042,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
-                 }
- 
--                MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
-+                //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
-+                lastTick = curTime;
-                 this.nextTickTime += 50L;
-                 this.startMetricsRecordingTick();
-                 this.profiler.push("tick");
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94278a932c95070a5e478e8cf148406e67ffb99a..afe90d9948a68946cfc09174024ec71a2c126dcd 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2540,6 +2540,17 @@ public final class CraftServer implements Server {
-         return CraftMagicNumbers.INSTANCE;
-     }
- 
-+    // Paper - Add getTPS API - Further improve tick loop
-+    @Override
-+    public double[] getTPS() {
-+        return new double[] {
-+                net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
-+                net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
-+                net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-+        };
-+    }
-+    // Paper end
-+
-     // Spigot start
-     private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
-     {
-diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index d9ec48be0fdd2bfea938aa29e36b0f6ffa839ab2..9eb2823cc8f83bad2626fc77578b0162d9ed5782 100644
---- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -15,6 +15,12 @@ public class TicksPerSecondCommand extends Command
-         this.usageMessage = "/tps";
-         this.setPermission( "bukkit.command.tps" );
-     }
-+    // Paper start
-+    private static final net.kyori.adventure.text.Component WARN_MSG = net.kyori.adventure.text.Component.text()
-+        .append(net.kyori.adventure.text.Component.text("Warning: ", net.kyori.adventure.text.format.NamedTextColor.RED))
-+        .append(net.kyori.adventure.text.Component.text("Memory usage on modern garbage collectors is not a stable value and it is perfectly normal to see it reach max. Please do not pay it much attention.", net.kyori.adventure.text.format.NamedTextColor.GOLD))
-+        .build();
-+    // Paper end
- 
-     @Override
-     public boolean execute(CommandSender sender, String currentAlias, String[] args)
-@@ -24,22 +30,40 @@ public class TicksPerSecondCommand extends Command
-             return true;
-         }
- 
--        StringBuilder sb = new StringBuilder( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " );
--        for ( double tps : MinecraftServer.getServer().recentTps )
--        {
--            sb.append( this.format( tps ) );
--            sb.append( ", " );
-+        // Paper start - Further improve tick handling
-+        double[] tps = org.bukkit.Bukkit.getTPS();
-+        net.kyori.adventure.text.Component[] tpsAvg = new net.kyori.adventure.text.Component[tps.length];
-+
-+        for ( int i = 0; i < tps.length; i++) {
-+            tpsAvg[i] = TicksPerSecondCommand.format( tps[i] );
-+        }
-+
-+        net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
-+        builder.append(net.kyori.adventure.text.Component.text("TPS from last 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
-+        builder.append(net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.commas(true), tpsAvg));
-+        sender.sendMessage(builder.asComponent());
-+        if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
-+            sender.sendMessage(net.kyori.adventure.text.Component.text()
-+                .append(net.kyori.adventure.text.Component.text("Current Memory Usage: ", net.kyori.adventure.text.format.NamedTextColor.GOLD))
-+                .append(net.kyori.adventure.text.Component.text(((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)", net.kyori.adventure.text.format.NamedTextColor.GREEN))
-+            );
-+            if (!this.hasShownMemoryWarning) {
-+                sender.sendMessage(WARN_MSG);
-+                this.hasShownMemoryWarning = true;
-+            }
-         }
--        sender.sendMessage( sb.substring( 0, sb.length() - 2 ) );
--        sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: "
--                + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)");
-+        // Paper end
- 
-         return true;
-     }
- 
--    private String format(double tps)
-+    private boolean hasShownMemoryWarning; // Paper
-+    private static net.kyori.adventure.text.Component format(double tps) // Paper - Made static
-     {
--        return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
--                + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
-+        // Paper
-+        net.kyori.adventure.text.format.TextColor color = ( ( tps > 18.0 ) ? net.kyori.adventure.text.format.NamedTextColor.GREEN : ( tps > 16.0 ) ? net.kyori.adventure.text.format.NamedTextColor.YELLOW : net.kyori.adventure.text.format.NamedTextColor.RED );
-+        String amount = Math.min(Math.round(tps * 100.0) / 100.0, 20.0) + (tps > 21.0  ? "*" : ""); // Paper - only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise
-+        return net.kyori.adventure.text.Component.text(amount, color);
-+        // Paper end
-     }
- }

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

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 23:12:03 -0600
-Subject: [PATCH] Only refresh abilities if needed
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ed70dc4b4dfd57af877c42ff579296ce5cebadbd..5f72f8ac8271d3a6619a708f52a42dc4b6dc5b80 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1922,12 +1922,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setFlying(boolean value) {
-+        boolean needsUpdate = getHandle().getAbilities().flying != value; // Paper - Only refresh abilities if needed
-         if (!this.getAllowFlight()) {
-             Preconditions.checkArgument(!value, "Player is not allowed to fly (check #getAllowFlight())");
-         }
- 
-         this.getHandle().getAbilities().flying = value;
--        this.getHandle().onUpdateAbilities();
-+        if (needsUpdate) this.getHandle().onUpdateAbilities(); // Paper - Only refresh abilities if needed
-     }
- 
-     @Override

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

@@ -1,158 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Tue, 1 Mar 2016 23:45:08 -0600
-Subject: [PATCH] Entity Origin API
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0261baddef54c47f7b32f4e2a31ba0172e676d38..c4490354ec7c6d66a0879e7f2c2eb4edd301d045 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2354,6 +2354,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-             entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
-             entity.valid = true; // CraftBukkit
-+            // Paper start - Set origin location when the entity is being added to the world
-+            if (entity.getOriginVector() == null) {
-+                entity.setOrigin(entity.getBukkitEntity().getLocation());
-+            }
-+            // Default to current world if unknown, gross assumption but entities rarely change world
-+            if (entity.getOriginWorld() == null) {
-+                entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
-+            }
-+            // Paper end
-         }
- 
-         public void onTrackingEnd(Entity entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0e79e92014dd56fc2ba98ce6050463627a0cde9f..f496c3d95d1cc47cada8f86a99b055f44eb6cd5e 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -312,7 +312,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public long activatedTick = Integer.MIN_VALUE;
-     public void inactiveTick() { }
-     // Spigot end
-+    // Paper start
-+    @javax.annotation.Nullable
-+    private org.bukkit.util.Vector origin;
-+    @javax.annotation.Nullable
-+    private UUID originWorld;
-+
-+    public void setOrigin(@javax.annotation.Nonnull Location location) {
-+        this.origin = location.toVector();
-+        this.originWorld = location.getWorld().getUID();
-+    }
- 
-+    @javax.annotation.Nullable
-+    public org.bukkit.util.Vector getOriginVector() {
-+        return this.origin != null ? this.origin.clone() : null;
-+    }
-+
-+    @javax.annotation.Nullable
-+    public UUID getOriginWorld() {
-+        return this.originWorld;
-+    }
-+    // Paper end
-     public float getBukkitYaw() {
-         return this.yRot;
-     }
-@@ -2070,6 +2090,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                 this.bukkitEntity.storeBukkitValues(nbt);
-             }
-             // CraftBukkit end
-+            // Paper start - Save the entity's origin location
-+            if (this.origin != null) {
-+                UUID originWorld = this.originWorld != null ? this.originWorld : this.level != null ? this.level.getWorld().getUID() : null;
-+                if (originWorld != null) {
-+                    nbt.putUUID("Paper.OriginWorld", originWorld);
-+                }
-+                nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
-+            }
-+            // Paper end
-             return nbt;
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2197,6 +2226,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-             }
-             // CraftBukkit end
- 
-+            // Paper start - Restore the entity's origin location
-+            ListTag originTag = nbt.getList("Paper.Origin", 6);
-+            if (!originTag.isEmpty()) {
-+                UUID originWorld = null;
-+                if (nbt.contains("Paper.OriginWorld")) {
-+                    originWorld = nbt.getUUID("Paper.OriginWorld");
-+                } else if (this.level != null) {
-+                    originWorld = this.level.getWorld().getUID();
-+                }
-+                this.originWorld = originWorld;
-+                origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));
-+            }
-+            // Paper end
-+
-         } catch (Throwable throwable) {
-             CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-             CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 57323813e26964af991dc9aead35fc86f23b602a..90f52ed06b4493610f65c8a82d6a3a3b32fef1a7 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -343,6 +343,14 @@ public class FallingBlockEntity extends Entity {
-             this.blockState = Blocks.SAND.defaultBlockState();
-         }
- 
-+        // Paper start - Try and load origin location from the old NBT tags for backwards compatibility
-+        if (nbt.contains("SourceLoc_x")) {
-+            int srcX = nbt.getInt("SourceLoc_x");
-+            int srcY = nbt.getInt("SourceLoc_y");
-+            int srcZ = nbt.getInt("SourceLoc_z");
-+            this.setOrigin(new org.bukkit.Location(this.level().getWorld(), srcX, srcY, srcZ));
-+        }
-+        // Paper end
-     }
- 
-     public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 415b8822f0dfb14d49bccb2a10ac04025891ddf7..89fd5d6b373d2705dccc2f22663048f4c2aaa60f 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -119,6 +119,14 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-     @Override
-     protected void readAdditionalSaveData(CompoundTag nbt) {
-         this.setFuse(nbt.getShort("Fuse"));
-+        // Paper start - Try and load origin location from the old NBT tags for backwards compatibility
-+        if (nbt.contains("SourceLoc_x")) {
-+            int srcX = nbt.getInt("SourceLoc_x");
-+            int srcY = nbt.getInt("SourceLoc_y");
-+            int srcZ = nbt.getInt("SourceLoc_z");
-+            this.setOrigin(new org.bukkit.Location(this.level().getWorld(), srcX, srcY, srcZ));
-+        }
-+        // Paper end
-     }
- 
-     @Nullable
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1557a28769cfe875b4c81ed503b2c1815caf8d90..210024c91eccd074a238e7a7834bbfb8c1b61b34 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1272,5 +1272,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
- 
-         return ret;
-     }
-+
-+    @Override
-+    public Location getOrigin() {
-+        Vector originVector = this.getHandle().getOriginVector();
-+        if (originVector == null) {
-+            return null;
-+        }
-+        World world = this.getWorld();
-+        if (this.getHandle().getOriginWorld() != null) {
-+            world = org.bukkit.Bukkit.getWorld(this.getHandle().getOriginWorld());
-+        }
-+
-+        //noinspection ConstantConditions
-+        return originVector.toLocation(world);
-+    }
-     // Paper end
- }

patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 Mar 2016 23:52:34 -0600
-Subject: [PATCH] Prevent tile entity and entity crashes
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fb78a91d1ab77f909823422c6d4e2ef7ed10c9c3..a022d009b72e366ed69d05087457b712970c0b84 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -728,11 +728,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         try {
-             tickConsumer.accept(entity);
-         } catch (Throwable throwable) {
--            CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
--            CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
--
--            entity.fillCrashReportCategory(crashreportsystemdetails);
--            throw new ReportedException(crashreport);
-+            // Paper start - Prevent tile entity and entity crashes
-+            final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
-+            MinecraftServer.LOGGER.error(msg, throwable);
-+            entity.discard();
-+            // Paper end
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index b300d12e9e00519028b53aca9c3fb01f589eaa91..63acd109a79ed752a05df3d4f1b99309297c2055 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -213,7 +213,12 @@ public abstract class BlockEntity {
-             return minecraftkey + " // " + this.getClass().getCanonicalName();
-         });
-         if (this.level != null) {
--            CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.getBlockState());
-+            // Paper start - Prevent TileEntity and Entity crashes
-+            BlockState block = this.getBlockState();
-+            if (block != null) {
-+                CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, block);
-+            }
-+            // Paper end
-             CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.level.getBlockState(this.worldPosition));
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 9da26705d41931e77bff0e6a4d73bb9263e6989e..aaf363b7074df5a8113242da1be140417e056e3d 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1143,11 +1143,11 @@ public class LevelChunk extends ChunkAccess {
- 
-                         gameprofilerfiller.pop();
-                     } catch (Throwable throwable) {
--                        CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking block entity");
--                        CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block entity being ticked");
--
--                        this.blockEntity.fillCrashReportCategory(crashreportsystemdetails);
--                        throw new ReportedException(crashreport);
-+                        // Paper start - Prevent tile entity and entity crashes
-+                        final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
-+                        net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
-+                        LevelChunk.this.removeBlockEntity(this.getPos());
-+                        // Paper end
-                         // Spigot start
-                     } finally {
-                         this.blockEntity.tickTimer.stopTiming();

patches/server/0035-Configurable-top-of-nether-void-damage.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 23:58:50 -0600
-Subject: [PATCH] Configurable top of nether void damage
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f496c3d95d1cc47cada8f86a99b055f44eb6cd5e..a9584072854fe3f8e946a271504fda70ebab9d2c 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -715,7 +715,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     public void checkBelowWorld() {
--        if (this.getY() < (double) (this.level().getMinBuildHeight() - 64)) {
-+        // Paper start - Configurable nether ceiling damage
-+        if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
-+            && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
-+            && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
-+            // Paper end
-             this.onBelowWorld();
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index 02e3322ec41108fe9275510e2daa833d180353dc..0762bb248b3bd43a06e89aa1893a6189f0e13866 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-@@ -55,7 +55,7 @@ public class PortalForcer {
-         Optional<PoiRecord> optional = villageplace.getInSquare((holder) -> {
-             return holder.is(PoiTypes.NETHER_PORTAL);
-         }, blockposition, i, PoiManager.Occupancy.ANY).filter((villageplacerecord) -> {
--            return worldborder.isWithinBounds(villageplacerecord.getPos());
-+            return worldborder.isWithinBounds(villageplacerecord.getPos()) && !(this.level.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> villageplacerecord.getPos().getY() >= v)); // Paper - don't teleport into void damage
-         }).sorted(Comparator.comparingDouble((PoiRecord villageplacerecord) -> { // CraftBukkit - decompile error
-             return villageplacerecord.getPos().distSqr(blockposition);
-         }).thenComparingInt((villageplacerecord) -> {
-@@ -90,6 +90,11 @@ public class PortalForcer {
-         BlockPos blockposition2 = null;
-         WorldBorder worldborder = this.level.getWorldBorder();
-         int i = Math.min(this.level.getMaxBuildHeight(), this.level.getMinBuildHeight() + this.level.getLogicalHeight()) - 1;
-+        // Paper start - if ceiling void damage is enabled, make sure the max height doesn't exceed the void damage height
-+        if (this.level.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.NETHER && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.enabled()) {
-+            i = Math.min(i, this.level.paperConfig().environment.netherCeilingVoidDamageHeight.intValue() - 1);
-+        }
-+        // Paper end
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = blockposition.mutable();
-         Iterator iterator = BlockPos.spiralAround(blockposition, createRadius, Direction.EAST, Direction.SOUTH).iterator(); // CraftBukkit
- 

patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 00:03:55 -0600
-Subject: [PATCH] Check online mode before converting and renaming player data
-
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index e2c0ab0ab06b15dcfa6ce8c82ad4136f2be33b5c..984b75e12b5feab63767e030df925b3cbf26d559 100644
---- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -56,7 +56,7 @@ public class PlayerDataStorage {
-             File file = new File(this.playerDir, player.getStringUUID() + ".dat");
-             // Spigot Start
-             boolean usingWrongFile = false;
--            if ( !file.exists() )
-+            if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
-             {
-                 file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + player.getScoreboardName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
-                 if ( file.exists() )

patches/server/0037-Always-tick-falling-blocks.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 00:32:25 -0600
-Subject: [PATCH] Always tick falling blocks
-
-
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6606a118e7bff01aa51440aea7540ec9feec6cc5..1d9ce6dae17ff572d4528971c69c63d0f85b313c 100644
---- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -89,6 +89,7 @@ public class ActivationRange
-                 || entity instanceof AbstractHurtingProjectile
-                 || entity instanceof LightningBolt
-                 || entity instanceof PrimedTnt
-+                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity // Paper - Always tick falling blocks
-                 || entity instanceof EndCrystal
-                 || entity instanceof FireworkRocketEntity
-                 || entity instanceof ThrownTrident )

patches/server/0038-Configurable-end-credits.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DoctorDark <doctordark11@gmail.com>
-Date: Wed, 16 Mar 2016 02:21:39 -0500
-Subject: [PATCH] Configurable end credits
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 80105ed5ab45552d86b2302586de7511dbe729d2..10a99aff9632db578d19683675ba12242ae6970b 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1069,6 +1069,7 @@ public class ServerPlayer extends Player {
-             this.unRide();
-             this.serverLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
-             if (!this.wonGame) {
-+                if (this.level().paperConfig().misc.disableEndCredits) this.seenCredits = true; // Paper - Toggle to always disable end credits
-                 this.wonGame = true;
-                 this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.WIN_GAME, this.seenCredits ? 0.0F : 1.0F));
-                 this.seenCredits = true;

patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Iceee <andrew@opticgaming.tv>
-Date: Wed, 2 Mar 2016 01:39:52 -0600
-Subject: [PATCH] Fix lag from explosions processing dead entities
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 280ee4747526c05a02d556908b8a3d59a4ccad9e..4f2e06dab92085edd8f98415272cf77952e4888f 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -203,7 +203,7 @@ public class Explosion {
-         int i1 = Mth.floor(this.y + (double) f2 + 1.0D);
-         int j1 = Mth.floor(this.z - (double) f2 - 1.0D);
-         int k1 = Mth.floor(this.z + (double) f2 + 1.0D);
--        List<Entity> list = this.level.getEntities(this.source, new AABB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1));
-+        List<Entity> list = this.level.getEntities(this.source, new AABB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1), (com.google.common.base.Predicate<Entity>) entity -> entity.isAlive() && !entity.isSpectator()); // Paper - Fix lag from explosions processing dead entities
-         Vec3 vec3d = new Vec3(this.x, this.y, this.z);
-         Iterator iterator = list.iterator();
- 

patches/server/0040-Optimize-explosions.patch

@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 2 Mar 2016 11:59:48 -0600
-Subject: [PATCH] Optimize explosions
-
-The process of determining an entity's exposure from explosions can be
-expensive when there are hundreds or more entities in range.
-
-This patch adds a per-tick cache that is used for storing and retrieving
-an entity's exposure during an explosion.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 086be61bfc8a43076b502bbf00e9f2d2785495d3..0e5661716d72ecf57d76443d8c7627e90966ee4d 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1390,6 +1390,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-             this.profiler.pop();
-             this.profiler.pop();
-+            worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
-         }
- 
-         this.profiler.popPush("connection");
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 4f2e06dab92085edd8f98415272cf77952e4888f..03151b8042912882ebb969dda16cc378562a0005 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -223,7 +223,7 @@ public class Explosion {
-                         d8 /= d11;
-                         d9 /= d11;
-                         d10 /= d11;
--                        double d12 = (double) Explosion.getSeenPercent(vec3d, entity);
-+                        double d12 = this.getBlockDensity(vec3d, entity); // Paper - Optimize explosions
-                         double d13 = (1.0D - d7) * d12;
- 
-                         // CraftBukkit start
-@@ -515,4 +515,84 @@ public class Explosion {
- 
-         private BlockInteraction() {}
-     }
-+    // Paper start - Optimize explosions
-+    private float getBlockDensity(Vec3 vec3d, Entity entity) {
-+        if (!this.level.paperConfig().environment.optimizeExplosions) {
-+            return getSeenPercent(vec3d, entity);
-+        }
-+        CacheKey key = new CacheKey(this, entity.getBoundingBox());
-+        Float blockDensity = this.level.explosionDensityCache.get(key);
-+        if (blockDensity == null) {
-+            blockDensity = getSeenPercent(vec3d, entity);
-+            this.level.explosionDensityCache.put(key, blockDensity);
-+        }
-+
-+        return blockDensity;
-+    }
-+
-+    static class CacheKey {
-+        private final Level world;
-+        private final double posX, posY, posZ;
-+        private final double minX, minY, minZ;
-+        private final double maxX, maxY, maxZ;
-+
-+        public CacheKey(Explosion explosion, AABB aabb) {
-+            this.world = explosion.level;
-+            this.posX = explosion.x;
-+            this.posY = explosion.y;
-+            this.posZ = explosion.z;
-+            this.minX = aabb.minX;
-+            this.minY = aabb.minY;
-+            this.minZ = aabb.minZ;
-+            this.maxX = aabb.maxX;
-+            this.maxY = aabb.maxY;
-+            this.maxZ = aabb.maxZ;
-+        }
-+
-+        @Override
-+        public boolean equals(Object o) {
-+            if (this == o) return true;
-+            if (o == null || getClass() != o.getClass()) return false;
-+
-+            CacheKey cacheKey = (CacheKey) o;
-+
-+            if (Double.compare(cacheKey.posX, posX) != 0) return false;
-+            if (Double.compare(cacheKey.posY, posY) != 0) return false;
-+            if (Double.compare(cacheKey.posZ, posZ) != 0) return false;
-+            if (Double.compare(cacheKey.minX, minX) != 0) return false;
-+            if (Double.compare(cacheKey.minY, minY) != 0) return false;
-+            if (Double.compare(cacheKey.minZ, minZ) != 0) return false;
-+            if (Double.compare(cacheKey.maxX, maxX) != 0) return false;
-+            if (Double.compare(cacheKey.maxY, maxY) != 0) return false;
-+            if (Double.compare(cacheKey.maxZ, maxZ) != 0) return false;
-+            return world.equals(cacheKey.world);
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            int result;
-+            long temp;
-+            result = world.hashCode();
-+            temp = Double.doubleToLongBits(posX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(posY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(posZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(minZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxX);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxY);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            temp = Double.doubleToLongBits(maxZ);
-+            result = 31 * result + (int) (temp ^ (temp >>> 32));
-+            return result;
-+        }
-+    }
-+    // 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 a022d009b72e366ed69d05087457b712970c0b84..da553430864689c426ad2c1dd74ad7d1134ffbae 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     private org.spigotmc.TickLimiter entityLimiter;
-     private org.spigotmc.TickLimiter tileLimiter;
-     private int tileTickPosition;
-+    public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
- 
-     public CraftWorld getWorld() {
-         return this.world;

patches/server/0041-Disable-explosion-knockback.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:48:03 -0600
-Subject: [PATCH] Disable explosion knockback
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 03151b8042912882ebb969dda16cc378562a0005..aea135503da20b7c4e2c6cd2dba81998f101b0c4 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -264,7 +264,7 @@ public class Explosion {
-                         if (entity instanceof LivingEntity) {
-                             LivingEntity entityliving = (LivingEntity) entity;
- 
--                            d14 = ProtectionEnchantment.getExplosionKnockbackAfterDampener(entityliving, d13);
-+                            d14 = entity instanceof Player && level.paperConfig().environment.disableExplosionKnockback ? 0 : ProtectionEnchantment.getExplosionKnockbackAfterDampener(entityliving, d13); // Paper - disable explosion knockback
-                         } else {
-                             d14 = d13;
-                         }
-@@ -278,7 +278,7 @@ public class Explosion {
-                         if (entity instanceof Player) {
-                             Player entityhuman = (Player) entity;
- 
--                            if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.getAbilities().flying)) {
-+                            if (!entityhuman.isSpectator() && (!entityhuman.isCreative() || !entityhuman.getAbilities().flying) && !level.paperConfig().environment.disableExplosionKnockback) { // Paper - Disable explosion knockback
-                                 this.hitPlayers.put(entityhuman, vec3d1);
-                             }
-                         }

patches/server/0042-Disable-thunder.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:52:43 -0600
-Subject: [PATCH] Disable thunder
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c4490354ec7c6d66a0879e7f2c2eb4edd301d045..03e05ddb51f9695079fccca9f7119f7adedd75ba 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -825,7 +825,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         ProfilerFiller gameprofilerfiller = this.getProfiler();
- 
-         gameprofilerfiller.push("thunder");
--        if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot
-+        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder
-             BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
- 
-             if (this.isRainingAt(blockposition)) {

patches/server/0043-Disable-ice-and-snow.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 14:57:24 -0600
-Subject: [PATCH] Disable ice and snow
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 03e05ddb51f9695079fccca9f7119f7adedd75ba..35c401b41750748738c8f8aa2b8988377f4e679f 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -855,11 +855,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-         gameprofilerfiller.popPush("iceandsnow");
- 
-+        if (!this.paperConfig().environment.disableIceAndSnow) { // Paper
-         for (int l = 0; l < randomTickSpeed; ++l) {
-             if (this.random.nextInt(48) == 0) {
-                 this.tickIceAndSnow(flag, this.getBlockRandomPos(j, 0, k, 15));
-             }
-         }
-+        } // Paper
- 
-         gameprofilerfiller.popPush("tickBlocks");
-         timings.chunkTicksBlocks.startTiming(); // Paper

patches/server/0044-Configurable-mob-spawner-tick-rate.patch

@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 15:03:53 -0600
-Subject: [PATCH] Configurable mob spawner tick rate
-
-
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 124703a7c043b6c3b651fa1a81c5ba3e99e47938..7ae0465091db8e8061737bf93884afa3db49feeb 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -45,6 +45,7 @@ public abstract class BaseSpawner {
-     public int maxNearbyEntities = 6;
-     public int requiredPlayerRange = 16;
-     public int spawnRange = 4;
-+    private int tickDelay = 0; // Paper
- 
-     public BaseSpawner() {}
- 
-@@ -79,13 +80,18 @@ public abstract class BaseSpawner {
-     }
- 
-     public void serverTick(ServerLevel world, BlockPos pos) {
-+        // Paper start - Configurable mob spawner tick rate
-+        if (spawnDelay > 0 && --tickDelay > 0) return;
-+        tickDelay = world.paperConfig().tickRates.mobSpawner;
-+        if (tickDelay == -1) { return; } // If disabled
-+        // Paper end
-         if (this.isNearPlayer(world, pos)) {
--            if (this.spawnDelay == -1) {
-+            if (this.spawnDelay < -tickDelay) {
-                 this.delay(world, pos);
-             }
- 
-             if (this.spawnDelay > 0) {
--                --this.spawnDelay;
-+                this.spawnDelay -= tickDelay; // Paper
-             } else {
-                 boolean flag = false;
-                 RandomSource randomsource = world.getRandom();

patches/server/0045-Implement-PlayerLocaleChangeEvent.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Isaac Moore <rmsy@me.com>
-Date: Tue, 19 Apr 2016 14:09:31 -0500
-Subject: [PATCH] Implement PlayerLocaleChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 61ec0ed91457e4b04a72010199be520c9d4a9488..b5a8d2505fa41c68abb1400a4269f833537b6ebe 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -214,7 +214,7 @@ public class ServerPlayer extends Player {
-     private int levitationStartTime;
-     private boolean disconnected;
-     private int requestedViewDistance;
--    public String language = "en_us"; // CraftBukkit - default
-+    public String language = null; // CraftBukkit - default  // Paper - default to null
-     public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
-     @Nullable
-     private Vec3 startingToFallPosition;
-@@ -308,7 +308,7 @@ public class ServerPlayer extends Player {
-         this.lastActionTime = Util.getMillis();
-         this.recipeBook = new ServerRecipeBook();
-         this.requestedViewDistance = 2;
--        this.language = "en_us";
-+        this.language =  null; // Paper - default to null
-         this.lastSectionPos = SectionPos.of(0, 0, 0);
-         this.chunkTrackingView = ChunkTrackingView.EMPTY;
-         this.respawnDimension = Level.OVERWORLD;
-@@ -1862,9 +1862,10 @@ public class ServerPlayer extends Player {
-             PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-             this.server.server.getPluginManager().callEvent(event);
-         }
--        if (!this.language.equals(clientOptions.language())) {
-+        if (this.language == null || !this.language.equals(clientOptions.language())) { // Paper
-             PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), clientOptions.language());
-             this.server.server.getPluginManager().callEvent(event);
-+            this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
-         }
-         // CraftBukkit end
-         this.language = clientOptions.language();
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5f72f8ac8271d3a6619a708f52a42dc4b6dc5b80..d0448d310fde607a006acf37e86cd3eede93a2ba 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2249,7 +2249,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public String getLocale() {
--        return this.getHandle().language;
-+        // Paper start - Locale change event
-+        final String locale = this.getHandle().language;
-+        return locale != null ? locale : "en_us";
-+        // Paper end
-     }
- 
-     // Paper start

patches/server/0046-Add-BeaconEffectEvent.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 2 Mar 2016 23:30:53 -0600
-Subject: [PATCH] Add BeaconEffectEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 9fb27f93a7ccbf64f9babf19f626d1f45b1c7103..18349957bd6d1a4bc21aff781a791f912dddff1d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -43,6 +43,10 @@ import net.minecraft.world.phys.AABB;
- import org.bukkit.craftbukkit.potion.CraftPotionUtil;
- import org.bukkit.potion.PotionEffect;
- // CraftBukkit end
-+// Paper start
-+import org.bukkit.craftbukkit.event.CraftEventFactory;
-+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
-+// Paper end
- 
- public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Nameable {
- 
-@@ -289,15 +293,23 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-         }
-     }
- 
--    private static void applyEffect(List list, MobEffect mobeffectlist, int j, int b0) {
--        {
-+    private static void applyEffect(List list, MobEffect effects, int i, int b0, boolean isPrimary, BlockPos worldPosition) { // Paper - BeaconEffectEvent
-+        if (!list.isEmpty()) { // Paper - BeaconEffectEvent
-             Iterator iterator = list.iterator();
- 
-             Player entityhuman;
-+            // Paper start - BeaconEffectEvent
-+            org.bukkit.block.Block block = ((Player) list.get(0)).level().getWorld().getBlockAt(worldPosition.getX(), worldPosition.getY(), worldPosition.getZ());
-+            PotionEffect effect = CraftPotionUtil.toBukkit(new MobEffectInstance(effects, i, b0, true, true));
-+            // Paper end
- 
-             while (iterator.hasNext()) {
--                entityhuman = (Player) iterator.next();
--                entityhuman.addEffect(new MobEffectInstance(mobeffectlist, j, b0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
-+                // Paper start - BeaconEffectEvent
-+                entityhuman = (ServerPlayer) iterator.next();
-+                BeaconEffectEvent event = new BeaconEffectEvent(block, effect, (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), isPrimary);
-+                if (CraftEventFactory.callEvent(event).isCancelled()) continue;
-+                entityhuman.addEffect(new MobEffectInstance(CraftPotionUtil.fromBukkit(event.getEffect())), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
-+                // Paper end
-             }
-         }
-     }
-@@ -320,10 +332,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-             int j = BeaconBlockEntity.getLevel(beaconLevel);
-             List list = BeaconBlockEntity.getHumansInRange(world, pos, beaconLevel);
- 
--            BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0);
-+            BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0, true, pos); // Paper - BeaconEffectEvent
- 
-             if (BeaconBlockEntity.hasSecondaryEffect(beaconLevel, primaryEffect, secondaryEffect)) {
--                BeaconBlockEntity.applyEffect(list, secondaryEffect, j, 0);
-+                BeaconBlockEntity.applyEffect(list, secondaryEffect, j, 0, false, pos); // Paper - BeaconEffectEvent
-             }
-         }
- 

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

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Wed, 2 Mar 2016 23:34:44 -0600
-Subject: [PATCH] Configurable container update tick rate
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 77668e9534f6d68755020cbae09aae5d47d10fa1..5d95cc1f0f66cdad867265c38a06938c00b3a2ed 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -239,6 +239,7 @@ public class ServerPlayer extends Player {
-     private RemoteChatSession chatSession;
-     private int containerCounter;
-     public boolean wonGame;
-+    private int containerUpdateDelay; // Paper
- 
-     // CraftBukkit start
-     public String displayName;
-@@ -675,7 +676,12 @@ public class ServerPlayer extends Player {
-             --this.invulnerableTime;
-         }
- 
--        this.containerMenu.broadcastChanges();
-+        // Paper start - Configurable container update tick rate
-+        if (--containerUpdateDelay <= 0) {
-+            this.containerMenu.broadcastChanges();
-+            containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
-+        }
-+        // Paper end
-         if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
-             this.closeContainer();
-             this.containerMenu = this.inventoryMenu;

patches/server/0048-Use-UserCache-for-player-heads.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Wed, 2 Mar 2016 23:42:37 -0600
-Subject: [PATCH] Use UserCache for player heads
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 51e94e6f97a7c75e2281ad751c8e2dbee2e28afd..062594cebbe8cc0a0c94ecf7c8da4ee349a27521 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -211,7 +211,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-         if (name == null) {
-             this.setProfile(null);
-         } else {
--            this.setProfile(new GameProfile(Util.NIL_UUID, name));
-+            // Paper start - Use Online Players Skull
-+            GameProfile newProfile = null;
-+            net.minecraft.server.level.ServerPlayer player = net.minecraft.server.MinecraftServer.getServer().getPlayerList().getPlayerByName(name);
-+            if (player != null) newProfile = player.getGameProfile();
-+            if (newProfile == null) newProfile = new GameProfile(Util.NIL_UUID, name);
-+            this.setProfile(newProfile);
-+            // Paper end
-         }
- 
-         return true;

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

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 23:45:17 -0600
-Subject: [PATCH] Disable spigot tick limiters
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 30a3e2586a1e75c5f146f8d19c53cabe28f61925..c2dd635cba209962d24b43fbf0ee0e9d9e82fee0 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -694,9 +694,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         // Spigot start
-         // Iterator iterator = this.blockEntityTickers.iterator();
-         int tilesThisCycle = 0;
--        for (this.tileLimiter.initTick();
--                tilesThisCycle < this.blockEntityTickers.size() && (tilesThisCycle % 10 != 0 || this.tileLimiter.shouldContinue());
--                this.tileTickPosition++, tilesThisCycle++) {
-+        for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
-             this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
-             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
-             // Spigot start

patches/server/0050-Add-PlayerInitialSpawnEvent.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Anton <anxuiz.nx@gmail.com>
-Date: Thu, 3 Mar 2016 00:09:38 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-This is a duplicate API from spigot, so use our duplicate subclass and
-improve setPosition to use raw
-
-== AT ==
-public net.minecraft.world.entity.Entity setRot(FF)V
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5ae47b3449df7a83a5c22a266f7b9e4ea681a492..fa7aad589275598eaf3cae86a4e1e47d40b52f05 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -228,7 +228,7 @@ public abstract class PlayerList {
- 
-         // Spigot start - spawn location event
-         Player spawnPlayer = player.getBukkitEntity();
--        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new org.spigotmc.event.player.PlayerSpawnLocationEvent(spawnPlayer, spawnPlayer.getLocation());
-+        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(spawnPlayer, spawnPlayer.getLocation()); // Paper use our duplicate event
-         this.cserver.getPluginManager().callEvent(ev);
- 
-         Location loc = ev.getSpawnLocation();
-@@ -236,7 +236,10 @@ public abstract class PlayerList {
- 
-         player.spawnIn(worldserver1);
-         player.gameMode.setLevel((ServerLevel) player.level());
--        player.absMoveTo(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
-+        // Paper start - set raw so we aren't fully joined to the world (not added to chunk or world)
-+        player.setPosRaw(loc.getX(), loc.getY(), loc.getZ());
-+        player.setRot(loc.getYaw(), loc.getPitch());
-+        // Paper end
-         // Spigot end
- 
-         // CraftBukkit - Moved message to after join

patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:13:45 -0600
-Subject: [PATCH] Configurable Disabling Cat Chest Detection
-
-Offers a gameplay feature to stop cats from blocking chests
-
-diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index d702444f7186fe2339f481cdced3ad3e34f1b3f1..5e22d175b1048a58802cdf64ac70a8b56329e915 100644
---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -361,6 +361,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
-     }
- 
-     private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) {
-+        // Paper start - Option to disable chest cat detection
-+        if (world.getMinecraftWorld().paperConfig().entities.behavior.disableChestCatDetection) {
-+            return false;
-+        }
-+        // Paper end
-         List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB((double) pos.getX(), (double) (pos.getY() + 1), (double) pos.getZ(), (double) (pos.getX() + 1), (double) (pos.getY() + 2), (double) (pos.getZ() + 1)));
- 
-         if (!list.isEmpty()) {

patches/server/0052-Improve-Player-chat-API-handling.patch

@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 01:17:12 -0600
-Subject: [PATCH] Improve Player chat API handling
-
-Properly split up the chat and command handling to reflect the server now
-having separate packets for both, and the client always using the correct packet. Text
-from a chat packet should never be parsed into a command, even if it starts with the `/`
-character.
-
-Add a missing async catcher and improve Spigot's async catcher error message.
-
-== AT ==
-public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 70fe4e973f41c2e5b12c0d96be418dd40e69c0f2..adef64b955170dc00c75c06bf0f41a09b2516520 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1926,7 +1926,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-         OutgoingChatMessage outgoing = OutgoingChatMessage.create(original);
- 
--        if (!async && s.startsWith("/")) {
-+        if (false && !async && s.startsWith("/")) { // Paper - Don't handle commands in chat logic
-             this.handleCommand(s);
-         } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
-             // Do nothing, this is coming from a plugin
-@@ -2010,7 +2010,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         }
-     }
- 
--    private void handleCommand(String s) {
-+    public void handleCommand(String s) { // Paper - private -> public
-+        org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
-         co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper
-         if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
-         this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index afe90d9948a68946cfc09174024ec71a2c126dcd..eb091fcf6f8b295bfac54acfafe662adb9052e88 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -889,7 +889,7 @@ public final class CraftServer implements Server {
-     public boolean dispatchCommand(CommandSender sender, String commandLine) {
-         Preconditions.checkArgument(sender != null, "sender cannot be null");
-         Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
--        org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
-+        org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + commandLine); // Spigot // Paper - Include command in error message
- 
-         if (this.commandMap.dispatch(sender, commandLine)) {
-             return true;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d99ae16d5e823d871d149ab61eeef4c0095b7740..6b753ee96706b38af0c80585222f2631b90e7c62 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -494,7 +494,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         if (this.getHandle().connection == null) return;
- 
--        this.getHandle().connection.chat(msg, PlayerChatMessage.system(msg), false);
-+        // Paper start - Improve chat handling
-+        if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
-+            this.getHandle().connection.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"));
-+        } else {
-+            if (msg.startsWith("/")) {
-+                this.getHandle().connection.handleCommand(msg);
-+            } else {
-+                final PlayerChatMessage playerChatMessage = PlayerChatMessage.system(msg).withResult(new net.minecraft.network.chat.ChatDecorator.ModernResult(Component.literal(msg), true, false));
-+                // TODO chat decorating
-+                // TODO text filtering
-+                this.getHandle().connection.chat(msg, playerChatMessage, false);
-+            }
-+        }
-+        // Paper end
-     }
- 
-     @Override

patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: vemacs <d@nkmem.es>
-Date: Thu, 3 Mar 2016 01:19:22 -0600
-Subject: [PATCH] All chunks are slime spawn chunks toggle
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 2e343d108714bd136ab8e7b20acbf241166177de..382cdfd7d7dceeeffed1cdc34b9e475a69b5c76b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -331,7 +331,7 @@ public class Slime extends Mob implements Enemy {
-             }
- 
-             ChunkPos chunkcoordintpair = new ChunkPos(pos);
--            boolean flag = WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
-+            boolean flag = world.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
- 
-             if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
-                 return checkMobSpawnRules(type, world, spawnReason, pos, random);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 7687a81bfa420e8377308fea3d6738141bc945d3..df02963faaf8f514f4175d394e67d2df10c8a3ea 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -171,7 +171,7 @@ public class CraftChunk implements Chunk {
-     @Override
-     public boolean isSlimeChunk() {
-         // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
--        return WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), this.worldServer.spigotConfig.slimeSeed).nextInt(10) == 0;
-+        return this.worldServer.paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
-     }
- 
-     @Override

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

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 3 Mar 2016 02:15:57 -0600
-Subject: [PATCH] Expose server CommandMap
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb091fcf6f8b295bfac54acfafe662adb9052e88..e9fb295f1ce47705ec7502a372e8fd9e5fe05310 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2080,6 +2080,7 @@ public final class CraftServer implements Server {
-         return this.helpMap;
-     }
- 
-+    @Override // Paper - add override
-     public SimpleCommandMap getCommandMap() {
-         return this.commandMap;
-     }

patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 3 Mar 2016 02:18:39 -0600
-Subject: [PATCH] Be a bit more informative in maxHealth exception
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c6f15e2626b6c9d451173dac28c7bdb5f14097d8..d75d98eb7f1699d3b180d11573628c3dd6704c76 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     @Override
-     public void setHealth(double health) {
-         health = (float) health;
--        Preconditions.checkArgument(health >= 0 && health <= this.getMaxHealth(), "Health value (%s) must be between 0 and %s", health, this.getMaxHealth());
-+        // Paper start - Be more informative
-+        Preconditions.checkArgument(health >= 0 && health <= this.getMaxHealth(),
-+            "Health value (%s) must be between 0 and %s. (attribute base value: %s%s)",
-+            health, this.getMaxHealth(), this.getHandle().getAttribute(Attributes.MAX_HEALTH).getBaseValue(), this instanceof CraftPlayer ? ", player: " + this.getName() : ""
-+        );
-+        // Paper end
- 
-         // during world generation, we don't want to run logic for dropping items and xp
-         if (this.getHandle().generation && health == 0) {

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

@@ -1,176 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Thu, 3 Mar 2016 02:32:10 -0600
-Subject: [PATCH] Player Tab List and Title APIs
-
-
-diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 7720470396d3ade926c4c75c5fab5a3f435b0033..9c211b0db837b16d50aee63d0caf45e1a12bcc83 100644
---- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -532,6 +532,11 @@ public class FriendlyByteBuf extends ByteBuf {
-     public FriendlyByteBuf writeComponent(final net.kyori.adventure.text.Component component) {
-         return this.writeUtf(io.papermc.paper.adventure.PaperAdventure.asJsonString(component, this.adventure$locale), 262144);
-     }
-+
-+    @Deprecated
-+    public FriendlyByteBuf writeComponent(final net.md_5.bungee.api.chat.BaseComponent[] component) {
-+        return this.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(component), 262144);
-+    }
-     // Paper end
- 
-     public FriendlyByteBuf writeComponent(Component text) {
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
-index c44a276d201fdfa5144d45d319d7761583c60639..f68a1a6dc6add9496e25cb52c318e086e356e2bb 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
-@@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet;
- public class ClientboundSetSubtitleTextPacket implements Packet<ClientGamePacketListener> {
-     private final Component text;
-     public net.kyori.adventure.text.Component adventure$text; // Paper
-+    public net.md_5.bungee.api.chat.BaseComponent[] components; // Paper
- 
-     public ClientboundSetSubtitleTextPacket(Component subtitle) {
-         this.text = subtitle;
-@@ -21,6 +22,8 @@ public class ClientboundSetSubtitleTextPacket implements Packet<ClientGamePacket
-         // Paper start
-         if (this.adventure$text != null) {
-             buf.writeComponent(this.adventure$text);
-+        } else if (this.components != null) {
-+            buf.writeComponent(this.components);
-         } else
-         // Paper end
-         buf.writeComponent(this.text);
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
-index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a43420b437 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
-@@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet;
- public class ClientboundSetTitleTextPacket implements Packet<ClientGamePacketListener> {
-     private final Component text;
-     public net.kyori.adventure.text.Component adventure$text; // Paper
-+    public net.md_5.bungee.api.chat.BaseComponent[] components; // Paper
- 
-     public ClientboundSetTitleTextPacket(Component title) {
-         this.text = title;
-@@ -21,6 +22,8 @@ public class ClientboundSetTitleTextPacket implements Packet<ClientGamePacketLis
-         // Paper start
-         if (this.adventure$text != null) {
-             buf.writeComponent(this.adventure$text);
-+        } else if (this.components != null) {
-+            buf.writeComponent(this.components);
-         } else
-         // Paper end
-         buf.writeComponent(this.text);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 422ed20cf1d77c0b7fa0a674a5bba95cb7cbc2df..e5b4aa1edb3f48b7356dbf25d7aba4ab6053ba03 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1,5 +1,6 @@
- package org.bukkit.craftbukkit.entity;
- 
-+import com.destroystokyo.paper.Title;
- import com.google.common.base.Preconditions;
- import com.google.common.collect.ImmutableSet;
- import com.google.common.io.BaseEncoding;
-@@ -336,6 +337,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
-+         if (header != null) {
-+             String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(header);
-+             playerListHeader = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(headerJson);
-+         } else {
-+             playerListHeader = null;
-+         }
-+
-+        if (footer != null) {
-+             String footerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
-+             playerListFooter = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(footerJson);
-+        } else {
-+             playerListFooter = null;
-+         }
-+
-+         updatePlayerListHeaderFooter();
-+    }
-+
-+    @Override
-+    public void setPlayerListHeaderFooter(BaseComponent header, BaseComponent footer) {
-+        this.setPlayerListHeaderFooter(header == null ? null : new BaseComponent[]{header},
-+                footer == null ? null : new BaseComponent[]{footer});
-+    }
-+
-+
-+    @Override
-+    public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        getHandle().connection.send(new ClientboundSetTitlesAnimationPacket(fadeInTicks, stayTicks, fadeOutTicks));
-+    }
-+
-+    @Override
-+    public void setSubtitle(BaseComponent[] subtitle) {
-+        final ClientboundSetSubtitleTextPacket packet = new ClientboundSetSubtitleTextPacket((net.minecraft.network.chat.Component) null);
-+        packet.components = subtitle;
-+        getHandle().connection.send(packet);
-+    }
-+
-+    @Override
-+    public void setSubtitle(BaseComponent subtitle) {
-+        setSubtitle(new BaseComponent[]{subtitle});
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent[] title) {
-+        final ClientboundSetTitleTextPacket packet = new ClientboundSetTitleTextPacket((net.minecraft.network.chat.Component) null);
-+        packet.components = title;
-+        getHandle().connection.send(packet);
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent title) {
-+        showTitle(new BaseComponent[]{title});
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent[] title, BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
-+        setSubtitle(subtitle);
-+        showTitle(title);
-+    }
-+
-+    @Override
-+    public void showTitle(BaseComponent title, BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
-+        setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
-+        setSubtitle(subtitle);
-+        showTitle(title);
-+    }
-+
-+    @Override
-+    public void sendTitle(Title title) {
-+        Preconditions.checkNotNull(title, "Title is null");
-+        setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
-+        setSubtitle(title.getSubtitle() == null ? new BaseComponent[0] : title.getSubtitle());
-+        showTitle(title.getTitle());
-+    }
-+
-+    @Override
-+    public void updateTitle(Title title) {
-+        Preconditions.checkNotNull(title, "Title is null");
-+        setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
-+        if (title.getSubtitle() != null) {
-+            setSubtitle(title.getSubtitle());
-+        }
-+        showTitle(title.getTitle());
-+    }
-+
-+    @Override
-+    public void hideTitle() {
-+        getHandle().connection.send(new ClientboundClearTitlesPacket(false));
-+    }
-+    // Paper end
-+
-     @Override
-     public String getDisplayName() {
-         if(true) return io.papermc.paper.adventure.DisplayNames.getLegacy(this); // Paper

patches/server/0057-Add-configurable-portal-search-radius.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 02:46:17 -0600
-Subject: [PATCH] Add configurable portal search radius
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a9584072854fe3f8e946a271504fda70ebab9d2c..1b301b9b577b632470a1e6d23f34288875c5ffb8 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3200,7 +3200,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                 double d0 = DimensionType.getTeleportationScale(this.level().dimensionType(), destination.dimensionType());
-                 BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
-                 // CraftBukkit start
--                CraftPortalEvent event = this.callPortalEvent(this, destination, new Vec3(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
-+                // Paper start
-+                int portalSearchRadius = destination.paperConfig().environment.portalSearchRadius;
-+                if (level.paperConfig().environment.portalSearchVanillaDimensionScaling && flag2) { // == THE_NETHER
-+                    portalSearchRadius = (int) (portalSearchRadius / destination.dimensionType().coordinateScale());
-+                }
-+                // Paper end
-+                CraftPortalEvent event = this.callPortalEvent(this, destination, new Vec3(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, portalSearchRadius, destination.paperConfig().environment.portalCreateRadius); // Paper start - configurable portal radius
-                 if (event == null) {
-                     return null;
-                 }
-diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index 0762bb248b3bd43a06e89aa1893a6189f0e13866..ed5210c63d964be7c28f59df315766794ec3ea1f 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-@@ -43,7 +43,7 @@ public class PortalForcer {
- 
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos pos, boolean destIsNether, WorldBorder worldBorder) {
-         // CraftBukkit start
--        return this.findPortalAround(pos, worldBorder, destIsNether ? 16 : 128); // Search Radius
-+        return this.findPortalAround(pos, worldBorder, destIsNether ? level.paperConfig().environment.portalCreateRadius : level.paperConfig().environment.portalSearchRadius); // Search Radius // Paper - search Radius
-     }
- 
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos blockposition, WorldBorder worldborder, int i) {

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

@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 02:48:12 -0600
-Subject: [PATCH] Add velocity warnings
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e9fb295f1ce47705ec7502a372e8fd9e5fe05310..13a70d87689d49818b97611b83b77df0e9a6c8f5 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -302,6 +302,7 @@ public final class CraftServer implements Server {
-     public boolean ignoreVanillaPermissions = false;
-     private final List<CraftPlayer> playerView;
-     public int reloadCount;
-+    public static Exception excessiveVelEx; // Paper - Velocity warnings
- 
-     static {
-         ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 402b6e5d6428c5a34d722888670f94c7fbe34fe4..68d00a158751d24c7f0e38920d78c0547f1928eb 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -470,10 +470,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     public void setVelocity(Vector velocity) {
-         Preconditions.checkArgument(velocity != null, "velocity");
-         velocity.checkFinite();
-+        // Paper start - Warn server owners when plugins try to set super high velocities
-+        if (!(this instanceof org.bukkit.entity.Projectile || this instanceof org.bukkit.entity.Minecart) && isUnsafeVelocity(velocity)) {
-+            CraftServer.excessiveVelEx = new Exception("Excessive velocity set detected: tried to set velocity of entity " + entity.getScoreboardName() + " id #" + getEntityId() + " to (" + velocity.getX() + "," + velocity.getY() + "," + velocity.getZ() + ").");
-+        }
-+        // Paper end
-         this.entity.setDeltaMovement(CraftVector.toNMS(velocity));
-         this.entity.hurtMarked = true;
-     }
- 
-+    // Paper start
-+    /**
-+     * Checks if the given velocity is not necessarily safe in all situations.
-+     * This function returning true does not mean the velocity is dangerous or to be avoided, only that it may be
-+     * a detriment to performance on the server.
-+     *
-+     * It is not to be used as a hard rule of any sort.
-+     * Paper only uses it to warn server owners in watchdog crashes.
-+     *
-+     * @param vel incoming velocity to check
-+     * @return if the velocity has the potential to be a performance detriment
-+     */
-+    private static boolean isUnsafeVelocity(Vector vel) {
-+        final double x = vel.getX();
-+        final double y = vel.getY();
-+        final double z = vel.getZ();
-+
-+        if (x > 4 || x < -4 || y > 4 || y < -4 || z > 4 || z < -4) {
-+            return true;
-+        }
-+
-+        return false;
-+    }
-+    // Paper end
-+
-     @Override
-     public double getHeight() {
-         return this.getHandle().getBbHeight();
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index cacbde8ac27a70b5e3bcd76ad90bc667abee3817..b5a2cbc21165e80820d6f7e2690e6e18de54c420 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -80,7 +80,19 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                     log.log( Level.SEVERE, "During the run of the server, a physics stackoverflow was supressed" );
-                     log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
-                 }
--                //
-+                // Paper start - Warn in watchdog if an excessive velocity was ever set
-+                if ( org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null )
-+                {
-+                    log.log( Level.SEVERE, "------------------------------" );
-+                    log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
-+                    log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
-+                    log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
-+                    for ( StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace() )
-+                    {
-+                        log.log( Level.SEVERE, "\t\t" + stack );
-+                    }
-+                }
-+                // Paper end
-                 log.log( Level.SEVERE, "------------------------------" );
-                 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system

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

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sudzzy <originmc@outlook.com>
-Date: Thu, 3 Mar 2016 02:50:31 -0600
-Subject: [PATCH] Configurable inter-world teleportation safety
-
-People are able to abuse the way Bukkit handles teleportation across worlds since it provides a built in teleportation
-safety check.
-
-To abuse the safety check, players are required to get into a location deemed unsafe by Bukkit e.g. be within a chest
-or door block. While they are in this block, they accept a teleport request from a player within a different world. Once
-the player teleports, Minecraft will recursively search upwards for a safe location, this could eventually land within a
-player's skybase.
-
-Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
-The wanted destination was on top of the emerald block however the player ended on top of the diamond block.
-This only is the case if the player is teleporting between worlds.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab8b584eb1c98d10caeb7d9581f826b4ae984c7c..c87cba2252f091b026c9169ebf1117cd82d7942b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1164,7 +1164,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             entity.connection.teleport(to);
-         } else {
-             // The respawn reason should never be used if the passed location is non null.
--            this.server.getHandle().respawn(entity, toWorld, true, to, true, null);
-+            this.server.getHandle().respawn(entity, toWorld, true, to, !toWorld.paperConfig().environment.disableTeleportationSuffocationCheck, null); // Paper
-         }
-         return true;
-     }

patches/server/0060-Add-exception-reporting-event.patch

@@ -1,215 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 03:15:41 -0600
-Subject: [PATCH] Add exception reporting event
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea853ea86e7
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
-@@ -0,0 +1,38 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.base.Preconditions;
-+import org.bukkit.craftbukkit.scheduler.CraftTask;
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+import com.destroystokyo.paper.exception.ServerSchedulerException;
-+
-+/**
-+ * Reporting wrapper to catch exceptions not natively
-+ */
-+public class ServerSchedulerReportingWrapper implements Runnable {
-+
-+    private final CraftTask internalTask;
-+
-+    public ServerSchedulerReportingWrapper(CraftTask internalTask) {
-+        this.internalTask = Preconditions.checkNotNull(internalTask, "internalTask");
-+    }
-+
-+    @Override
-+    public void run() {
-+        try {
-+            internalTask.run();
-+        } catch (RuntimeException e) {
-+            internalTask.getOwner().getServer().getPluginManager().callEvent(
-+                    new ServerExceptionEvent(new ServerSchedulerException(e, internalTask))
-+            );
-+            throw e;
-+        } catch (Throwable t) {
-+            internalTask.getOwner().getServer().getPluginManager().callEvent(
-+                    new ServerExceptionEvent(new ServerSchedulerException(t, internalTask))
-+            ); //Do not rethrow, since it is not permitted with Runnable#run
-+        }
-+    }
-+
-+    public CraftTask getInternalTask() {
-+        return internalTask;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 0650b1eee2ae8caa5268f4df82f740440ce16fdf..0214830d9bc98b8d435ff11f40df65596980cf77 100644
---- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-@@ -1,5 +1,6 @@
- package net.minecraft.server.players;
- 
-+import com.destroystokyo.paper.exception.ServerInternalException;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.google.common.io.Files;
-@@ -358,6 +359,7 @@ public class OldUsersConverter {
-                             root = NbtIo.readCompressed(new java.io.FileInputStream(file5));
-                         } catch (Exception exception) {
-                             exception.printStackTrace();
-+                            ServerInternalException.reportInternalException(exception); // Paper
-                         }
- 
-                         if (root != null) {
-@@ -371,6 +373,7 @@ public class OldUsersConverter {
-                                 NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
-                             } catch (Exception exception) {
-                                 exception.printStackTrace();
-+                                ServerInternalException.reportInternalException(exception); // Paper
-                             }
-                        }
-                         // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
-index c6fb4c33d7ea52b88d8fc0d90748cbab7387c565..fed09b886f4fa0006d160e5f2abb00dfee45434d 100644
---- a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
-@@ -118,6 +118,7 @@ public class VillageSiege implements CustomSpawner {
-                 entityzombie.finalizeSpawn(world, world.getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.EVENT, (SpawnGroupData) null, (CompoundTag) null);
-             } catch (Exception exception) {
-                 VillageSiege.LOGGER.warn("Failed to create zombie for village siege at {}", vec3d, exception);
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-                 return;
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 78041052d7ab2e6b60405ce7e02468458650db22..8149286827d9b609be47a4ded0413ca11f7858de 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1,5 +1,10 @@
- package net.minecraft.world.level;
- 
-+import co.aikar.timings.Timing;
-+import co.aikar.timings.Timings;
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+import com.destroystokyo.paper.exception.ServerInternalException;
-+import com.google.common.base.MoreObjects;
- import com.google.common.collect.Lists;
- import com.mojang.serialization.Codec;
- import java.io.IOException;
-@@ -730,6 +735,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             // Paper start - Prevent tile entity and entity crashes
-             final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
-             MinecraftServer.LOGGER.error(msg, throwable);
-+            getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
-             entity.discard();
-             // Paper end
-         }
-diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 5d65baba605dd83e5f74d526aeda36d8ede8c014..92e76dd39dc3575e9466031dd799080a98ad8b8d 100644
---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -291,6 +291,7 @@ public final class NaturalSpawner {
-             NaturalSpawner.LOGGER.warn("Can't spawn entity of type: {}", BuiltInRegistries.ENTITY_TYPE.getKey(type));
-         } catch (Exception exception) {
-             NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-         }
- 
-         return null;
-@@ -404,6 +405,7 @@ public final class NaturalSpawner {
-                                     entity = biomesettingsmobs_c.type.create(world.getLevel());
-                                 } catch (Exception exception) {
-                                     NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
-+                                    com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-                                     continue;
-                                 }
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index aaf363b7074df5a8113242da1be140417e056e3d..080615881c93e73f207be1aa1105b0b1067fa308 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1,6 +1,7 @@
- package net.minecraft.world.level.chunk;
- 
- import com.google.common.collect.ImmutableList;
-+import com.destroystokyo.paper.exception.ServerInternalException;
- import com.google.common.collect.Maps;
- import com.google.common.collect.UnmodifiableIterator;
- import com.mojang.logging.LogUtils;
-@@ -565,10 +566,16 @@ public class LevelChunk extends ChunkAccess {
- 
-             // CraftBukkit start
-         } else {
--            System.out.println("Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + "," + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
--                + " (" + this.getBlockState(blockposition) + ") where there was no entity tile!");
--            System.out.println("Chunk coordinates: " + (this.chunkPos.x * 16) + "," + (this.chunkPos.z * 16));
--            new Exception().printStackTrace();
-+            // Paper start
-+            ServerInternalException e = new ServerInternalException(
-+                "Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + ","
-+                    + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
-+                    + " (" + getBlockState(blockposition) + ") where there was no entity tile!\n" +
-+                    "Chunk coordinates: " + (this.chunkPos.x * 16) + "," + (this.chunkPos.z * 16) +
-+                    "\nWorld: " + level.getLevel().dimension().location());
-+            e.printStackTrace();
-+            ServerInternalException.reportInternalException(e);
-+            // Paper end
-             // CraftBukkit end
-         }
-     }
-@@ -1146,6 +1153,7 @@ public class LevelChunk extends ChunkAccess {
-                         // Paper start - Prevent tile entity and entity crashes
-                         final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
-                         net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
-+                        net.minecraft.world.level.chunk.LevelChunk.this.level.getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new ServerInternalException(msg, throwable)));
-                         LevelChunk.this.removeBlockEntity(this.getPos());
-                         // Paper end
-                         // Spigot start
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 5103081e8469dd5a393595eae00c6f6c9d0a5028..ab9681ba3a86212e0e23a9af8788eec1dbee36ab 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -275,6 +275,7 @@ public class RegionFile implements AutoCloseable {
-                     return true;
-                 }
-             } catch (IOException ioexception) {
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
-                 return false;
-             }
-         }
-@@ -356,6 +357,7 @@ public class RegionFile implements AutoCloseable {
-             ((java.nio.Buffer) buf).position(5); // CraftBukkit - decompile error
-             filechannel.write(buf);
-         } catch (Throwable throwable) {
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
-             if (filechannel != null) {
-                 try {
-                     filechannel.close();
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index fcbf32a233c240dd45f75ee736bd102ce9f79332..833240d2a4936343710a60876a66d01112e15a2c 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -434,6 +434,8 @@ public class CraftScheduler implements BukkitScheduler {
-                             msg,
-                             throwable);
-                     }
-+                    org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
-+                        new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerSchedulerException(msg, throwable, task)));
-                     // Paper end
-                 } finally {
-                     this.currentTask = null;
-@@ -441,7 +443,7 @@ public class CraftScheduler implements BukkitScheduler {
-                 this.parsePending();
-             } else {
-                 this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass()));
--                this.executor.execute(task);
-+                this.executor.execute(new com.destroystokyo.paper.ServerSchedulerReportingWrapper(task)); // Paper
-                 // We don't need to parse pending
-                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
-             }

patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Tue, 8 Mar 2016 18:28:43 -0800
-Subject: [PATCH] Don't nest if we don't need to when cerealising text
- components
-
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
-index 55e21c7b13826f60e3c656f76e1507e0242e0af3..1387e3597c43fd652f2fc82ca6fc2e83039604e2 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
-@@ -14,7 +14,7 @@ public record ClientboundSystemChatPacket(@javax.annotation.Nullable net.kyori.a
-     }
- 
-     public ClientboundSystemChatPacket(net.md_5.bungee.api.chat.BaseComponent[] content, boolean overlay) {
--        this(null, net.md_5.bungee.chat.ComponentSerializer.toString(content), overlay); // Paper - Adventure
-+        this(null, improveBungeeComponentSerialization(content), overlay); // Paper - Adventure
-     }
-     // Spigot end
-     // Paper start
-@@ -25,6 +25,14 @@ public record ClientboundSystemChatPacket(@javax.annotation.Nullable net.kyori.a
-     public ClientboundSystemChatPacket(net.kyori.adventure.text.Component content, boolean overlay) {
-         this(content, null, overlay);
-     }
-+
-+    private static String improveBungeeComponentSerialization(net.md_5.bungee.api.chat.BaseComponent[] content) {
-+        if (content.length == 1) {
-+            return net.md_5.bungee.chat.ComponentSerializer.toString(content[0]);
-+        } else {
-+            return net.md_5.bungee.chat.ComponentSerializer.toString(content);
-+        }
-+    }
-     // Paper end
- 
-     public ClientboundSystemChatPacket(FriendlyByteBuf buf) {

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

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 8 Mar 2016 23:25:45 -0500
-Subject: [PATCH] Disable Scoreboards for non players by default
-
-Entities collision is checking for scoreboards setting.
-This is very heavy to do map lookups for every collision to check
-this setting.
-
-So avoid looking up scoreboards and short circuit to the "not on a team"
-logic which is most likely to be true.
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1b301b9b577b632470a1e6d23f34288875c5ffb8..a8608e7b3dae15a54185d720c01a49d3a7e59994 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2831,6 +2831,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     @Nullable
-     public Team getTeam() {
-+        if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper
-         return this.level().getScoreboard().getPlayersTeam(this.getScoreboardName());
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7fd5e2cb9139f53c0c08cf14760db311347f843d..f22055ef2b5ff7a98c9388b0324b8e3e4b5e1172 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -833,6 +833,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         if (nbt.contains("Team", 8)) {
-             String s = nbt.getString("Team");
-             PlayerTeam scoreboardteam = this.level().getScoreboard().getPlayerTeam(s);
-+            if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof net.minecraft.world.entity.player.Player)) { scoreboardteam = null; } // Paper
-             boolean flag = scoreboardteam != null && this.level().getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
- 
-             if (!flag) {

patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: mrapple <tony@oc.tc>
-Date: Sun, 25 Nov 2012 13:43:39 -0600
-Subject: [PATCH] Add methods for working with arrows stuck in living entities
-
-Upstream added methods for this, original methods are now
-deprecated
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d75d98eb7f1699d3b180d11573628c3dd6704c76..166dfd2cde916709ef952216643bb7b92e9e1600 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     }
- 
-     @Override
--    public void setArrowsInBody(int count) {
-+    public void setArrowsInBody(final int count, final boolean fireEvent) { // Paper
-         Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0");
-+        if (!fireEvent) { // Paper
-         this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count);
-+        // Paper start
-+        } else {
-+            this.getHandle().setArrowCount(count);
-+        }
-+        // Paper end
-     }
- 
-     @Override
-@@ -783,4 +789,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         this.getHandle().persistentInvisibility = invisible;
-         this.getHandle().setSharedFlag(5, invisible);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getArrowsStuck() {
-+        return this.getHandle().getArrowCount();
-+    }
-+
-+    @Override
-+    public void setArrowsStuck(final int arrows) {
-+        this.getHandle().setArrowCount(arrows);
-+    }
-+    // Paper end
- }

patches/server/0064-Chunk-Save-Reattempt.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 4 Mar 2013 23:46:10 -0500
-Subject: [PATCH] Chunk Save Reattempt
-
-We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index ab9681ba3a86212e0e23a9af8788eec1dbee36ab..2a7f17726a161ddbcd0397fb4332de6980199c38 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -275,7 +275,7 @@ public class RegionFile implements AutoCloseable {
-                     return true;
-                 }
-             } catch (IOException ioexception) {
--                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
-+                com.destroystokyo.paper.util.SneakyThrow.sneaky(ioexception); // Paper - we want the upper try/catch to retry this
-                 return false;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 2b6ba2e30c9a4682d6deb2ab750d6923ad8469e4..2d00333f25828ef5912c925d1213a56c564d85c9 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -209,6 +209,7 @@ public class RegionFileStorage implements AutoCloseable {
-         }
-         // Paper end - rewrite chunk system
-         try { // Paper
-+        int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
- 
-         if (nbt == null) {
-             regionfile.clear(pos);
-@@ -233,7 +234,18 @@ public class RegionFileStorage implements AutoCloseable {
-                 dataoutputstream.close();
-             }
-         }
-+        // Paper start
-+        return;
-+        } catch (Exception ex)  {
-+            laste = ex;
-+        }
-+        }
- 
-+        if (laste != null) {
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste);
-+            net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk " + pos, laste);
-+        }
-+        // Paper end
-         } finally { // Paper start
-             regionfile.fileLock.unlock();
-         } // Paper end

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

@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sat, 4 Apr 2015 23:17:52 -0400
-Subject: [PATCH] Complete resource pack API
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0a0a9f1be333911b6de7502a9541063ab9ea0164..a258a252e749e3b7ebb1a6304b7f143e93a67178 100644
---- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -156,7 +156,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-             ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.playerProfile().getName());
-             this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
-         }
--        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), PlayerResourcePackStatusEvent.Status.values()[packet.getAction().ordinal()])); // CraftBukkit
-+        // Paper start
-+        PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.getAction().ordinal()];
-+        player.getBukkitEntity().setResourcePackStatus(packStatus);
-+        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
-+        // Paper end
- 
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c87cba2252f091b026c9169ebf1117cd82d7942b..e542d86dbf44e91058ad026e1bf9105d92fa687c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -191,6 +191,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     private double healthScale = 20;
-     private CraftWorldBorder clientWorldBorder = null;
-     private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
-+    // Paper start
-+    private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
-+    private String resourcePackHash;
-+    // Paper end
- 
-     public CraftPlayer(CraftServer server, ServerPlayer entity) {
-         super(server, entity);
-@@ -2372,6 +2376,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public boolean getAffectsSpawning() {
-         return this.getHandle().affectsSpawning;
-     }
-+
-+    @Override
-+    public void setResourcePack(@NotNull String url, @NotNull String hash) {
-+        this.setResourcePack(url, hash, false, null);
-+    }
-+
-+    @Override
-+    public void setResourcePack(@NotNull String url, @NotNull String hash, boolean required) {
-+        this.setResourcePack(url, hash, required, null);
-+    }
-+
-+    @Override
-+    public void setResourcePack(@NotNull String url, @NotNull String hash, boolean required, net.kyori.adventure.text.Component resourcePackPrompt) {
-+        Preconditions.checkArgument(url != null, "Resource pack URL cannot be null");
-+        Preconditions.checkArgument(hash != null, "Hash cannot be null");
-+        net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
-+                            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
-+                           null;
-+        this.getHandle().connection.send(new ClientboundResourcePackPacket(url, hash, required, promptComponent));
-+    }
-+
-+    @Override
-+    public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {
-+        return this.resourcePackStatus;
-+    }
-+
-+    @Override
-+    public String getResourcePackHash() {
-+        return this.resourcePackHash;
-+    }
-+
-+    @Override
-+    public boolean hasResourcePack() {
-+        return this.resourcePackStatus == org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED;
-+    }
-+
-+    public void setResourcePackStatus(org.bukkit.event.player.PlayerResourcePackStatusEvent.Status status) {
-+        this.resourcePackStatus = status;
-+    }
-     // Paper end
- 
-     @Override

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

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 13:17:38 -0400
-Subject: [PATCH] Default loading permissions.yml before plugins
-
-Under previous behavior, plugins were not able to check if a player had a permission
-if it was defined in permissions.yml. there is no clean way for a plugin to fix that either.
-
-This will change the order so that by default, permissions.yml loads BEFORE plugins instead of after.
-
-This gives plugins expected permission checks.
-
-It also helps improve the expected logic, as servers should set the initial defaults, and then let plugins
-modify that. Under the previous logic, plugins were unable (cleanly) override permissions.yml.
-
-A config option has been added for those who depend on the previous behavior, but I don't expect that.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 13a70d87689d49818b97611b83b77df0e9a6c8f5..0187cf0317ca427dd753e4a354361bec47ae55b8 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -465,6 +465,7 @@ public final class CraftServer implements Server {
-         if (type == PluginLoadOrder.STARTUP) {
-             this.helpMap.clear();
-             this.helpMap.initializeGeneralTopics();
-+            if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) loadCustomPermissions(); // Paper
-         }
- 
-         Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -484,7 +485,7 @@ public final class CraftServer implements Server {
-             this.commandMap.registerServerAliases();
-             DefaultPermissions.registerCorePermissions();
-             CraftDefaultPermissions.registerCorePermissions();
--            this.loadCustomPermissions();
-+            if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) this.loadCustomPermissions(); // Paper
-             this.helpMap.initializeCommands();
-             this.syncCommands();
-         }

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

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William <admin@domnian.com>
-Date: Fri, 18 Mar 2016 03:30:17 -0400
-Subject: [PATCH] Allow Reloading of Custom Permissions
-
-https://github.com/PaperMC/Paper/issues/49
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0187cf0317ca427dd753e4a354361bec47ae55b8..9418fce310fe30ebb7c0f2368dda8c6000d9541c 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2684,5 +2684,23 @@ public final class CraftServer implements Server {
-         }
-         return this.adventure$audiences;
-     }
-+
-+    @Override
-+    public void reloadPermissions() {
-+        pluginManager.clearPermissions();
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) loadCustomPermissions();
-+        for (Plugin plugin : pluginManager.getPlugins()) {
-+            for (Permission perm : plugin.getDescription().getPermissions()) {
-+                try {
-+                    pluginManager.addPermission(perm);
-+                } catch (IllegalArgumentException ex) {
-+                    getLogger().log(Level.WARNING, "Plugin " + plugin.getDescription().getFullName() + " tried to register permission '" + perm.getName() + "' but it's already registered", ex);
-+                }
-+            }
-+        }
-+        if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) loadCustomPermissions();
-+        DefaultPermissions.registerCorePermissions();
-+        CraftDefaultPermissions.registerCorePermissions();
-+    }
-     // Paper end
- }

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

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 13:50:14 -0400
-Subject: [PATCH] Remove Metadata on reload
-
-Metadata is not meant to persist reload as things break badly with non primitive types
-This will remove metadata on reload so it does not crash everything if a plugin uses it.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9418fce310fe30ebb7c0f2368dda8c6000d9541c..3836e0ad2f09ab015a165794400edd64a017f439 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -956,8 +956,16 @@ public final class CraftServer implements Server {
-             world.spigotConfig.init(); // Spigot
-         }
- 
-+        Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-         this.pluginManager.clearPlugins();
-         this.commandMap.clearCommands();
-+        // Paper start
-+        for (Plugin plugin : pluginClone) {
-+            entityMetadata.removeAll(plugin);
-+            worldMetadata.removeAll(plugin);
-+            playerMetadata.removeAll(plugin);
-+        }
-+        // Paper end
-         this.reloadData();
-         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper

patches/server/0069-Handle-Item-Meta-Inconsistencies.patch

@@ -1,324 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 28 May 2015 23:00:19 -0400
-Subject: [PATCH] Handle Item Meta Inconsistencies
-
-First, Enchantment order would blow away seeing 2 items as the same,
-however the Client forces enchantment list in a certain order, as well
-as does the /enchant command. Anvils can insert it into forced order,
-causing 2 same items to be considered different.
-
-This change makes unhandled NBT Tags and Enchantments use a sorted tree map,
-so they will always be in a consistent order.
-
-Additionally, the old enchantment API was never updated when ItemMeta
-was added, resulting in 2 different ways to modify an items enchantments.
-
-For consistency, the old API methods now forward to use the
-ItemMeta API equivalents, and should deprecate the old API's.
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1b2c0fda262ca6d5bd2ce22bc2e934803bd6f602..cae548dbb5a3027e2de0bfbe38918ec7c2803e8e 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -157,6 +157,23 @@ public final class ItemStack {
-         return this.getItem().getTooltipImage(this);
-     }
- 
-+    // Paper start
-+    private static final java.util.Comparator<? super CompoundTag> enchantSorter = java.util.Comparator.comparing(o -> o.getString("id"));
-+    private void processEnchantOrder(@Nullable CompoundTag tag) {
-+        if (tag == null || !tag.contains("Enchantments", 9)) {
-+            return;
-+        }
-+        ListTag list = tag.getList("Enchantments", 10);
-+        if (list.size() < 2) {
-+            return;
-+        }
-+        try {
-+            //noinspection unchecked
-+            list.sort((java.util.Comparator<? super net.minecraft.nbt.Tag>) enchantSorter); // Paper
-+        } catch (Exception ignored) {}
-+    }
-+    // Paper end
-+
-     public ItemStack(ItemLike item) {
-         this(item, 1);
-     }
-@@ -205,6 +222,7 @@ public final class ItemStack {
-             // CraftBukkit start - make defensive copy as this data may be coming from the save thread
-             this.tag = nbttagcompound.getCompound("tag").copy();
-             // CraftBukkit end
-+            this.processEnchantOrder(this.tag); // Paper
-             this.getItem().verifyTagAfterLoad(this.tag);
-         }
- 
-@@ -819,6 +837,7 @@ public final class ItemStack {
- 
-     public void setTag(@Nullable CompoundTag nbt) {
-         this.tag = nbt;
-+        this.processEnchantOrder(this.tag); // Paper
-         if (this.getItem().canBeDepleted()) {
-             this.setDamageValue(this.getDamageValue());
-         }
-@@ -1116,6 +1135,7 @@ public final class ItemStack {
-         ListTag nbttaglist = this.tag.getList("Enchantments", 10);
- 
-         nbttaglist.add(EnchantmentHelper.storeEnchantment(EnchantmentHelper.getEnchantmentId(enchantment), (byte) level));
-+        processEnchantOrder(this.tag); // Paper
-     }
- 
-     public boolean isEnchanted() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8eb170bd71c7158dcd1b90f9c8d46a13a2202509..f42f6f5fb7a2398c183eb9fa1a964a7680b687b8 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -188,28 +188,11 @@ public final class CraftItemStack extends ItemStack {
-     public void addUnsafeEnchantment(Enchantment ench, int level) {
-         Preconditions.checkArgument(ench != null, "Enchantment cannot be null");
- 
--        if (!CraftItemStack.makeTag(this.handle)) {
--            return;
--        }
--        ListTag list = CraftItemStack.getEnchantmentList(this.handle);
--        if (list == null) {
--            list = new ListTag();
--            this.handle.getTag().put(ENCHANTMENTS.NBT, list);
--        }
--        int size = list.size();
--
--        for (int i = 0; i < size; i++) {
--            CompoundTag tag = (CompoundTag) list.get(i);
--            String id = tag.getString(ENCHANTMENTS_ID.NBT);
--            if (ench.getKey().equals(NamespacedKey.fromString(id))) {
--                tag.putShort(ENCHANTMENTS_LVL.NBT, (short) level);
--                return;
--            }
--        }
--        CompoundTag tag = new CompoundTag();
--        tag.putString(ENCHANTMENTS_ID.NBT, ench.getKey().toString());
--        tag.putShort(ENCHANTMENTS_LVL.NBT, (short) level);
--        list.add(tag);
-+        // Paper start - Replace whole method
-+        final ItemMeta itemMeta = this.getItemMeta();
-+        itemMeta.addEnchant(ench, level, true);
-+        this.setItemMeta(itemMeta);
-+        // Paper end
-     }
- 
-     static boolean makeTag(net.minecraft.world.item.ItemStack item) {
-@@ -235,57 +218,40 @@ public final class CraftItemStack extends ItemStack {
-         if (this.handle == null) {
-             return 0;
-         }
--        return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), this.handle);
-+        // Paper start - replace to allow custom enchantments
-+        final ListTag enchantments = this.handle.getEnchantmentTags();
-+        for (int i = 0; i < enchantments.size(); i++) {
-+            final CompoundTag tag = enchantments.getCompound(i);
-+            final String id = tag.getString(CraftMetaItem.ENCHANTMENTS_ID.NBT);
-+            final Enchantment enchant = Enchantment.getByKey(CraftNamespacedKey.fromStringOrNull(id));
-+            if (ench.equals(enchant)) {
-+                return EnchantmentHelper.getEnchantmentLevel(tag);
-+            }
-+        }
-+        return 0;
-+        // Paper end - replace to allow custom enchantments
-     }
- 
-     @Override
-     public int removeEnchantment(Enchantment ench) {
-         Preconditions.checkArgument(ench != null, "Enchantment cannot be null");
- 
--        ListTag list = CraftItemStack.getEnchantmentList(this.handle), listCopy;
--        if (list == null) {
--            return 0;
--        }
--        int index = Integer.MIN_VALUE;
--        int level = Integer.MIN_VALUE;
--        int size = list.size();
--
--        for (int i = 0; i < size; i++) {
--            CompoundTag enchantment = (CompoundTag) list.get(i);
--            String id = enchantment.getString(ENCHANTMENTS_ID.NBT);
--            if (ench.getKey().equals(NamespacedKey.fromString(id))) {
--                index = i;
--                level = 0xffff & enchantment.getShort(ENCHANTMENTS_LVL.NBT);
--                break;
--            }
--        }
--
--        if (index == Integer.MIN_VALUE) {
--            return 0;
--        }
--        if (size == 1) {
--            this.handle.getTag().remove(ENCHANTMENTS.NBT);
--            if (this.handle.getTag().isEmpty()) {
--                this.handle.setTag(null);
--            }
--            return level;
--        }
--
--        // This is workaround for not having an index removal
--        listCopy = new ListTag();
--        for (int i = 0; i < size; i++) {
--            if (i != index) {
--                listCopy.add(list.get(i));
--            }
-+        // Paper start - replace entire method
-+        int level = getEnchantmentLevel(ench);
-+        if (level > 0) {
-+            final ItemMeta itemMeta = this.getItemMeta();
-+            if (itemMeta == null) return 0;
-+            itemMeta.removeEnchant(ench);
-+            this.setItemMeta(itemMeta);
-         }
--        this.handle.getTag().put(ENCHANTMENTS.NBT, listCopy);
-+        // Paper end
- 
-         return level;
-     }
- 
-     @Override
-     public Map<Enchantment, Integer> getEnchantments() {
--        return CraftItemStack.getEnchantments(this.handle);
-+        return this.hasItemMeta() ? this.getItemMeta().getEnchants() : ImmutableMap.<Enchantment, Integer>of(); // Paper - use Item Meta
-     }
- 
-     static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 3d5abdf6986457e39fb216d8f5e257c9df880078..57bd07e7aa9d09e843bf33f4c6c2c610aca5401e 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
- import com.google.common.collect.ImmutableMap;
- import com.google.common.collect.ImmutableMultimap;
- import com.google.common.collect.LinkedHashMultimap;
-+import com.google.common.collect.ImmutableSortedMap; // Paper
- import com.google.common.collect.Lists;
- import com.google.common.collect.Multimap;
- import com.google.common.collect.SetMultimap;
-@@ -23,6 +24,7 @@ import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Base64;
- import java.util.Collection;
-+import java.util.Comparator; // Paper
- import java.util.EnumSet;
- import java.util.HashMap;
- import java.util.Iterator;
-@@ -33,6 +35,7 @@ import java.util.Map;
- import java.util.NoSuchElementException;
- import java.util.Objects;
- import java.util.Set;
-+import java.util.TreeMap; // Paper
- import java.util.logging.Level;
- import java.util.logging.Logger;
- import javax.annotation.Nonnull;
-@@ -276,7 +279,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     private List<String> lore; // null and empty are two different states internally
-     private Integer customModelData;
-     private CompoundTag blockData;
--    private Map<Enchantment, Integer> enchantments;
-+    private EnchantmentMap enchantments; // Paper
-     private Multimap<Attribute, AttributeModifier> attributeModifiers;
-     private int repairCost;
-     private int hideFlag;
-@@ -287,7 +290,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
- 
-     private CompoundTag internalTag;
--    final Map<String, Tag> unhandledTags = new HashMap<String, Tag>(); // Visible for testing only
-+    final Map<String, Tag> unhandledTags = new TreeMap<String, Tag>(); // Visible for testing only // Paper
-     private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY);
- 
-     private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -308,7 +311,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         this.blockData = meta.blockData;
- 
-         if (meta.enchantments != null) { // Spigot
--            this.enchantments = new LinkedHashMap<Enchantment, Integer>(meta.enchantments);
-+            this.enchantments = new EnchantmentMap(meta.enchantments); // Paper
-         }
- 
-         if (meta.hasAttributeModifiers()) {
-@@ -391,13 +394,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         }
-     }
- 
--    static Map<Enchantment, Integer> buildEnchantments(CompoundTag tag, ItemMetaKey key) {
-+    static EnchantmentMap buildEnchantments(CompoundTag tag, ItemMetaKey key) { // Paper
-         if (!tag.contains(key.NBT)) {
-             return null;
-         }
- 
-         ListTag ench = tag.getList(key.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND);
--        Map<Enchantment, Integer> enchantments = new LinkedHashMap<Enchantment, Integer>(ench.size());
-+        EnchantmentMap enchantments = new EnchantmentMap(); // Paper
- 
-         for (int i = 0; i < ench.size(); i++) {
-             String id = ((CompoundTag) ench.get(i)).getString(CraftMetaItem.ENCHANTMENTS_ID.NBT);
-@@ -550,13 +553,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         }
-     }
- 
--    static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
-+    static EnchantmentMap buildEnchantments(Map<String, Object> map, ItemMetaKey key) { // Paper
-         Map<?, ?> ench = SerializableMeta.getObject(Map.class, map, key.BUKKIT, true);
-         if (ench == null) {
-             return null;
-         }
- 
--        Map<Enchantment, Integer> enchantments = new LinkedHashMap<Enchantment, Integer>(ench.size());
-+        EnchantmentMap enchantments = new EnchantmentMap(); // Paper
-         for (Map.Entry<?, ?> entry : ench.entrySet()) {
-             // Doctor older enchants
-             String enchantKey = entry.getKey().toString();
-@@ -832,14 +835,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
- 
-     @Override
-     public Map<Enchantment, Integer> getEnchants() {
--        return this.hasEnchants() ? ImmutableMap.copyOf(this.enchantments) : ImmutableMap.<Enchantment, Integer>of();
-+        return this.hasEnchants() ? ImmutableSortedMap.copyOfSorted(this.enchantments) : ImmutableMap.<Enchantment, Integer>of(); // Paper
-     }
- 
-     @Override
-     public boolean addEnchant(Enchantment ench, int level, boolean ignoreRestrictions) {
-         Preconditions.checkArgument(ench != null, "Enchantment cannot be null");
-         if (this.enchantments == null) {
--            this.enchantments = new LinkedHashMap<Enchantment, Integer>(4);
-+            this.enchantments = new EnchantmentMap(); // Paper
-         }
- 
-         if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1228,7 +1231,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-             clone.customModelData = this.customModelData;
-             clone.blockData = this.blockData;
-             if (this.enchantments != null) {
--                clone.enchantments = new LinkedHashMap<Enchantment, Integer>(this.enchantments);
-+                clone.enchantments = new EnchantmentMap(this.enchantments); // Paper
-             }
-             if (this.hasAttributeModifiers()) {
-                 clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
-@@ -1470,4 +1473,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-             return CraftMetaItem.HANDLED_TAGS;
-         }
-     }
-+
-+    // Paper start
-+    private static class EnchantmentMap extends TreeMap<Enchantment, Integer> {
-+        private EnchantmentMap(Map<Enchantment, Integer> enchantments) {
-+            this();
-+            putAll(enchantments);
-+        }
-+
-+        private EnchantmentMap() {
-+            super(Comparator.comparing(o -> o.getKey().toString()));
-+        }
-+
-+        public EnchantmentMap clone() {
-+            return (EnchantmentMap) super.clone();
-+        }
-+    }
-+    // Paper end
-+
- }

patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 15:12:22 -0400
-Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
-
-Can set a much shorter despawn rate for arrows that players can not pick up.
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 5268821d343aa6834b81e6598158c50b600e66ce..61a23f67c71116881bab9febf8db219a6c0b98a1 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
- 
-     protected void tickDespawn() {
-         ++this.life;
--        if (this.life >= ((this instanceof ThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)) { // Spigot
-+        if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? this.level().paperConfig().entities.spawning.creativeArrowDespawnRate.value() : (pickup == Pickup.DISALLOWED ? this.level().paperConfig().entities.spawning.nonPlayerArrowDespawnRate.value() : ((this instanceof ThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?
-             this.discard();
-         }
- 

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

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 20:16:03 -0400
-Subject: [PATCH] Add World Util Methods
-
-Methods that can be used for other patches to help improve logic.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 35c401b41750748738c8f8aa2b8988377f4e679f..b9d93d802e981139b79ecba91968f56f842acc48 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -221,7 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
- 
--    public LevelChunk getChunkIfLoaded(int x, int z) {
-+    @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-         return this.chunkSource.getChunk(x, z, false);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8149286827d9b609be47a4ded0413ca11f7858de..809f7db469583ea90fbb165cf180dc87055c6105 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -342,6 +342,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return chunk == null ? null : chunk.getFluidState(blockposition);
-     }
- 
-+    public final boolean isLoadedAndInBounds(BlockPos blockposition) { // Paper - final for inline
-+        return getWorldBorder().isWithinBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
-+    }
-+
-+    public @Nullable LevelChunk getChunkIfLoaded(int x, int z) { // Overridden in WorldServer for ABI compat which has final
-+        return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(x, z);
-+    }
-+    public final @Nullable LevelChunk getChunkIfLoaded(BlockPos blockposition) {
-+        return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
-+    }
-+
-+    //  reduces need to do isLoaded before getType
-+    public final @Nullable BlockState getBlockStateIfLoadedAndInBounds(BlockPos blockposition) {
-+        return getWorldBorder().isWithinBounds(blockposition) ? getBlockStateIfLoaded(blockposition) : null;
-+    }
-+
-     @Override
-     public final ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create) { // Paper - final for inline
-         // Paper end

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

@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sun, 21 Jun 2015 15:07:20 -0400
-Subject: [PATCH] Custom replacement for eaten items
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0c049587bd99b66b5307cd37da72b1b01f201a86..b819c60cb7640c10594953597e3dde3007ff3be5 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3696,10 +3696,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                     this.triggerItemUseEffects(this.useItem, 16);
-                     // CraftBukkit start - fire PlayerItemConsumeEvent
-                     ItemStack itemstack;
-+                    PlayerItemConsumeEvent event = null; // Paper
-                     if (this instanceof ServerPlayer) {
-                         org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem);
-                         org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand);
--                        PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand);
-+                        event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper
-                         this.level().getCraftServer().getPluginManager().callEvent(event);
- 
-                         if (event.isCancelled()) {
-@@ -3713,6 +3714,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                     } else {
-                         itemstack = this.useItem.finishUsingItem(this.level(), this);
-                     }
-+                    // Paper start - save the default replacement item and change it if necessary
-+                    final ItemStack defaultReplacement = itemstack;
-+                    if (event != null && event.getReplacement() != null) {
-+                        itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
-+                    }
-+                    // Paper end
-                     // CraftBukkit end
- 
-                     if (itemstack != this.useItem) {
-@@ -3720,6 +3727,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                     }
- 
-                     this.stopUsingItem();
-+                    // Paper start - if the replacement is anything but the default, update the client inventory
-+                    if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
-+                        ((ServerPlayer) this).getBukkitEntity().updateInventory();
-+                    }
-+                    // Paper end
-                 }
- 
-             }

patches/server/0073-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch

@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paul Sauve <paul@technove.co>
-Date: Sat, 31 Oct 2020 18:43:02 -0500
-Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
-
-The BlockGetter#clip method is very wasteful in both allocations,
-and in logic. While EntityLiving#hasLineOfSight provides static
-parameters for collisions with blocks and fluids, the method still does
-a lot of dynamic checks for both of these, which result in extra work.
-As well, since the fluid collision option is set to NONE, the entire
-fluid collision system is completely unneeded, yet used anyways.
-
-Copyright (C) 2020 Technove LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b819c60cb7640c10594953597e3dde3007ff3be5..3fe9b954bf2394986cf8b76f37e6e0780b3d5978 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
-             Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
- 
--            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
-+            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc12120d66af3d 100644
---- a/src/main/java/net/minecraft/world/level/BlockGetter.java
-+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -68,6 +68,19 @@ public interface BlockGetter extends LevelHeightAccessor {
-         });
-     }
- 
-+    // Paper start - Broken down variant of the method below, used by Level#clipDirect
-+    @Nullable
-+    default BlockHitResult.Type clipDirect(Vec3 start, Vec3 end, BlockPos pos, BlockState state, net.minecraft.world.phys.shapes.CollisionContext collisionContext) {
-+        if (state.isAir()) {
-+            return null;
-+        }
-+
-+        final VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(state, this, pos, collisionContext);
-+        final BlockHitResult hitResult = this.clipWithInteractionOverride(start, end, pos, voxelshape, state);
-+        return hitResult == null ? null : hitResult.getType();
-+    }
-+    // Paper end
-+
-     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
-     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
-             BlockState iblockdata = this.getBlockState(blockposition);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 809f7db469583ea90fbb165cf180dc87055c6105..37d5abf5a18b90695d1cea9e365c764e93b918bf 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -283,6 +283,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return null;
-     }
- 
-+    // Paper start - Broken down method of raytracing for EntityLiving#hasLineOfSight, replaces BlockGetter#clip(CollisionContext)
-+    public net.minecraft.world.phys.BlockHitResult.Type clipDirect(Vec3 start, Vec3 end, net.minecraft.world.phys.shapes.CollisionContext collisionContext) {
-+        // most of this code comes from BlockGetter#clip(CollisionContext, BiFunction, Function), but removes the needless functions
-+        if (start.equals(end)) {
-+            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+        }
-+
-+        final double endX = Mth.lerp(-1.0E-7D, end.x, start.x);
-+        final double endY = Mth.lerp(-1.0E-7D, end.y, start.y);
-+        final double endZ = Mth.lerp(-1.0E-7D, end.z, start.z);
-+
-+        final double startX = Mth.lerp(-1.0E-7D, start.x, end.x);
-+        final double startY = Mth.lerp(-1.0E-7D, start.y, end.y);
-+        final double startZ = Mth.lerp(-1.0E-7D, start.z, end.z);
-+
-+        int currentX = Mth.floor(startX);
-+        int currentY = Mth.floor(startY);
-+        int currentZ = Mth.floor(startZ);
-+
-+        final BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ);
-+
-+        LevelChunk chunk = this.getChunkIfLoaded(currentBlock);
-+        if (chunk == null) {
-+            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+        }
-+
-+        final net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.clipDirect(start, end, currentBlock, chunk.getBlockState(currentBlock), collisionContext);
-+        if (initialCheck != null) {
-+            return initialCheck;
-+        }
-+
-+        final double diffX = endX - startX;
-+        final double diffY = endY - startY;
-+        final double diffZ = endZ - startZ;
-+
-+        final int xDirection = Mth.sign(diffX);
-+        final int yDirection = Mth.sign(diffY);
-+        final int zDirection = Mth.sign(diffZ);
-+
-+        final double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX;
-+        final double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY;
-+        final double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ;
-+
-+        double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX));
-+        double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY));
-+        double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ));
-+
-+        net.minecraft.world.phys.BlockHitResult.Type result;
-+
-+        do {
-+            if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) {
-+                return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+            }
-+
-+            if (normalizedXDirection < normalizedYDirection) {
-+                if (normalizedXDirection < normalizedZDirection) {
-+                    currentX += xDirection;
-+                    normalizedXDirection += normalizedX;
-+                } else {
-+                    currentZ += zDirection;
-+                    normalizedZDirection += normalizedZ;
-+                }
-+            } else if (normalizedYDirection < normalizedZDirection) {
-+                currentY += yDirection;
-+                normalizedYDirection += normalizedY;
-+            } else {
-+                currentZ += zDirection;
-+                normalizedZDirection += normalizedZ;
-+            }
-+
-+            currentBlock.set(currentX, currentY, currentZ);
-+            if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) {
-+                chunk = this.getChunkIfLoaded(currentBlock);
-+                if (chunk == null) {
-+                    return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+                }
-+            }
-+            result = this.clipDirect(start, end, currentBlock, chunk.getBlockState(currentBlock), collisionContext);
-+        } while (result == null);
-+
-+        return result;
-+    }
-+    // Paper end
-+
-     public boolean isInWorldBounds(BlockPos pos) {
-         return !this.isOutsideBuildHeight(pos) && Level.isInWorldBoundsHorizontal(pos);
-     }

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

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 27 Sep 2015 01:18:02 -0400
-Subject: [PATCH] handle NaN health/absorb values and repair bad data
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9b9e02f27f4281d3d39130521b1cc4e6979f8ea5..2cf9d80494c6b70992d8ec74fe1697c6522bd952 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -794,7 +794,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
--        this.internalSetAbsorptionAmount(nbt.getFloat("AbsorptionAmount"));
-+        // Paper start - jvm keeps optimizing the setter
-+        float absorptionAmount = nbt.getFloat("AbsorptionAmount");
-+        if (Float.isNaN(absorptionAmount)) {
-+            absorptionAmount = 0;
-+        }
-+        this.internalSetAbsorptionAmount(absorptionAmount);
-+        // Paper end
-         if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
-             this.getAttributes().load(nbt.getList("Attributes", 10));
-         }
-@@ -1344,6 +1350,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public void setHealth(float health) {
-+        // Paper start
-+        if (Float.isNaN(health)) { health = getMaxHealth(); if (this.valid) {
-+            System.err.println("[NAN-HEALTH] " + getScoreboardName() + " had NaN health set");
-+        } } // Paper end
-         // CraftBukkit start - Handle scaled health
-         if (this instanceof ServerPlayer) {
-             org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity();
-@@ -3529,7 +3539,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public final void setAbsorptionAmount(float absorptionAmount) {
--        this.internalSetAbsorptionAmount(Mth.clamp(absorptionAmount, 0.0F, this.getMaxAbsorption()));
-+        this.internalSetAbsorptionAmount(!Float.isNaN(absorptionAmount) ? Mth.clamp(absorptionAmount, 0.0F, this.getMaxAbsorption()) : 0.0F); // Paper
-     }
- 
-     protected void internalSetAbsorptionAmount(float absorptionAmount) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e542d86dbf44e91058ad026e1bf9105d92fa687c..7363c80d35d4ff61d771fb77125a4e520f745bba 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2167,6 +2167,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
- 
-     public void setRealHealth(double health) {
-+        if (Double.isNaN(health)) {return;} // Paper
-         this.health = health;
-     }
- 

patches/server/0075-Use-a-Shared-Random-for-Entities.patch

@@ -1,113 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 22 Mar 2016 00:33:47 -0400
-Subject: [PATCH] Use a Shared Random for Entities
-
-Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a8608e7b3dae15a54185d720c01a49d3a7e59994..fc39c3742e852bc9f4131b1ade62c32b318bdb02 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-     }
- 
-+    // Paper start
-+    public static RandomSource SHARED_RANDOM = new RandomRandomSource();
-+    private static final class RandomRandomSource extends java.util.Random implements net.minecraft.world.level.levelgen.BitRandomSource {
-+        private boolean locked = false;
-+
-+        @Override
-+        public synchronized void setSeed(long seed) {
-+            if (locked) {
-+                LOGGER.error("Ignoring setSeed on Entity.SHARED_RANDOM", new Throwable());
-+            } else {
-+                super.setSeed(seed);
-+                locked = true;
-+            }
-+        }
-+
-+        @Override
-+        public RandomSource fork() {
-+            return new net.minecraft.world.level.levelgen.LegacyRandomSource(this.nextLong());
-+        }
-+
-+        @Override
-+        public net.minecraft.world.level.levelgen.PositionalRandomFactory forkPositional() {
-+            return new net.minecraft.world.level.levelgen.LegacyRandomSource.LegacyPositionalRandomFactory(this.nextLong());
-+        }
-+
-+        // these below are added to fix reobf issues that I don't wanna deal with right now
-+        @Override
-+        public int next(int bits) {
-+            return super.next(bits);
-+        }
-+
-+        @Override
-+        public int nextInt(int origin, int bound) {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt(origin, bound);
-+        }
-+
-+        @Override
-+        public long nextLong() {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextLong();
-+        }
-+
-+        @Override
-+        public int nextInt() {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt();
-+        }
-+
-+        @Override
-+        public int nextInt(int bound) {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt(bound);
-+        }
-+
-+        @Override
-+        public boolean nextBoolean() {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextBoolean();
-+        }
-+
-+        @Override
-+        public float nextFloat() {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextFloat();
-+        }
-+
-+        @Override
-+        public double nextDouble() {
-+            return net.minecraft.world.level.levelgen.BitRandomSource.super.nextDouble();
-+        }
-+
-+        @Override
-+        public double nextGaussian() {
-+            return super.nextGaussian();
-+        }
-+    }
-+    // Paper end
-+
-     private CraftEntity bukkitEntity;
- 
-     public CraftEntity getBukkitEntity() {
-@@ -406,7 +479,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         this.bb = Entity.INITIAL_AABB;
-         this.stuckSpeedMultiplier = Vec3.ZERO;
-         this.nextStep = 1.0F;
--        this.random = RandomSource.create();
-+        this.random = SHARED_RANDOM; // Paper
-         this.remainingFireTicks = -this.getFireImmuneTicks();
-         this.fluidHeight = new Object2DoubleArrayMap(2);
-         this.fluidOnEyes = new HashSet();
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 891d8b4c8cb73d5e310970066831ab3e2af14e91..f60c4cd0543fd5d50fa7e2c1a9e8381227adb540 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -44,7 +44,7 @@ public class Squid extends WaterAnimal {
- 
-     public Squid(EntityType<? extends Squid> type, Level world) {
-         super(type, world);
--        this.random.setSeed((long)this.getId());
-+        //this.random.setSeed((long)this.getId()); // Paper - we set the random to shared, do not clobber the seed
-         this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
-     }
- 

patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 22 Mar 2016 12:04:28 -0500
-Subject: [PATCH] Configurable spawn chances for skeleton horses
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b9d93d802e981139b79ecba91968f56f842acc48..d419ff842d1df822e14994e4f1d5b91352579cf1 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -830,7 +830,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-             if (this.isRainingAt(blockposition)) {
-                 DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
--                boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * 0.01D && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD);
-+                boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
- 
-                 if (flag1) {
-                     SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create(this);

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

@@ -1,166 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 02:07:55 -0600
-Subject: [PATCH] Optimize isInWorldBounds and getBlockState for inlining
-
-Hot methods, so reduce # of instructions for the method.
-
-Move is valid location test to the BlockPosition class so that it can access local variables.
-
-Replace all calls to the new place to the unnecessary forward.
-
-Optimize getType and getBlockData to manually inline and optimize the calls
-
-diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c86249354d12108f 100644
---- a/src/main/java/net/minecraft/core/Vec3i.java
-+++ b/src/main/java/net/minecraft/core/Vec3i.java
-@@ -31,6 +31,12 @@ public class Vec3i implements Comparable<Vec3i> {
-         });
-     }
- 
-+    // Paper start
-+    public final boolean isInsideBuildHeightAndWorldBoundsHorizontal(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
-+        return getX() >= -30000000 && getZ() >= -30000000 && getX() < 30000000 && getZ() < 30000000 && !levelHeightAccessor.isOutsideBuildHeight(getY());
-+    }
-+    // Paper end
-+
-     public Vec3i(int x, int y, int z) {
-         this.x = x;
-         this.y = y;
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 37d5abf5a18b90695d1cea9e365c764e93b918bf..5502d037279ba876f5e4c6728cc678f128bce9d4 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -368,7 +368,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     // Paper end
- 
-     public boolean isInWorldBounds(BlockPos pos) {
--        return !this.isOutsideBuildHeight(pos) && Level.isInWorldBoundsHorizontal(pos);
-+        return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
-     }
- 
-     public static boolean isInSpawnableBounds(BlockPos pos) {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index 3e5addb60ae8f466dad09edb3ae1fc88fe2681e9..5e8d2e4245757a0889645ea79ee68afb53f7dde4 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -172,6 +172,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
-         return GameEventListenerRegistry.NOOP;
-     }
- 
-+    public abstract BlockState getBlockState(final int x, final int y, final int z); // Paper
-     @Nullable
-     public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-index f49cc61840c6588fca301b4c5c3aaeede03a323e..785fa679860413b736122f8e88a92e683cbdd99f 100644
---- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-@@ -55,6 +55,12 @@ public class EmptyLevelChunk extends LevelChunk {
-     public void setBlockEmptinessMap(final boolean[] emptinessMap) {}
-     // Paper end - starlight
- 
-+    // Paper start
-+    @Override
-+    public BlockState getBlockState(int x, int y, int z) {
-+        return Blocks.VOID_AIR.defaultBlockState();
-+    }
-+    // Paper end
-     @Override
-     public BlockState getBlockState(BlockPos pos) {
-         return Blocks.VOID_AIR.defaultBlockState();
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc717d0ced 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-@@ -91,6 +91,12 @@ public class ImposterProtoChunk extends ProtoChunk {
-     public BlockState getBlockState(BlockPos pos) {
-         return this.wrapped.getBlockState(pos);
-     }
-+    // Paper start
-+    @Override
-+    public final BlockState getBlockState(final int x, final int y, final int z) {
-+        return this.wrapped.getBlockStateFinal(x, y, z);
-+    }
-+    // Paper end
- 
-     @Override
-     public FluidState getFluidState(BlockPos pos) {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 080615881c93e73f207be1aa1105b0b1067fa308..b16e32720196b40a617122dbefe34e59b1a2ac8e 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -292,12 +292,29 @@ public class LevelChunk extends ChunkAccess {
-         }
-     }
- 
-+    // Paper start - Optimize getBlockData to reduce instructions
-     @Override
-     public BlockState getBlockState(BlockPos pos) {
--        int i = pos.getX();
--        int j = pos.getY();
--        int k = pos.getZ();
-+        return this.getBlockStateFinal(pos.getX(), pos.getY(), pos.getZ());
-+    }
-+
-+    @Override
-+    public BlockState getBlockState(final int x, final int y, final int z) {
-+        return this.getBlockStateFinal(x, y, z);
-+    }
-+    public final BlockState getBlockStateFinal(final int x, final int y, final int z) {
-+        // Method body / logic copied from below
-+        final int i = this.getSectionIndex(y);
-+        if (i < 0 || i >= this.sections.length || this.sections[i].nonEmptyBlockCount == 0 || this.sections[i].hasOnlyAir()) {
-+            return Blocks.AIR.defaultBlockState();
-+        }
-+        // Inlined ChunkSection.getType() and DataPaletteBlock.a(int,int,int)
-+        return this.sections[i].states.get((y & 15) << 8 | (z & 15) << 4 | x & 15);
- 
-+    }
-+
-+    public BlockState getBlockState_unused(int i, int j, int k) {
-+        // Paper end
-         if (this.level.isDebug()) {
-             BlockState iblockdata = null;
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index d59392c322936ce89b759ac9787c8f4f0b228af6..2c3ea88bac229df67bd742e16d2106d80bcc8889 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -19,7 +19,7 @@ public class LevelChunkSection {
-     public static final int SECTION_HEIGHT = 16;
-     public static final int SECTION_SIZE = 4096;
-     public static final int BIOME_CONTAINER_BITS = 2;
--    private short nonEmptyBlockCount;
-+    short nonEmptyBlockCount; // Paper - package-private
-     private short tickingBlockCount;
-     private short tickingFluidCount;
-     public final PalettedContainer<BlockState> states;
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-index 7da1ed9640211b0e064162dcdb0000538e7b30f3..7aa585875dad5296526bb5d67fc5ea0f8875e452 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-@@ -86,14 +86,18 @@ public class ProtoChunk extends ChunkAccess {
- 
-     @Override
-     public BlockState getBlockState(BlockPos pos) {
--        int i = pos.getY();
--        if (this.isOutsideBuildHeight(i)) {
-+        // Paper start
-+        return getBlockState(pos.getX(), pos.getY(), pos.getZ());
-+    }
-+    public BlockState getBlockState(final int x, final int y, final int z) {
-+        if (this.isOutsideBuildHeight(y)) {
-             return Blocks.VOID_AIR.defaultBlockState();
-         } else {
--            LevelChunkSection levelChunkSection = this.getSection(this.getSectionIndex(i));
--            return levelChunkSection.hasOnlyAir() ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(pos.getX() & 15, i & 15, pos.getZ() & 15);
-+            LevelChunkSection levelChunkSection = this.getSections()[this.getSectionIndex(y)];
-+            return levelChunkSection.hasOnlyAir() ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(x & 15, y & 15, z & 15);
-         }
-     }
-+    // Paper end
- 
-     @Override
-     public FluidState getFluidState(BlockPos pos) {

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

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 28 Mar 2016 19:55:45 -0400
-Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
-
-Saves on some object allocation and processing when no plugin listens to this
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0e5661716d72ecf57d76443d8c7627e90966ee4d..281884fedf6607581a24fef4b3326dfb81012124 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1351,6 +1351,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
-+            worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
- 
-             this.profiler.push(() -> {
-                 return worldserver + " " + worldserver.dimension().location();
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d419ff842d1df822e14994e4f1d5b91352579cf1..9ee06d9b6eceb5df90275177ea855272fc61b016 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     // CraftBukkit start
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
-+    public boolean hasPhysicsEvent = true; // Paper
- 
-     @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-         return this.chunkSource.getChunk(x, z, false);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5502d037279ba876f5e4c6728cc678f128bce9d4..ba7760b0b478c6f24dcbaa64919a4766e107a720 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -580,7 +580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-                 // CraftBukkit start
-                 iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
-                 CraftWorld world = ((ServerLevel) this).getWorld();
--                if (world != null) {
-+                if (world != null && ((ServerLevel)this).hasPhysicsEvent) { // Paper
-                     BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
-                     this.getCraftServer().getPluginManager().callEvent(event);
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/BushBlock.java b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-index d40e791529911ca81398ac267a819415da91502a..03fde6e47c4a347c62fe9b4a3351769aedf874f6 100644
---- a/src/main/java/net/minecraft/world/level/block/BushBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-@@ -24,7 +24,7 @@ public class BushBlock extends Block {
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-         // CraftBukkit start
-         if (!state.canSurvive(world, pos)) {
--            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) {
-+            if (!(world instanceof net.minecraft.server.level.ServerLevel && ((net.minecraft.server.level.ServerLevel) world).hasPhysicsEvent) || !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) { // Paper
-                 return Blocks.AIR.defaultBlockState();
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-index ec66f00703fcb68aa567b2d14a756729371320e0..9db66b393e057d93a8025b803ae0ad2a1bca61f6 100644
---- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-@@ -95,7 +95,7 @@ public class DoublePlantBlock extends BushBlock {
- 
-     protected static void preventCreativeDropFromBottomPart(Level world, BlockPos pos, BlockState state, Player player) {
-         // CraftBukkit start
--        if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) {
-+        if (((net.minecraft.server.level.ServerLevel)world).hasPhysicsEvent && org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) { // Paper
-             return;
-         }
-         // CraftBukkit end

patches/server/0079-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 28 Mar 2016 20:32:58 -0400
-Subject: [PATCH] Entity AddTo/RemoveFrom World Events
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9ee06d9b6eceb5df90275177ea855272fc61b016..949404f3ac0e853cfc45e28453136dd166ac9563 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2366,6 +2366,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                 entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
-             }
-             // Paper end
-+            new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
-         }
- 
-         public void onTrackingEnd(Entity entity) {
-@@ -2441,6 +2442,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                 }
-             }
-             // CraftBukkit end
-+            new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
-         }
- 
-         public void onSectionChange(Entity entity) {

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

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 28 Mar 2016 20:46:14 -0400
-Subject: [PATCH] Configurable Chunk Inhabited Time
-
-Vanilla stores how long a chunk has been active on a server, and dynamically scales some
-aspects of vanilla gameplay to this factor.
-
-For people who want all chunks to be treated equally, you can chose a fixed value.
-
-This allows to fine-tune vanilla gameplay.
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b16e32720196b40a617122dbefe34e59b1a2ac8e..43cb8c3240fa058557f67d632a713747c1a19a39 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -277,6 +277,13 @@ public class LevelChunk extends ChunkAccess {
-         return new ChunkAccess.TicksToSave(this.blockTicks, this.fluidTicks);
-     }
- 
-+    // Paper start
-+    @Override
-+    public long getInhabitedTime() {
-+        return this.level.paperConfig().chunks.fixedChunkInhabitedTime < 0 ? super.getInhabitedTime() : this.level.paperConfig().chunks.fixedChunkInhabitedTime;
-+    }
-+    // Paper end
-+
-     @Override
-     public GameEventListenerRegistry getListenerRegistry(int ySectionCoord) {
-         Level world = this.level;

patches/server/0081-EntityPathfindEvent.patch

@@ -1,151 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 28 Mar 2016 21:22:26 -0400
-Subject: [PATCH] EntityPathfindEvent
-
-Fires when an Entity decides to start moving to a location.
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-index 3db41017c6690d4519564496edd8e7365b2f5a22..027eef4ace908147285c8d72b612d16e4f925672 100644
---- a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
-@@ -40,7 +40,7 @@ public class FlyingPathNavigation extends PathNavigation {
- 
-     @Override
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(entity.blockPosition(), distance);
-+        return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-index 12564909abff7da4e5a4bb3d004a7ede2ffda12d..ac996b066415e461af1fcb71b19807401179c7f8 100644
---- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
-@@ -41,7 +41,7 @@ public class GroundPathNavigation extends PathNavigation {
-     }
- 
-     @Override
--    public Path createPath(BlockPos target, int distance) {
-+    public Path createPath(BlockPos target, @javax.annotation.Nullable Entity entity, int distance) { // Paper
-         LevelChunk levelChunk = this.level.getChunkSource().getChunkNow(SectionPos.blockToSectionCoord(target.getX()), SectionPos.blockToSectionCoord(target.getZ()));
-         if (levelChunk == null) {
-             return null;
-@@ -52,7 +52,7 @@ public class GroundPathNavigation extends PathNavigation {
-                 }
- 
-                 if (blockPos.getY() > this.level.getMinBuildHeight()) {
--                    return super.createPath(blockPos.above(), distance);
-+                    return super.createPath(blockPos.above(), entity, distance); // Paper
-                 }
- 
-                 while(blockPos.getY() < this.level.getMaxBuildHeight() && levelChunk.getBlockState(blockPos).isAir()) {
-@@ -63,20 +63,20 @@ public class GroundPathNavigation extends PathNavigation {
-             }
- 
-             if (!levelChunk.getBlockState(target).isSolid()) {
--                return super.createPath(target, distance);
-+                return super.createPath(target, entity, distance); // Paper
-             } else {
-                 BlockPos blockPos2;
-                 for(blockPos2 = target.above(); blockPos2.getY() < this.level.getMaxBuildHeight() && levelChunk.getBlockState(blockPos2).isSolid(); blockPos2 = blockPos2.above()) {
-                 }
- 
--                return super.createPath(blockPos2, distance);
-+                return super.createPath(blockPos2, entity, distance); // Paper
-             }
-         }
-     }
- 
-     @Override
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(entity.blockPosition(), distance);
-+        return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
-     }
- 
-     private int getSurfaceY() {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index fa19df17967f57b5ac99b8eee9d38864c0b7a1bb..d14b329e5bccf13139c32f71da274082efc7199c 100644
---- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-@@ -110,7 +110,13 @@ public abstract class PathNavigation {
- 
-     @Nullable
-     public Path createPath(BlockPos target, int distance) {
--        return this.createPath(ImmutableSet.of(target), 8, false, distance);
-+        // Paper start - add target entity parameter
-+        return this.createPath(target, null, distance);
-+    }
-+    @Nullable
-+    public Path createPath(BlockPos target, @Nullable Entity entity, int distance) {
-+        return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
-+        // Paper end
-     }
- 
-     @Nullable
-@@ -120,7 +126,7 @@ public abstract class PathNavigation {
- 
-     @Nullable
-     public Path createPath(Entity entity, int distance) {
--        return this.createPath(ImmutableSet.of(entity.blockPosition()), 16, true, distance);
-+        return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, distance); // Paper
-     }
- 
-     @Nullable
-@@ -130,6 +136,16 @@ public abstract class PathNavigation {
- 
-     @Nullable
-     protected Path createPath(Set<BlockPos> positions, int range, boolean useHeadPos, int distance, float followRange) {
-+        return this.createPath(positions, null, range, useHeadPos, distance, followRange);
-+    }
-+
-+    @Nullable
-+    protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance) {
-+        return this.createPath(positions, target, range, useHeadPos, distance, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
-+    }
-+
-+    @Nullable protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance, float followRange) {
-+        // Paper end
-         if (positions.isEmpty()) {
-             return null;
-         } else if (this.mob.getY() < (double)this.level.getMinBuildHeight()) {
-@@ -139,6 +155,23 @@ public abstract class PathNavigation {
-         } else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
-             return this.path;
-         } else {
-+            // Paper start - Pathfind event
-+            boolean copiedSet = false;
-+            for (BlockPos possibleTarget : positions) {
-+                if (!new com.destroystokyo.paper.event.entity.EntityPathfindEvent(this.mob.getBukkitEntity(),
-+                    io.papermc.paper.util.MCUtil.toLocation(this.mob.level(), possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
-+                    if (!copiedSet) {
-+                        copiedSet = true;
-+                        positions = new java.util.HashSet<>(positions);
-+                    }
-+                    // note: since we copy the set this remove call is safe, since we're iterating over the old copy
-+                    positions.remove(possibleTarget);
-+                    if (positions.isEmpty()) {
-+                        return null;
-+                    }
-+                }
-+            }
-+            // Paper end
-             this.level.getProfiler().push("pathfind");
-             BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
-             int i = (int)(followRange + (float)range);
-diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
-index e9b49c72aa73dfcef6c136d9ed7bb5044fe8405d..2d1b2b84d7cf5bafe2cccfa0dec2bae805dbe7cf 100644
---- a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
-@@ -16,9 +16,9 @@ public class WallClimberNavigation extends GroundPathNavigation {
-     }
- 
-     @Override
--    public Path createPath(BlockPos target, int distance) {
-+    public Path createPath(BlockPos target, @Nullable Entity entity, int distance) { // Paper
-         this.pathToPosition = target;
--        return super.createPath(target, distance);
-+        return super.createPath(target, entity, distance); // Paper
-     }
- 
-     @Override

patches/server/0082-Sanitise-RegionFileCache-and-make-configurable.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antony Riley <antony@cyberiantiger.org>
-Date: Tue, 29 Mar 2016 08:22:55 +0300
-Subject: [PATCH] Sanitise RegionFileCache and make configurable.
-
-RegionFileCache prior to this patch would close every single open region
-file upon reaching a size of 256.
-This patch modifies that behaviour so it closes the the least recently
-used RegionFile.
-The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
-The maximum size of the RegionFileCache is also made configurable.
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 2d00333f25828ef5912c925d1213a56c564d85c9..465ad0bae446a20e941e8f2dbf2d85f2627482b9 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -92,7 +92,7 @@ public class RegionFileStorage implements AutoCloseable {
-                 return null;
-             }
-             // Paper end - cache regionfile does not exist state
--            if (this.regionCache.size() >= 256) {
-+            if (this.regionCache.size() >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.regionFileCacheSize) { // Paper - configurable
-                 ((RegionFile) this.regionCache.removeLast()).close();
-             }
- 

patches/server/0083-Do-not-load-chunks-for-Pathfinding.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 31 Mar 2016 19:17:58 -0400
-Subject: [PATCH] Do not load chunks for Pathfinding
-
-
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index b7995e6159c865f8e2e7865f7eb51936a9720311..10503d6d8b6daf645cf4360ee289d5e25144c976 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-@@ -459,7 +459,12 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-                 for(int n = -1; n <= 1; ++n) {
-                     if (l != 0 || n != 0) {
-                         pos.set(i + l, j + m, k + n);
--                        BlockState blockState = world.getBlockState(pos);
-+                        // Paper start
-+                        BlockState blockState = world.getBlockStateIfLoaded(pos);
-+                        if (blockState == null) {
-+                            return BlockPathTypes.BLOCKED;
-+                        } else {
-+                        // Paper end
-                         if (blockState.is(Blocks.CACTUS) || blockState.is(Blocks.SWEET_BERRY_BUSH)) {
-                             return BlockPathTypes.DANGER_OTHER;
-                         }
-@@ -475,6 +480,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-                         if (blockState.is(Blocks.WITHER_ROSE) || blockState.is(Blocks.POINTED_DRIPSTONE)) {
-                             return BlockPathTypes.DAMAGE_CAUTIOUS;
-                         }
-+                        } // Paper
-                     }
-                 }
-             }
-@@ -484,7 +490,8 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-     }
- 
-     protected static BlockPathTypes getBlockPathTypeRaw(BlockGetter world, BlockPos pos) {
--        BlockState blockState = world.getBlockState(pos);
-+        BlockState blockState = world.getBlockStateIfLoaded(pos); // Paper
-+        if (blockState == null) return BlockPathTypes.BLOCKED; // Paper
-         Block block = blockState.getBlock();
-         if (blockState.isAir()) {
-             return BlockPathTypes.OPEN;

patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sat, 2 Apr 2016 05:09:16 -0400
-Subject: [PATCH] Add PlayerUseUnknownEntityEvent
-
-Adds the PlayerUseUnknownEntityEvent to be used by plugins dealing with
-virtual entities/entities that are not actually known to the server.
-
-Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
-index 644a0fdea6576647539b96528717dbaeab498d93..221e64a66ff12a8de5c75992fc26a54a03b317e7 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
-@@ -169,4 +169,14 @@ public class ServerboundInteractPacket implements Packet<ServerGamePacketListene
-             buf.writeEnum(this.hand);
-         }
-     }
-+
-+    // Paper start - PlayerUseUnknownEntityEvent
-+    public int getEntityId() {
-+        return this.entityId;
-+    }
-+
-+    public boolean isAttack() {
-+        return this.action.getType() == ActionType.ATTACK;
-+    }
-+    // Paper end - PlayerUseUnknownEntityEvent
- }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index adef64b955170dc00c75c06bf0f41a09b2516520..3fbe132d278928a55115dce116f14ac1ce1ebc69 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2393,8 +2393,38 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                 });
-             }
-         }
-+        // Paper start - PlayerUseUnknownEntityEvent
-+        else {
-+            packet.dispatch(new net.minecraft.network.protocol.game.ServerboundInteractPacket.Handler() {
-+                @Override
-+                public void onInteraction(net.minecraft.world.InteractionHand hand) {
-+                    ServerGamePacketListenerImpl.this.callPlayerUseUnknownEntityEvent(packet, hand, null);
-+                }
-+
-+                @Override
-+                public void onInteraction(net.minecraft.world.InteractionHand hand, net.minecraft.world.phys.Vec3 pos) {
-+                    ServerGamePacketListenerImpl.this.callPlayerUseUnknownEntityEvent(packet, hand, pos);
-+                }
-+
-+                @Override
-+                public void onAttack() {
-+                    ServerGamePacketListenerImpl.this.callPlayerUseUnknownEntityEvent(packet, net.minecraft.world.InteractionHand.MAIN_HAND, null);
-+                }
-+            });
-+        }
-+
-+    }
- 
-+    private void callPlayerUseUnknownEntityEvent(ServerboundInteractPacket packet, InteractionHand hand, @Nullable net.minecraft.world.phys.Vec3 vector) {
-+        this.cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent(
-+            this.getCraftPlayer(),
-+            packet.getEntityId(),
-+            packet.isAttack(),
-+            hand == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND,
-+            vector != null ? new org.bukkit.util.Vector(vector.x, vector.y, vector.z) : null)
-+        );
-     }
-+    // Paper end - PlayerUseUnknownEntityEvent
- 
-     @Override
-     public void handleClientCommand(ServerboundClientCommandPacket packet) {

patches/server/0085-Configurable-random-tick-rates-for-blocks.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 3 Apr 2016 16:28:17 -0400
-Subject: [PATCH] Configurable random tick rates for blocks
-
-A general purpose patch that includes config options for the tick rate
-of a variety of blocks that are random ticked.
-
-Co-authored-by: MrPowerGamerBR <git@mrpowergamerbr.com>
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 3b4d8a47e7fe08284b79fab2d147629e902db026..eb6056c5051e5e8a872a10dc993dbd5232787663 100644
---- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -85,6 +85,8 @@ public class FarmBlock extends Block {
-     @Override
-     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-         int i = (Integer) state.getValue(FarmBlock.MOISTURE);
-+        if (i > 0 && world.paperConfig().tickRates.wetFarmland != 1 && (world.paperConfig().tickRates.wetFarmland < 1 || (net.minecraft.server.MinecraftServer.currentTick + pos.hashCode()) % world.paperConfig().tickRates.wetFarmland != 0)) { return; } // Paper
-+        if (i == 0 && world.paperConfig().tickRates.dryFarmland != 1 && (world.paperConfig().tickRates.dryFarmland < 1 || (net.minecraft.server.MinecraftServer.currentTick + pos.hashCode()) % world.paperConfig().tickRates.dryFarmland != 0)) { return; } // Paper
- 
-         if (!FarmBlock.isNearWater(world, pos) && !world.isRainingAt(pos.above())) {
-             if (i > 0) {
-diff --git a/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java b/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-index 1df22561b2d39066b6b30f10ea43edd734e3b50a..1fe07f8f9b28faf076209f7ad235fd5dc948b294 100644
---- a/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-@@ -2,6 +2,7 @@ package net.minecraft.world.level.block;
- 
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
-+import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.tags.FluidTags;
- import net.minecraft.util.RandomSource;
-@@ -39,6 +40,7 @@ public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock {
- 
-     @Override
-     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-+        if (this instanceof GrassBlock && world.paperConfig().tickRates.grassSpread != 1 && (world.paperConfig().tickRates.grassSpread < 1 || (MinecraftServer.currentTick + pos.hashCode()) % world.paperConfig().tickRates.grassSpread != 0)) { return; } // Paper
-         if (!SpreadingSnowyDirtBlock.canBeGrass(state, world, pos)) {
-             // CraftBukkit start
-             if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {

patches/server/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 3 Apr 2016 17:48:50 -0400
-Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 949404f3ac0e853cfc45e28453136dd166ac9563..f13e39082638310532a0fd1dab41e809c45287c0 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1600,6 +1600,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-     @Override
-     public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
-+        if (captureBlockStates) { return; } // Paper - Cancel all physics during placement
-         this.neighborUpdater.updateNeighborsAtExceptFromFacing(pos, sourceBlock, (Direction) null);
-     }
- 

patches/server/0087-Optimize-DataBits.patch

@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 5 Apr 2016 21:38:58 -0400
-Subject: [PATCH] Optimize DataBits
-
-Remove Debug checks as these are super hot and causing noticeable hits
-
-Before: http://i.imgur.com/nQsMzAE.png
-After: http://i.imgur.com/nJ46crB.png
-
-Optimize redundant converting of static fields into an unsigned long each call by precomputing it in ctor
-
-diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-index f677cc252d5510a2365e73dc42bd266e56115e83..2b3fd62dca2d1475075b5dcde56cea85b749cb44 100644
---- a/src/main/java/net/minecraft/util/SimpleBitStorage.java
-+++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-@@ -11,8 +11,8 @@ public class SimpleBitStorage implements BitStorage {
-     private final long mask;
-     private final int size;
-     private final int valuesPerLong;
--    private final int divideMul;
--    private final int divideAdd;
-+    private final int divideMul; private final long divideMulUnsigned; // Paper - referenced in b(int) with 2 Integer.toUnsignedLong calls
-+    private final int divideAdd; private final long divideAddUnsigned; // Paper
-     private final int divideShift;
- 
-     public SimpleBitStorage(int elementBits, int size, int[] data) {
-@@ -56,8 +56,8 @@ public class SimpleBitStorage implements BitStorage {
-         this.mask = (1L << elementBits) - 1L;
-         this.valuesPerLong = (char)(64 / elementBits);
-         int i = 3 * (this.valuesPerLong - 1);
--        this.divideMul = MAGIC[i + 0];
--        this.divideAdd = MAGIC[i + 1];
-+        this.divideMul = MAGIC[i + 0]; this.divideMulUnsigned = Integer.toUnsignedLong(this.divideMul); // Paper
-+        this.divideAdd = MAGIC[i + 1]; this.divideAddUnsigned = Integer.toUnsignedLong(this.divideAdd); // Paper
-         this.divideShift = MAGIC[i + 2];
-         int j = (size + this.valuesPerLong - 1) / this.valuesPerLong;
-         if (data != null) {
-@@ -73,15 +73,15 @@ public class SimpleBitStorage implements BitStorage {
-     }
- 
-     private int cellIndex(int index) {
--        long l = Integer.toUnsignedLong(this.divideMul);
--        long m = Integer.toUnsignedLong(this.divideAdd);
--        return (int)((long)index * l + m >> 32 >> this.divideShift);
-+        //long l = Integer.toUnsignedLong(this.divideMul); // Paper
-+        //long m = Integer.toUnsignedLong(this.divideAdd); // Paper
-+        return (int) ((long) index * this.divideMulUnsigned + this.divideAddUnsigned >> 32 >> this.divideShift); // Paper
-     }
- 
-     @Override
--    public int getAndSet(int index, int value) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
--        Validate.inclusiveBetween(0L, this.mask, (long)value);
-+    public final int getAndSet(int index, int value) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper
-+        //Validate.inclusiveBetween(0L, this.mask, (long)value); // Paper
-         int i = this.cellIndex(index);
-         long l = this.data[i];
-         int j = (index - i * this.valuesPerLong) * this.bits;
-@@ -91,9 +91,9 @@ public class SimpleBitStorage implements BitStorage {
-     }
- 
-     @Override
--    public void set(int index, int value) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
--        Validate.inclusiveBetween(0L, this.mask, (long)value);
-+    public final void set(int index, int value) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper
-+        //Validate.inclusiveBetween(0L, this.mask, (long)value); // Paper
-         int i = this.cellIndex(index);
-         long l = this.data[i];
-         int j = (index - i * this.valuesPerLong) * this.bits;
-@@ -101,8 +101,8 @@ public class SimpleBitStorage implements BitStorage {
-     }
- 
-     @Override
--    public int get(int index) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
-+    public final int get(int index) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
-         int i = this.cellIndex(index);
-         long l = this.data[i];
-         int j = (index - i * this.valuesPerLong) * this.bits;
-diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index 0710c72441c832a93275f3f9bd9dd7643dc0f229..f0f764f36fb92c64ab2dc8a0a50c3f48321c3c9a 100644
---- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
-+++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-@@ -13,21 +13,21 @@ public class ZeroBitStorage implements BitStorage {
-     }
- 
-     @Override
--    public int getAndSet(int index, int value) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
--        Validate.inclusiveBetween(0L, 0L, (long)value);
-+    public final int getAndSet(int index, int value) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper
-+        //Validate.inclusiveBetween(0L, 0L, (long)value); // Paper
-         return 0;
-     }
- 
-     @Override
--    public void set(int index, int value) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
--        Validate.inclusiveBetween(0L, 0L, (long)value);
-+    public final void set(int index, int value) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper
-+        //Validate.inclusiveBetween(0L, 0L, (long)value); // Paper
-     }
- 
-     @Override
--    public int get(int index) {
--        Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index);
-+    public final int get(int index) { // Paper - make final for inline
-+        //Validate.inclusiveBetween(0L, (long)(this.size - 1), (long)index); // Paper
-         return 0;
-     }
- 

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

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 6 Apr 2016 01:04:23 -0500
-Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
-
-This change is basically a bandaid to fix CB's complete and utter lack
-of support for vanilla scoreboard name modifications.
-
-In the future, finding a way to merge the vanilla expectations in with
-bukkit's concept of a display name would be preferable. There was a PR
-for this on CB at one point but I can't find it. We may need to do this
-ourselves at some point in the future.
-
-diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 57081e84d50f7eca7ea11540b550da8269378e9e..e4fd372a1d585887287253a02531cd192929377b 100644
---- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -19,6 +19,7 @@ import net.kyori.adventure.audience.Audience;
- import net.kyori.adventure.audience.ForwardingAudience;
- import net.kyori.adventure.key.Key;
- import net.kyori.adventure.text.Component;
-+import net.minecraft.ChatFormatting;
- import net.minecraft.Optionull;
- import net.minecraft.Util;
- import net.minecraft.core.registries.Registries;
-@@ -31,6 +32,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerPlayer;
- import org.bukkit.command.ConsoleCommandSender;
-+import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.craftbukkit.entity.CraftPlayer;
- import org.bukkit.craftbukkit.util.LazyPlayerSet;
- import org.bukkit.craftbukkit.util.Waitable;
-@@ -367,10 +369,16 @@ public final class ChatProcessor {
-     }
- 
-     static String legacyDisplayName(final CraftPlayer player) {
-+        if (((org.bukkit.craftbukkit.CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring) {
-+            return legacySection().serialize(player.teamDisplayName()) + ChatFormatting.RESET;
-+        }
-         return player.getDisplayName();
-     }
- 
-     static Component displayName(final CraftPlayer player) {
-+        if (((CraftWorld) player.getWorld()).getHandle().paperConfig().scoreboards.useVanillaWorldScoreboardNameColoring) {
-+            return player.teamDisplayName();
-+        }
-         return player.displayName();
-     }
- 

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

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 13 Apr 2016 02:10:49 -0400
-Subject: [PATCH] Configurable Player Collision
-
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c81434a1b4 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-@@ -193,7 +193,7 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
-             buf.writeComponent(this.displayName);
-             buf.writeByte(this.options);
-             buf.writeUtf(this.nametagVisibility);
--            buf.writeUtf(this.collisionRule);
-+            buf.writeUtf(!io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions ? "never" : this.collisionRule); // Paper
-             buf.writeEnum(this.color);
-             buf.writeComponent(this.playerPrefix);
-             buf.writeComponent(this.playerSuffix);
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 281884fedf6607581a24fef4b3326dfb81012124..1356d61428a50b4fc09c6c4d4c02e02056b6b38b 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -575,6 +575,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
-         }
- 
-+        // Paper start - Handle collideRule team for player collision toggle
-+        final ServerScoreboard scoreboard = this.getScoreboard();
-+        final java.util.Collection<String> toRemove = scoreboard.getPlayerTeams().stream().filter(team -> team.getName().startsWith("collideRule_")).map(net.minecraft.world.scores.PlayerTeam::getName).collect(java.util.stream.Collectors.toList());
-+        for (String teamName : toRemove) {
-+            scoreboard.removePlayerTeam(scoreboard.getPlayerTeam(teamName)); // Clean up after ourselves
-+        }
-+
-+        if (!io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) {
-+            this.getPlayerList().collideRuleTeamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + java.util.concurrent.ThreadLocalRandom.current().nextInt(), 16);
-+            net.minecraft.world.scores.PlayerTeam collideTeam = scoreboard.addPlayerTeam(this.getPlayerList().collideRuleTeamName);
-+            collideTeam.setSeeFriendlyInvisibles(false); // Because we want to mimic them not being on a team at all
-+        }
-+        // Paper end
-+
-         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
-         this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
-         this.connection.acceptConnections();
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa7aad589275598eaf3cae86a4e1e47d40b52f05..441c187b45bfa20d929fe3c5e8dc25db22c4aad1 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -100,6 +100,7 @@ import net.minecraft.world.phys.Vec3;
- import net.minecraft.world.scores.DisplaySlot;
- import net.minecraft.world.scores.Objective;
- import net.minecraft.world.scores.PlayerTeam;
-+import net.minecraft.world.scores.Scoreboard; // Paper
- import net.minecraft.world.scores.Team;
- import org.slf4j.Logger;
- 
-@@ -157,6 +158,7 @@ public abstract class PlayerList {
-     // CraftBukkit start
-     private CraftServer cserver;
-     private final Map<String,ServerPlayer> playersByName = new java.util.HashMap<>();
-+    public @Nullable String collideRuleTeamName; // Paper - Team name used for collideRule
- 
-     public PlayerList(MinecraftServer server, LayeredRegistryAccess<RegistryLayer> registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
-         this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
-@@ -399,6 +401,13 @@ public abstract class PlayerList {
- 
-         player.initInventoryMenu();
-         // CraftBukkit - Moved from above, added world
-+        // Paper start - Add to collideRule team if needed
-+        final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
-+        final PlayerTeam collideRuleTeam = scoreboard.getPlayerTeam(this.collideRuleTeamName);
-+        if (this.collideRuleTeamName != null && collideRuleTeam != null && player.getTeam() == null) {
-+            scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
-+        }
-+        // Paper end
-         PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-     }
- 
-@@ -522,6 +531,16 @@ public abstract class PlayerList {
-         entityplayer.doTick(); // SPIGOT-924
-         // CraftBukkit end
- 
-+        // Paper start - Remove from collideRule team if needed
-+        if (this.collideRuleTeamName != null) {
-+            final Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
-+            final PlayerTeam team = scoreBoard.getPlayersTeam(this.collideRuleTeamName);
-+            if (entityplayer.getTeam() == team && team != null) {
-+                scoreBoard.removePlayerFromTeam(entityplayer.getScoreboardName(), team);
-+            }
-+        }
-+        // Paper end
-+
-         this.save(entityplayer);
-         if (entityplayer.isPassenger()) {
-             Entity entity = entityplayer.getRootVehicle();
-@@ -1160,6 +1179,13 @@ public abstract class PlayerList {
-         }
-         // CraftBukkit end
- 
-+        // Paper start - Remove collideRule team if it exists
-+        if (this.collideRuleTeamName != null) {
-+            final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
-+            final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName);
-+            if (team != null) scoreboard.removePlayerTeam(team);
-+        }
-+        // Paper end
-     }
- 
-     // CraftBukkit start

patches/server/0090-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 13 Apr 2016 20:21:38 -0700
-Subject: [PATCH] Add handshake event to allow plugins to handle client
- handshaking logic themselves
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 4a649a2006f907c9b7542843ec6938d9375ca645..0d9658b1c6b5912a34058c0ce53b8e7f8c28afac 100644
---- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -89,9 +89,44 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-                     this.connection.disconnect(ichatmutablecomponent);
-                 } else {
-                     this.connection.setListener(new ServerLoginPacketListenerImpl(this.server, this.connection));
-+                // Paper start - handshake event
-+                boolean proxyLogicEnabled = org.spigotmc.SpigotConfig.bungee;
-+                boolean handledByEvent = false;
-+                // Try and handle the handshake through the event
-+                if (com.destroystokyo.paper.event.player.PlayerHandshakeEvent.getHandlerList().getRegisteredListeners().length != 0) { // Hello? Can you hear me?
-+                    java.net.SocketAddress socketAddress = this.connection.address;
-+                    String hostnameOfRemote = socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getHostString() : InetAddress.getLoopbackAddress().getHostAddress();
-+                    com.destroystokyo.paper.event.player.PlayerHandshakeEvent event = new com.destroystokyo.paper.event.player.PlayerHandshakeEvent(packet.hostName(), hostnameOfRemote, !proxyLogicEnabled);
-+                    if (event.callEvent()) {
-+                        // If we've failed somehow, let the client know so and go no further.
-+                        if (event.isFailed()) {
-+                            Component component = io.papermc.paper.adventure.PaperAdventure.asVanilla(event.failMessage());
-+                            this.connection.send(new ClientboundLoginDisconnectPacket(component));
-+                            this.connection.disconnect(component);
-+                            return;
-+                        }
-+
-+                        if (event.getServerHostname() != null) {
-+                            // change hostname
-+                            packet = new ClientIntentionPacket(
-+                                packet.protocolVersion(),
-+                                event.getServerHostname(),
-+                                packet.port(),
-+                                packet.intention()
-+                            );
-+                        }
-+                        if (event.getSocketAddressHostname() != null) this.connection.address = new java.net.InetSocketAddress(event.getSocketAddressHostname(), socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getPort() : 0);
-+                        this.connection.spoofedUUID = event.getUniqueId();
-+                        this.connection.spoofedProfile = gson.fromJson(event.getPropertiesJson(), com.mojang.authlib.properties.Property[].class);
-+                        handledByEvent = true; // Hooray, we did it!
-+                    }
-+                }
-                     // Spigot Start
-                     String[] split = packet.hostName().split("\00");
--                    if (org.spigotmc.SpigotConfig.bungee) {
-+                    // Don't try and handle default logic if it's been handled by the event.
-+                    if (!handledByEvent && proxyLogicEnabled) {
-+                        // Paper end
-+                    // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                         if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
-                             this.connection.hostname = split[0];
-                             this.connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());

patches/server/0091-Configurable-RCON-IP-address.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 16 Apr 2016 00:39:33 -0400
-Subject: [PATCH] Configurable RCON IP address
-
-For servers with multiple IP's, ability to bind to a specific interface.
-
-== AT ==
-public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 20d02405b8e6476b11a8c8518c9a3949d3df11a4..bdf520c32847658fefaf2bde33bac16ea807002f 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -109,6 +109,8 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     private final DedicatedServerProperties.WorldDimensionData worldDimensionData;
-     public final WorldOptions worldOptions;
- 
-+    public final String rconIp; // Paper - Add rcon ip
-+
-     // CraftBukkit start
-     public DedicatedServerProperties(Properties properties, OptionSet optionset) {
-         super(properties, optionset);
-@@ -167,6 +169,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         }, WorldPresets.NORMAL.location().toString()));
-         this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
-         this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled())));
-+        // Paper start - Configurable rcon ip
-+        final String rconIp = this.getStringRaw("rcon.ip");
-+        this.rconIp = rconIp == null ? this.serverIp : rconIp;
-+        // Paper end
-     }
- 
-     // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
-index cb61eaf8447c8340c4b4e1079c0a6aecd41a6116..3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24 100644
---- a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
-+++ b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
-@@ -60,7 +60,7 @@ public class RconThread extends GenericThread {
-     @Nullable
-     public static RconThread create(ServerInterface server) {
-         DedicatedServerProperties dedicatedServerProperties = server.getProperties();
--        String string = server.getServerIp();
-+        String string = dedicatedServerProperties.rconIp; // Paper - Configurable rcon ip
-         if (string.isEmpty()) {
-             string = "0.0.0.0";
-         }

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

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 22 Apr 2016 01:43:11 -0500
-Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
-
-Don't even get me started
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 82eee07363edd313c6f1f6243867d91185076382..a820cdc5cf39bd5021e118bf9efdc8a8c92c722b 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1323,10 +1323,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {
-+        // Paper start - Forward
-+        heal(f, regainReason, false);
-+    }
-+
-+    public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason, boolean isFastRegen) {
-+        // Paper end
-         float f1 = this.getHealth();
- 
-         if (f1 > 0.0F) {
--            EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason);
-+            EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason, isFastRegen); // Paper
-             // Suppress during worldgen
-             if (this.valid) {
-                 this.level().getCraftServer().getPluginManager().callEvent(event);
-diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
-index 5ff0eba33f848de5172944274e14062090ab7407..2038df72f8d7d33d4105de8129628daf21de6f0f 100644
---- a/src/main/java/net/minecraft/world/food/FoodData.java
-+++ b/src/main/java/net/minecraft/world/food/FoodData.java
-@@ -83,7 +83,7 @@ public class FoodData {
-             if (this.tickTimer >= this.saturatedRegenRate) { // CraftBukkit
-                 float f = Math.min(this.saturationLevel, 6.0F);
- 
--                player.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
-+                player.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED, true); // CraftBukkit - added RegainReason // Paper - This is fast regen
-                 // this.addExhaustion(f); CraftBukkit - EntityExhaustionEvent
-                 player.causeFoodExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
-                 this.tickTimer = 0;

patches/server/0093-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 21 Apr 2016 23:51:55 -0700
-Subject: [PATCH] Add ability to configure frosted_ice properties
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-index e1916fe8a7aa736d9266efde954bbfbda38a3a65..331b642c36af97f7f05bd63f96d42d1af443e5a3 100644
---- a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-@@ -32,6 +32,7 @@ public class FrostedIceBlock extends IceBlock {
- 
-     @Override
-     public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-+        if (!world.paperConfig().environment.frostedIce.enabled) return; // Paper - add ability to disable frosted ice
-         if ((random.nextInt(3) == 0 || this.fewerNeigboursThan(world, pos, 4)) && world.getMaxLocalRawBrightness(pos) > 11 - state.getValue(AGE) - state.getLightBlock(world, pos) && this.slightlyMelt(state, world, pos)) {
-             BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
- 
-@@ -39,12 +40,12 @@ public class FrostedIceBlock extends IceBlock {
-                 mutableBlockPos.setWithOffset(pos, direction);
-                 BlockState blockState = world.getBlockState(mutableBlockPos);
-                 if (blockState.is(this) && !this.slightlyMelt(blockState, world, mutableBlockPos)) {
--                    world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, 20, 40));
-+                    world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - use configurable min/max delay
-                 }
-             }
- 
-         } else {
--            world.scheduleTick(pos, this, Mth.nextInt(random, 20, 40));
-+            world.scheduleTick(pos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - use configurable min/max delay
-         }
-     }
- 

patches/server/0094-remove-null-possibility-for-getServer-singleton.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 28 Apr 2016 00:57:27 -0400
-Subject: [PATCH] remove null possibility for getServer singleton
-
-to stop IDE complaining about potential NPE
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1356d61428a50b4fc09c6c4d4c02e02056b6b38b..1766cd6d83aee31800364402dbe4a439c56e63d0 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -189,6 +189,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
- 
- public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
- 
-+    private static MinecraftServer SERVER; // Paper
-     public static final Logger LOGGER = LogUtils.getLogger();
-     public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
-     public static final String VANILLA_BRAND = "vanilla";
-@@ -314,6 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
-         super("Server");
-+        SERVER = this; // Paper - better singleton
-         this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
-         this.profiler = this.metricsRecorder.getProfiler();
-         this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2319,9 +2321,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         return false;
-     }
- 
--    @Deprecated
-     public static MinecraftServer getServer() {
--        return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
-+        return SERVER; // Paper
-     }
-     // CraftBukkit end
- 

patches/server/0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 29 Apr 2016 20:02:00 -0400
-Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
-
-Maps used a modified version of rendering to support plugin controlled
-imaging on maps. The Craft Map Renderer is much slower than Vanilla,
-causing maps in item frames to cause a noticeable hit on server performance.
-
-This updates the map system to not use the Craft system if we detect that no
-custom renderers are in use, defaulting to the much simpler Vanilla system.
-
-Additionally, numerous issues to player position tracking on maps has been fixed.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f13e39082638310532a0fd1dab41e809c45287c0..10c492e57958335a0f054f17c985209238df8b63 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2387,6 +2387,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                             {
-                                 if ( iter.next().player == entity )
-                                 {
-+                                    map.decorations.remove(entity.getName().getString()); // Paper
-                                     iter.remove();
-                                 }
-                             }
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 06522d8d3b7e0d455a42b10ec5004cc82e0d888d..62a52216e27c0e4847b9c346c35c3d1b7b3b15aa 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -769,6 +769,14 @@ public abstract class Player extends LivingEntity {
-                 return null;
-             }
-             // CraftBukkit end
-+            // Paper start - remove player from map on drop
-+            if (itemstack.getItem() == Items.FILLED_MAP) {
-+                net.minecraft.world.level.saveddata.maps.MapItemSavedData worldmap = net.minecraft.world.item.MapItem.getSavedData(itemstack, this.level());
-+                if (worldmap != null) {
-+                    worldmap.tickCarriedBy(this, itemstack);
-+                }
-+            }
-+            // Paper end
- 
-             return entityitem;
-         }
-diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f85660c51 100644
---- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -64,6 +64,7 @@ public class MapItemSavedData extends SavedData {
-     public final Map<String, MapDecoration> decorations = Maps.newLinkedHashMap();
-     private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
-     private int trackedDecorationCount;
-+    private org.bukkit.craftbukkit.map.RenderData vanillaRender = new org.bukkit.craftbukkit.map.RenderData(); // Paper
- 
-     // CraftBukkit start
-     public final CraftMapView mapView;
-@@ -90,6 +91,7 @@ public class MapItemSavedData extends SavedData {
-         // CraftBukkit start
-         this.mapView = new CraftMapView(this);
-         this.server = (CraftServer) org.bukkit.Bukkit.getServer();
-+        this.vanillaRender.buffer = colors; // Paper
-         // CraftBukkit end
-     }
- 
-@@ -145,6 +147,7 @@ public class MapItemSavedData extends SavedData {
-         if (abyte.length == 16384) {
-             worldmap.colors = abyte;
-         }
-+        worldmap.vanillaRender.buffer = abyte; // Paper
- 
-         ListTag nbttaglist = nbt.getList("banners", 10);
- 
-@@ -555,6 +558,21 @@ public class MapItemSavedData extends SavedData {
- 
-     public class HoldingPlayer {
- 
-+        // Paper start
-+        private void addSeenPlayers(java.util.Collection<MapDecoration> icons) {
-+            org.bukkit.entity.Player player = (org.bukkit.entity.Player) this.player.getBukkitEntity();
-+            MapItemSavedData.this.decorations.forEach((name, mapIcon) -> {
-+                // If this cursor is for a player check visibility with vanish system
-+                org.bukkit.entity.Player other = org.bukkit.Bukkit.getPlayerExact(name); // Spigot
-+                if (other == null || player.canSee(other)) {
-+                    icons.add(mapIcon);
-+                }
-+            });
-+        }
-+        private boolean shouldUseVanillaMap() {
-+            return mapView.getRenderers().size() == 1 && mapView.getRenderers().get(0).getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class;
-+        }
-+        // Paper end
-         public final Player player;
-         private boolean dirtyData = true;
-         private int minDirtyX;
-@@ -588,7 +606,9 @@ public class MapItemSavedData extends SavedData {
-         @Nullable
-         Packet<?> nextUpdatePacket(int mapId) {
-             MapItemSavedData.MapPatch worldmap_b;
--            org.bukkit.craftbukkit.map.RenderData render = MapItemSavedData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()); // CraftBukkit
-+            if (!this.dirtyData && this.tick % 5 != 0) { this.tick++; return null; } // Paper - this won't end up sending, so don't render it!
-+            boolean vanillaMaps = shouldUseVanillaMap(); // Paper
-+            org.bukkit.craftbukkit.map.RenderData render = !vanillaMaps ? MapItemSavedData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()) : MapItemSavedData.this.vanillaRender; // CraftBukkit // Paper
- 
-             if (this.dirtyData) {
-                 this.dirtyData = false;
-@@ -604,6 +624,8 @@ public class MapItemSavedData extends SavedData {
-                 // CraftBukkit start
-                 java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
- 
-+                if (vanillaMaps) addSeenPlayers(icons); // Paper
-+
-                 for (org.bukkit.map.MapCursor cursor : render.cursors) {
-                     if (cursor.isVisible()) {
-                         icons.add(new MapDecoration(MapDecoration.Type.byIcon(cursor.getRawType()), cursor.getX(), cursor.getY(), cursor.getDirection(), PaperAdventure.asVanilla(cursor.caption()))); // Paper - Adventure
-diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a131781721c86dd6cdbc329335964570cbe8c..5768cd512ec166f1e8d1f4a28792015347297c3f 100644
---- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-+++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-@@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
- 
- public class RenderData {
- 
--    public final byte[] buffer;
-+    public byte[] buffer; // Paper
-     public final ArrayList<MapCursor> cursors;
- 
-     public RenderData() {

patches/server/0096-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,800 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 1 May 2016 21:19:14 -0400
-Subject: [PATCH] LootTable API & Replenishable Lootables Feature
-
-Provides an API to control the loot table for an object.
-Also provides a feature that any Lootable Inventory (Chests in Structures)
-can automatically replenish after a given time.
-
-This feature is good for long term worlds so that newer players
-do not suffer with "Every chest has been looted"
-
-== AT ==
-public org.bukkit.craftbukkit.block.CraftBlockEntityState getTileEntity()Lnet/minecraft/world/level/block/entity/BlockEntity;
-public org.bukkit.craftbukkit.block.CraftLootable setLootTable(Lorg/bukkit/loot/LootTable;J)V
-public org.bukkit.craftbukkit.entity.CraftMinecartContainer setLootTable(Lorg/bukkit/loot/LootTable;J)V
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9ca389ca789dc54bba3542cac0aac2e1dc66c870
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-@@ -0,0 +1,63 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.vehicle.AbstractMinecartContainer;
-+import net.minecraft.world.entity.vehicle.ContainerEntity;
-+import net.minecraft.world.level.Level;
-+import org.bukkit.Bukkit;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+
-+public class PaperContainerEntityLootableInventory implements PaperLootableEntityInventory {
-+
-+    private final ContainerEntity entity;
-+
-+    public PaperContainerEntityLootableInventory(ContainerEntity entity) {
-+        this.entity = entity;
-+    }
-+
-+    @Override
-+    public org.bukkit.loot.LootTable getLootTable() {
-+        return entity.getLootTable() != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table, long seed) {
-+        setLootTable(table);
-+        setSeed(seed);
-+    }
-+
-+    @Override
-+    public void setSeed(long seed) {
-+        entity.setLootTableSeed(seed);
-+    }
-+
-+    @Override
-+    public long getSeed() {
-+        return entity.getLootTableSeed();
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table) {
-+        entity.setLootTable((table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey()));
-+    }
-+
-+    @Override
-+    public PaperLootableInventoryData getLootableData() {
-+        return entity.getLootableData();
-+    }
-+
-+    @Override
-+    public Entity getHandle() {
-+        return entity.getEntity();
-+    }
-+
-+    @Override
-+    public LootableInventory getAPILootableInventory() {
-+        return (LootableInventory) entity.getEntity().getBukkitEntity();
-+    }
-+
-+    @Override
-+    public Level getNMSWorld() {
-+        return entity.level();
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..24c6ff57cd25533e71f8a1d0b3c0ece2fdbbf87e
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
-@@ -0,0 +1,33 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-+import org.bukkit.Chunk;
-+import org.bukkit.block.Block;
-+
-+public interface PaperLootableBlockInventory extends LootableBlockInventory, PaperLootableInventory {
-+
-+    RandomizableContainerBlockEntity getTileEntity();
-+
-+    @Override
-+    default LootableInventory getAPILootableInventory() {
-+        return this;
-+    }
-+
-+    @Override
-+    default Level getNMSWorld() {
-+        return this.getTileEntity().getLevel();
-+    }
-+
-+    default Block getBlock() {
-+        final BlockPos position = this.getTileEntity().getBlockPos();
-+        final Chunk bukkitChunk = this.getBukkitWorld().getChunkAt(org.bukkit.craftbukkit.block.CraftBlock.at(this.getNMSWorld(), position));
-+        return bukkitChunk.getBlock(position.getX(), position.getY(), position.getZ());
-+    }
-+
-+    @Override
-+    default PaperLootableInventoryData getLootableData() {
-+        return this.getTileEntity().lootableData;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2fba5bc0f982e143ad5f5bda55d768edc5f847df
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
-@@ -0,0 +1,28 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import net.minecraft.world.level.Level;
-+import org.bukkit.entity.Entity;
-+
-+public interface PaperLootableEntityInventory extends LootableEntityInventory, PaperLootableInventory {
-+
-+    net.minecraft.world.entity.Entity getHandle();
-+
-+    @Override
-+    default LootableInventory getAPILootableInventory() {
-+        return this;
-+    }
-+
-+    default Entity getEntity() {
-+        return getHandle().getBukkitEntity();
-+    }
-+
-+    @Override
-+    default Level getNMSWorld() {
-+        return getHandle().getCommandSenderWorld();
-+    }
-+
-+    @Override
-+    default PaperLootableInventoryData getLootableData() {
-+        return getHandle().lootableData;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8e6dac2cef7af26ad74928eff631c1826c2980bb
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
-@@ -0,0 +1,75 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.loot.Lootable;
-+import java.util.UUID;
-+import net.minecraft.world.level.Level;
-+
-+public interface PaperLootableInventory extends LootableInventory, Lootable {
-+
-+    PaperLootableInventoryData getLootableData();
-+    LootableInventory getAPILootableInventory();
-+
-+    Level getNMSWorld();
-+
-+    default org.bukkit.World getBukkitWorld() {
-+        return getNMSWorld().getWorld();
-+    }
-+
-+    @Override
-+    default boolean isRefillEnabled() {
-+        return getNMSWorld().paperConfig().lootables.autoReplenish;
-+    }
-+
-+    @Override
-+    default boolean hasBeenFilled() {
-+        return getLastFilled() != -1;
-+    }
-+
-+    @Override
-+    default boolean hasPlayerLooted(UUID player) {
-+        return getLootableData().hasPlayerLooted(player);
-+    }
-+
-+    @Override
-+    default boolean canPlayerLoot(final UUID player) {
-+        return getLootableData().canPlayerLoot(player, this.getNMSWorld().paperConfig());
-+    }
-+
-+    @Override
-+    default Long getLastLooted(UUID player) {
-+        return getLootableData().getLastLooted(player);
-+    }
-+
-+    @Override
-+    default boolean setHasPlayerLooted(UUID player, boolean looted) {
-+        final boolean hasLooted = hasPlayerLooted(player);
-+        if (hasLooted != looted) {
-+            getLootableData().setPlayerLootedState(player, looted);
-+        }
-+        return hasLooted;
-+    }
-+
-+    @Override
-+    default boolean hasPendingRefill() {
-+        long nextRefill = getLootableData().getNextRefill();
-+        return nextRefill != -1 && nextRefill > getLootableData().getLastFill();
-+    }
-+
-+    @Override
-+    default long getLastFilled() {
-+        return getLootableData().getLastFill();
-+    }
-+
-+    @Override
-+    default long getNextRefill() {
-+        return getLootableData().getNextRefill();
-+    }
-+
-+    @Override
-+    default long setNextRefill(long refillAt) {
-+        if (refillAt < -1) {
-+            refillAt = -1;
-+        }
-+        return getLootableData().setNextRefill(refillAt);
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5408cbc21fc7577a6100b5a1ca0463e899d2df8b
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-@@ -0,0 +1,188 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import io.papermc.paper.configuration.WorldConfiguration;
-+import io.papermc.paper.configuration.type.DurationOrDisabled;
-+import java.time.temporal.ChronoUnit;
-+import java.util.concurrent.TimeUnit;
-+import org.bukkit.entity.Player;
-+import org.bukkit.loot.LootTable;
-+import javax.annotation.Nullable;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.nbt.ListTag;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.Random;
-+import java.util.UUID;
-+
-+public class PaperLootableInventoryData {
-+
-+    private static final Random RANDOM = new Random();
-+
-+    private long lastFill = -1;
-+    private long nextRefill = -1;
-+    private int numRefills = 0;
-+    private Map<UUID, Long> lootedPlayers;
-+    private final PaperLootableInventory lootable;
-+
-+    public PaperLootableInventoryData(PaperLootableInventory lootable) {
-+        this.lootable = lootable;
-+    }
-+
-+    long getLastFill() {
-+        return this.lastFill;
-+    }
-+
-+    long getNextRefill() {
-+        return this.nextRefill;
-+    }
-+
-+    long setNextRefill(long nextRefill) {
-+        long prev = this.nextRefill;
-+        this.nextRefill = nextRefill;
-+        return prev;
-+    }
-+
-+    public boolean shouldReplenish(@Nullable net.minecraft.world.entity.player.Player player) {
-+        LootTable table = this.lootable.getLootTable();
-+
-+        // No Loot Table associated
-+        if (table == null) {
-+            return false;
-+        }
-+
-+        // ALWAYS process the first fill or if the feature is disabled
-+        if (this.lastFill == -1 || !this.lootable.getNMSWorld().paperConfig().lootables.autoReplenish) {
-+            return true;
-+        }
-+
-+        // Only process refills when a player is set
-+        if (player == null) {
-+            return false;
-+        }
-+
-+        // Chest is not scheduled for refill
-+        if (this.nextRefill == -1) {
-+            return false;
-+        }
-+
-+        final WorldConfiguration paperConfig = this.lootable.getNMSWorld().paperConfig();
-+
-+        // Check if max refills has been hit
-+        if (paperConfig.lootables.maxRefills != -1 && this.numRefills >= paperConfig.lootables.maxRefills) {
-+            return false;
-+        }
-+
-+        // Refill has not been reached
-+        if (this.nextRefill > System.currentTimeMillis()) {
-+            return false;
-+        }
-+
-+
-+        final Player bukkitPlayer = (Player) player.getBukkitEntity();
-+        LootableInventoryReplenishEvent event = new LootableInventoryReplenishEvent(bukkitPlayer, lootable.getAPILootableInventory());
-+        event.setCancelled(!canPlayerLoot(player.getUUID(), paperConfig));
-+        return event.callEvent();
-+    }
-+    public void processRefill(@Nullable net.minecraft.world.entity.player.Player player) {
-+        this.lastFill = System.currentTimeMillis();
-+        final WorldConfiguration paperConfig = this.lootable.getNMSWorld().paperConfig();
-+        if (paperConfig.lootables.autoReplenish) {
-+            long min = paperConfig.lootables.refreshMin.seconds();
-+            long max = paperConfig.lootables.refreshMax.seconds();
-+            this.nextRefill = this.lastFill + (min + RANDOM.nextLong(max - min + 1)) * 1000L;
-+            this.numRefills++;
-+            if (paperConfig.lootables.resetSeedOnFill) {
-+                this.lootable.setSeed(0);
-+            }
-+            if (player != null) { // This means that numRefills can be incremented without a player being in the lootedPlayers list - Seems to be EntityMinecartChest specific
-+                this.setPlayerLootedState(player.getUUID(), true);
-+            }
-+        } else {
-+            this.lootable.clearLootTable();
-+        }
-+    }
-+
-+
-+    public void loadNbt(CompoundTag base) {
-+        if (!base.contains("Paper.LootableData", 10)) { // 10 = compound
-+            return;
-+        }
-+        CompoundTag comp = base.getCompound("Paper.LootableData");
-+        if (comp.contains("lastFill")) {
-+            this.lastFill = comp.getLong("lastFill");
-+        }
-+        if (comp.contains("nextRefill")) {
-+            this.nextRefill = comp.getLong("nextRefill");
-+        }
-+
-+        if (comp.contains("numRefills")) {
-+            this.numRefills = comp.getInt("numRefills");
-+        }
-+        if (comp.contains("lootedPlayers", 9)) { // 9 = list
-+            ListTag list = comp.getList("lootedPlayers", 10); // 10 = compound
-+            final int size = list.size();
-+            if (size > 0) {
-+                this.lootedPlayers = new HashMap<>(list.size());
-+            }
-+            for (int i = 0; i < size; i++) {
-+                final CompoundTag cmp = list.getCompound(i);
-+                lootedPlayers.put(cmp.getUUID("UUID"), cmp.getLong("Time"));
-+            }
-+        }
-+    }
-+    public void saveNbt(CompoundTag base) {
-+        CompoundTag comp = new CompoundTag();
-+        if (this.nextRefill != -1) {
-+            comp.putLong("nextRefill", this.nextRefill);
-+        }
-+        if (this.lastFill != -1) {
-+            comp.putLong("lastFill", this.lastFill);
-+        }
-+        if (this.numRefills != 0) {
-+            comp.putInt("numRefills", this.numRefills);
-+        }
-+        if (this.lootedPlayers != null && !this.lootedPlayers.isEmpty()) {
-+            ListTag list = new ListTag();
-+            for (Map.Entry<UUID, Long> entry : this.lootedPlayers.entrySet()) {
-+                CompoundTag cmp = new CompoundTag();
-+                cmp.putUUID("UUID", entry.getKey());
-+                cmp.putLong("Time", entry.getValue());
-+                list.add(cmp);
-+            }
-+            comp.put("lootedPlayers", list);
-+        }
-+
-+        if (!comp.isEmpty()) {
-+            base.put("Paper.LootableData", comp);
-+        }
-+    }
-+
-+    void setPlayerLootedState(UUID player, boolean looted) {
-+        if (looted && this.lootedPlayers == null) {
-+            this.lootedPlayers = new HashMap<>();
-+        }
-+        if (looted) {
-+            this.lootedPlayers.put(player, System.currentTimeMillis());
-+        } else if (this.lootedPlayers != null) {
-+            this.lootedPlayers.remove(player);
-+        }
-+    }
-+
-+    boolean canPlayerLoot(final UUID player, final WorldConfiguration worldConfiguration) {
-+        final Long lastLooted = getLastLooted(player);
-+        if (!worldConfiguration.lootables.restrictPlayerReloot || lastLooted == null) return true;
-+
-+        final DurationOrDisabled restrictPlayerRelootTime = worldConfiguration.lootables.restrictPlayerRelootTime;
-+        if (restrictPlayerRelootTime.value().isEmpty()) return false;
-+
-+        return TimeUnit.SECONDS.toMillis(restrictPlayerRelootTime.value().get().seconds()) + lastLooted < System.currentTimeMillis();
-+    }
-+
-+    boolean hasPlayerLooted(UUID player) {
-+        return this.lootedPlayers != null && this.lootedPlayers.containsKey(player);
-+    }
-+
-+    Long getLastLooted(UUID player) {
-+        return lootedPlayers != null ? lootedPlayers.get(player) : null;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9cfa5d36a6991067a3866e0d437749fafcc0158e
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-@@ -0,0 +1,65 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import io.papermc.paper.util.MCUtil;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-+import org.bukkit.Bukkit;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+
-+public class PaperTileEntityLootableInventory implements PaperLootableBlockInventory {
-+    private RandomizableContainerBlockEntity tileEntityLootable;
-+
-+    public PaperTileEntityLootableInventory(RandomizableContainerBlockEntity tileEntityLootable) {
-+        this.tileEntityLootable = tileEntityLootable;
-+    }
-+
-+    @Override
-+    public org.bukkit.loot.LootTable getLootTable() {
-+        return tileEntityLootable.lootTable != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table, long seed) {
-+        setLootTable(table);
-+        setSeed(seed);
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table) {
-+        tileEntityLootable.lootTable = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey());
-+    }
-+
-+    @Override
-+    public void setSeed(long seed) {
-+        tileEntityLootable.lootTableSeed = seed;
-+    }
-+
-+    @Override
-+    public long getSeed() {
-+        return tileEntityLootable.lootTableSeed;
-+    }
-+
-+    @Override
-+    public PaperLootableInventoryData getLootableData() {
-+        return tileEntityLootable.lootableData;
-+    }
-+
-+    @Override
-+    public RandomizableContainerBlockEntity getTileEntity() {
-+        return tileEntityLootable;
-+    }
-+
-+    @Override
-+    public LootableInventory getAPILootableInventory() {
-+        Level world = tileEntityLootable.getLevel();
-+        if (world == null) {
-+            return null;
-+        }
-+        return (LootableInventory) getBukkitWorld().getBlockAt(MCUtil.toLocation(world, tileEntityLootable.getBlockPos())).getState();
-+    }
-+
-+    @Override
-+    public Level getNMSWorld() {
-+        return tileEntityLootable.getLevel();
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3e8f8ead702daa15451fb7259a960a9f3033828f..6240ad60358bf8ba9891ca1d40af2d2a7d10130d 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -235,6 +235,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
-     // Paper end
- 
-+    public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-     private CraftEntity bukkitEntity;
- 
-     public CraftEntity getBukkitEntity() {
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 442736878291fbdc62572b2c83f384413408326f..00187fbbeddfc17e1b6887f8bf0f50da23938470 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -32,6 +32,20 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     public ResourceLocation lootTable;
-     public long lootTableSeed;
- 
-+    // Paper start
-+    {
-+        this.lootableData = new com.destroystokyo.paper.loottable.PaperLootableInventoryData(new com.destroystokyo.paper.loottable.PaperContainerEntityLootableInventory(this));
-+    }
-+    @Override
-+    public Entity getEntity() {
-+        return this;
-+    }
-+
-+    @Override
-+    public com.destroystokyo.paper.loottable.PaperLootableInventoryData getLootableData() {
-+        return this.lootableData;
-+    }
-+    // Paper end
-     // CraftBukkit start
-     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
-     private int maxStack = MAX_STACK;
-@@ -134,12 +148,14 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     @Override
-     protected void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-+        this.lootableData.saveNbt(nbt); // Paper
-         this.addChestVehicleSaveData(nbt);
-     }
- 
-     @Override
-     protected void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-+        this.lootableData.loadNbt(nbt); // Paper
-         this.readChestVehicleSaveData(nbt);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-index 11d9d4861aee68cd97d36ee2ff7597b7a6c81294..d70c1206df96b03c031399049a65e6a765d80347 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -65,12 +65,14 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
-     @Override
-     protected void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-+        this.lootableData.saveNbt(nbt); // Paper
-         this.addChestVehicleSaveData(nbt);
-     }
- 
-     @Override
-     protected void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-+        this.lootableData.loadNbt(nbt); // Paper
-         this.readChestVehicleSaveData(nbt);
-     }
- 
-@@ -245,6 +247,20 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
-         this.level().gameEvent(GameEvent.CONTAINER_CLOSE, this.position(), GameEvent.Context.of((Entity) player));
-     }
- 
-+    // Paper start
-+    {
-+        this.lootableData = new com.destroystokyo.paper.loottable.PaperLootableInventoryData(new com.destroystokyo.paper.loottable.PaperContainerEntityLootableInventory(this));
-+    }
-+    @Override
-+    public Entity getEntity() {
-+        return this;
-+    }
-+
-+    @Override
-+    public com.destroystokyo.paper.loottable.PaperLootableInventoryData getLootableData() {
-+        return this.lootableData;
-+    }
-+    // Paper end
-     // CraftBukkit start
-     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
-     private int maxStack = MAX_STACK;
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-index e0fbacd574e0c83c2e1d164ded8e9ccf4af30480..7529751afa2932fd16bc4591189b0358268a7b14 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
-@@ -59,10 +59,9 @@ public interface ContainerEntity extends Container, MenuProvider {
-             if (this.getLootTableSeed() != 0L) {
-                 nbt.putLong("LootTableSeed", this.getLootTableSeed());
-             }
--        } else {
--            ContainerHelper.saveAllItems(nbt, this.getItemStacks());
-         }
- 
-+        ContainerHelper.saveAllItems(nbt, this.getItemStacks()); // Paper - always save the items, table may still remain
-     }
- 
-     default void readChestVehicleSaveData(CompoundTag nbt) {
-@@ -70,10 +69,9 @@ public interface ContainerEntity extends Container, MenuProvider {
-         if (nbt.contains("LootTable", 8)) {
-             this.setLootTable(new ResourceLocation(nbt.getString("LootTable")));
-             this.setLootTableSeed(nbt.getLong("LootTableSeed"));
--        } else {
--            ContainerHelper.loadAllItems(nbt, this.getItemStacks());
-         }
- 
-+        ContainerHelper.loadAllItems(nbt, this.getItemStacks()); // Paper - always load the items, table may still remain
-     }
- 
-     default void chestVehicleDestroyed(DamageSource source, Level world, Entity vehicle) {
-@@ -96,13 +94,13 @@ public interface ContainerEntity extends Container, MenuProvider {
- 
-     default void unpackChestVehicleLootTable(@Nullable Player player) {
-         MinecraftServer minecraftServer = this.level().getServer();
--        if (this.getLootTable() != null && minecraftServer != null) {
-+        if (this.getLootableData().shouldReplenish(player) && minecraftServer != null) { // Paper
-             LootTable lootTable = minecraftServer.getLootData().getLootTable(this.getLootTable());
-             if (player != null) {
-                 CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer)player, this.getLootTable());
-             }
- 
--            this.setLootTable((ResourceLocation)null);
-+            this.getLootableData().processRefill(player); // Paper
-             LootParams.Builder builder = (new LootParams.Builder((ServerLevel)this.level())).withParameter(LootContextParams.ORIGIN, this.position());
-             if (player != null) {
-                 builder.withLuck(player.getLuck()).withParameter(LootContextParams.THIS_ENTITY, player);
-@@ -176,4 +174,13 @@ public interface ContainerEntity extends Container, MenuProvider {
-     default boolean isChestVehicleStillValid(Player player) {
-         return !this.isRemoved() && this.position().closerThan(player.position(), 8.0D);
-     }
-+    // Paper start
-+    default Entity getEntity() {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    default com.destroystokyo.paper.loottable.PaperLootableInventoryData getLootableData() {
-+        throw new UnsupportedOperationException();
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 111494c30a2b7d8464237a92cf5c98f7f4cca19d..e11618247ad889fa8fadbb2c7addd0de94caf249 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -29,6 +29,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     @Nullable
-     public ResourceLocation lootTable;
-     public long lootTableSeed;
-+    public final com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData = new com.destroystokyo.paper.loottable.PaperLootableInventoryData(new com.destroystokyo.paper.loottable.PaperTileEntityLootableInventory(this)); // Paper
- 
-     protected RandomizableContainerBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
-         super(type, pos, state);
-@@ -43,16 +44,19 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     }
- 
-     protected boolean tryLoadLootTable(CompoundTag nbt) {
-+        this.lootableData.loadNbt(nbt); // Paper
-         if (nbt.contains("LootTable", 8)) {
-             this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
-+            try { org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.lootTable); } catch (IllegalArgumentException ex) { this.lootTable = null; } // Paper - validate
-             this.lootTableSeed = nbt.getLong("LootTableSeed");
--            return true;
-+            return false; // Paper - always load the items, table may still remain
-         } else {
-             return false;
-         }
-     }
- 
-     protected boolean trySaveLootTable(CompoundTag nbt) {
-+        this.lootableData.saveNbt(nbt); // Paper
-         if (this.lootTable == null) {
-             return false;
-         } else {
-@@ -61,18 +65,18 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-                 nbt.putLong("LootTableSeed", this.lootTableSeed);
-             }
- 
--            return true;
-+            return false; // Paper - always save the items, table may still remain
-         }
-     }
- 
-     public void unpackLootTable(@Nullable Player player) {
--        if (this.lootTable != null && this.level.getServer() != null) {
-+        if (this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper
-             LootTable lootTable = this.level.getServer().getLootData().getLootTable(this.lootTable);
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer)player, this.lootTable);
-             }
- 
--            this.lootTable = null;
-+            this.lootableData.processRefill(player); // Paper
-             LootParams.Builder builder = (new LootParams.Builder((ServerLevel)this.level)).withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(this.worldPosition));
-             if (player != null) {
-                 builder.withLuck(player.getLuck()).withParameter(LootContextParams.THIS_ENTITY, player);
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
-index 86076a9d2a3b1044c96518cbaeee66d60a8a22c6..c268513bc5719d80e1c3d73de53b85ec7f852fa9 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBrushableBlock.java
-@@ -64,7 +64,7 @@ public class CraftBrushableBlock extends CraftBlockEntityState<BrushableBlockEnt
-         this.setLootTable(this.getLootTable(), seed);
-     }
- 
--    private void setLootTable(LootTable table, long seed) {
-+    public void setLootTable(LootTable table, long seed) { // Paper - make public since it overrides a public method
-         ResourceLocation key = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey());
-         this.getSnapshot().setLootTable(key, seed);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 58bd3c4b328b5e792c9ed8dfcdfa0f5ddcc83092..b742d9d231bf79ed53d3fe4deaa81e64c6801c4c 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-@@ -12,8 +12,9 @@ import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.craftbukkit.inventory.CraftInventory;
- import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
- import org.bukkit.inventory.Inventory;
-+import com.destroystokyo.paper.loottable.PaperLootableBlockInventory; // Paper
- 
--public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest {
-+public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest, PaperLootableBlockInventory { // Paper
- 
-     public CraftChest(World world, ChestBlockEntity tileEntity) {
-         super(world, tileEntity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index 2803e34bd29fd7a965093b507f11b5ee83bc5f09..f6942cb3ef1f9ef03708d4bc932ea9aeb1c13894 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
- import org.bukkit.loot.LootTable;
- import org.bukkit.loot.Lootable;
- 
--public abstract class CraftLootable<T extends RandomizableContainerBlockEntity> extends CraftContainer<T> implements Nameable, Lootable {
-+public abstract class CraftLootable<T extends RandomizableContainerBlockEntity> extends CraftContainer<T> implements Nameable, Lootable, com.destroystokyo.paper.loottable.PaperLootableBlockInventory { // Paper
- 
-     public CraftLootable(World world, T tileEntity) {
-         super(world, tileEntity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
-index cc3f70fafea2d5c3a878cfe3e0a2db39ae713bf6..f1844d697b91e61878ade5b922cf2a3a538365c7 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java
-@@ -10,8 +10,7 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;
- import org.bukkit.inventory.Inventory;
- import org.bukkit.loot.LootTable;
- 
--public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.ChestBoat {
--
-+public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.ChestBoat, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper
-     private final Inventory inventory;
- 
-     public CraftChestBoat(CraftServer server, ChestBoat entity) {
-@@ -60,7 +59,7 @@ public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.Chest
-         return this.getHandle().getLootTableSeed();
-     }
- 
--    private void setLootTable(LootTable table, long seed) {
-+    public void setLootTable(LootTable table, long seed) { // Paper - change visibility since it overrides a public method
-         ResourceLocation newKey = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey());
-         this.getHandle().setLootTable(newKey);
-         this.getHandle().setLootTableSeed(seed);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index fd42f0b20132d08039ca7735d31a61806a6b07dc..b1a708de6790bbe336202b13ab862ced78de084f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-@@ -7,7 +7,7 @@ import org.bukkit.entity.minecart.StorageMinecart;
- import org.bukkit.inventory.Inventory;
- 
- @SuppressWarnings("deprecation")
--public class CraftMinecartChest extends CraftMinecartContainer implements StorageMinecart {
-+public class CraftMinecartChest extends CraftMinecartContainer implements StorageMinecart, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper
-     private final CraftInventory inventory;
- 
-     public CraftMinecartChest(CraftServer server, MinecartChest entity) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index 39427b4f284e9402663be2b160ccb5f03f8b91da..17f5684cba9d3ed22d9925d1951520cc4751dfe2 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-@@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
- import org.bukkit.entity.minecart.HopperMinecart;
- import org.bukkit.inventory.Inventory;
- 
--public final class CraftMinecartHopper extends CraftMinecartContainer implements HopperMinecart {
-+public final class CraftMinecartHopper extends CraftMinecartContainer implements HopperMinecart, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper
-     private final CraftInventory inventory;
- 
-     public CraftMinecartHopper(CraftServer server, MinecartHopper entity) {

patches/server/0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 7 May 2016 23:33:08 -0400
-Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
-
-
-diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index a6d23b23e5b5c02427ec538d1d7fd89f51e9e59c..4def212655cea0fd998b52e924f8b671d6aeb559 100644
---- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-+++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-@@ -143,6 +143,7 @@ public class ScoreboardSaveData extends SavedData {
-         ListTag listTag = new ListTag();
- 
-         for(PlayerTeam playerTeam : this.scoreboard.getPlayerTeams()) {
-+            if (!io.papermc.paper.configuration.GlobalConfiguration.get().scoreboards.saveEmptyScoreboardTeams && playerTeam.getPlayers().isEmpty()) continue; // Paper
-             CompoundTag compoundTag = new CompoundTag();
-             compoundTag.putString("Name", playerTeam.getName());
-             compoundTag.putString("DisplayName", Component.Serializer.toJson(playerTeam.getDisplayName()));

patches/server/0098-System-property-for-disabling-watchdoge.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Thu, 12 May 2016 23:02:58 -0500
-Subject: [PATCH] System property for disabling watchdoge
-
-
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 3ad14bf0697e682a2e777baa8faeb323d127fb13..a9897c494b3dc56d900356d74030359832febbaa 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -61,7 +61,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-         while ( !this.stopping )
-         {
-             //
--            if ( this.lastTick != 0 && this.timeoutTime > 0 && WatchdogThread.monotonicMillis() > this.lastTick + this.timeoutTime )
-+            if ( this.lastTick != 0 && this.timeoutTime > 0 && WatchdogThread.monotonicMillis() > this.lastTick + this.timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
-             {
-                 Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "------------------------------" );

patches/server/0099-Async-GameProfileCache-saving.patch

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 16 May 2016 20:47:41 -0400
-Subject: [PATCH] Async GameProfileCache saving
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1766cd6d83aee31800364402dbe4a439c56e63d0..b46cffe141921e499a47dac08318f167f21a5509 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -914,7 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         } catch (java.lang.InterruptedException ignored) {} // Paper
-         if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
-             MinecraftServer.LOGGER.info("Saving usercache.json");
--            this.getProfileCache().save();
-+            this.getProfileCache().save(false); // Paper
-         }
-         // Spigot end
-         io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b77cbdd926cd54a4bae89e0d5a21e7d139bc0c63..f17e1621b498e70c8787dfe96dd819dc6e4b621f 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         }
- 
-         if (this.convertOldUsers()) {
--            this.getProfileCache().save();
-+            this.getProfileCache().save(false); // Paper
-         }
- 
-         if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
-diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 7170f8cfd733708089495b51647659237bd10385..322e07adc556ee8131d40d89856574b185ee4c94 100644
---- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
-+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-@@ -115,7 +115,7 @@ public class GameProfileCache {
-         GameProfileCache.GameProfileInfo usercache_usercacheentry = new GameProfileCache.GameProfileInfo(profile, date);
- 
-         this.safeAdd(usercache_usercacheentry);
--        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(); // Spigot - skip saving if disabled
-+        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(true); // Spigot - skip saving if disabled // Paper - async
-     }
- 
-     private long getNextOperation() {
-@@ -148,7 +148,7 @@ public class GameProfileCache {
-         }
- 
-         if (flag && !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { // Spigot - skip saving if disabled
--            this.save();
-+            this.save(true); // Paper
-         }
- 
-         return optional;
-@@ -260,7 +260,7 @@ public class GameProfileCache {
-         return arraylist;
-     }
- 
--    public void save() {
-+    public void save(boolean asyncSave) { // Paper
-         JsonArray jsonarray = new JsonArray();
-         DateFormat dateformat = GameProfileCache.createDateFormat();
- 
-@@ -268,6 +268,7 @@ public class GameProfileCache {
-             jsonarray.add(GameProfileCache.writeGameProfile(usercache_usercacheentry, dateformat));
-         });
-         String s = this.gson.toJson(jsonarray);
-+        Runnable save = () -> { // Paper
- 
-         try {
-             BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
-@@ -292,6 +293,14 @@ public class GameProfileCache {
-         } catch (IOException ioexception) {
-             ;
-         }
-+        // Paper start
-+        };
-+        if (asyncSave) {
-+            io.papermc.paper.util.MCUtil.scheduleAsyncTask(save);
-+        } else {
-+            save.run();
-+        }
-+        // Paper end
- 
-     }
- 

patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sun, 22 May 2016 20:20:55 -0500
-Subject: [PATCH] Optional TNT doesn't move in water
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index fb16216b54eea81fceaf3edafa69b554ad01c807..90d2fa5b90d64ddb28075a50f4478b464a29a285 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -73,7 +73,7 @@ public class ServerEntity {
-     @Nullable
-     private List<SynchedEntityData.DataValue<?>> trackedDataValues;
-     // CraftBukkit start
--    private final Set<ServerPlayerConnection> trackedPlayers;
-+    final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package
- 
-     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
-         this.trackedPlayers = trackedPlayers;
-diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 89fd5d6b373d2705dccc2f22663048f4c2aaa60f..57f9bf73ee14bc8811d0192543caf2b02e890ee0 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -98,6 +98,27 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-             }
-         }
- 
-+        // Paper start - Optional prevent TNT from moving in water
-+        if (!this.isRemoved() && this.wasTouchingWater && this.level().paperConfig().fixes.preventTntFromMovingInWater) {
-+            /*
-+             * Author: Jedediah Smith <jedediah@silencegreys.com>
-+             */
-+            // Send position and velocity updates to nearby players on every tick while the TNT is in water.
-+            // This does pretty well at keeping their clients in sync with the server.
-+            net.minecraft.server.level.ChunkMap.TrackedEntity ete = ((net.minecraft.server.level.ServerLevel)this.level()).getChunkSource().chunkMap.entityMap.get(this.getId());
-+            if (ete != null) {
-+                net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
-+                net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = new net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket(this);
-+
-+                ete.seenBy.stream()
-+                    .filter(viewer -> (viewer.getPlayer().getX() - this.getX()) * (viewer.getPlayer().getY() - this.getY()) * (viewer.getPlayer().getZ() - this.getZ()) < 16 * 16)
-+                    .forEach(viewer -> {
-+                        viewer.send(velocityPacket);
-+                        viewer.send(positionPacket);
-+                    });
-+            }
-+        }
-+        // Paper end
-     }
- 
-     private void explode() {
-@@ -147,4 +168,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-     public int getFuse() {
-         return (Integer) this.entityData.get(PrimedTnt.DATA_FUSE_ID);
-     }
-+
-+    // Paper start - Optional prevent TNT from moving in water
-+    @Override
-+    public boolean isPushedByFluid() {
-+        return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
-+    }
-+    // Paper end
- }