Prepare for updating server patches

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

@@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b4534df4812
+index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b70fe1b4c2
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,145 @@
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
 +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 +import io.papermc.paperweight.util.*
@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +        // This includes junit transitively for whatever reason
 +        isTransitive = false
 +    }
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
-+    runtimeOnly("mysql:mysql-connector-java:5.1.49")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
++    runtimeOnly("mysql:mysql-connector-java:8.0.27")
 +
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -105,35 +105,10 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +
 +relocation {
 +    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
-+    val packageVersion = "1_17_R1"
++    val packageVersion = "1_18_R1"
 +    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
 +        exclude("org.bukkit.craftbukkit.Main*")
 +    }
-+
-+    fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
-+
-+    relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
-+    sequenceOf(
-+        "commons-codec:commons-codec" to "org.apache.commons.codec",
-+        "commons-io:commons-io" to "org.apache.commons.io",
-+        "it.unimi.dsi:fastutil" to "it.unimi",
-+        "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-+        "org.ow2.asm:asm" to "org.objectweb.asm"
-+    ).forEach { (owner, pack) ->
-+        relocate(owner, pack to cb(pack))
-+    }
-+
-+    // runtimeOnly dependencies don't need an owner attached
-+    // owner is used for dev bundle generation, runtimeOnly deps are not included in dev bundle
-+    sequenceOf(
-+        "org.apache.http",
-+        "org.apache.maven",
-+        "org.codehaus.plexus",
-+        "org.eclipse.aether",
-+        "org.eclipse.sisu"
-+    ).forEach { pack ->
-+        relocate(pack to cb(pack))
-+    }
 +}
 +
 +tasks.shadowJar {
@@ -166,7 +141,7 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +    if (rootProject.childProjects["test-plugin"] != null) {
 +        val testPluginJar = rootProject.project(":test-plugin").tasks.jar.flatMap { it.archiveFile }
 +        inputs.file(testPluginJar)
-+        args("-add-plugin=${testPluginJar.get().asFile.absolutePath}")
++        // args("-add-plugin=${testPluginJar.get().asFile.absolutePath}") // todo - uncomment
 +    }
 +
 +    args("--nogui")
@@ -204,30 +179,20 @@ index 0000000000000000000000000000000000000000..b64b0200a6b19f93ba0592ecc6f29b45
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index c936167e107ab76cfb21febb9534353f481a95d3..0000000000000000000000000000000000000000
+index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,472 +0,0 @@
+@@ -1,539 +0,0 @@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 -    <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.17.1-R0.1-SNAPSHOT</version>
+-    <version>1.18-pre5-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
--    <properties>
--        <skipTests>true</skipTests>
--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--        <api.version>unknown</api.version>
--        <bt.name>git</bt.name>
--        <minecraft_version>1_17_R1</minecraft_version>
--        <maven.compiler.source>1.8</maven.compiler.source>
--        <maven.compiler.target>1.8</maven.compiler.target>
--    </properties>
--
 -    <parent>
 -        <groupId>org.spigotmc</groupId>
 -        <artifactId>spigot-parent</artifactId>
@@ -235,6 +200,24 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -        <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_18_R1</minecraft_version>
+-        <maven.compiler.source>16</maven.compiler.source>
+-        <maven.compiler.target>16</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>
@@ -259,13 +242,6 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <artifactId>log4j-iostreams</artifactId>
 -            <version>2.14.1</version>
 -            <scope>compile</scope>
--            <exclusions>
--                <!-- included in minecraft-server -->
--                <exclusion>
--                    <groupId>org.apache.logging.log4j</groupId>
--                    <artifactId>log4j-api</artifactId>
--                </exclusion>
--            </exclusions>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
@@ -273,6 +249,85 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <version>9.2</version>
 -            <scope>compile</scope>
 -        </dependency>
+-        <!-- Mojang depends -->
+-        <dependency>
+-            <groupId>com.github.oshi</groupId>
+-            <artifactId>oshi-core</artifactId>
+-            <version>5.8.2</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>authlib</artifactId>
+-            <version>3.2.38</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>brigadier</artifactId>
+-            <version>1.0.18</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>datafixerupper</artifactId>
+-            <version>4.0.26</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.mojang</groupId>
+-            <artifactId>javabridge</artifactId>
+-            <version>1.2.24</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>commons-io</groupId>
+-            <artifactId>commons-io</artifactId>
+-            <version>2.11.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.netty</groupId>
+-            <artifactId>netty-all</artifactId>
+-            <version>4.1.68.Final</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>it.unimi.dsi</groupId>
+-            <artifactId>fastutil</artifactId>
+-            <version>8.5.6</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>net.sf.jopt-simple</groupId>
+-            <artifactId>jopt-simple</artifactId>
+-            <version>5.0.4</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.commons</groupId>
+-            <artifactId>commons-lang3</artifactId>
+-            <version>3.12.0</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-core</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.logging.log4j</groupId>
+-            <artifactId>log4j-slf4j18-impl</artifactId>
+-            <version>2.14.1</version>
+-            <scope>compile</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-            <version>1.8.0-beta4</version>
+-            <scope>compile</scope>
+-        </dependency>
 -        <!-- deprecated API depend -->
 -        <dependency>
 -            <groupId>com.googlecode.json-simple</groupId>
@@ -283,13 +338,13 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.xerial</groupId>
 -            <artifactId>sqlite-jdbc</artifactId>
--            <version>3.34.0</version>
+-            <version>3.36.0.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>mysql</groupId>
 -            <artifactId>mysql-connector-java</artifactId>
--            <version>5.1.49</version>
+-            <version>8.0.27</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- add these back in as they are not exposed by the API -->
@@ -439,87 +494,21 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                        </goals>
 -                        <configuration>
 -                            <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
--                            <filters>
--                                <filter>
--                                    <artifact>org.spigotmc:minecraft-server</artifact>
--                                    <excludes>
--                                        <exclude>com/google/common/**</exclude>
--                                        <exclude>com/google/gson/**</exclude>
--                                        <exclude>com/google/thirdparty/**</exclude>
--                                    </excludes>
--                                </filter>
--                                <filter>
--                                    <artifact>org.eclipse.sisu:org.eclipse.sisu.inject</artifact>
--                                    <excludes>
--                                        <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
--                                    </excludes>
--                                </filter>
--                            </filters>
+-                            <artifactSet>
+-                                <includes>
+-                                    <include>org.spigotmc:minecraft-server</include>
+-                                </includes>
+-                            </artifactSet>
 -                            <relocations>
--                                <!-- Cannot be relocated as it breaks translation property keys -->
--                                <!--
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
--                                -->
--                                <relocation>
--                                    <pattern>jline</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>it.unimi</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.codec</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.io</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.io</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.commons.lang3</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.lang3</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.http</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.http</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.apache.maven</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.maven</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.codehaus.plexus</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.codehaus.plexus</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.aether</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.aether</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.eclipse.sisu</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.eclipse.sisu</shadedPattern>
--                                </relocation>
--                                <relocation>
--                                    <pattern>org.objectweb.asm</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.org.objectweb.asm</shadedPattern>
--                                </relocation>
 -                                <relocation>
 -                                    <pattern>org.bukkit.craftbukkit</pattern>
 -                                    <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
 -                                    <excludes>
+-                                        <exclude>org.bukkit.craftbukkit.bootstrap.*</exclude>
 -                                        <exclude>org.bukkit.craftbukkit.Main*</exclude>
 -                                    </excludes>
 -                                </relocation>
 -                            </relocations>
--                            <transformers>
--                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
--                                    <resource>META-INF/services/java.sql.Driver</resource>
--                                </transformer>
--                            </transformers>
 -                        </configuration>
 -                    </execution>
 -                </executions>
@@ -527,22 +516,75 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>net.md-5</groupId>
 -                <artifactId>specialsource-maven-plugin</artifactId>
--                <version>1.2.2</version>
+-                <version>1.2.3</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>remap</goal>
 -                        </goals>
--                        <id>remap-fields</id>
+-                        <id>remap-members</id>
 -                        <configuration>
--                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-fields</srgIn>
+-                            <logFile>${project.build.directory}/server.txt</logFile>
+-                            <srgIn>org.spigotmc:minecraft-server:${project.version}:csrg:maps-spigot-members</srgIn>
 -                            <reverse>true</reverse>
 -                        </configuration>
 -                    </execution>
 -                </executions>
 -            </plugin>
 -            <plugin>
+-                <groupId>net.nicoulaj.maven.plugins</groupId>
+-                <artifactId>checksum-maven-plugin</artifactId>
+-                <version>1.11</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>artifacts</goal>
+-                            <goal>dependencies</goal>
+-                        </goals>
+-                        <configuration>
+-                            <algorithms>
+-                                <algorithm>SHA-256</algorithm>
+-                            </algorithms>
+-                            <scopes>
+-                                <scope>compile</scope>
+-                                <scope>runtime</scope>
+-                            </scopes>
+-                            <shasumSummary>true</shasumSummary>
+-                            <transitive>true</transitive>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-assembly-plugin</artifactId>
+-                <version>3.3.0</version>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>single</goal>
+-                        </goals>
+-                        <configuration>
+-                            <appendAssemblyId>false</appendAssemblyId>
+-                            <archive>
+-                                <manifest>
+-                                    <addDefaultEntries>false</addDefaultEntries>
+-                                </manifest>
+-                                <manifestEntries>
+-                                    <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
+-                                </manifestEntries>
+-                            </archive>
+-                            <descriptors>
+-                                <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
+-                            </descriptors>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-compiler-plugin</artifactId>
 -                <version>3.8.1</version>
@@ -559,7 +601,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                    <dependency>
 -                        <groupId>org.eclipse.jdt</groupId>
 -                        <artifactId>ecj</artifactId>
--                        <version>3.26.0</version>
+-                        <version>3.27.0</version>
 -                    </dependency>
 -                </dependencies>
 -            </plugin>
@@ -612,7 +654,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                            <dependency>
 -                                <groupId>com.puppycrawl.tools</groupId>
 -                                <artifactId>checkstyle</artifactId>
--                                <version>8.44</version>
+-                                <version>8.45.1</version>
 -                            </dependency>
 -                        </dependencies>
 -                    </plugin>
@@ -624,7 +666,7 @@ index c936167e107ab76cfb21febb9534353f481a95d3..00000000000000000000000000000000
 -                            <execution>
 -                                <phase>process-classes</phase>
 -                                <goals>
--                                    <goal>check</goal>
+-                                    <!--<goal>check</goal>-->
 -                                </goals>
 -                            </execution>
 -                        </executions>

patches/server/0002-Remap-fixes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remap fixes
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 1bd6ef643b17b059eb525035496b816a098279c4..754e65f322ded875ae7614066bab30a8da2aa4a9 100644
+index a492a3ff23a6e4bd1a47bdfbe295163ac3ef66c9..dc88152a1458dadd102989d4fc5ffd5bbc7eb523 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -270,9 +270,11 @@ public class BlockPos extends Vec3i {
@@ -42,10 +42,10 @@ index 1bd6ef643b17b059eb525035496b816a098279c4..754e65f322ded875ae7614066bab30a8
                          }
  
 diff --git a/src/main/java/net/minecraft/server/commands/SummonCommand.java b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-index 71c22f72b6e7507e85ecb6be3166b809b7409ab2..0821cd15071ac10c88f0bcfd869c27cadbe778ba 100644
+index bb57dacc71711abfd9fb22a395ff798920564e5a..f6aed91482d9c7bf8b56fb7c53f938a4f37b9605 100644
 --- a/src/main/java/net/minecraft/server/commands/SummonCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-@@ -54,9 +54,9 @@ public class SummonCommand {
+@@ -53,9 +53,9 @@ public class SummonCommand {
  
              nbttagcompound1.putString("id", entity.toString());
              ServerLevel worldserver = source.getLevel();
@@ -59,35 +59,26 @@ index 71c22f72b6e7507e85ecb6be3166b809b7409ab2..0821cd15071ac10c88f0bcfd869c27ca
  
              if (entity1 == null) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index 88a8c2bc4aa30f478122a05fd119486a0107db82..ef17f21574ce37b9ce6f72b9585034db473502c7 100644
+index b925f8e74cad0214c57b2c5cb75502dce3f23e15..28fbdc53dd983e462db50261164f522d1996f50d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -169,8 +169,8 @@ public class BehaviorUtils {
+@@ -172,11 +172,11 @@ public class BehaviorUtils {
  
          return optional.map((uuid) -> {
              return ((ServerLevel) entity.level).getEntity(uuid);
 -        }).map((entity) -> {
--            return entity instanceof LivingEntity ? (LivingEntity) entity : null;
-+        }).map((entity2) -> { // Paper - remap fix
-+            return entity2 instanceof LivingEntity ? (LivingEntity) entity2 : null; // Paper - remap fix
-         });
-     }
++        }).map((entity1) -> { // Paper - remap fix
+             LivingEntity entityliving1;
  
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 296d4ab3dace530cab03c787051c9f2c2626228f..7cbb16646c6c83d443deedaf425d18d6de76e314 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -522,7 +522,7 @@ public class Phantom extends FlyingMob implements Enemy {
-                 List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
+-            if (entity instanceof LivingEntity) {
+-                LivingEntity entityliving2 = (LivingEntity) entity;
++            if (entity1 instanceof LivingEntity) { // Paper - remap fix
++                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
  
-                 if (!list.isEmpty()) {
--                    list.sort(Comparator.comparing(Entity::getY).reversed());
-+                    list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
-                     Iterator iterator = list.iterator();
- 
-                     while (iterator.hasNext()) {
+                 entityliving1 = entityliving2;
+             } else {
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index efb37470d4927def456c382420775a815594aa58..38dd114fbfa07a18987cd774ae05060d723247e4 100644
+index c0694fef35bc000a5212e377a285dfd1dd94ca07..2e2bc7213b7e19e945eba885ff5614f809c81db0 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -172,7 +172,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
@@ -129,19 +120,6 @@ index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d
          assertThat(color, is(Color.fromRGB(nmsColor)));
      }
  }
-diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
-index 90baf6e3329d64495da9edd580d5fbc80df8c165..e2fb8a0183885b4ad81d5284297be7a35946aa9c 100644
---- a/src/test/java/org/bukkit/PerMaterialTest.java
-+++ b/src/test/java/org/bukkit/PerMaterialTest.java
-@@ -221,7 +221,7 @@ public class PerMaterialTest extends AbstractTestingBase {
-         if (this.material.isBlock()) {
-             assertThat(this.material.isInteractable(),
-                     is(!CraftMagicNumbers.getBlock(material).getClass()
--                            .getMethod("interact", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class)
-+                            .getMethod("use", BlockState.class, net.minecraft.world.level.Level.class, BlockPos.class, Player.class, InteractionHand.class, BlockHitResult.class) // Paper - remap fix
-                             .getDeclaringClass().equals(BlockBehaviour.class)));
-         } else {
-             assertFalse(this.material.isInteractable());
 diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
 index 8c4ad718e113f24a30fd11b345d34d6ca1ef73b0..1e84f541683ddb619c2a8dfcd2a141fba2bd851d 100644
 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68ff602a310 100644
+index 273746fe476a9a09ebca01c6ecd814b70fe1b4c2..6cab6b2f348366e7e0357638ac11df5961a7388d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,21 +17,23 @@ repositories {
+@@ -17,10 +17,9 @@ repositories {
  dependencies {
      implementation(project(":Paper-API"))
      implementation("jline:jline:2.12.1")
@@ -16,27 +16,12 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
 -        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 -    }
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
-+    implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
      implementation("org.ow2.asm:asm:9.2")
 +    implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
      implementation("com.googlecode.json-simple:json-simple:1.1.1") {
          // This includes junit transitively for whatever reason
          isTransitive = false
-     }
-     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
--    runtimeOnly("mysql:mysql-connector-java:5.1.49")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
- 
-+    implementation("io.netty:netty-all:4.1.65.Final") // Paper
-+
-     testImplementation("junit:junit:4.13.1")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
- }
-@@ -52,6 +54,7 @@ tasks.jar {
+@@ -52,6 +51,7 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -44,16 +29,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -82,7 +85,7 @@ relocation {
-     sequenceOf(
-         "commons-codec:commons-codec" to "org.apache.commons.codec",
-         "commons-io:commons-io" to "org.apache.commons.io",
--        "it.unimi.dsi:fastutil" to "it.unimi",
-+        //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
-         "org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
-         "org.ow2.asm:asm" to "org.objectweb.asm"
-     ).forEach { (owner, pack) ->
-@@ -102,9 +105,17 @@ relocation {
+@@ -77,9 +77,17 @@ relocation {
      }
  }
  
@@ -72,7 +48,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68f
          relocate(relocation.fromPackage, relocation.toPackage) {
              for (exclude in relocation.excludes) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1338f52370dafbb8820a67cc4528eb20e0b9155c..90af1b123722bac1c4c5956465a153ec1ea998ff 100644
+index 189c262b22cad352fc87565ff499a5340d92b4e4..09c33e8613d31f4519109f29b44cfea754184c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -190,7 +190,7 @@ public class Main {
@@ -83,7 +59,7 @@ index 1338f52370dafbb8820a67cc4528eb20e0b9155c..90af1b123722bac1c4c5956465a153ec
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -28);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

patches/server/0004-Paper-config-files.patch

@@ -585,10 +585,10 @@ index 0000000000000000000000000000000000000000..6cb3a37612240d4150d7c62628f4b744
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce03bca018 100644
+index dc2cb18ec926e2eed1caa8e2106e70bcb04f6c0f..a497b281d03c097587b21e9f141a6a66f36e4dad 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -101,6 +101,12 @@ public class Main {
+@@ -106,6 +106,12 @@ public class Main {
              DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
              dedicatedserversettings.forceSave();
@@ -601,7 +601,7 @@ index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce
              Path path1 = Paths.get("eula.txt");
              Eula eula = new Eula(path1);
  
-@@ -251,6 +257,20 @@ public class Main {
+@@ -261,6 +267,20 @@ public class Main {
  
      }
  
@@ -619,26 +619,26 @@ index 21c0fe42af0239cf8d857fa9fddae8a5974930e2..39ca32e006a36991b9d948c709c1b9ce
 +    }
 +    // Paper end
 +
-     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier booleansupplier, ImmutableSet<ResourceKey<DimensionType>> worlds) { // CraftBukkit
+     public static void forceUpgrade(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, boolean eraseCache, BooleanSupplier continueCheck, WorldGenSettings generatorOptions) {
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
-         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
+         WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f393503204cf219c60dbae868172a29a0d23d5f..9f3d7089d066bda13af8b4b714a0ebd0c3403e4f 100644
+index cf64088cbf19ef17943fdfd51fc543d4acc0e794..6e97d5101be851518461df440d8160a2710afc0d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -609,6 +609,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -601,6 +601,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
 +            worldserver.paperConfig.removeOldValues(); // Paper - callback for clearing old config options, after any migrations have taken place
-             this.loadSpawn(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
+             this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
              worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index cd65a5bb6da734a39b0bb6e9a0571455d19ceac4..fac993d58bd6e3bb19fd69881092a863c8952c65 100644
+index 2599fbabd5e5c0d10d0c915016f7cc982bda0e20..4dd57007af218ba1c0e666117a49939c5884f2c6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          org.spigotmc.SpigotConfig.init((java.io.File) options.valueOf("spigot-settings"));
          org.spigotmc.SpigotConfig.registerCommands();
          // Spigot end
@@ -655,7 +655,7 @@ index cd65a5bb6da734a39b0bb6e9a0571455d19ceac4..fac993d58bd6e3bb19fd69881092a863
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 1ff471fb8a4f69f02debe9c40b13cc1e8b8045d7..9591f50922343283597bad6d9ac17c175d8ae230 100644
+index c44dfc1044a5dfe39fad3906d1a4455ffc5dbe89..a551683bc73db23d82bd2ca1e2c7c83e31e3c834 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -334,6 +334,12 @@ public class ServerChunkCache extends ChunkSource {
@@ -669,36 +669,28 @@ index 1ff471fb8a4f69f02debe9c40b13cc1e8b8045d7..9591f50922343283597bad6d9ac17c17
 +    // Paper end
 +
      public boolean isPositionTicking(long pos) {
-         return this.checkChunkFuture(pos, (Function<ChunkHolder, CompletableFuture<Either<LevelChunk, ChunkHolder.ChunkLoadingFailure>>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error
-     }
+         ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 067216078c7b50390957d1fcfbfbaaeb81cfba21..7f3d83d3d071f6b441ad119b1c93be035e911e70 100644
+index 1bee6fc5b9fa70adf2f7cac792778f5ed203d291..e688949fc2f3031dc9c9817bc59554e9f5a436af 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet;
- import java.util.List;
- import java.util.Optional;
- import java.util.Spliterator;
-+import java.util.Set; // Paper
- import java.util.UUID;
- import java.util.function.Consumer;
- import java.util.function.Function;
-@@ -666,4 +667,10 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
+@@ -664,4 +664,10 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
  
          T create(EntityType<T> type, Level world);
      }
 +
 +    // Paper start
-+    public static Set<ResourceLocation> getEntityNameList() {
++    public static java.util.Set<ResourceLocation> getEntityNameList() {
 +        return Registry.ENTITY_TYPE.keySet();
 +    }
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8e49d7a3d 100644
+index f705a40fad19e218669857ffccc3589e074c94b7..90d1567aa49ca6005f956f7e3c1cb14ac4cf9c22 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -148,6 +148,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -149,6 +149,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean populating;
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
@@ -707,7 +699,7 @@ index 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8
      public final SpigotTimings.WorldTimingsHandler timings; // Spigot
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -168,6 +170,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -169,6 +171,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
@@ -716,10 +708,10 @@ index 5e0f455d2efe5f5be6ef3f82b06f024c54b22829..8516eef6ba56bd81710a8ad706f0fac8
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5043a4448 100644
+index 70ec18340b9e9bde6784fc5929a1db61ccb39b34..0cd31f82fcaab925db6dcada3e9b42a48fe04c67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -835,6 +835,7 @@ public final class CraftServer implements Server {
+@@ -844,6 +844,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -727,7 +719,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
          for (ServerLevel world : this.console.getAllLevels()) {
              world.serverLevelData.setDifficulty(config.difficulty);
              world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
-@@ -874,12 +875,14 @@ public final class CraftServer implements Server {
+@@ -883,12 +884,14 @@ public final class CraftServer implements Server {
                  world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -742,7 +734,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2284,4 +2287,35 @@ public final class CraftServer implements Server {
+@@ -2296,4 +2299,35 @@ public final class CraftServer implements Server {
          return this.spigot;
      }
      // Spigot end
@@ -779,7 +771,7 @@ index cfbf2190b2b61683b574b9048cb4bb40cecfbf1f..fea5e7abcb5e429a3de5dd8968773fe5
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 90af1b123722bac1c4c5956465a153ec1ea998ff..11d1bc56439ff867224ef1c2058aee67ba0ee332 100644
+index 09c33e8613d31f4519109f29b44cfea754184c3f..aa4b21c9d3c4af08c4d3a309f948692cc585c9c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -129,6 +129,14 @@ public class Main {

patches/server/0007-Not-implemeneted.patch

@@ -1,67 +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] Not implemeneted
-
-Currently a placeholder patch.
-
-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..728c39bb163b2334da9915441fd46970b16cf2a9
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/TickThread.java
-@@ -0,0 +1,41 @@
-+package io.papermc.paper.util;
-+
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+
-+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 (!Bukkit.isPrimaryThread()) {
-+            MinecraftServer.LOGGER.fatal("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) */
-+
-+    public TickThread(final Runnable run, final String name, final int id) {
-+        super(run, name);
-+        this.id = id;
-+    }
-+
-+    public static TickThread getCurrentTickThread() {
-+        return (TickThread)Thread.currentThread();
-+    }
-+}
-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/0008-Paper-Metrics.patch

@@ -1,735 +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..e3b74dbdf8e14219a56fab939f3174e0c2f66de6
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -0,0 +1,670 @@
-+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;
-+        }
-+
-+    }
-+
-+    static class PaperMetrics {
-+        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"));
-+                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
-+
-+                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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a632a796a3e5f2b361a521d70581b83a6839fc73..644a26bd5ac49e67a04ced0ac07097e22fe064f5 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -42,6 +42,7 @@ public class PaperConfig {
-     private static boolean verbose;
-     private static boolean fatalError;
-     /*========================================================================*/
-+    private static boolean metricsStarted;
- 
-     public static void init(File configFile) {
-         CONFIG_FILE = configFile;
-@@ -84,6 +85,11 @@ public class PaperConfig {
-         for (Map.Entry<String, Command> entry : commands.entrySet()) {
-             MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
-         }
-+
-+        if (!metricsStarted) {
-+            Metrics.PaperMetrics.startMetrics();
-+            metricsStarted = true;
-+        }
-     }
- 
-     static void readConfig(Class<?> clazz, Object instance) {
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 58c9ab2f6db97bfbf280efc56f9c9be791604a75..f8a9d6a394f796634e4663ef4078a4c98447e13c 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
-     }
- 
-     static void readConfig(Class<?> clazz, Object instance)

patches/server/0009-Add-MinecraftKey-Information-to-Objects.patch

@@ -1,124 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 Jul 2018 01:40:13 -0400
-Subject: [PATCH] Add MinecraftKey Information to Objects
-
-Stores the reference to the objects respective MinecraftKey
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index bee2fa2bfbb61209381f24ed6508d3d1c73a344a..1fa190e098079522e0fe3593fa261c1b7ad4e24b 100644
---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -207,7 +207,7 @@ public class PaperCommand extends Command {
-                 ServerChunkCache chunkProviderServer = world.getChunkSource();
- 
-                 world.getAllEntities().forEach(e -> {
--                    ResourceLocation key = new ResourceLocation(""); // TODO: update in next patch
-+                    ResourceLocation key = e.getMinecraftKey();
- 
-                     MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
-                     ChunkPos chunk = e.chunkPosition();
-diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d02bd109399d6b32cbbb5e6f9ec7e650e8299a26
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/KeyedObject.java
-@@ -0,0 +1,12 @@
-+package net.minecraft.server;
-+
-+import net.minecraft.resources.ResourceLocation;
-+
-+// TODO(Mariell Hoversholm): Move stupid ass class
-+public interface KeyedObject {
-+    ResourceLocation getMinecraftKey();
-+    default String getMinecraftKeyString() {
-+        ResourceLocation key = getMinecraftKey();
-+        return key != null ? key.toString() : null;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a5f704edf4d8afdb088f3a4ac8e3957f8851842d..264d216429c164798d5e645c044b95892b3b615e 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -146,7 +146,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
- import org.bukkit.plugin.PluginManager;
- // CraftBukkit end
- 
--public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-+public abstract class Entity implements Nameable, EntityAccess, CommandSource, net.minecraft.server.KeyedObject { // Paper
- 
-     // CraftBukkit start
-     private static final int CURRENT_LEVEL = 2;
-@@ -1960,12 +1960,31 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return true;
-     }
- 
-+    // Paper start
-+    private ResourceLocation entityKey;
-+    private String entityKeyString;
-+
-+    @Override
-+    public ResourceLocation getMinecraftKey() {
-+        if (entityKey == null) {
-+            this.entityKey = EntityType.getKey(this.getType());
-+            this.entityKeyString = this.entityKey != null ? this.entityKey.toString() : null;
-+        }
-+        return entityKey;
-+    }
-+
-+    @Override
-+    public String getMinecraftKeyString() {
-+        getMinecraftKey(); // Try to load if it doesn't exists. see: https://github.com/PaperMC/Paper/issues/1280
-+        return entityKeyString;
-+    }
-     @Nullable
-     public final String getEncodeId() {
-         EntityType<?> entitytypes = this.getType();
-         ResourceLocation minecraftkey = EntityType.getKey(entitytypes);
- 
--        return entitytypes.canSerialize() && minecraftkey != null ? minecraftkey.toString() : null;
-+        return entitytypes != null && entitytypes.canSerialize() ? getMinecraftKeyString() : null;
-+        // Paper end
-     }
- 
-     protected abstract void readAdditionalSaveData(CompoundTag nbt);
-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 33884161de688c47c90a7b86196234acc80f9434..92b042080f06fb95958ff5e824830a84f2d1f2a6 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
-@@ -20,7 +20,7 @@ import org.bukkit.inventory.InventoryHolder;
- 
- import org.spigotmc.CustomTimingsHandler; // Spigot
- 
--public abstract class BlockEntity {
-+public abstract class BlockEntity implements net.minecraft.server.KeyedObject { // Paper
- 
-     public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
-     // CraftBukkit start - data containers
-@@ -41,6 +41,26 @@ public abstract class BlockEntity {
-         this.blockState = state;
-     }
- 
-+    // Paper start
-+    private String tileEntityKeyString = null;
-+    private ResourceLocation tileEntityKey = null;
-+
-+    @Override
-+    public ResourceLocation getMinecraftKey() {
-+        if (tileEntityKey == null) {
-+            tileEntityKey = BlockEntityType.getKey(this.type);
-+            tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
-+        }
-+        return tileEntityKey;
-+    }
-+
-+    @Override
-+    public String getMinecraftKeyString() {
-+        getMinecraftKey(); // Try to load if it doesn't exists.
-+        return tileEntityKeyString;
-+    }
-+    // Paper end
-+
-     @Nullable
-     public Level getLevel() {
-         return this.level;

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

@@ -1,114 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6cb3a37612240d4150d7c62628f4b7440c822d48..3d9a805d01cea0b414446c0540ac9a4f86f1e1e3 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -85,4 +85,17 @@ public class PaperWorldConfig {
-         config.addDefault("world-settings.default." + path, def);
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
-     }
-+
-+    public int cactusMaxHeight;
-+    public int reedMaxHeight;
-+    public int bambooMaxHeight;
-+    public int bambooMinHeight;
-+    private void blockGrowthHeight() {
-+        cactusMaxHeight = getInt("max-growth-height.cactus", 3);
-+        reedMaxHeight = getInt("max-growth-height.reeds", 3);
-+        bambooMaxHeight = getInt("max-growth-height.bamboo.max", 16);
-+        bambooMinHeight = getInt("max-growth-height.bamboo.min", 11);
-+        log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight + ". Max height for bamboo growth " + bambooMaxHeight + ". Min height for fully-grown bamboo " + bambooMinHeight + ".");
-+
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/BambooBlock.java b/src/main/java/net/minecraft/world/level/block/BambooBlock.java
-index 7f40f6206f10a78fb74c19bd62c584f9f5c3e635..878b8fb992b448f0a644f7fa2c2bded191ff8268 100644
---- a/src/main/java/net/minecraft/world/level/block/BambooBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BambooBlock.java
-@@ -137,7 +137,7 @@ public class BambooBlock extends Block implements BonemealableBlock {
-             if (random.nextInt(Math.max(1, (int) (100.0F / world.spigotConfig.bambooModifier) * 3)) == 0 && world.isEmptyBlock(pos.above()) && world.getRawBrightness(pos.above(), 0) >= 9) { // Spigot
-                 int i = this.getHeightBelowUpToMax((BlockGetter) world, pos) + 1;
- 
--                if (i < 16) {
-+                if (i < world.paperConfig.bambooMaxHeight) { // Paper
-                     this.growBamboo(state, (Level) world, pos, random, i);
-                 }
-             }
-@@ -168,7 +168,7 @@ public class BambooBlock 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(BambooBlock.STAGE) != 1;
-+        return i + j + 1 < ((Level) world).paperConfig.bambooMaxHeight && (Integer) world.getBlockState(pos.above(i)).getValue(BambooBlock.STAGE) != 1; // Paper
-     }
- 
-     @Override
-@@ -187,7 +187,7 @@ public class BambooBlock extends Block implements BonemealableBlock {
-             BlockPos blockposition1 = pos.above(i);
-             BlockState iblockdata1 = world.getBlockState(blockposition1);
- 
--            if (k >= 16 || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooBlock.STAGE) == 1 || !world.isEmptyBlock(blockposition1.above())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here
-+            if (k >= world.paperConfig.bambooMaxHeight || !iblockdata1.is(Blocks.BAMBOO) || (Integer) iblockdata1.getValue(BambooBlock.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;
-             }
- 
-@@ -228,7 +228,7 @@ public class BambooBlock extends Block implements BonemealableBlock {
-         }
- 
-         int j = (Integer) state.getValue(BambooBlock.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.bambooMinHeight || random.nextFloat() >= 0.25F) && height != (world.paperConfig.bambooMaxHeight - 1) ? 0 : 1; // Paper
- 
-         // CraftBukkit start
-         if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, pos.above(), (BlockState) ((BlockState) ((BlockState) this.defaultBlockState().setValue(BambooBlock.AGE, j)).setValue(BambooBlock.LEAVES, blockpropertybamboosize)).setValue(BambooBlock.STAGE, k), 3)) {
-@@ -243,7 +243,7 @@ public class BambooBlock 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.bambooMaxHeight && world.getBlockState(pos.above(i + 1)).is(Blocks.BAMBOO); ++i) { // Paper
-             ;
-         }
- 
-@@ -253,7 +253,7 @@ public class BambooBlock 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.bambooMaxHeight && 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 d6aad164b4910f86ff613db9b337ff174e69e4d7..722f1816cd4130fa4b1e2310badedc77ab96eee6 100644
---- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -56,7 +56,7 @@ public class CactusBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+            if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
-                 int j = (Integer) state.getValue(CactusBlock.AGE);
- 
-                 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
-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 77e9c50d2c64e7c7a6e658a2dba8919953c1842c..dbd0147ad08fb825b10665859054f17c9125b621 100644
---- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-@@ -53,7 +53,7 @@ public class SugarCaneBlock extends Block {
-                 ;
-             }
- 
--            if (i < 3) {
-+                if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
-                 int j = (Integer) state.getValue(SugarCaneBlock.AGE);
- 
-                 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot

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

@@ -1,51 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3d9a805d01cea0b414446c0540ac9a4f86f1e1e3..d5a93adafc9e897b78f83102ea101d96c5bf2744 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -98,4 +98,15 @@ public class PaperWorldConfig {
-         log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight + ". Max height for bamboo growth " + bambooMaxHeight + ". Min height for fully-grown bamboo " + bambooMinHeight + ".");
- 
-     }
-+
-+    public double babyZombieMovementModifier;
-+    private void babyZombieMovementModifier() {
-+        babyZombieMovementModifier = getDouble("baby-zombie-movement-modifier", 0.5D);
-+        if (PaperConfig.version < 20) {
-+            babyZombieMovementModifier = getDouble("baby-zombie-movement-speed", 0.5D);
-+            set("baby-zombie-movement-modifier", babyZombieMovementModifier);
-+        }
-+
-+        log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
-+    }
- }
-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 998d11263b96f72a29787e5d58f4850e8cd5cdf7..6f990e39e696890d39c3ae94fd6a0ecf9513d710 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -79,7 +79,7 @@ import org.bukkit.event.entity.EntityTransformEvent;
- 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 SPEED_MODIFIER_BABY = new AttributeModifier(Zombie.SPEED_MODIFIER_BABY_UUID, "Baby speed boost", 0.5D, AttributeModifier.Operation.MULTIPLY_BASE); private final AttributeModifier babyModifier = this.SPEED_MODIFIER_BABY; // Paper - remove static - 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);
-@@ -187,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);
-+            attributemodifiable.removeModifier(this.babyModifier); // Paper
-             if (baby) {
--                attributemodifiable.addTransientModifier(Zombie.SPEED_MODIFIER_BABY);
-+                attributemodifiable.addTransientModifier(this.babyModifier); // Paper
-             }
-         }
- 

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

@@ -1,38 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5a93adafc9e897b78f83102ea101d96c5bf2744..3b35d45881a041aaa7adea0ffc92379208a138b7 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -109,4 +109,12 @@ public class PaperWorldConfig {
- 
-         log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
-     }
-+
-+    public int fishingMinTicks;
-+    public int fishingMaxTicks;
-+    private void fishingTickRange() {
-+        fishingMinTicks = getInt("fishing-time-range.MinimumTicks", 100);
-+        fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
-+        log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
-+    }
- }
-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 dde25bf5e4e6e6514a8141e4dee473d96eee83f5..b007efe91c0abef3e90179b67dfdaf999ced11d2 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -83,6 +83,10 @@ public class FishingHook extends Projectile {
-         this.noCulling = true;
-         this.luck = Math.max(0, lureLevel);
-         this.lureSpeed = Math.max(0, luckOfTheSeaLevel);
-+        // Paper start
-+        minWaitTime = world.paperConfig.fishingMinTicks;
-+        maxWaitTime = world.paperConfig.fishingMaxTicks;
-+        // Paper end
-     }
- 
-     public FishingHook(EntityType<? extends FishingHook> type, Level world) {

patches/server/0015-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch

@@ -1,75 +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 and take water damage
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b35d45881a041aaa7adea0ffc92379208a138b7..a6f0e2193f930cf4f1e38ac30e92a7f7cafb8413 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -117,4 +117,9 @@ public class PaperWorldConfig {
-         fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
-         log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
-     }
-+
-+    public boolean nerfedMobsShouldJump;
-+    private void nerfedMobsShouldJump() {
-+        nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 70154157221dcdd0d228a934aee2213d4ea2545a..40f644f25bb0489631765f5768317e20a7997eb4 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1270,6 +1270,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         return this.isInWater() || this.isInRain();
-     }
- 
-+    @Deprecated public final boolean isInWaterOrRainOrBubble() { return isInWaterRainOrBubble(); } // Paper - OBFHELPER
-     public boolean isInWaterRainOrBubble() {
-         return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d0047fc5156f13c831ab4f23a429d567ed6a39ac..abaa57d9a4d222753d28801c6ab86b11c71aca6b 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -104,6 +104,7 @@ public abstract class Mob extends LivingEntity {
-     private final BodyRotationControl bodyRotationControl;
-     protected PathNavigation navigation;
-     public GoalSelector goalSelector;
-+    @Nullable public net.minecraft.world.entity.ai.goal.FloatGoal goalFloat; // Paper
-     public GoalSelector targetSelector;
-     private LivingEntity target;
-     private final Sensing sensing;
-@@ -799,7 +800,17 @@ public abstract class Mob extends LivingEntity {
-     @Override
-     protected final void serverAiStep() {
-         ++this.noActionTime;
--        if (!this.aware) return; // CraftBukkit
-+        if (!this.aware) { // Paper start - Allow nerfed mobs to jump, float and take water damage
-+            if (goalFloat != null) {
-+                if (goalFloat.canUse()) goalFloat.tick();
-+                this.getJumpControl().tick();
-+            }
-+            if ((this instanceof net.minecraft.world.entity.monster.Blaze || this instanceof net.minecraft.world.entity.monster.EnderMan) && isInWaterRainOrBubble()) {
-+                hurt(DamageSource.DROWN, 1.0F);
-+            }
-+            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 54085b104547f2fe7c08ff8aa4839b1230877bca..08bb9a723dd11be66bec2e852dc345a22d926bea 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.nerfedMobsShouldJump) mob.goalFloat = this; // Paper
-         this.setFlags(EnumSet.of(Goal.Flag.JUMP));
-         mob.getNavigation().setCanFloat(true);
-     }

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

@@ -1,87 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a6f0e2193f930cf4f1e38ac30e92a7f7cafb8413..6d1a880737c90da743fd772426b4050036bdb926 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -2,6 +2,9 @@ package com.destroystokyo.paper;
- 
- import java.util.List;
- 
-+import it.unimi.dsi.fastutil.objects.Reference2IntMap;
-+import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
-+import net.minecraft.world.entity.MobCategory;
- import org.bukkit.Bukkit;
- import org.bukkit.configuration.file.YamlConfiguration;
- import org.spigotmc.SpigotWorldConfig;
-@@ -40,6 +43,13 @@ public class PaperWorldConfig {
-     public void removeOldValues() {
-         boolean needsSave = false;
- 
-+        if (PaperConfig.version < 24) {
-+            needsSave = true;
-+
-+            set("despawn-ranges.soft", null);
-+            set("despawn-ranges.hard", null);
-+        }
-+
-         if (needsSave) {
-             saveConfig();
-         }
-@@ -122,4 +132,31 @@ public class PaperWorldConfig {
-     private void nerfedMobsShouldJump() {
-         nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
-     }
-+
-+    public final Reference2IntMap<MobCategory> softDespawnDistances = new Reference2IntOpenHashMap<>(MobCategory.values().length);
-+    public final Reference2IntMap<MobCategory> hardDespawnDistances = new Reference2IntOpenHashMap<>(MobCategory.values().length);
-+    private void despawnDistances() {
-+        if (PaperConfig.version < 24) {
-+            int softDistance = getInt("despawn-ranges.soft", 32, false); // 32^2 = 1024, Minecraft Default
-+            int hardDistance = getInt("despawn-ranges.hard", 128, false); // 128^2 = 16384, Minecraft Default
-+            for (MobCategory value : MobCategory.values()) {
-+                if (softDistance != 32) {
-+                    softDespawnDistances.put(value, softDistance);
-+                }
-+                if (hardDistance != 128) {
-+                    hardDespawnDistances.put(value, hardDistance);
-+                }
-+            }
-+        }
-+        for (MobCategory category : MobCategory.values()) {
-+            int softDistance = getInt("despawn-ranges." + category.getName() + ".soft", softDespawnDistances.getOrDefault(category, category.getNoDespawnDistance()));
-+            int hardDistance = getInt("despawn-ranges." + category.getName() + ".hard", hardDespawnDistances.getOrDefault(category, category.getDespawnDistance()));
-+            if (softDistance > hardDistance) {
-+                softDistance = hardDistance;
-+            }
-+            log("Mobs in " + category.getName() + " Despawn Ranges: Soft" + softDistance + " Hard: " + hardDistance);
-+            softDespawnDistances.put(category, softDistance);
-+            hardDespawnDistances.put(category, hardDistance);
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index abaa57d9a4d222753d28801c6ab86b11c71aca6b..867ada6ba562d9d3db6bf97cb3fd2c5a281f915f 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -775,14 +775,14 @@ public abstract class Mob extends LivingEntity {
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this); // CraftBukkit - decompile error
--                int i = this.getType().getCategory().getDespawnDistance();
-+                int i = this.level.paperConfig.hardDespawnDistances.getInt(this.getType().getCategory()); // Paper - custom despawn distances
-                 int j = i * i;
- 
-                 if (d0 > (double) j) { // CraftBukkit - remove isTypeNotPersistent() check
-                     this.discard();
-                 }
- 
--                int k = this.getType().getCategory().getNoDespawnDistance();
-+                int k = this.level.paperConfig.softDespawnDistances.getInt(this.getType().getCategory()); // Paper - custom despawn distances
-                 int l = k * k;
- 
-                 if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && d0 > (double) l) { // CraftBukkit - remove isTypeNotPersistent() check

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

@@ -1,33 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6d1a880737c90da743fd772426b4050036bdb926..8521772cf6cf9716093495cb8c41dfb7a649e741 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -159,4 +159,10 @@ public class PaperWorldConfig {
-             hardDespawnDistances.put(category, hardDistance);
-         }
-     }
-+
-+    public boolean keepSpawnInMemory;
-+    private void keepSpawnInMemory() {
-+        keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
-+        log("Keep spawn chunk loaded: " + keepSpawnInMemory);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 71cbc053a23e5404a2472f5e1e56484939c8413a..e8469eaad83932024a6f817674e0a50ae7df75aa 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -239,6 +239,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         });
-         // CraftBukkit end
-         timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
-+        this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
-         this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
-         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
-     }

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

@@ -1,82 +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
-
-* Dec 2, 2020 Added tnt nerf for tnt minecarts - Machine_Maker
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8521772cf6cf9716093495cb8c41dfb7a649e741..1cfa6ae0a2fc42cd83c1323d49151ec2bbbacf83 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -165,4 +165,14 @@ public class PaperWorldConfig {
-         keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
-         log("Keep spawn chunk loaded: " + keepSpawnInMemory);
-     }
-+
-+    public int fallingBlockHeightNerf;
-+    public int entityTNTHeightNerf;
-+    private void heightNerfs() {
-+        fallingBlockHeightNerf = getInt("falling-block-height-nerf", 0);
-+        entityTNTHeightNerf = getInt("tnt-entity-height-nerf", 0);
-+
-+        if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
-+        if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
-+    }
- }
-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 27707ccea8763dbfdfe80da45f26127e58bc7316..91c0e425de193be1e4e9779d1c92c8ea577e29e0 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -127,6 +127,17 @@ public class FallingBlockEntity extends Entity {
-             }
- 
-             this.move(MoverType.SELF, this.getDeltaMovement());
-+
-+            // Paper start - Configurable EntityFallingBlock height nerf
-+            if (this.level.paperConfig.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig.fallingBlockHeightNerf) {
-+                if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
-+                    this.spawnAtLocation(block);
-+                }
-+
-+                this.discard();
-+                return;
-+            }
-+            // Paper end
-             if (!this.level.isClientSide) {
-                 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 540fe28b16ff0208e23ecdd50fc5fa05960c0299..394164f50256ad9a167e15531a9202875abb6cb6 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -68,6 +68,12 @@ public class PrimedTnt extends Entity {
-         }
- 
-         this.move(MoverType.SELF, this.getDeltaMovement());
-+        // Paper start - Configurable TNT entity height nerf
-+        if (this.level.paperConfig.entityTNTHeightNerf != 0 && this.getY() > this.level.paperConfig.entityTNTHeightNerf) {
-+            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 01d3247501ad228882e9e0a03f964a18e051d4c4..4572a3cf0a067b64f2bd6c31139a773cddf4e872 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-@@ -45,6 +45,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.entityTNTHeightNerf != 0 && this.getY() > this.level.paperConfig.entityTNTHeightNerf) {
-+                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/0019-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,117 +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/Eula.java b/src/main/java/net/minecraft/server/Eula.java
-index 2c53a400611c78236c5a1c1270d27c02e94251bf..a1d5c0f8fe2adb2ee56f3217e089211ec7c61eb0 100644
---- a/src/main/java/net/minecraft/server/Eula.java
-+++ b/src/main/java/net/minecraft/server/Eula.java
-@@ -64,7 +64,7 @@ public class Eula {
-                 try {
-                     Properties properties = new Properties();
-                     properties.setProperty("eula", "false");
--                    properties.store(outputStream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).");
-+                    properties.store(outputStream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world.");  // Paper - fix lag;
-                 } catch (Throwable var5) {
-                     if (outputStream != null) {
-                         try {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e6afb76adc428dc1e919a1255a43b8d96aefd79b..e6be4991f07a9cd59946d501c002fd9113b46af0 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1444,7 +1444,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 c92dd103f4a7f5d122ef5e49ac5582ec8fb156eb..55bc67744d41c3416dc7be1ae1acc37e8f798e56 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -247,7 +247,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 52f78b8a3d4588f9aba10c8aea4d36cb02f1f54f..2da0896ca3b15deded3556c6298a41f18324db58 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -210,12 +210,25 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -28);
-                     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
-                         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 335120afc88a8fc1543c2e6df516fd728e3ab032..d5863b0b06384b25eaa33572fa02649795463ed8 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
- 
-     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 class WatchdogThread extends Thread
-             {
-                 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 class WatchdogThread extends Thread
-                 }
-                 //
-                 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
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );
-                 //

patches/server/0020-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..91d7afc710a2d52b4f429e0381cf64176ecb6415
---- /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";
-+    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://papermc.io/api/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 fa64a0ea5b6dd9c6031fe54c9030bdb1999ef109..2b54c6980166cb7378e3db42d3a68005ebf451a1 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -368,6 +368,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getTimingsServerName() {
-         return com.destroystokyo.paper.PaperConfig.timingsServerName;
-     }
-+
-+    @Override
-+    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.PaperVersionFetcher();
-+    }
-     // Paper end
- 
-     /**

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

@@ -1,214 +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 54a43041eb9a91b43cb87d9ee145fa96750433a1..3daeebb5ce4df012e6cb6683697c9179eebf6b35 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..aac3f66cb23d260729c2a48d8710a9de2346aa22
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -0,0 +1,145 @@
-+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 (!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 2b062beaad39f2e86801fdd5b0cc84b253f1348a..bd94277862e0f5546b4df81fbd535d2e4c7ef5b1 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -203,6 +203,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             return false;
-         }
-         com.destroystokyo.paper.PaperConfig.registerCommands();
-+        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);

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

@@ -1,143 +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 195989667c7d844399a72787819f62a3fd0d9c78..d17b75ad13bbc8a38cdc2f2d77ee5d88438cec31 100644
---- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -28,6 +28,11 @@ public final class EntitySelector {
-     };
- 
-     private EntitySelector() {}
-+    // Paper start
-+    public static final Predicate<Entity> affectsSpawning = (entity) -> {
-+        return !entity.isSpectator() && entity.isAlive() && (entity instanceof net.minecraft.server.level.ServerPlayer) && ((net.minecraft.server.level.ServerPlayer) entity).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 c9a9a4c6ba930dedb227c1f1d4ca4bb520983854..5dbc90cf67ee88d2f7043c38eaad4fc5874606b5 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -771,7 +771,7 @@ public abstract class Mob extends LivingEntity {
-         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.affectsSpawning); // Paper
- 
-             if (entityhuman != null) {
-                 double d0 = entityhuman.distanceToSqr((Entity) this); // CraftBukkit - decompile error
-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 5b028cd78fd8584568836cbd7b3ca4b62dce5af8..aec7dd2df77efeaf65d9fe08adc668030dfe08e2 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -123,7 +123,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/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4ba15f9cea1277939807d34b3a947f2b26d25d98..1bdaa8d1a65b11175801f47ddfe15bffee6143bf 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -176,6 +176,9 @@ public abstract class Player extends LivingEntity {
-     private final ItemCooldowns cooldowns;
-     @Nullable
-     public FishingHook fishing;
-+    // 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 03bdbb832ff6a86f2dac9c008de45f3bb53aa688..a003e1c0d99a4d4c88269ea5bad250ba73bbc9c9 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -77,7 +77,7 @@ public abstract class BaseSpawner {
-     }
- 
-     private 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.isAffectsSpawningPlayerNearby((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper
-     }
- 
-     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 389985e022b82c675fb21f363422471bd15b84b0..849616d9ad140285f7aa4d2ffafd6371f3904bd5 100644
---- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -71,8 +71,8 @@ public interface EntityGetter {
-         }
-     }
- 
--    @Nullable
--    default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) {
-+    default Player findNearbyPlayer(Entity entity, double d0, @Nullable Predicate<Entity> predicate) { return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), d0, predicate); } // Paper
-+    @Nullable default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) { // Paper
-         double d = -1.0D;
-         Player player = null;
- 
-@@ -100,6 +100,27 @@ public interface EntityGetter {
-         return this.getNearestPlayer(x, y, z, maxDistance, predicate);
-     }
- 
-+    // Paper end
-+    default boolean isAffectsSpawningPlayerNearby(double d0, double d1, double d2, double d3) {
-+        java.util.Iterator iterator = this.players().iterator();
-+        double d4;
-+        do {
-+            Player entityhuman;
-+            do {
-+                if (!iterator.hasNext()) {
-+                    return false;
-+                }
-+
-+                entityhuman = (Player) iterator.next();
-+            } while (!EntitySelector.affectsSpawning.test(entityhuman));
-+
-+            d4 = entityhuman.distanceToSqr(d0, d1, d2);
-+        } while (d3 >= 0.0D && d4 >= d3 * d3);
-+
-+        return true;
-+    }
-+    // 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 63abd7058bd770724145526a89a539f064079b81..b139868f1c84a97d145634d37cf0f658871f93c6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1791,8 +1791,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     @Override
-     public String getLocale() {
-         return this.getHandle().locale;
-+
-+    }
-+
-+    // 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/0023-Remove-invalid-mob-spawner-tile-entities.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Tue, 1 Mar 2016 15:08:03 -0600
-Subject: [PATCH] Remove invalid mob spawner tile entities
-
-
-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 4a13b18ce609fc6a86da48b0673ccf9d3e0d8292..be1d7d2be46c746b593c3842030412940e2e57f8 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -46,10 +46,12 @@ import net.minecraft.world.level.TickList;
- import net.minecraft.world.level.block.Block;
- import net.minecraft.world.level.block.Blocks;
- import net.minecraft.world.level.block.EntityBlock;
-+import net.minecraft.world.level.block.SpawnerBlock;
- import net.minecraft.world.level.block.entity.BlockEntity;
- import net.minecraft.world.level.block.entity.BlockEntityTicker;
- import net.minecraft.world.level.block.entity.BlockEntityType;
- import net.minecraft.world.level.block.entity.TickingBlockEntity;
-+import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
- import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.level.gameevent.EuclideanGameEventDispatcher;
- import net.minecraft.world.level.gameevent.GameEventDispatcher;
-@@ -608,6 +610,10 @@ public class LevelChunk implements ChunkAccess {
-             }
- 
-             // CraftBukkit start
-+            // Paper start - Remove invalid mob spawner tile entities
-+        } else if (blockEntity instanceof SpawnerBlockEntity && !(getBlockState(blockposition).getBlock() instanceof SpawnerBlock)) {
-+            this.removeBlockEntity(blockEntity.getBlockPos());
-+            // Paper end
-         } 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!");

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

@@ -1,212 +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 e6be4991f07a9cd59946d501c002fd9113b46af0..25a0038179ae71511638ecb5cd3f47bd9b81e4b1 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -283,7 +283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public org.bukkit.command.ConsoleCommandSender console;
-     public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
-     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;
-@@ -292,7 +292,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 ];
-     public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
-     // Spigot end
-@@ -1007,6 +1007,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
- 
-     protected void runServer() {
-@@ -1019,26 +1070,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-                 // Spigot start
-                 Arrays.fill( 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) {
--                    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;
- 
-                         if (this.server.getWarnOnOverload()) // CraftBukkit
--                        MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
-+                            MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
-                         this.nextTickTime += j * 50L;
-                         this.lastOverloadWarning = this.nextTickTime;
-                     }
- 
-                     ++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
-@@ -1048,7 +1106,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 55bc67744d41c3416dc7be1ae1acc37e8f798e56..47b212ca59b1c30b7224cac6a96f527fdfe659f8 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2304,6 +2304,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 4ab81a99f906e3f28e026d0e50b5b943c1bdcfb5..9bede6a26c08ede063c7a38f1149c811df14b258 100644
---- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -24,22 +24,30 @@ 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();
-+        String[] tpsAvg = new String[tps.length];
-+
-+        for ( int i = 0; i < tps.length; i++) {
-+            tpsAvg[i] = TicksPerSecondCommand.format( tps[i] );
-+        }
-+        sender.sendMessage(ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", "));
-+        if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
-+            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)");
-+            if (!hasShownMemoryWarning) {
-+                sender.sendMessage(ChatColor.RED + "Warning: " + ChatColor.GOLD + " 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.");
-+                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 String 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 );
-+                + ( ( tps > 21.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); // Paper - only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise
-     }
- }

patches/server/0025-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 b139868f1c84a97d145634d37cf0f658871f93c6..767bb340e4d7c1cd96a097145c9a9ad0cd2509b9 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1460,12 +1460,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() && value) {
-             throw new IllegalArgumentException("Cannot make player fly if getAllowFlight() is false");
-         }
- 
-         this.getHandle().getAbilities().flying = value;
--        this.getHandle().onUpdateAbilities();
-+        if (needsUpdate) this.getHandle().onUpdateAbilities(); // Paper - Only refresh abilities if needed
-     }
- 
-     @Override

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

@@ -1,159 +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 9d00198c74bae8507df75553c9005ba847fd7c11..29cff1fba174be7fb6b26958db61bd4ea6c3125d 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1946,6 +1946,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }
- 
-             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 f903453fd129f6fb5023615088bd84d33052f0dc..3d6b2a74182485af701838be075edd999520ddf2 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -281,6 +281,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
-     public boolean forceExplosionKnockback; // SPIGOT-949
-     public boolean persistentInvisibility = false;
-+    // 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
-     // Spigot start
-     public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
-     public final boolean defaultActivationState;
-@@ -1818,6 +1839,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-                 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");
-@@ -1944,6 +1974,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-             }
-             // 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 91c0e425de193be1e4e9779d1c92c8ea577e29e0..1d538f490c7aa48991446fb55c7f0916bb5d5e29 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -330,6 +330,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(level.getWorld(), srcX, srcY, srcZ));
-+        }
-+        // Paper end
-     }
- 
-     public Level getLevel() {
-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 394164f50256ad9a167e15531a9202875abb6cb6..8ad1b3cb16533d62deda643ce0cdda308743f78e 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -120,6 +120,14 @@ public class PrimedTnt extends Entity {
-     @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(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 a527e4e04babfaf6f324e4aa3b93a86009664166..5d5c6d1cfaa25f3a05976ee496d14fb32b052785 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1146,4 +1146,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.spigot;
-     }
-     // Spigot end
-+
-+    // Paper start
-+    @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/0027-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 e8469eaad83932024a6f817674e0a50ae7df75aa..9745f583f8ba4a654e8ad81e54ad3d95d9849dd7 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -736,11 +736,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 7b333e2d6884b272abefbc820bcce8026a4cdf7e..66ab4deedd177f507d170a61ceca4c3ebbac9adc 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
-@@ -196,7 +196,12 @@ public abstract class BlockEntity implements net.minecraft.server.KeyedObject {
-             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 be1d7d2be46c746b593c3842030412940e2e57f8..ea894662b41cddfc5702a7d6305978be71da79b4 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1247,11 +1247,11 @@ public class LevelChunk implements 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/0028-Configurable-top-of-nether-void-damage.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 23:58:50 -0600
-Subject: [PATCH] Configurable top of nether void damage
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1cfa6ae0a2fc42cd83c1323d49151ec2bbbacf83..08281351cc99e904a3a388607425dde4c83f13e2 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -175,4 +175,19 @@ public class PaperWorldConfig {
-         if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
-         if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
-     }
-+
-+    public int netherVoidTopDamageHeight;
-+    public boolean doNetherTopVoidDamage() { return netherVoidTopDamageHeight > 0; }
-+    private void netherVoidTopDamageHeight() {
-+        netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 0);
-+        log("Top of the nether void damage height: " + netherVoidTopDamageHeight);
-+
-+        if (PaperConfig.version < 18) {
-+            boolean legacy = getBoolean("nether-ceiling-void-damage", false);
-+            if (legacy) {
-+                netherVoidTopDamageHeight = 128;
-+                set("nether-ceiling-void-damage-height", netherVoidTopDamageHeight);
-+            }
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 30502371b8d49738787b7cddab713472b6f2ce41..3acb00b025d5e45c7244cb62b59c5466d16a88dc 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -628,7 +628,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     }
- 
-     public void checkOutOfWorld() {
--        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
-+            && level.paperConfig.doNetherTopVoidDamage()
-+            && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
-+            // Paper end
-             this.outOfWorld();
-         }
- 

patches/server/0029-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 4dcdfda78966df2596b44f7e2d3b1d61c45f17af..7b367e273c2a6869f8d8929c24ee45efdf6d4b1e 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/0030-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 f023f3a0d1671398363f0caa432ffb61fd07c9b2..84ce3d38d5decb4a2f9fae78e0ef5d715860dc7d 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/0031-Configurable-end-credits.patch

@@ -1,33 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 08281351cc99e904a3a388607425dde4c83f13e2..58c8c6db87492cf70de3a26d23209a931c6726b2 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -190,4 +190,10 @@ public class PaperWorldConfig {
-             }
-         }
-     }
-+
-+    public boolean disableEndCredits;
-+    private void disableEndCredits() {
-+        disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
-+        log("End credits disabled: " + disableEndCredits);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0e7c09c80509c83a52f32f735a1b19960bb369ee..a29058a772bcb908de631c34cd9743f4721cf1ae 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -936,6 +936,7 @@ public class ServerPlayer extends Player {
-             this.unRide();
-             this.getLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
-             if (!this.wonGame) {
-+                if (level.paperConfig.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/0032-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 73a2b98a7080f7f033ac79c097f0758fefdba5c0..83f542bc7c5cb9a309202bb37affac3432bb0535 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -208,7 +208,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);
- 
-         for (int l1 = 0; l1 < list.size(); ++l1) {

patches/server/0033-Optimize-explosions.patch

@@ -1,148 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 58c8c6db87492cf70de3a26d23209a931c6726b2..ef0ec6b45cee27547e06ead7ef5acd6e51380a52 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -196,4 +196,10 @@ public class PaperWorldConfig {
-         disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
-         log("End credits disabled: " + disableEndCredits);
-     }
-+
-+    public boolean optimizeExplosions;
-+    private void optimizeExplosions() {
-+        optimizeExplosions = getBoolean("optimize-explosions", false);
-+        log("Optimize explosions: " + optimizeExplosions);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bfb835174390f6265d78c980cd56cd48ab1f4994..564517db80c3e7346f01746600d497becf0f0cff 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1423,6 +1423,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 83f542bc7c5cb9a309202bb37affac3432bb0535..f833041bb004203f327d33dc7aaade8e9ab36772 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -227,7 +227,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
-@@ -446,4 +446,84 @@ public class Explosion {
- 
-         private BlockInteraction() {}
-     }
-+    // Paper start - Optimize explosions
-+    private float getBlockDensity(Vec3 vec3d, Entity entity) {
-+        if (!this.level.paperConfig.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 9745f583f8ba4a654e8ad81e54ad3d95d9849dd7..dd2dd8c12a8dfe252ab90ba5defd98a15dea14eb 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -155,6 +155,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/0034-Disable-explosion-knockback.patch

@@ -1,69 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef0ec6b45cee27547e06ead7ef5acd6e51380a52..dc8a1e4c5375fdd733146f671df91f59817f8377 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -202,4 +202,9 @@ public class PaperWorldConfig {
-         optimizeExplosions = getBoolean("optimize-explosions", false);
-         log("Optimize explosions: " + optimizeExplosions);
-     }
-+
-+    public boolean disableExplosionKnockback;
-+    private void disableExplosionKnockback(){
-+        disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2e1857e80797c9012e203f69f44d5a6126d48ea7..c5fb30aec04bd46ab4ad376382889f99015f63b9 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1380,6 +1380,7 @@ public abstract class LivingEntity extends Entity {
-                 }
-             }
- 
-+            boolean knockbackCancelled = level.paperConfig.disableExplosionKnockback && source.isExplosion() && this instanceof net.minecraft.world.entity.player.Player; // Paper - Disable explosion knockback
-             if (flag1) {
-                 if (flag) {
-                     this.level.broadcastEntityEvent(this, (byte) 29);
-@@ -1400,6 +1401,7 @@ public abstract class LivingEntity extends Entity {
-                         b0 = 2;
-                     }
- 
-+                    if (!knockbackCancelled) // Paper - Disable explosion knockback
-                     this.level.broadcastEntityEvent(this, b0);
-                 }
- 
-@@ -1423,6 +1425,7 @@ public abstract class LivingEntity extends Entity {
-                 }
-             }
- 
-+            if (knockbackCancelled) this.level.broadcastEntityEvent(this, (byte) 2); // Paper - Disable explosion knockback
-             if (this.isDeadOrDying()) {
-                 if (!this.checkTotemDeathProtection(source)) {
-                     SoundEvent soundeffect = this.getDeathSound();
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index f833041bb004203f327d33dc7aaade8e9ab36772..35ea80a18234d8125397edb5bab9e86ea526d3ca 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -243,14 +243,14 @@ public class Explosion {
-                         double d14 = d13;
- 
-                         if (entity instanceof LivingEntity) {
--                            d14 = ProtectionEnchantment.getExplosionKnockbackAfterDampener((LivingEntity) entity, d13);
-+                            d14 = entity instanceof Player && level.paperConfig.disableExplosionKnockback ? 0 : ProtectionEnchantment.getExplosionKnockbackAfterDampener((LivingEntity) entity, d13); // Paper - Disable explosion knockback
-                         }
- 
-                         entity.setDeltaMovement(entity.getDeltaMovement().add(d8 * d14, d9 * d14, d10 * d14));
-                         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.disableExplosionKnockback) { // Paper - Disable explosion knockback
-                                 this.hitPlayers.put(entityhuman, new Vec3(d8 * d13, d9 * d13, d10 * d13));
-                             }
-                         }

patches/server/0035-Disable-thunder.patch

@@ -1,33 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dc8a1e4c5375fdd733146f671df91f59817f8377..3ca83e07060e184cbd19a5585d44f5e7a5354462 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -207,4 +207,9 @@ public class PaperWorldConfig {
-     private void disableExplosionKnockback(){
-         disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
-     }
-+
-+    public boolean disableThunder;
-+    private void disableThunder() {
-+        disableThunder = getBoolean("disable-thunder", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 55dda62e7ec3b92a406ce85d345dd7af422e2783..2649c180cbfcc210458ca795d3f14fa0b6017546 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -644,7 +644,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         gameprofilerfiller.push("thunder");
-         BlockPos blockposition;
- 
--        if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot
-+        if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder
-             blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
-             if (this.isRainingAt(blockposition)) {
-                 DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);

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

@@ -1,33 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3ca83e07060e184cbd19a5585d44f5e7a5354462..bf0c767af0ca5129b69b3c8dcfe54cdee989854b 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -212,4 +212,9 @@ public class PaperWorldConfig {
-     private void disableThunder() {
-         disableThunder = getBoolean("disable-thunder", false);
-     }
-+
-+    public boolean disableIceAndSnow;
-+    private void disableIceAndSnow(){
-+        disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2649c180cbfcc210458ca795d3f14fa0b6017546..6899be05202c114a6e6086bc3fdf739d3ab97fd7 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -668,7 +668,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         }
- 
-         gameprofilerfiller.popPush("iceandsnow");
--        if (this.random.nextInt(16) == 0) {
-+        if (!this.paperConfig.disableIceAndSnow && this.random.nextInt(16) == 0) { // Paper - Disable ice and snow
-             blockposition = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, this.getBlockRandomPos(j, 0, k, 15));
-             BlockPos blockposition1 = blockposition.below();
-             Biome biomebase = this.getBiome(blockposition);

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

@@ -1,63 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf0c767af0ca5129b69b3c8dcfe54cdee989854b..cff814a123e02aea96197c1be092c210c2fcf781 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -217,4 +217,9 @@ public class PaperWorldConfig {
-     private void disableIceAndSnow(){
-         disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
-     }
-+
-+    public int mobSpawnerTickRate;
-+    private void mobSpawnerTickRate() {
-+        mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index a003e1c0d99a4d4c88269ea5bad250ba73bbc9c9..65744b55f06c225745e3e145e5f5e60ebefd304c 100644
---- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -46,6 +46,7 @@ public abstract class BaseSpawner {
-     public int requiredPlayerRange;
-     public int spawnRange;
-     private final Random random;
-+    private int tickDelay = 0; // Paper
- 
-     public BaseSpawner() {
-         this.spawnPotentials = BaseSpawner.EMPTY_POTENTIALS;
-@@ -101,13 +102,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.mobSpawnerTickRate;
-+        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;
- 
-@@ -156,8 +162,7 @@ public abstract class BaseSpawner {
-                                 ((Mob) entity).finalizeSpawn(world, world.getCurrentDifficultyAt(entity.blockPosition()), MobSpawnType.SPAWNER, (SpawnGroupData) null, (CompoundTag) null);
-                             }
-                             // Spigot Start
--                            if ( entityinsentient.level.spigotConfig.nerfSpawnerMobs )
--                            {
-+                            if (entityinsentient.level.spigotConfig.nerfSpawnerMobs) {
-                                 entityinsentient.aware = false;
-                             }
-                             // Spigot End

patches/server/0038-Per-Player-View-Distance-API-placeholders.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Mon, 6 May 2019 01:29:25 -0400
-Subject: [PATCH] Per-Player View Distance API placeholders
-
-I hope to look at this more in-depth soon. It appears doable.
-However this should not block the update.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6bee392787a517d5ab8966b94c035db00eeb7d99..ae63083b1283a5628fa900827c0af6e9254592c2 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -171,6 +171,8 @@ import org.bukkit.inventory.MainHand;
- 
- public class ServerPlayer extends Player {
- 
-+    public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder
-+
-     private static final Logger LOGGER = LogManager.getLogger();
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cb91db9a25b96b0ad2b9c6a61ba26cd6d638b8a0..6572528a3a664f10d8c3a0d0808c411fcd031f71 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -371,6 +371,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
-         }
-     }
-+
-+    @Override
-+    public int getViewDistance() {
-+        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
-+    }
-+
-+    @Override
-+    public void setViewDistance(int viewDistance) {
-+        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
-+    }
-     // Paper end
- 
-     @Override

patches/server/0039-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 5406ca495dd3dcb23929605d5b27bb4370a63d4d..0fa01b98f4a2ce2a7d34437a71d8c1cc7e718fb1 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 {
- 
-@@ -274,15 +278,23 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-         }
-     }
- 
--    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
-             }
-         }
-     }
-@@ -305,10 +317,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-             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/0040-Configurable-container-update-tick-rate.patch

@@ -1,46 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cff814a123e02aea96197c1be092c210c2fcf781..0f93c6ba2bc1b6207f8a5c3f9a39cb086797e800 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -222,4 +222,9 @@ public class PaperWorldConfig {
-     private void mobSpawnerTickRate() {
-         mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
-     }
-+
-+    public int containerUpdateTickRate;
-+    private void containerUpdateTickRate() {
-+        containerUpdateTickRate = getInt("container-update-tick-rate", 1);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d263d9ce353312fe6954cdd2ef1a2c4c0260f168..3f3404d7d890864fcdcde7d65f726d288ddec688 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -217,6 +217,7 @@ public class ServerPlayer extends Player {
-     private int containerCounter;
-     public int latency;
-     public boolean wonGame;
-+    private int containerUpdateDelay; // Paper
- 
-     // CraftBukkit start
-     public String displayName;
-@@ -587,7 +588,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 = level.paperConfig.containerUpdateTickRate;
-+        }
-+        // Paper end
-         if (!this.level.isClientSide && !this.containerMenu.stillValid(this)) {
-             this.closeContainer();
-             this.containerMenu = this.inventoryMenu;

patches/server/0041-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 6432f668f72c0543283b5a1439d01da81ff5b981..9405812b8c308d70de1e26ba55500301b24ecc3c 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -168,7 +168,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-         if (name == null) {
-             this.setProfile(null);
-         } else {
--            this.setProfile(new GameProfile(null, 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(null, name);
-+            this.setProfile(newProfile);
-+            // Paper end
-         }
- 
-         return true;

patches/server/0042-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 dd2dd8c12a8dfe252ab90ba5defd98a15dea14eb..5f047982b559087ae6eaffbc89ea83d289609de5 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -702,9 +702,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(tileTickPosition);
-             // Spigot start

patches/server/0043-Add-PlayerInitialSpawnEvent.patch

@@ -1,35 +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
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 14cf49b910bd789f1dd61d303b88d53a93c3abd6..0ea5574ab43141a69e6aa5e05aeb548660f126e1 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -216,7 +216,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();
-@@ -224,7 +224,10 @@ public abstract class PlayerList {
- 
-         player.setLevel(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/0044-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,37 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0f93c6ba2bc1b6207f8a5c3f9a39cb086797e800..0ccb86aed122ecd54a460db426163d0d2639c609 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -227,4 +227,9 @@ public class PaperWorldConfig {
-     private void containerUpdateTickRate() {
-         containerUpdateTickRate = getInt("container-update-tick-rate", 1);
-     }
-+
-+    public boolean disableChestCatDetection;
-+    private void disableChestCatDetection() {
-+        disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
-+    }
- }
-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 1c1998c15849a56241b397bd2dfa8b00d39f610b..1891cfb8f7ebae5a95a55f706bb04f8206121d32 100644
---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -362,6 +362,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 (((Level) world).paperConfig.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/0045-Ensure-commands-are-not-ran-async.patch

@@ -1,118 +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] Ensure commands are not ran async
-
-Plugins calling Player.chat("/foo") or Server.dispatchCommand() could
-trigger the server to execute a command while on another thread.
-
-These commands would then process EXPECTING to be on the main thread, leaving to
-very hard to trace concurrency issues.
-
-This change will synchronize the command execution back to the main thread, causing a
-big slowdown in execution but throwing an exception at same time to raise awareness
-that it is happening so that plugin authors can fix their code to stop executing commands async.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index da9f4b3337b49597c17b50964656457cd629a0b7..22c2c121bbcc7b0e15d73d20c9cc83d5fb085e5f 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1846,6 +1846,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         }
- 
-         if (!async && s.startsWith("/")) {
-+            // Paper Start
-+            if (!org.spigotmc.AsyncCatcher.shuttingDown && !org.bukkit.Bukkit.isPrimaryThread()) {
-+                final String fCommandLine = s;
-+                MinecraftServer.LOGGER.log(org.apache.logging.log4j.Level.ERROR, "Command Dispatched Async: " + fCommandLine);
-+                MinecraftServer.LOGGER.log(org.apache.logging.log4j.Level.ERROR, "Please notify author of plugin causing this execution to fix this bug! see: http://bit.ly/1oSiM6C", new Throwable());
-+                Waitable wait = new Waitable() {
-+                    @Override
-+                    protected Object evaluate() {
-+                        chat(fCommandLine, false);
-+                        return null;
-+                    }
-+                };
-+                server.processQueue.add(wait);
-+                try {
-+                    wait.get();
-+                    return;
-+                } catch (InterruptedException e) {
-+                    Thread.currentThread().interrupt(); // This is proper habit for java. If we aren't handling it, pass it on!
-+                } catch (Exception e) {
-+                    throw new RuntimeException("Exception processing chat command", e.getCause());
-+                }
-+            }
-+            // Paper End
-             this.handleCommand(s);
-         } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
-             // Do nothing, this is coming from a plugin
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47b212ca59b1c30b7224cac6a96f527fdfe659f8..52a20a67ac25018c04d037c54b014d15ee2c1e95 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -787,6 +787,28 @@ public final class CraftServer implements Server {
-         Validate.notNull(commandLine, "CommandLine cannot be null");
-         org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
- 
-+        // Paper Start
-+        if (!org.spigotmc.AsyncCatcher.shuttingDown && !Bukkit.isPrimaryThread()) {
-+            final CommandSender fSender = sender;
-+            final String fCommandLine = commandLine;
-+            Bukkit.getLogger().log(Level.SEVERE, "Command Dispatched Async: " + commandLine);
-+            Bukkit.getLogger().log(Level.SEVERE, "Please notify author of plugin causing this execution to fix this bug! see: http://bit.ly/1oSiM6C", new Throwable());
-+            org.bukkit.craftbukkit.util.Waitable<Boolean> wait = new org.bukkit.craftbukkit.util.Waitable<Boolean>() {
-+                @Override
-+                protected Boolean evaluate() {
-+                    return dispatchCommand(fSender, fCommandLine);
-+                }
-+            };
-+            net.minecraft.server.MinecraftServer.getServer().processQueue.add(wait);
-+            try {
-+                return wait.get();
-+            } catch (InterruptedException e) {
-+                Thread.currentThread().interrupt(); // This is proper habit for java. If we aren't handling it, pass it on!
-+            } catch (Exception e) {
-+                throw new RuntimeException("Exception processing dispatch command", e.getCause());
-+            }
-+        }
-+        // Paper End
-         if (this.commandMap.dispatch(sender, commandLine)) {
-             return true;
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 19c44daaa407b7c1c7a7ffe56fef8c8814c6d5b2..6a073a9dc44d93eba296a0e18a9c7be8a7881725 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-@@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread {
-     public void run() {
-         try {
-             org.spigotmc.AsyncCatcher.enabled = false; // Spigot
-+            org.spigotmc.AsyncCatcher.shuttingDown = true; // Paper
-             this.server.close();
-         } finally {
-             try {
-diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 78669fa035b7537ff7e533cf32aaf2995625424f..7585a30e8f063ac2656b5de519b1e9edaceffbc7 100644
---- a/src/main/java/org/spigotmc/AsyncCatcher.java
-+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
-@@ -6,6 +6,7 @@ public class AsyncCatcher
- {
- 
-     public static boolean enabled = true;
-+    public static boolean shuttingDown = false; // Paper
- 
-     public static void catchOp(String reason)
-     {
-diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 882e93ad4471e3688f2fcfb1e6f16926786ee5e7..94d8ba376cd1f024b244654cac9bb62bb19e3060 100644
---- a/src/main/java/org/spigotmc/RestartCommand.java
-+++ b/src/main/java/org/spigotmc/RestartCommand.java
-@@ -43,6 +43,7 @@ public class RestartCommand extends Command
-     private static void restart(final String restartScript)
-     {
-         AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
-+        org.spigotmc.AsyncCatcher.shuttingDown = true; // Paper
-         try
-         {
-             String[] split = restartScript.split( " " );

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

@@ -1,33 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0ccb86aed122ecd54a460db426163d0d2639c609..84df54523eada327033bb8821a7009df62dc7bca 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -232,4 +232,9 @@ public class PaperWorldConfig {
-     private void disableChestCatDetection() {
-         disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
-     }
-+
-+    public boolean allChunksAreSlimeChunks;
-+    private void allChunksAreSlimeChunks() {
-+        allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
-+    }
- }
-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 b42fa1aa311cab14580906c1f77d02c418ce2285..239f3a17ab8cff4e6c97044e4f8e6755abac193d 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -323,7 +323,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.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);

patches/server/0047-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 52a20a67ac25018c04d037c54b014d15ee2c1e95..8f24d4e8eb26b02f8aa2160d69a7a61807a9580a 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1923,6 +1923,7 @@ public final class CraftServer implements Server {
-         return this.helpMap;
-     }
- 
-+    @Override // Paper - add override
-     public SimpleCommandMap getCommandMap() {
-         return this.commandMap;
-     }

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

@@ -1,22 +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 6c4cb5a8878f2738048d9dc8386cbb985843cf50..8e97b3985056caa2aa692ec6250022e095d0b3a6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -99,7 +99,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setHealth(double health) {
-         health = (float) health;
-         if ((health < 0) || (health > this.getMaxHealth())) {
--            throw new IllegalArgumentException("Health must be between 0 and " + this.getMaxHealth() + "(" + health + ")");
-+            // Paper - Be more informative
-+            throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
-+                + ". (attribute base value: " + this.getHandle().getAttribute(Attributes.MAX_HEALTH).getBaseValue()
-+                + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
-         }
- 
-         // during world generation, we don't want to run logic for dropping items and xp

patches/server/0049-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 22bc8fa039375a3205bdfdf05b6c73c856fb1b16..b10cf0c5800397520f57c0bbc88a52e52db6a4c8 100644
---- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -357,6 +357,11 @@ public class FriendlyByteBuf extends ByteBuf {
-     public FriendlyByteBuf writeComponent(final net.kyori.adventure.text.Component component) {
-         return this.writeUtf(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 6572528a3a664f10d8c3a0d0808c411fcd031f71..ca8987d38f1fcbc094f0f5f13f12dfbf7dd2718a 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;
-@@ -242,6 +243,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/0050-Ensure-inv-drag-is-in-bounds.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Hirschfeld <joe@ibj.io>
-Date: Thu, 3 Mar 2016 02:33:53 -0600
-Subject: [PATCH] Ensure inv drag is in bounds
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 13e5dbc79dc8b70d158717ad48f64240a2643714..60a67f75b4f772654e064e2b19f68a907ca4c93b 100644
---- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -406,7 +406,7 @@ public abstract class AbstractContainerMenu {
-                     this.resetQuickCraft();
-                 }
-             } else if (this.quickcraftStatus == 1) {
--                slot = (Slot) this.slots.get(slotIndex);
-+                slot = slotIndex < this.slots.size() ? this.slots.get(slotIndex) : null; // Paper - Ensure drag in bounds
-                 itemstack = this.getCarried();
-                 if (AbstractContainerMenu.canItemQuickReplace(slot, itemstack, true) && slot.mayPlace(itemstack) && (this.quickcraftType == 2 || itemstack.getCount() > this.quickcraftSlots.size()) && this.canDragTo(slot)) {
-                     this.quickcraftSlots.add(slot);

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

@@ -1,56 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 84df54523eada327033bb8821a7009df62dc7bca..304883dc18bab3bf4740006a5e6d7c58bab12348 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -237,4 +237,13 @@ public class PaperWorldConfig {
-     private void allChunksAreSlimeChunks() {
-         allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
-     }
-+
-+    public int portalSearchRadius;
-+    public int portalCreateRadius;
-+    public boolean portalSearchVanillaDimensionScaling;
-+    private void portalSearchRadius() {
-+        portalSearchRadius = getInt("portal-search-radius", 128);
-+        portalCreateRadius = getInt("portal-create-radius", 16);
-+        portalSearchVanillaDimensionScaling = getBoolean("portal-search-vanilla-dimension-scaling", true);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3acb00b025d5e45c7244cb62b59c5466d16a88dc..3456dcbac4984d4485c85b432f33ab33e76d1361 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2906,7 +2906,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-                 double d4 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType());
-                 BlockPos blockposition = new BlockPos(Mth.clamp(this.getX() * d4, d0, d2), this.getY(), Mth.clamp(this.getZ() * d4, d1, d3));
-                 // CraftBukkit start
--                CraftPortalEvent event = this.callPortalEvent(this, destination, blockposition, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
-+                // Paper start
-+                int portalSearchRadius = destination.paperConfig.portalSearchRadius;
-+                if (level.paperConfig.portalSearchVanillaDimensionScaling && flag2) { // == THE_NETHER
-+                    portalSearchRadius = (int) (portalSearchRadius / destination.dimensionType().coordinateScale());
-+                }
-+                // Paper end
-+                CraftPortalEvent event = this.callPortalEvent(this, destination, blockposition, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, portalSearchRadius, destination.paperConfig.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 4d186a7d6ccf09092c5e1577e4b49e0975787980..d5ba2e679ed1858ea18e18feffce50544ae036c2 100644
---- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-@@ -44,7 +44,7 @@ public class PortalForcer {
- 
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos destPos, boolean destIsNether) {
-         // CraftBukkit start
--        return this.findPortal(destPos, destIsNether ? 16 : 128); // Search Radius
-+        return this.findPortal(destPos, destIsNether ? level.paperConfig.portalCreateRadius : level.paperConfig.portalSearchRadius); // Search Radius // Paper - search Radius
-     }
- 
-     public Optional<BlockUtil.FoundRectangle> findPortal(BlockPos blockposition, int i) {

patches/server/0052-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 8f24d4e8eb26b02f8aa2160d69a7a61807a9580a..cde74a4785e4197f4b39ee28663801726a9e4dca 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -285,6 +285,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 5d5c6d1cfaa25f3a05976ee496d14fb32b052785..2c638d95b396044841ab0dea8d8ce829077992fe 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -436,10 +436,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) && 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));
-         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 d5863b0b06384b25eaa33572fa02649795463ed8..2693cc933d746e40d8a47d96c6cb6799f0a2472f 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -80,7 +80,19 @@ public class WatchdogThread extends Thread
-                     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
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );

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

@@ -1,44 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 304883dc18bab3bf4740006a5e6d7c58bab12348..6d1473a5267ecd3617d76fee23527bde58283bb1 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -246,4 +246,9 @@ public class PaperWorldConfig {
-         portalCreateRadius = getInt("portal-create-radius", 16);
-         portalSearchVanillaDimensionScaling = getBoolean("portal-search-vanilla-dimension-scaling", true);
-     }
-+
-+    public boolean disableTeleportationSuffocationCheck;
-+    private void disableTeleportationSuffocationCheck() {
-+        disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5a90d36915ab14aea6bf6431a1894031a5c9ee96..8eac81867ff299d45427fd71d9b085439deb95d8 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -898,7 +898,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         if (fromWorld == toWorld) {
-             entity.connection.teleport(to);
-         } else {
--            server.getHandle().moveToWorld(entity, toWorld, true, to, true);
-+            server.getHandle().moveToWorld(entity, toWorld, true, to, !toWorld.paperConfig.disableTeleportationSuffocationCheck); // Paper
-         }
-         return true;
-     }

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

@@ -1,256 +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/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d3213114aaaaef575efb79f0c66d5c23baf8614d..fb3b0693abb6f2f044d39508b727fb3a2ad16823 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -875,6 +875,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 return true;
-             } catch (Exception exception) {
-                 ChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-                 return false;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index b0ed7d12bee6b247762fff3d5a24f0cc9411e3dc..f6cb864c45f960811acc02829d1f7883b916de29 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;
-@@ -363,6 +364,7 @@ public class OldUsersConverter {
-                             root = NbtIo.readCompressed(new java.io.FileInputStream(file5));
-                         } catch (Exception exception) {
-                             exception.printStackTrace();
-+                            ServerInternalException.reportInternalException(exception); // Paper
-                         }
- 
-                         if (root != null) {
-@@ -376,6 +378,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 08c5f6fd1a307c89cf8365f56314a0c6d3e89e4b..26e0f03f2e736ed6ba86e2510a7962deee180ef3 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
-@@ -1,5 +1,7 @@
- package net.minecraft.world.entity.ai.village;
- 
-+import com.destroystokyo.paper.exception.ServerInternalException;
-+
- import java.util.Iterator;
- import javax.annotation.Nullable;
- import net.minecraft.core.BlockPos;
-@@ -119,6 +121,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);
-+                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 5f047982b559087ae6eaffbc89ea83d289609de5..dccf23a64bad4fbfcef56eace434884e35919add 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;
-@@ -738,6 +743,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 ac815b900f58f67a2c656fc1dbf8f53ffc15b96e..0432ad7ab00c336e7c566f24c3ec92b399cb6e9d 100644
---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -313,6 +313,7 @@ public final class NaturalSpawner {
-             }
-         } catch (Exception exception) {
-             NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-             return null;
-         }
-     }
-@@ -415,6 +416,7 @@ public final class NaturalSpawner {
-                                     entity = biomesettingsmobs_c.type.create((Level) 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 ea894662b41cddfc5702a7d6305978be71da79b4..aa6db78339d6b0661ac3be12c82da92742b5f519 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.Sets;
- import com.google.common.collect.UnmodifiableIterator;
-@@ -615,10 +616,15 @@ public class LevelChunk implements ChunkAccess {
-             this.removeBlockEntity(blockEntity.getBlockPos());
-             // Paper end
-         } 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));
-+            e.printStackTrace();
-+            ServerInternalException.reportInternalException(e);
-+            // Paper end
-             // CraftBukkit end
-         }
-     }
-@@ -1250,6 +1256,7 @@ public class LevelChunk implements 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 1441888430687b9de2a67f21ed426f16d5b30538..f514c29e64a9c7a66ff4edd5ba8c2a3dfbba2ad9 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
-@@ -277,6 +277,7 @@ public class RegionFile implements AutoCloseable {
-                     return true;
-                 }
-             } catch (IOException ioexception) {
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
-                 return false;
-             }
-         }
-@@ -358,6 +359,7 @@ public class RegionFile implements AutoCloseable {
-             ((java.nio.Buffer) bytebuffer).position(5); // CraftBukkit - decompile error
-             filechannel.write(bytebuffer);
-         } catch (Throwable throwable) {
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
-             if (filechannel != null) {
-                 try {
-                     filechannel.close();
-diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-index 2fdb313e8eaed868c36f68c9b7f6a6f9f4864575..c8ed0673ff819cb88d0ee6f53f2a2b9b46b203d4 100644
---- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-@@ -120,6 +120,7 @@ public class DimensionDataStorage {
- 
-             pushbackInputStream.close();
-         } catch (Throwable var15) {
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(var15); // Paper
-             try {
-                 fileInputStream.close();
-             } catch (Throwable var10) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 07c4d9cd5081378e1b903518f7174fca959cd9e3..dfc2789009fcaa08baa8054bdac915590b8701d6 100644
---- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -17,6 +17,9 @@ import java.util.concurrent.atomic.AtomicReference;
- import java.util.function.Consumer;
- import java.util.function.IntUnaryOperator;
- import java.util.logging.Level;
-+import com.destroystokyo.paper.ServerSchedulerReportingWrapper;
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+import com.destroystokyo.paper.exception.ServerSchedulerException;
- import org.apache.commons.lang.Validate;
- import org.bukkit.plugin.IllegalPluginAccessException;
- import org.bukkit.plugin.Plugin;
-@@ -434,6 +437,8 @@ public class CraftScheduler implements BukkitScheduler {
-                             msg,
-                             throwable);
-                     }
-+                    org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
-+                        new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task)));
-                     // Paper end
-                 } finally {
-                     this.currentTask = null;
-@@ -441,7 +446,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 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/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,27 +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/ClientboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
-index 1f5050e6c1d932aa196ab9524f7f1f9bd1b45fce..a64780b4b49d01322d8f755ff540a9622c89e983 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
-@@ -36,7 +36,14 @@ public class ClientboundChatPacket implements Packet<ClientGamePacketListener> {
-         // Paper end
-         // Spigot start
-         if (this.components != null) {
--            buf.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(components));
-+            // buf.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(components)); // Paper - comment, replaced with below
-+            // Paper start - don't nest if we don't need to so that we can preserve formatting
-+            if (this.components.length == 1) {
-+                buf.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(this.components[0]));
-+            } else {
-+                buf.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(this.components));
-+            }
-+            // Paper end
-         } else {
-             buf.writeComponent(this.message);
-         }

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

@@ -1,50 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6d1473a5267ecd3617d76fee23527bde58283bb1..1ab2ede5e9d8939f69fb430084437fda63879fb7 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -251,4 +251,9 @@ public class PaperWorldConfig {
-     private void disableTeleportationSuffocationCheck() {
-         disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
-     }
-+
-+    public boolean nonPlayerEntitiesOnScoreboards = false;
-+    private void nonPlayerEntitiesOnScoreboards() {
-+        nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3456dcbac4984d4485c85b432f33ab33e76d1361..bd64589488506c018dde86ff3a47836168dd7025 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2555,6 +2555,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
- 
-     @Nullable
-     public Team getTeam() {
-+        if (!this.level.paperConfig.nonPlayerEntitiesOnScoreboards && !(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 c5fb30aec04bd46ab4ad376382889f99015f63b9..0f27ee2ed35f54e30e2169941706eb0fc11275d5 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -803,6 +803,7 @@ public abstract class LivingEntity extends Entity {
-         if (nbt.contains("Team", 8)) {
-             String s = nbt.getString("Team");
-             PlayerTeam scoreboardteam = this.level.getScoreboard().getPlayerTeam(s);
-+            if (!level.paperConfig.nonPlayerEntitiesOnScoreboards && !(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/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,27 +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
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 72ddddde1dafad3be501d0aba73e04515d218d18..5d5ad28d01ff66a8b9f608f82b5213d112243e4d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -717,4 +717,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         this.getHandle().persistentInvisibility = invisible;
-         this.getHandle().setSharedFlag(5, invisible);
-     }
-+
-+    // Paper start
-+    @Override
-+    public int getArrowsStuck() {
-+        return getHandle().getArrowCount();
-+    }
-+
-+    @Override
-+    public void setArrowsStuck(int arrows) {
-+        getHandle().setArrowCount(arrows);
-+    }
-+    // Paper end
- }

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

@@ -1,93 +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/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d217c3b7a72127e6421b2bfa224536e86e27e260..b4bcceeaec778103e07d69f9565f21a9d7e50ff2 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1628,8 +1628,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-             ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
-             this.disconnect(new TranslatableComponent("multiplayer.requiredTexturePrompt.disconnect"));
-         }
--        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()])); // CraftBukkit
--
-+        // Paper start
-+        PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
-+        player.getBukkitEntity().setResourcePackStatus(packStatus);
-+        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
-+        // Paper end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8eac81867ff299d45427fd71d9b085439deb95d8..1a790c9913e8d83276ca3c3158562b2a03e2c82e 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -126,6 +126,7 @@ import org.bukkit.metadata.MetadataValue;
- import org.bukkit.plugin.Plugin;
- import org.bukkit.plugin.messaging.StandardMessenger;
- import org.bukkit.scoreboard.Scoreboard;
-+import org.jetbrains.annotations.NotNull;
- 
- import net.md_5.bungee.api.chat.BaseComponent; // Spigot
- 
-@@ -142,6 +143,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     private double health = 20;
-     private boolean scaledHealth = false;
-     private double healthScale = 20;
-+    // Paper start
-+    private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
-+    private String resourcePackHash;
-+    // Paper end
- 
-     public CraftPlayer(CraftServer server, ServerPlayer entity) {
-         super(server, entity);
-@@ -1909,6 +1914,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) {
-+        Validate.notNull(url, "Resource pack URL cannot be null");
-+        Validate.notNull(hash, "Hash cannot be null");
-+        net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
-+                            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
-+                           null;
-+        this.getHandle().sendTexturePack(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/0059-Chunk-Save-Reattempt.patch

@@ -1,59 +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 f514c29e64a9c7a66ff4edd5ba8c2a3dfbba2ad9..84327c8fe1dc62c7b99950261a344042b4456616 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
-@@ -277,7 +277,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 344d281f0abc93488e41565efac130108745f861..a0516f72671522a6d7d9ea649506760f120b88bd 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
-@@ -11,6 +11,7 @@ import java.io.IOException;
- import javax.annotation.Nullable;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.NbtIo;
-+import net.minecraft.server.MinecraftServer;
- import net.minecraft.util.ExceptionCollector;
- import net.minecraft.world.level.ChunkPos;
- 
-@@ -101,6 +102,7 @@ public class RegionFileStorage implements AutoCloseable {
- 
-     protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
-         RegionFile regionfile = this.getFile(pos, false); // CraftBukkit
-+        int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
- 
-         if (nbt == null) {
-             regionfile.clear(pos);
-@@ -126,6 +128,18 @@ public class RegionFileStorage implements AutoCloseable {
-             }
-         }
- 
-+            // Paper start
-+            return;
-+        } catch (Exception ex)  {
-+            laste = ex;
-+        }
-+        }
-+
-+        if (laste != null) {
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste);
-+            MinecraftServer.LOGGER.error("Failed to save chunk", laste);
-+        }
-+        // Paper end
-     }
- 
-     public void close() throws IOException {

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

@@ -1,52 +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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 701a2ffd04df48d437b2cb963dd150af99725b6e..817d4572c9991992b720b3ba163188ac0e5b59b7 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -234,4 +234,9 @@ public class PaperConfig {
-         }
-         useDisplayNameInQuit = getBoolean("settings.use-display-name-in-quit-message", useDisplayNameInQuit);
-     }
-+
-+    public static boolean loadPermsBeforePlugins = true;
-+    private static void loadPermsBeforePlugins() {
-+        loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cde74a4785e4197f4b39ee28663801726a9e4dca..a929d46ad3a079d68c46246d9321de08f0d6dcaa 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -424,6 +424,7 @@ public final class CraftServer implements Server {
-         if (type == PluginLoadOrder.STARTUP) {
-             this.helpMap.clear();
-             this.helpMap.initializeGeneralTopics();
-+            if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions(); // Paper
-         }
- 
-         Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -443,7 +444,7 @@ public final class CraftServer implements Server {
-             this.commandMap.registerServerAliases();
-             DefaultPermissions.registerCorePermissions();
-             CraftDefaultPermissions.registerCorePermissions();
--            this.loadCustomPermissions();
-+            if (!com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) this.loadCustomPermissions(); // Paper
-             this.helpMap.initializeCommands();
-             this.syncCommands();
-         }

patches/server/0061-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 a929d46ad3a079d68c46246d9321de08f0d6dcaa..36de0faea986ecbbdc5cab7351d3b51049f9b633 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2434,5 +2434,23 @@ public final class CraftServer implements Server {
-         }
-         return this.adventure$audiences;
-     }
-+
-+    @Override
-+    public void reloadPermissions() {
-+        pluginManager.clearPermissions();
-+        if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) 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 (!com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions();
-+        DefaultPermissions.registerCorePermissions();
-+        CraftDefaultPermissions.registerCorePermissions();
-+    }
-     // Paper end
- }

patches/server/0062-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 36de0faea986ecbbdc5cab7351d3b51049f9b633..9db5f614512d05eb99b4811c71fbc914e50c712e 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -904,8 +904,16 @@ public final class CraftServer implements Server {
-             world.paperConfig.init(); // Paper
-         }
- 
-+        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
-         com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper

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

@@ -1,340 +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 ab9cb0bf0321e4130b5bbf2b24b7655e9327d363..c6880228982ef12a37cfa867acb5e564254932b5 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -13,6 +13,8 @@ import java.text.DecimalFormatSymbols;
- import java.util.Collection;
- import java.util.Iterator;
- import java.util.List;
-+import java.util.Collections;
-+import java.util.Comparator;
- import java.util.Locale;
- import java.util.Map.Entry;
- import java.util.Objects;
-@@ -151,6 +153,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(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((Comparator<? super net.minecraft.nbt.Tag>) enchantSorter); // Paper
-+        } catch (Exception ignored) {}
-+    }
-+    // Paper end
-+
-     public ItemStack(ItemLike item) {
-         this(item, 1);
-     }
-@@ -194,6 +213,7 @@ public final class ItemStack {
-             // CraftBukkit start - make defensive copy as this data may be coming from the save thread
-             this.tag = (CompoundTag) nbttagcompound.getCompound("tag").copy();
-             // CraftBukkit end
-+            this.processEnchantOrder(this.tag); // Paper
-             this.getItem().verifyTagAfterLoad(this.tag);
-         }
- 
-@@ -747,6 +767,7 @@ public final class ItemStack {
-     // Paper end
-     public void setTag(@Nullable CompoundTag tag) {
-         this.tag = tag;
-+        processEnchantOrder(this.tag); // Paper
-         if (this.getItem().canBeDepleted()) {
-             this.setDamageValue(this.getDamageValue());
-         }
-@@ -1054,6 +1075,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 d6467a42d54954dffe919482294cb9355f217f21..84f11780a22b3369519fc8f80d6c274360045df7 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -6,7 +6,6 @@ import java.util.Map;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
- import net.minecraft.world.item.Item;
--import net.minecraft.world.item.enchantment.EnchantmentHelper;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Material;
- import org.bukkit.NamespacedKey;
-@@ -178,28 +177,11 @@ public final class CraftItemStack extends ItemStack {
-     public void addUnsafeEnchantment(Enchantment ench, int level) {
-         Validate.notNull(ench, "Cannot add null enchantment");
- 
--        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) {
-@@ -216,66 +198,34 @@ public final class CraftItemStack extends ItemStack {
- 
-     @Override
-     public boolean containsEnchantment(Enchantment ench) {
--        return this.getEnchantmentLevel(ench) > 0;
-+        return this.hasItemMeta() && this.getItemMeta().hasEnchant(ench); // Paper - use meta
-     }
- 
-     @Override
-     public int getEnchantmentLevel(Enchantment ench) {
--        Validate.notNull(ench, "Cannot find null enchantment");
--        if (this.handle == null) {
--            return 0;
--        }
--        return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), handle);
-+        return this.hasItemMeta() ? this.getItemMeta().getEnchantLevel(ench) : 0; // Paper - replace entire method with meta
-     }
- 
-     @Override
-     public int removeEnchantment(Enchantment ench) {
-         Validate.notNull(ench, "Cannot remove null enchantment");
- 
--        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
-+        final ItemMeta itemMeta = this.getItemMeta();
-+        if (itemMeta == null) return 0;
-+        int level = itemMeta.getEnchantLevel(ench);
-+        if (level > 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 86163b56d10689aa512953c8df869aa45ebac735..05d54f0eff89b721f01e90e79d2571baab297799 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;
-@@ -22,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collection;
-+import java.util.Comparator; // Paper
- import java.util.EnumSet;
- import java.util.HashMap;
- import java.util.Iterator;
-@@ -32,6 +34,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;
-@@ -272,7 +275,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;
-@@ -283,7 +286,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-     private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
- 
-     private CompoundTag internalTag;
--    private final Map<String, Tag> unhandledTags = new HashMap<String, Tag>();
-+    private final Map<String, Tag> unhandledTags = new TreeMap<>(); // Paper
-     private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY);
- 
-     private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -304,7 +307,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()) {
-@@ -387,13 +390,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(ENCHANTMENTS_ID.NBT);
-@@ -546,13 +549,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();
-@@ -828,14 +831,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
- 
-     @Override
-     public Map<Enchantment, Integer> getEnchants() {
--        return this.hasEnchants() ? ImmutableMap.copyOf(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) {
-         Validate.notNull(ench, "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()) {
-@@ -1216,7 +1219,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);
-@@ -1450,4 +1453,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/0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,44 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ab2ede5e9d8939f69fb430084437fda63879fb7..e5d5f4c692e80c616ccde58ab13604777eb71101 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -256,4 +256,19 @@ public class PaperWorldConfig {
-     private void nonPlayerEntitiesOnScoreboards() {
-         nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
-     }
-+
-+    public int nonPlayerArrowDespawnRate = -1;
-+    public int creativeArrowDespawnRate = -1;
-+    private void nonPlayerArrowDespawnRate() {
-+        nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
-+        if (nonPlayerArrowDespawnRate == -1) {
-+            nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
-+        }
-+        creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1);
-+        if (creativeArrowDespawnRate == -1) {
-+            creativeArrowDespawnRate = spigotConfig.arrowDespawnRate;
-+        }
-+        log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
-+        log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
-+    }
- }
-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 860c4ca60adfbf265299c0db41eadc0384f68779..97a4d3b3709028d322617efdfe9a5aabe2197d82 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -310,7 +310,7 @@ public abstract class AbstractArrow extends Projectile {
- 
-     protected void tickDespawn() {
-         ++this.life;
--        if (this.life >= ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)) { // Spigot
-+        if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? level.paperConfig.creativeArrowDespawnRate : (pickup == Pickup.DISALLOWED ? level.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?
-             this.discard();
-         }
- 

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

@@ -1,53 +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 c9ee1a12b6fe92db6896cd4abd7e7833b094c9da..41dab560595a6d052c82b4474d824a584756371a 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -199,7 +199,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 dccf23a64bad4fbfcef56eace434884e35919add..123a34b97fe76bd694214ded6174ecb26b970438 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -312,11 +312,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     }
- 
-     @Override
--    public FluidState getFluidIfLoaded(BlockPos blockposition) {
-+    public final FluidState getFluidIfLoaded(BlockPos blockposition) {
-         ChunkAccess chunk = this.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
- 
-         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 LevelChunk getChunkIfLoaded(int x, int z) { // Overridden in WorldServer for ABI compat which has final
-+        return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(x, z);
-+    }
-+    public final LevelChunk getChunkIfLoaded(BlockPos blockposition) {
-+        return ((ServerLevel) this).getChunkSource().getChunkAtIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
-+    }
-+
-+    //  reduces need to do isLoaded before getType
-+    public final BlockState getTypeIfLoadedAndInBounds(BlockPos blockposition) {
-+        return getWorldBorder().isWithinBounds(blockposition) ? getTypeIfLoaded(blockposition) : null;
-+    }
-     // Paper end
- 
-     @Override

patches/server/0066-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 5335312b9a8c8166590df69a78311652b4b36d7e..4b41ad3d9feeaf7f75c8459fb8acdab9ac1fce61 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3564,9 +3564,10 @@ public abstract class LivingEntity extends Entity {
-                 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);
--                    PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
-+                    event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
-                     level.getCraftServer().getPluginManager().callEvent(event);
- 
-                     if (event.isCancelled()) {
-@@ -3580,6 +3581,13 @@ public abstract class LivingEntity extends Entity {
-                 } 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) {
-@@ -3587,6 +3595,11 @@ public abstract class LivingEntity extends Entity {
-                 }
- 
-                 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/0067-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 2ded905b151e7d01859641fdeebcfb2027d60349..7baedf1fb800f2f1bc526377eb32b169beac275b 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -764,7 +764,13 @@ public abstract class LivingEntity extends Entity {
- 
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
--        this.setAbsorptionAmount(nbt.getFloat("AbsorptionAmount"));
-+        // Paper start - jvm keeps optimizing the setter
-+        float absorptionAmount = nbt.getFloat("AbsorptionAmount");
-+        if (Float.isNaN(absorptionAmount)) {
-+            absorptionAmount = 0;
-+        }
-+        this.setAbsorptionAmount(absorptionAmount);
-+        // Paper end
-         if (nbt.contains("Attributes", 9) && this.level != null && !this.level.isClientSide) {
-             this.getAttributes().load(nbt.getList("Attributes", 10));
-         }
-@@ -1251,6 +1257,10 @@ public abstract class LivingEntity extends Entity {
-     }
- 
-     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();
-@@ -3399,7 +3409,7 @@ public abstract class LivingEntity extends Entity {
-     }
- 
-     public void setAbsorptionAmount(float amount) {
--        if (amount < 0.0F) {
-+        if (amount < 0.0F || Float.isNaN(amount)) { // Paper
-             amount = 0.0F;
-         }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1a790c9913e8d83276ca3c3158562b2a03e2c82e..f65140c04efd036019c7f91643ecd9644cd498df 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1716,6 +1716,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
- 
-     public void setRealHealth(double health) {
-+        if (Double.isNaN(health)) {return;} // Paper
-         this.health = health;
-     }
- 

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

@@ -1,55 +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 9fbe3ed59416d773dc5c19d5ea73f95ddd9b5143..287ee89418e28366866e70bd104cd11b5ae0aad6 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -153,6 +153,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-     }
- 
-+    // Paper start
-+    public static Random SHARED_RANDOM = new Random() {
-+        private boolean locked = false;
-+        @Override
-+        public synchronized void setSeed(long seed) {
-+            if (locked) {
-+                LogManager.getLogger().error("Ignoring setSeed on Entity.SHARED_RANDOM", new Throwable());
-+            } else {
-+                super.setSeed(seed);
-+                locked = true;
-+            }
-+        }
-+    };
-+    // Paper end
-+
-     private CraftEntity bukkitEntity;
- 
-     public CraftEntity getBukkitEntity() {
-@@ -330,7 +345,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         this.bb = Entity.INITIAL_AABB;
-         this.stuckSpeedMultiplier = Vec3.ZERO;
-         this.nextStep = 1.0F;
--        this.random = new Random();
-+        this.random = SHARED_RANDOM; // Paper
-         this.remainingFireTicks = -this.getFireImmuneTicks();
-         this.fluidHeight = new Object2DoubleArrayMap(2);
-         this.firstTick = true;
-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 552f758b046e750e1020f309a21d0e475befee10..3ffc1ee8a9ae63c8678c12736fab5d6ba0a21a5b 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -50,7 +50,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/0069-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,36 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5d5f4c692e80c616ccde58ab13604777eb71101..7addb5c66c88da73a4d80da1e898d629d76074f0 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -271,4 +271,12 @@ public class PaperWorldConfig {
-         log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
-         log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
-     }
-+
-+    public double skeleHorseSpawnChance;
-+    private void skeleHorseSpawnChance() {
-+        skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D);
-+        if (skeleHorseSpawnChance < 0) {
-+            skeleHorseSpawnChance = 0.01D; // Vanilla value
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e47fffb3a8e2ce12dedce764fbd7ff52a0616426..53713875d95af656abbb30bc7b8c4ba251677615 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -648,7 +648,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
-             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() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
- 
-                 if (flag1) {
-                     SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create((Level) this);

patches/server/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -1,193 +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 isValidLocation, getType and getBlockData 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 f484cf19e1ed6f4e14a6c324c59511e822335ba7..f924f2b20800dfde93eeafea3614203661d35389 100644
---- a/src/main/java/net/minecraft/core/Vec3i.java
-+++ b/src/main/java/net/minecraft/core/Vec3i.java
-@@ -21,6 +21,15 @@ public class Vec3i implements Comparable<Vec3i> {
-     private int y;
-     private int z;
- 
-+    // Paper start
-+    public boolean isValidLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
-+        return getX() >= -30000000 && getZ() >= -30000000 && getX() < 30000000 && getZ() < 30000000 && !levelHeightAccessor.isOutsideBuildHeight(getY());
-+    }
-+    public boolean isInvalidYLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
-+        return 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 123a34b97fe76bd694214ded6174ecb26b970438..1f1601f0e7f30bb44c57c771b93e7aa8be3e9725 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -262,7 +262,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     }
- 
-     public boolean isInWorldBounds(BlockPos pos) {
--        return !this.isOutsideBuildHeight(pos) && Level.isInWorldBoundsHorizontal(pos);
-+        return pos.isValidLocation(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 6a3f98edbc2b4056c5baf00277caee327e444a77..974ab04b08bbd3c27a394b37c1af112be5f28f43 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -29,6 +29,7 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
-         return GameEventDispatcher.NOOP;
-     }
- 
-+    BlockState getType(final int x, final int y, final int z); // Paper
-     @Nullable
-     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 84ebfdfc4350fb57ca2959e000b33b8d5efa6e0b..69c2454533e6f21c70792b555ec02c6bc6d169b3 100644
---- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
-@@ -19,6 +19,11 @@ public class EmptyLevelChunk extends LevelChunk {
-         super(world, pos, new EmptyLevelChunk.EmptyChunkBiomeContainer(world));
-     }
- 
-+    // Paper start
-+    @Override public BlockState getType(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 c1beb6d5fc3cabfeacf0ffbf563e53ff7984c5d3..452b513e8b89d865a396066adaf4feb1140e1c62 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-@@ -40,6 +40,11 @@ public class ImposterProtoChunk extends ProtoChunk {
-     public BlockState getBlockState(BlockPos pos) {
-         return this.wrapped.getBlockState(pos);
-     }
-+    // Paper start
-+    public final BlockState getType(final int x, final int y, final int z) {
-+        return this.wrapped.getBlockData(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 aa6db78339d6b0661ac3be12c82da92742b5f519..29fda19d7e1a8b6675598de22967e2aec81091fa 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -337,12 +337,28 @@ public class LevelChunk implements ChunkAccess {
-         return this.sections;
-     }
- 
-+    // 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.getBlockData(pos.getX(), pos.getY(), pos.getZ());
-+    }
-+
-+    public BlockState getType(final int x, final int y, final int z) {
-+        return this.getBlockData(x, y, z);
-+    }
-+    public final BlockState getBlockData(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] == null || this.sections[i].nonEmptyBlockCount == 0) {
-+            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 getBlockData_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 03fd5684aec8fa0d87963f2adcd8244e92840917..5fd66020a937b641e2a060cf38df731a43f3bf55 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -15,10 +15,10 @@ public class LevelChunkSection {
-     public static final int SECTION_SIZE = 4096;
-     public static final Palette<BlockState> GLOBAL_BLOCKSTATE_PALETTE = new GlobalPalette<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState());
-     private final int bottomBlockY;
--    private short nonEmptyBlockCount;
-+    short nonEmptyBlockCount; // Paper - package-private
-     private short tickingBlockCount;
-     private short tickingFluidCount;
--    private final PalettedContainer<BlockState> states;
-+    final PalettedContainer<BlockState> states; // Paper - package-private
- 
-     public LevelChunkSection(int yOffset) {
-         this(yOffset, (short)0, (short)0, (short)0);
-@@ -37,7 +37,7 @@ public class LevelChunkSection {
-     }
- 
-     public BlockState getBlockState(int x, int y, int z) {
--        return this.states.get(x, y, z);
-+        return this.states.get(y << 8 | z << 4 | x); // Paper - inline
-     }
- 
-     public FluidState getFluidState(int x, int y, int z) {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 527238373b944a1e4a6e3a408534c72dd4c84035..bb8fd88aebb550edec8c679622a02a595cbc6694 100644
---- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -135,7 +135,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
-     }
- 
-     public T get(int x, int y, int z) {
--        return this.get(getIndex(x, y, z));
-+        return this.get(y << 8 | z << 4 | x); // Paper - inline
-     }
- 
-     protected T get(int index) {
-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 39fe8f64528ad08594aaaa88e5c989c82e4e29d3..873fea54aecca411b6dee1ed3566f93c4fb9670f 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-@@ -104,14 +104,18 @@ public class ProtoChunk implements ChunkAccess {
- 
-     @Override
-     public BlockState getBlockState(BlockPos pos) {
--        int i = pos.getY();
--        if (this.isOutsideBuildHeight(i)) {
-+        // Paper start
-+        return getType(pos.getX(), pos.getY(), pos.getZ());
-+    }
-+    public BlockState getType(final int x, final int y, final int z) {
-+        if (this.isOutsideBuildHeight(y)) {
-             return Blocks.VOID_AIR.defaultBlockState();
-         } else {
--            LevelChunkSection levelChunkSection = this.getSections()[this.getSectionIndex(i)];
--            return LevelChunkSection.isEmpty(levelChunkSection) ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(pos.getX() & 15, i & 15, pos.getZ() & 15);
-+            LevelChunkSection chunksection = this.getSections()[this.getSectionIndex(y)];
-+            return chunksection == LevelChunk.EMPTY_SECTION || chunksection.isEmpty() ? Blocks.AIR.defaultBlockState() : chunksection.getBlockState(x & 15, y & 15, z & 15);
-         }
-     }
-+    // Paper end
- 
-     @Override
-     public FluidState getFluidState(BlockPos pos) {

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

@@ -1,95 +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 2450bb69e08190804212172a298c1f12cd5345d7..d6195f7b0bac1bd1ababe8c4eec07654c323c014 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1384,6 +1384,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 75fa3f2392936d86d29fee73079507c642660b30..525cf19c9ecc5886720d0505f0554b667ef3267f 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -198,6 +198,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     private int tickPosition;
-     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 1f1601f0e7f30bb44c57c771b93e7aa8be3e9725..322edb169e9b482aac71292b992d4a3c2622b2d8 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -473,7 +473,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);
- 
-@@ -586,7 +586,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             try {
-                 // CraftBukkit start
-                 CraftWorld world = ((ServerLevel) this).getWorld();
--                if (world != null) {
-+                if (world != null && ((ServerLevel)this).hasPhysicsEvent) { // Paper
-                     BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), CraftBlockData.fromData(iblockdata), world.getBlockAt(neighborPos.getX(), neighborPos.getY(), neighborPos.getZ()));
-                     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 24227939493f852a88477c84160bda1605291eb0..1f8cf302d2309aec2955832ffafd87f14934e141 100644
---- a/src/main/java/net/minecraft/world/level/block/BushBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-@@ -4,6 +4,7 @@ import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.tags.BlockTags;
- import net.minecraft.tags.Tag;
-+import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.level.BlockGetter;
- import net.minecraft.world.level.LevelAccessor;
- import net.minecraft.world.level.LevelReader;
-@@ -25,7 +26,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 ServerLevel && ((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 9edf1b87e59d589b053e5b4fee15faa221718c2f..65a163d93a293e1e0a12a300d6335a700099cac2 100644
---- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.util.Mth;
-+import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.LivingEntity;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.item.ItemStack;
-@@ -93,7 +94,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 (((ServerLevel)world).hasPhysicsEvent && org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, pos).isCancelled()) { // Paper
-             return;
-         }
-         // CraftBukkit end

patches/server/0072-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 c2dc2ec29949074e71d0b4e5244ec71587f01178..9d6ff9aff140574038b7f619cdfebf47d4b3a14c 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1956,6 +1956,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) {
-@@ -2020,6 +2021,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             }
- 
-             entity.valid = false; // CraftBukkit
-+            new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
-         }
-     }
- }

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

@@ -1,44 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7addb5c66c88da73a4d80da1e898d629d76074f0..a0688ef7eb38e7c156193db3d94c44a3c290d8f2 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -279,4 +279,14 @@ public class PaperWorldConfig {
-             skeleHorseSpawnChance = 0.01D; // Vanilla value
-         }
-     }
-+
-+    public int fixedInhabitedTime;
-+    private void fixedInhabitedTime() {
-+        if (PaperConfig.version < 16) {
-+            if (!config.getBoolean("world-settings.default.use-chunk-inhabited-timer", true)) config.set("world-settings.default.fixed-chunk-inhabited-time", 0);
-+            if (!config.getBoolean("world-settings." + worldName + ".use-chunk-inhabited-timer", true)) config.set("world-settings." + worldName + ".fixed-chunk-inhabited-time", 0);
-+            set("use-chunk-inhabited-timer", null);
-+        }
-+        fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
-+    }
- }
-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 29fda19d7e1a8b6675598de22967e2aec81091fa..702dbe24bfd19b0999648d4364f68a5675bee6e0 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -984,7 +984,7 @@ public class LevelChunk implements ChunkAccess {
- 
-     @Override
-     public long getInhabitedTime() {
--        return this.inhabitedTime;
-+        return this.level.paperConfig.fixedInhabitedTime < 0 ? this.inhabitedTime : this.level.paperConfig.fixedInhabitedTime; // Paper
-     }
- 
-     @Override

patches/server/0074-EntityPathfindEvent.patch

@@ -1,110 +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 3afe97f4e330016164e741934c888f5b85824e67..6cdb0f0f881ea57c95821914262208c4b636587e 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
-@@ -35,7 +35,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 d2e71f1e70a8b3360110f7e5e6c5ec278218ae27..f351b1eb923cc72bc5bb7f891d27246af14f4e1d 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
-@@ -70,7 +70,7 @@ public class GroundPathNavigation 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
-     }
- 
-     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 f4f2b7a1de7eb37c3d6331bd16f916cf4bbf1a03..5ddc033594c26a69f8c610cf1610a06a9be8dd4d 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
-@@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
- import net.minecraft.core.Vec3i;
- import net.minecraft.network.protocol.game.DebugPackets;
- import net.minecraft.tags.BlockTags;
-+import net.minecraft.server.MCUtil;
- import net.minecraft.util.Mth;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.Mob;
-@@ -108,7 +109,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, Entity entity, int distance) {
-+        return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
-+        // Paper end
-     }
- 
-     @Nullable
-@@ -118,7 +125,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
-@@ -128,6 +135,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, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
-+    }
-+
-+    @Nullable
-+    protected Path createPath(Set<BlockPos> positions, 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, 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()) {
-@@ -137,6 +154,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(),
-+                    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);

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

@@ -1,39 +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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 817d4572c9991992b720b3ba163188ac0e5b59b7..01da2246c70237676597b3e70e3e169ab1132071 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -239,4 +239,9 @@ public class PaperConfig {
-     private static void loadPermsBeforePlugins() {
-         loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
-     }
-+
-+    public static int regionFileCacheSize = 256;
-+    private static void regionFileCacheSize() {
-+        regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4);
-+    }
- }
-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 a0516f72671522a6d7d9ea649506760f120b88bd..3d07235ad34d219c7c5fccd216a3a6935ced645c 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
-@@ -35,7 +35,7 @@ public class RegionFileStorage implements AutoCloseable {
-         if (regionfile != null) {
-             return regionfile;
-         } else {
--            if (this.regionCache.size() >= 256) {
-+            if (this.regionCache.size() >= com.destroystokyo.paper.PaperConfig.regionFileCacheSize) { // Paper - configurable
-                 ((RegionFile) this.regionCache.removeLast()).close();
-             }
- 

patches/server/0076-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 204ed5665adf2df7252fe2d21872db6956415311..b37acb6e6e253529a38f44a518a02c7747d3145e 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-@@ -453,7 +453,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.getTypeIfLoaded(pos);
-+                        if (blockState == null) {
-+                            return BlockPathTypes.BLOCKED;
-+                        } else {
-+                        // Paper end
-                         if (blockState.is(Blocks.CACTUS)) {
-                             return BlockPathTypes.DANGER_CACTUS;
-                         }
-@@ -469,6 +474,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-                         if (world.getFluidState(pos).is(FluidTags.WATER)) {
-                             return BlockPathTypes.WATER_BORDER;
-                         }
-+                        } // Paper
-                     }
-                 }
-             }
-@@ -478,7 +484,8 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-     }
- 
-     protected static BlockPathTypes getBlockPathTypeRaw(BlockGetter world, BlockPos pos) {
--        BlockState blockState = world.getBlockState(pos);
-+        BlockState blockState = world.getTypeIfLoaded(pos); // Paper
-+        if (blockState == null) return BlockPathTypes.BLOCKED; // Paper
-         Block block = blockState.getBlock();
-         Material material = blockState.getMaterial();
-         if (blockState.isAir()) {

patches/server/0077-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,63 +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
-
-
-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 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510e20db25a 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java
-@@ -10,8 +10,8 @@ import net.minecraft.world.entity.Entity;
- import net.minecraft.world.phys.Vec3;
- 
- public class ServerboundInteractPacket implements Packet<ServerGamePacketListener> {
--    private final int entityId;
--    private final ServerboundInteractPacket.Action action;
-+    private final int entityId; public final int getEntityId() { return this.entityId; } // Paper - add accessor
-+    private final ServerboundInteractPacket.Action action; public final ServerboundInteractPacket.ActionType getActionType() { return this.action.getType(); } // Paper - add accessor
-     private final boolean usingSecondaryAction;
-     static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() {
-         @Override
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index edb66e8c4507597ec8c35883460f88de8b263e54..60772b6d6fe171d7dd832cb132f7c56db9439bdb 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2190,8 +2190,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-                 });
-             }
-         }
-+        // Paper start - fire event
-+        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);
-+                }
-+
-+                @Override
-+                public void onInteraction(net.minecraft.world.InteractionHand hand, net.minecraft.world.phys.Vec3 pos) {
-+                    ServerGamePacketListenerImpl.this.callPlayerUseUnknownEntityEvent(packet, hand);
-+                }
-+
-+                @Override
-+                public void onAttack() {
-+                    ServerGamePacketListenerImpl.this.callPlayerUseUnknownEntityEvent(packet, net.minecraft.world.InteractionHand.MAIN_HAND);
-+                }
-+            });
-+        }
-+
-+    }
- 
-+    private void callPlayerUseUnknownEntityEvent(ServerboundInteractPacket packet, InteractionHand hand) {
-+        this.cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerUseUnknownEntityEvent(
-+            this.getCraftPlayer(),
-+            packet.getEntityId(),
-+            packet.getActionType() == ServerboundInteractPacket.ActionType.ATTACK,
-+            hand == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND
-+        ));
-     }
-+    // Paper end
- 
-     @Override
-     public void handleClientCommand(ServerboundClientCommandPacket packet) {

patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,41 +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 Grass Spread Tick Rate
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a0688ef7eb38e7c156193db3d94c44a3c290d8f2..53692c9a72a75cb5280165a99c95667928eec753 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -289,4 +289,10 @@ public class PaperWorldConfig {
-         }
-         fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
-     }
-+
-+    public int grassUpdateRate = 1;
-+    private void grassUpdateRate() {
-+        grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
-+        log("Grass Spread Tick Rate: " + grassUpdateRate);
-+    }
- }
-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 4c6c91deacddc4f383ecb6986e8e265a4e8eb7e6..d8c29bc282365b68951a39b4b2590b19957d578b 100644
---- a/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/SpreadingSnowyDirtBlock.java
-@@ -3,6 +3,7 @@ package net.minecraft.world.level.block;
- import java.util.Random;
- 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.tags.Tag;
-@@ -41,6 +42,7 @@ public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock {
- 
-     @Override
-     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
-+        if (this instanceof GrassBlock && world.paperConfig.grassUpdateRate != 1 && (world.paperConfig.grassUpdateRate < 1 || (MinecraftServer.currentTick + pos.hashCode()) % world.paperConfig.grassUpdateRate != 0)) { return; } // Paper
-         if (!SpreadingSnowyDirtBlock.canBeGrass(state, (LevelReader) world, pos)) {
-             // CraftBukkit start
-             if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {

patches/server/0080-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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 322edb169e9b482aac71292b992d4a3c2622b2d8..07a4f76d8142b5ee60910faf552fb33095694512 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -544,6 +544,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public void setBlocksDirty(BlockPos pos, BlockState old, BlockState updated) {}
- 
-     public void updateNeighborsAt(BlockPos pos, Block block) {
-+        if (captureBlockStates) { return; } // Paper - Cancel all physics during placement
-         this.neighborChanged(pos.west(), block, pos);
-         this.neighborChanged(pos.east(), block, pos);
-         this.neighborChanged(pos.below(), block, pos);

patches/server/0081-Optimize-DataBits.patch

@@ -1,82 +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/BitStorage.java b/src/main/java/net/minecraft/util/BitStorage.java
-index 65bd706ca96f5c0ec4573da9fb144fb51d2de919..07e1374ac3430662edd9f585e59b785e329f0820 100644
---- a/src/main/java/net/minecraft/util/BitStorage.java
-+++ b/src/main/java/net/minecraft/util/BitStorage.java
-@@ -12,8 +12,8 @@ public class 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 BitStorage(int elementBits, int size) {
-@@ -27,8 +27,8 @@ public class 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 = BitStorage.MAGIC[i + 0]; this.divideMulUnsigned = Integer.toUnsignedLong(this.divideMul); // Paper
-+        this.divideAdd = BitStorage.MAGIC[i + 1]; this.divideAddUnsigned = Integer.toUnsignedLong(this.divideAdd); // Paper
-         this.divideShift = MAGIC[i + 2];
-         int j = (size + this.valuesPerLong - 1) / this.valuesPerLong;
-         if (storage != null) {
-@@ -44,14 +44,14 @@ public class 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
-     }
- 
--    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;
-@@ -60,17 +60,17 @@ public class BitStorage {
-         return k;
-     }
- 
--    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;
-         this.data[i] = l & ~(this.mask << j) | ((long)value & this.mask) << j;
-     }
- 
--    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;

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

@@ -1,57 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 53692c9a72a75cb5280165a99c95667928eec753..91d9717c88d7a413a71cc0897402dac0013fea4d 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -295,4 +295,9 @@ public class PaperWorldConfig {
-         grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
-         log("Grass Spread Tick Rate: " + grassUpdateRate);
-     }
-+
-+    public boolean useVanillaScoreboardColoring;
-+    private void useVanillaScoreboardColoring() {
-+        useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
-+    }
- }
-diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 0bc2c2ef9312ebcc32dacdd2ba9f17d2ba072586..9507ba43cacc31c02423a4f576feda32291101e7 100644
---- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -18,6 +18,8 @@ import net.kyori.adventure.text.event.ClickEvent;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerPlayer;
- import org.bukkit.Bukkit;
-+import org.bukkit.ChatColor;
-+import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.craftbukkit.entity.CraftPlayer;
- import org.bukkit.craftbukkit.util.LazyPlayerSet;
- import org.bukkit.craftbukkit.util.Waitable;
-@@ -189,10 +191,16 @@ public final class ChatProcessor {
-     }
- 
-     private static String legacyDisplayName(final CraftPlayer player) {
-+        if (((CraftWorld) player.getWorld()).getHandle().paperConfig.useVanillaScoreboardColoring) {
-+            return PaperAdventure.LEGACY_SECTION_UXRC.serialize(player.teamDisplayName()) + ChatColor.RESET;
-+        }
-         return player.getDisplayName();
-     }
- 
-     private static Component displayName(final CraftPlayer player) {
-+        if (((CraftWorld) player.getWorld()).getHandle().paperConfig.useVanillaScoreboardColoring) {
-+            return player.teamDisplayName();
-+        }
-         return player.displayName();
-     }
- 

patches/server/0083-Workaround-for-setting-passengers-on-players.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sun, 10 Apr 2016 03:23:32 -0500
-Subject: [PATCH] Workaround for setting passengers on players
-
-SPIGOT-1915 & GH-114
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f65140c04efd036019c7f91643ecd9644cd498df..4592ac12058e7cf575ceb47a0021528f5dd91b0a 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -908,6 +908,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return true;
-     }
- 
-+    // Paper start - Ugly workaround for SPIGOT-1915 & GH-114
-+    @Override
-+    public boolean setPassenger(org.bukkit.entity.Entity passenger) {
-+        boolean wasSet = super.setPassenger(passenger);
-+        if (wasSet) {
-+            this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSetPassengersPacket(this.getHandle()));
-+        }
-+        return wasSet;
-+    }
-+    // Paper end
-+
-     @Override
-     public void setSneaking(boolean sneak) {
-         this.getHandle().setShiftKeyDown(sneak);

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

@@ -1,131 +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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ad73dbb8e7112e2843c4104d367c98bf8b2b3370..f54096daee8c51a887b943ddd257ac2eae63952e 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -244,4 +244,9 @@ public class PaperConfig {
-     private static void regionFileCacheSize() {
-         regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4);
-     }
-+
-+    public static boolean enablePlayerCollisions = true;
-+    private static void enablePlayerCollisions() {
-+        enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
-+    }
- }
-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 8885220e4813b34627b42523834bbec995d8950d..4c9660176e783999301565790b8cf6f47b0d02a2 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(!com.destroystokyo.paper.PaperConfig.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 d6195f7b0bac1bd1ababe8c4eec07654c323c014..4e7016c20a72271ff62fb676280d3880864919f1 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -161,6 +161,7 @@ import net.minecraft.world.level.storage.loot.LootTables;
- import net.minecraft.world.level.storage.loot.PredicateManager;
- import net.minecraft.world.phys.Vec2;
- import net.minecraft.world.phys.Vec3;
-+import net.minecraft.world.scores.PlayerTeam; // Paper
- import org.apache.commons.lang3.Validate;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-@@ -616,6 +617,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(PlayerTeam::getName).collect(java.util.stream.Collectors.toList());
-+        for (String teamName : toRemove) {
-+            scoreboard.removePlayerTeam(scoreboard.getPlayerTeam(teamName)); // Clean up after ourselves
-+        }
-+
-+        if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions) {
-+            this.getPlayerList().collideRuleTeamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + java.util.concurrent.ThreadLocalRandom.current().nextInt(), 16);
-+            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 e2e20a33c8e434af6b3637f49181c530b32633c7..4b21d3d73d76b81377a1d2222f37074c75ac3753 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -87,6 +87,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage;
- import net.minecraft.world.phys.Vec3;
- 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.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-@@ -149,6 +150,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, RegistryAccess.RegistryHolder registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
-         this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
-@@ -385,6 +387,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());
-     }
- 
-@@ -504,6 +513,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();
-@@ -1127,6 +1146,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/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,48 +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 94d0111f35cb025024da10e2fb4ea0cb802d4ff2..c4ba069f5124ec151e05813beddf293fddc3b804 100644
---- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -88,8 +88,35 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-                     this.connection.disconnect(chatmessage);
-                 } 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()) {
-+                            TranslatableComponent chatmessage = new TranslatableComponent(event.getFailMessage());
-+                            this.connection.send(new ClientboundLoginDisconnectPacket(chatmessage));
-+                            this.connection.disconnect(chatmessage);
-+                            return;
-+                        }
-+
-+                        if (event.getServerHostname() != null) packet.hostName = event.getServerHostname();
-+                        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!
-+                    }
-+                }
-+                // Don't try and handle default logic if it's been handled by the event.
-+                if (!handledByEvent && proxyLogicEnabled) {
-+                // Paper end
-                     // Spigot Start
--                    if (org.spigotmc.SpigotConfig.bungee) {
-+                //if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                         String[] split = packet.hostName.split("\00");
-                         if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
-                             packet.hostName = split[0];

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

@@ -1,44 +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.
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 9793b51080d0f4adba0d6bc684a6927382420a0b..12e55aabf0daf341ec74688e79c43451e820e6dc 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -67,6 +67,8 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     @Nullable
-     private WorldGenSettings worldGenSettings;
- 
-+    public final String rconIp; // Paper - Add rcon ip
-+
-     // CraftBukkit start
-     public DedicatedServerProperties(Properties properties, OptionSet optionset) {
-         super(properties, optionset);
-@@ -115,6 +117,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         this.textFilteringConfig = this.get("text-filtering-config", "");
-         this.playerIdleTimeout = this.getMutable("player-idle-timeout", 0);
-         this.whiteList = this.getMutable("white-list", false);
-+        // 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 5e642ab9947f054c1741e13170a36f8fe300cdbe..a93e0eb67a78abb2eabd549cd5240095a24e5545 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/0087-Implement-PlayerLocaleChangeEvent.patch

@@ -1,48 +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 3f3404d7d890864fcdcde7d65f726d288ddec688..da722cddaaa8c40715748de81104a5b213c2fea8 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1709,7 +1709,7 @@ public class ServerPlayer extends Player {
-         return s;
-     }
- 
--    public String locale = "en_us"; // CraftBukkit - add, lowercase
-+    public String locale = null; // CraftBukkit - add, lowercase // Paper - default to null
-     public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
-     public void updateOptions(ServerboundClientInformationPacket packet) {
-         // CraftBukkit start
-@@ -1717,9 +1717,10 @@ public class ServerPlayer extends Player {
-             PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-             this.server.server.getPluginManager().callEvent(event);
-         }
--        if (!this.locale.equals(packet.language)) {
-+        if (this.locale == null || !this.locale.equals(packet.language)) { // Paper - check for null
-             PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), packet.language);
-             this.server.server.getPluginManager().callEvent(event);
-+            new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packet.language).callEvent(); // Paper
-         }
-         this.locale = packet.language;
-         // Paper start
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4592ac12058e7cf575ceb47a0021528f5dd91b0a..8fc027fbbc3f5fc3ecdd8fce4f3b2eb510fa76da 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1913,8 +1913,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public String getLocale() {
--        return this.getHandle().locale;
--
-+        // Paper start - Locale change event
-+        final String locale = this.getHandle().locale;
-+        return locale != null ? locale : "en_us";
-+        // Paper end
-     }
- 
-     // Paper start

patches/server/0088-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 407292123b29fbc558b6b826878bf739fba05436..f6761a4bfa7a73cdbd1ecd4be1f9e78f61a67ae3 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1230,10 +1230,16 @@ public abstract class LivingEntity extends Entity {
-     }
- 
-     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 4957366784799fb204ecec735655c3440734ca57..97133bd4af30d0ba92cbf884b83140f3399f92e2 100644
---- a/src/main/java/net/minecraft/world/food/FoodData.java
-+++ b/src/main/java/net/minecraft/world/food/FoodData.java
-@@ -84,7 +84,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.a(f); CraftBukkit - EntityExhaustionEvent
-                 player.applyExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
-                 this.tickTimer = 0;

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

@@ -1,52 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 91d9717c88d7a413a71cc0897402dac0013fea4d..ee771addea0af09749d6cbed8ff332ddc6895dd5 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -300,4 +300,14 @@ public class PaperWorldConfig {
-     private void useVanillaScoreboardColoring() {
-         useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
-     }
-+
-+    public boolean frostedIceEnabled = true;
-+    public int frostedIceDelayMin = 20;
-+    public int frostedIceDelayMax = 40;
-+    private void frostedIce() {
-+        this.frostedIceEnabled = this.getBoolean("frosted-ice.enabled", this.frostedIceEnabled);
-+        this.frostedIceDelayMin = this.getInt("frosted-ice.delay.min", this.frostedIceDelayMin);
-+        this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
-+        log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
-+    }
- }
-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 958d84d0046814a4a5715d9c8be09318f483aa22..54eb7ba0265bb155dd1c753661242fa9d299ff80 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, Random random) {
-+        if (!world.paperConfig.frostedIceEnabled) 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.getBlockTicks().scheduleTick(mutableBlockPos, this, Mth.nextInt(random, 20, 40));
-+                    world.getBlockTicks().scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
-                 }
-             }
- 
-         } else {
--            world.getBlockTicks().scheduleTick(pos, this, Mth.nextInt(random, 20, 40));
-+            world.getBlockTicks().scheduleTick(pos, this, Mth.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
-         }
-     }
- 

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

@@ -1,36 +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 4e7016c20a72271ff62fb676280d3880864919f1..d58516922198ffeb51263243e7b7b666de2d9ea2 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -188,6 +188,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
- 
- public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements SnooperPopulator, CommandSource, AutoCloseable {
- 
-+    private static MinecraftServer SERVER; // Paper
-     public static final Logger LOGGER = LogManager.getLogger();
-     private static final float AVERAGE_TICK_TIME_SMOOTHING = 0.8F;
-     private static final int TICK_STATS_SPAN = 100;
-@@ -317,6 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     public MinecraftServer(OptionSet options, DataPackConfig datapackconfiguration, Thread thread, RegistryAccess.RegistryHolder iregistrycustom_dimension, LevelStorageSource.LevelStorageAccess convertable_conversionsession, WorldData savedata, PackRepository resourcepackrepository, Proxy proxy, DataFixer datafixer, ServerResources datapackresources, @Nullable MinecraftSessionService minecraftsessionservice, @Nullable GameProfileRepository gameprofilerepository, @Nullable GameProfileCache usercache, ChunkProgressListenerFactory worldloadlistenerfactory) {
-         super("Server");
-+        SERVER = this; // Paper - better singleton
-         this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
-         this.profiler = this.metricsRecorder.getProfiler();
-         this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2259,7 +2261,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @Deprecated
-     public static MinecraftServer getServer() {
--        return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
-+        return SERVER; // Paper
-     }
-     // CraftBukkit end
- 

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

@@ -1,144 +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 9d6ff9aff140574038b7f619cdfebf47d4b3a14c..26c25b103f08a2e66179d1ed8f450778aa2e539a 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1976,6 +1976,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 1bdaa8d1a65b11175801f47ddfe15bffee6143bf..82d71f529dd5d270820fbfcd9a6ee7363ae94941 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -88,6 +88,7 @@ import net.minecraft.world.item.ElytraItem;
- import net.minecraft.world.item.ItemCooldowns;
- import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.item.Items;
-+import net.minecraft.world.item.MapItem; // Paper
- import net.minecraft.world.item.ProjectileWeaponItem;
- import net.minecraft.world.item.SwordItem;
- import net.minecraft.world.item.crafting.Recipe;
-@@ -107,6 +108,7 @@ import net.minecraft.world.level.block.entity.SignBlockEntity;
- import net.minecraft.world.level.block.entity.StructureBlockEntity;
- import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.level.block.state.pattern.BlockInWorld;
-+import net.minecraft.world.level.saveddata.maps.MapItemSavedData; // Paper
- import net.minecraft.world.phys.AABB;
- import net.minecraft.world.phys.Vec3;
- import net.minecraft.world.scores.PlayerTeam;
-@@ -732,6 +734,14 @@ public abstract class Player extends LivingEntity {
-                 return null;
-             }
-             // CraftBukkit end
-+            // Paper start - remove player from map on drop
-+            if (stack.getItem() == Items.FILLED_MAP) {
-+                MapItemSavedData worldmap = MapItem.getSavedData(stack, this.level);
-+                if (worldmap != null) {
-+                    worldmap.tickCarriedBy(this, stack);
-+                }
-+            }
-+            // 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 6859fafa42527d45366018f737c19e6c3777d152..15c6f9d1c43fbedac70526a84a010be83b4cae86 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;
-@@ -84,6 +85,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
-     }
- 
-@@ -139,6 +141,7 @@ public class MapItemSavedData extends SavedData {
-         if (abyte.length == 16384) {
-             worldmap.colors = abyte;
-         }
-+        worldmap.vanillaRender.buffer = abyte; // Paper
- 
-         ListTag nbttaglist = nbt.getList("banners", 10);
- 
-@@ -549,6 +552,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;
-@@ -582,7 +600,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;
-@@ -598,6 +618,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/0092-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,697 +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"
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ee771addea0af09749d6cbed8ff332ddc6895dd5..1c8ca94e981b216c338f8b0a34303d558901c5d8 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -310,4 +310,26 @@ public class PaperWorldConfig {
-         this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
-         log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
-     }
-+
-+    public boolean autoReplenishLootables;
-+    public boolean restrictPlayerReloot;
-+    public boolean changeLootTableSeedOnFill;
-+    public int maxLootableRefills;
-+    public int lootableRegenMin;
-+    public int lootableRegenMax;
-+    private void enhancedLootables() {
-+        autoReplenishLootables = getBoolean("lootables.auto-replenish", false);
-+        restrictPlayerReloot = getBoolean("lootables.restrict-player-reloot", true);
-+        changeLootTableSeedOnFill = getBoolean("lootables.reset-seed-on-fill", true);
-+        maxLootableRefills = getInt("lootables.max-refills", -1);
-+        lootableRegenMin = PaperConfig.getSeconds(getString("lootables.refresh-min", "12h"));
-+        lootableRegenMax = PaperConfig.getSeconds(getString("lootables.refresh-max", "2d"));
-+        if (autoReplenishLootables) {
-+            log("Lootables: Replenishing every " +
-+                PaperConfig.timeSummary(lootableRegenMin) + " to " +
-+                PaperConfig.timeSummary(lootableRegenMax) +
-+                (restrictPlayerReloot ? " (restricting reloot)" : "")
-+            );
-+        }
-+    }
- }
-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..70ca5625ff5d13a8e9cd64953066a7e1547ff223
---- /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 getTileEntity().getLevel();
-+    }
-+
-+    default Block getBlock() {
-+        final BlockPos position = getTileEntity().getBlockPos();
-+        final Chunk bukkitChunk = getTileEntity().getLevel().getChunkAt(position).bukkitChunk;
-+        return bukkitChunk.getBlock(position.getX(), position.getY(), position.getZ());
-+    }
-+
-+    @Override
-+    default PaperLootableInventoryData getLootableData() {
-+        return 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..16b3527d7bc782c47e6f6c3ecd7165bd16b0ab0a
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
-@@ -0,0 +1,70 @@
-+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.autoReplenishLootables;
-+    }
-+
-+    @Override
-+    default boolean hasBeenFilled() {
-+        return getLastFilled() != -1;
-+    }
-+
-+    @Override
-+    default boolean hasPlayerLooted(UUID player) {
-+        return getLootableData().hasPlayerLooted(player);
-+    }
-+
-+    @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..20cfe7b9b7127ddeb97aa91d759fc17b4a548eaf
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
-@@ -0,0 +1,179 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import com.destroystokyo.paper.PaperWorldConfig;
-+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.autoReplenishLootables) {
-+            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 PaperWorldConfig paperConfig = this.lootable.getNMSWorld().paperConfig;
-+
-+        // Check if max refills has been hit
-+        if (paperConfig.maxLootableRefills != -1 && this.numRefills >= paperConfig.maxLootableRefills) {
-+            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());
-+        if (paperConfig.restrictPlayerReloot && hasPlayerLooted(player.getUUID())) {
-+            event.setCancelled(true);
-+        }
-+        return event.callEvent();
-+    }
-+    public void processRefill(@Nullable net.minecraft.world.entity.player.Player player) {
-+        this.lastFill = System.currentTimeMillis();
-+        final PaperWorldConfig paperConfig = this.lootable.getNMSWorld().paperConfig;
-+        if (paperConfig.autoReplenishLootables) {
-+            int min = paperConfig.lootableRegenMin;
-+            int max = paperConfig.lootableRegenMax;
-+            this.nextRefill = this.lastFill + (min + RANDOM.nextInt(max - min + 1)) * 1000L;
-+            this.numRefills++;
-+            if (paperConfig.changeLootTableSeedOnFill) {
-+                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) {
-+            if (!this.lootedPlayers.containsKey(player)) {
-+                this.lootedPlayers.put(player, System.currentTimeMillis());
-+            }
-+        } else if (this.lootedPlayers != null) {
-+            this.lootedPlayers.remove(player);
-+        }
-+    }
-+
-+    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/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6d2e0493729b7b4e109ff103a6ac36c9901568c0
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
-@@ -0,0 +1,62 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.vehicle.AbstractMinecartContainer;
-+import net.minecraft.world.level.Level;
-+import org.bukkit.Bukkit;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+
-+public class PaperMinecartLootableInventory implements PaperLootableEntityInventory {
-+
-+    private AbstractMinecartContainer entity;
-+
-+    public PaperMinecartLootableInventory(AbstractMinecartContainer entity) {
-+        this.entity = entity;
-+    }
-+
-+    @Override
-+    public org.bukkit.loot.LootTable getLootTable() {
-+        return entity.lootTable != null ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.lootTable)) : null;
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table, long seed) {
-+        setLootTable(table);
-+        setSeed(seed);
-+    }
-+
-+    @Override
-+    public void setSeed(long seed) {
-+        entity.lootTableSeed = seed;
-+    }
-+
-+    @Override
-+    public long getSeed() {
-+        return entity.lootTableSeed;
-+    }
-+
-+    @Override
-+    public void setLootTable(org.bukkit.loot.LootTable table) {
-+        entity.lootTable = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey());
-+    }
-+
-+    @Override
-+    public PaperLootableInventoryData getLootableData() {
-+        return entity.lootableData;
-+    }
-+
-+    @Override
-+    public Entity getHandle() {
-+        return entity;
-+    }
-+
-+    @Override
-+    public LootableInventory getAPILootableInventory() {
-+        return (LootableInventory) entity.getBukkitEntity();
-+    }
-+
-+    @Override
-+    public Level getNMSWorld() {
-+        return entity.level;
-+    }
-+}
-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..3377b86c337d0234bbb9b0349e4034a7cd450a97
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-@@ -0,0 +1,65 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import net.minecraft.server.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 cff2867eb92fb3b69ed4645d3b5294eaca62e998..78d547660cc3996606e671466d33170faa8a2c29 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -168,6 +168,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     };
-     // 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 e347f30d7c5be460788cc815da2f4f8742488713..f57864ce919ef4721cfb5913c636fe8903ce4cc1 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -46,6 +46,7 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     public long lootTableSeed;
- 
-     // CraftBukkit start
-+    { this.lootableData = new com.destroystokyo.paper.loottable.PaperLootableInventoryData(new com.destroystokyo.paper.loottable.PaperMinecartLootableInventory(this)); } // Paper
-     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
-     private int maxStack = MAX_STACK;
- 
-@@ -200,12 +201,13 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     @Override
-     protected void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-+        this.lootableData.saveNbt(nbt); // Paper
-         if (this.lootTable != null) {
-             nbt.putString("LootTable", this.lootTable.toString());
-             if (this.lootTableSeed != 0L) {
-                 nbt.putLong("LootTableSeed", this.lootTableSeed);
-             }
--        } else {
-+        } if (true) { // Paper - Always save the items, Table may stick around
-             ContainerHelper.saveAllItems(nbt, this.itemStacks);
-         }
- 
-@@ -214,11 +216,12 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     @Override
-     protected void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-+        this.lootableData.loadNbt(nbt); // Paper
-         this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-         if (nbt.contains("LootTable", 8)) {
-             this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
-             this.lootTableSeed = nbt.getLong("LootTableSeed");
--        } else {
-+        } if (true) { // Paper - always load the items, table may still remain
-             ContainerHelper.loadAllItems(nbt, this.itemStacks);
-         }
- 
-@@ -254,14 +257,15 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     }
- 
-     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().getLootTables().get(this.lootTable);
- 
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer) player, this.lootTable);
-             }
- 
--            this.lootTable = null;
-+            //this.lootTable = null; // Paper
-+            this.lootableData.processRefill(player); // Paper
-             LootContext.Builder loottableinfo_builder = (new LootContext.Builder((ServerLevel) this.level)).withParameter(LootContextParams.ORIGIN, this.position()).withOptionalRandomSeed(this.lootTableSeed);
- 
-             if (player != null) {
-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 b79d9d26a8e60f9c0ecd69e9c2f9cfd087e21d23..f23fff80d07ac7d06715efe67cb49ebbe704967b 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
-@@ -28,6 +28,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);
-@@ -42,16 +43,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 {
-@@ -60,18 +64,19 @@ 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().getLootTables().get(this.lootTable);
-             if (player instanceof ServerPlayer) {
-                 CriteriaTriggers.GENERATE_LOOT.trigger((ServerPlayer)player, this.lootTable);
-             }
- 
--            this.lootTable = null;
-+            //this.lootTable = null; // Paper
-+            this.lootableData.processRefill(player); // Paper
-             LootContext.Builder builder = (new LootContext.Builder((ServerLevel)this.level)).withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(this.worldPosition)).withOptionalRandomSeed(this.lootTableSeed);
-             if (player != null) {
-                 builder.withLuck(player.getLuck()).withParameter(LootContextParams.THIS_ENTITY, player);
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index e9f671b9e6b73c28835bf787f6517b997c306fa2..6a1f47c58f1186f12fd112feedaf11da85b0bdcc 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-@@ -13,8 +13,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 982adacb361b0590799dc68f9b7c13c7195627fd..e49eece9bff3a53469673d03a7bbf8f9cf8776b8 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/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index eb21b8457774d5ac765fa9008157cb29d9b72509..abf58bef2042a9efba5a78fd7f97339deceaa780 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-@@ -8,7 +8,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 34b8f103625f087bb725bed595dd9c30f4a6f70c..ee9648739fb39c5842063d7442df6eb5c9336d7f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-@@ -7,7 +7,7 @@ import org.bukkit.entity.EntityType;
- 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/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -1,32 +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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c8242aa5b4a896111b23de60fa120ec6be06d0ca..c6ca15a5cc53995ca0ada9c9ac9dc1d084963eb5 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -249,4 +249,9 @@ public class PaperConfig {
-     private static void enablePlayerCollisions() {
-         enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
-     }
-+
-+    public static boolean saveEmptyScoreboardTeams = false;
-+    private static void saveEmptyScoreboardTeams() {
-+        saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 90a97a87fe67d8c3bbc60f08c9911faa4259349e..2153e7035535990b5307b85d8bc3dab50c0a3ae8 100644
---- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-+++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-@@ -144,6 +144,7 @@ public class ScoreboardSaveData extends SavedData {
-         ListTag listTag = new ListTag();
- 
-         for(PlayerTeam playerTeam : this.scoreboard.getPlayerTeams()) {
-+            if (!com.destroystokyo.paper.PaperConfig.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/0094-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 2693cc933d746e40d8a47d96c6cb6799f0a2472f..6e1fa4f0616ccfd258acd1b4f5b08fc0ad4c9529 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -61,7 +61,7 @@ public class WatchdogThread extends Thread
-         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/0095-Optimize-UserCache-Thread-Safe.patch

@@ -1,111 +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] Optimize UserCache / Thread Safe
-
-Because Techable keeps complaining about how this isn't thread safe,
-easier to do this than replace the entire thing.
-
-Additionally, move Saving of the User cache to be done async, incase
-the user never changed the default setting for Spigot's save on stop only.
-
-1.17: TODO does this need the synchronized blocks anymore?
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d58516922198ffeb51263243e7b7b666de2d9ea2..9c73d69658de96b8216c7d945521af84d41c69ab 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -989,7 +989,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
- 
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index bd94277862e0f5546b4df81fbd535d2e4c7ef5b1..7d834c1b1588851188372eebd9efad9313c610f7 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -257,7 +257,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 769f2a595f8ca6030c17d5472ee1773063ebe52c..548627b5a12e79ac31136b2695e45f9452115348 100644
---- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
-+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-@@ -118,7 +118,7 @@ public class GameProfileCache {
-         return GameProfileCache.usesAuthentication;
-     }
- 
--    public void add(GameProfile profile) {
-+    public synchronized void add(GameProfile profile) { // Paper - synchronize
-         Calendar calendar = Calendar.getInstance();
- 
-         calendar.setTime(new Date());
-@@ -127,14 +127,14 @@ 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() {
-         return this.operationCount.incrementAndGet();
-     }
- 
--    public Optional<GameProfile> get(String name) {
-+    public synchronized Optional<GameProfile> get(String name) { // Paper - synchronize
-         String s1 = name.toLowerCase(Locale.ROOT);
-         GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
-         boolean flag = false;
-@@ -160,7 +160,7 @@ public class GameProfileCache {
-         }
- 
-         if (flag && !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { // Spigot - skip saving if disabled
--            this.save();
-+            this.save(true); // Paper
-         }
- 
-         return optional;
-@@ -270,7 +270,7 @@ public class GameProfileCache {
-         return arraylist;
-     }
- 
--    public void save() {
-+    public void save(boolean asyncSave) { // Paper
-         JsonArray jsonarray = new JsonArray();
-         DateFormat dateformat = GameProfileCache.createDateFormat();
- 
-@@ -278,6 +278,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);
-@@ -302,7 +303,14 @@ public class GameProfileCache {
-         } catch (IOException ioexception) {
-             ;
-         }
--
-+        // Paper start
-+        };
-+        if (asyncSave) {
-+            net.minecraft.server.MCUtil.scheduleAsyncTask(save);
-+        } else {
-+            save.run();
-+        }
-+        // Paper end
-     }
- 
-     private Stream<GameProfileCache.GameProfileInfo> getTopMRUProfiles(int limit) {

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

@@ -1,82 +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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1c8ca94e981b216c338f8b0a34303d558901c5d8..6324c3465cf34cea2e7fd7d8c26a0cbeeb20eefd 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -332,4 +332,14 @@ public class PaperWorldConfig {
-             );
-         }
-     }
-+
-+    public boolean preventTntFromMovingInWater;
-+    private void preventTntFromMovingInWater() {
-+        if (PaperConfig.version < 13) {
-+            boolean oldVal = getBoolean("enable-old-tnt-cannon-behaviors", false);
-+            set("prevent-tnt-from-moving-in-water", oldVal);
-+        }
-+        preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
-+        log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index c062b9e2b58485ad54afe06ec09d9ed2d22adefb..3a94e2fca036ba7853de2e79a585e66116612845 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -68,7 +68,7 @@ public class ServerEntity {
-     private boolean wasRiding;
-     private boolean wasOnGround;
-     // 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 8ad1b3cb16533d62deda643ce0cdda308743f78e..dcbd9ec44fb8d1334aca33c136b121ab5c25a0e2 100644
---- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -97,6 +97,27 @@ public class PrimedTnt extends Entity {
-             }
-         }
- 
-+        // Paper start - Optional prevent TNT from moving in water
-+        if (!this.isRemoved() && this.wasTouchingWater && this.level.paperConfig.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() {
-@@ -152,4 +173,11 @@ public class PrimedTnt extends Entity {
-     public Packet<?> getAddEntityPacket() {
-         return new ClientboundAddEntityPacket(this);
-     }
-+
-+    // Paper start - Optional prevent TNT from moving in water
-+    @Override
-+    public boolean isPushedByFluid() {
-+        return !level.paperConfig.preventTntFromMovingInWater && super.isPushedByFluid();
-+    }
-+    // Paper end
- }

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

@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Panzer <postremus1996@googlemail.com>
-Date: Mon, 23 May 2016 12:12:37 +0200
-Subject: [PATCH] Faster redstone torch rapid clock removal
-
-Only resize the the redstone torch list once, since resizing arrays / lists is costly
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 07a4f76d8142b5ee60910faf552fb33095694512..3032f52ea3375c62aa13dc1802a85df22a9f3082 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -161,6 +161,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     private org.spigotmc.TickLimiter tileLimiter;
-     private int tileTickPosition;
-     public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
-+    public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
- 
-     public CraftWorld getWorld() {
-         return this.world;
-diff --git a/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java b/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
-index 28e785813628e5763576812ec6201d1e5b1def23..47df36208d91dad126849e29c0e410f95b168f23 100644
---- a/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RedstoneTorchBlock.java
-@@ -21,7 +21,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
- public class RedstoneTorchBlock extends TorchBlock {
- 
-     public static final BooleanProperty LIT = BlockStateProperties.LIT;
--    private static final Map<BlockGetter, List<RedstoneTorchBlock.Toggle>> RECENT_TOGGLES = new WeakHashMap();
-+    // Paper - Move the mapped list to World
-     public static final int RECENT_TOGGLE_TIMER = 60;
-     public static final int MAX_RECENT_TOGGLES = 8;
-     public static final int RESTART_DELAY = 160;
-@@ -72,11 +72,15 @@ public class RedstoneTorchBlock extends TorchBlock {
-     @Override
-     public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
-         boolean flag = this.hasNeighborSignal((Level) world, pos, state);
--        List list = (List) RedstoneTorchBlock.RECENT_TOGGLES.get(world);
--
--        while (list != null && !list.isEmpty() && world.getGameTime() - ((RedstoneTorchBlock.Toggle) list.get(0)).when > 60L) {
--            list.remove(0);
-+        // Paper start
-+        java.util.ArrayDeque<RedstoneTorchBlock.Toggle> redstoneUpdateInfos = world.redstoneUpdateInfos;
-+        if (redstoneUpdateInfos != null) {
-+            RedstoneTorchBlock.Toggle curr;
-+            while ((curr = redstoneUpdateInfos.peek()) != null && world.getGameTime() - curr.when > 60L) {
-+                redstoneUpdateInfos.poll();
-+            }
-         }
-+        // Paper end
- 
-         // CraftBukkit start
-         org.bukkit.plugin.PluginManager manager = world.getCraftServer().getPluginManager();
-@@ -152,9 +156,12 @@ public class RedstoneTorchBlock extends TorchBlock {
-     }
- 
-     private static boolean isToggledTooFrequently(Level world, BlockPos pos, boolean addNew) {
--        List<RedstoneTorchBlock.Toggle> list = (List) RedstoneTorchBlock.RECENT_TOGGLES.computeIfAbsent(world, (iblockaccess) -> {
--            return Lists.newArrayList();
--        });
-+        // Paper start
-+        java.util.ArrayDeque<RedstoneTorchBlock.Toggle> list = world.redstoneUpdateInfos;
-+        if (list == null) {
-+            list = world.redstoneUpdateInfos = new java.util.ArrayDeque<>();
-+        }
-+
- 
-         if (addNew) {
-             list.add(new RedstoneTorchBlock.Toggle(pos.immutable(), world.getGameTime()));
-@@ -162,9 +169,9 @@ public class RedstoneTorchBlock extends TorchBlock {
- 
-         int i = 0;
- 
--        for (int j = 0; j < list.size(); ++j) {
--            RedstoneTorchBlock.Toggle blockredstonetorch_redstoneupdateinfo = (RedstoneTorchBlock.Toggle) list.get(j);
--
-+        for (java.util.Iterator<RedstoneTorchBlock.Toggle> iterator = list.iterator(); iterator.hasNext();) {
-+            RedstoneTorchBlock.Toggle blockredstonetorch_redstoneupdateinfo = iterator.next();
-+            // Paper end
-             if (blockredstonetorch_redstoneupdateinfo.pos.equals(pos)) {
-                 ++i;
-                 if (i >= 8) {

patches/server/0098-Add-server-name-parameter.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Panzer <postremus1996@googlemail.com>
-Date: Sat, 28 May 2016 16:54:03 +0200
-Subject: [PATCH] Add server-name parameter
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2da0896ca3b15deded3556c6298a41f18324db58..f09520b7723dee6ab04215276d037012d643999f 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -143,6 +143,14 @@ public class Main {
-                         .defaultsTo(new File("paper.yml"))
-                         .describedAs("Yml file");
-                 // Paper end
-+
-+                // Paper start
-+                acceptsAll(asList("server-name"), "Name of the server")
-+                        .withRequiredArg()
-+                        .ofType(String.class)
-+                        .defaultsTo("Unknown Server")
-+                        .describedAs("Name");
-+                // Paper end
-             }
-         };
- 

patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch

@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 31 May 2016 22:53:50 -0400
-Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
-
-Also fix view distance lookup
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index fb6aef4cdbd2ad4037e20c9302ae5ef07ff0c7ce..e17cf38b791f509447ce2c8ef38411530a0fb09b 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -640,8 +640,9 @@ public class EnderDragon extends Mob implements Enemy {
-             if (this.dragonDeathTime == 1 && !this.isSilent()) {
-                 // CraftBukkit start - Use relative location for far away sounds
-                 // this.world.b(1028, this.getChunkCoordinates(), 0);
--                int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
--                for (net.minecraft.server.level.ServerPlayer player : this.level.getServer().getPlayerList().players) {
-+                //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-+                for (net.minecraft.server.level.ServerPlayer player : (List<net.minecraft.server.level.ServerPlayer>) ((ServerLevel)level).players()) {
-+                    final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-                     double deltaX = this.getX() - player.getX();
-                     double deltaZ = this.getZ() - player.getZ();
-                     double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 07b631e074ef91ea51dfecfa0232482d8983a12d..9a89e6ff72d285a941be986300ff5c2a723a80e0 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -260,8 +260,9 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-                 if (!this.isSilent()) {
-                     // CraftBukkit start - Use relative location for far away sounds
-                     // this.world.b(1023, new BlockPosition(this), 0);
--                    int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
--                    for (ServerPlayer player : (List<ServerPlayer>) MinecraftServer.getServer().getPlayerList().players) {
-+                    //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-+                    for (ServerPlayer player : (List<ServerPlayer>)this.level.players()) {
-+                        final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-                         double deltaX = this.getX() - player.getX();
-                         double deltaZ = this.getZ() - player.getZ();
-                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;

patches/server/0100-Fix-Old-Sign-Conversion.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 17 Jun 2016 20:50:11 -0400
-Subject: [PATCH] Fix Old Sign Conversion
-
-1) Sign loading code was trying to parse the JSON before the check for oldSign.
-   That code could then skip the old sign converting code if it triggers a JSON parse exception.
-2) New Mojang Schematic system has Tile Entities in the new converted format, but missing the Bukkit.isConverted flag
-   This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
-
-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 66ab4deedd177f507d170a61ceca4c3ebbac9adc..77645019c88d61dde28b7598d8a29b7d0c23c209 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
-@@ -30,6 +30,7 @@ public abstract class BlockEntity implements net.minecraft.server.KeyedObject {
-     public CraftPersistentDataContainer persistentDataContainer;
-     // CraftBukkit end
-     private static final Logger LOGGER = LogManager.getLogger();
-+    public boolean isLoadingStructure = false; // Paper
-     private final BlockEntityType<?> type;
-     @Nullable
-     protected Level level;
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index dbb59775422b80fb4b60a8cfd2c0bd81c1646e88..589fbdd5c86655244aa92a42e5f45747b5c5026e 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -95,7 +95,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
-                 s = "\"\"";
-             }
- 
--            if (oldSign) {
-+            if (oldSign && !this.isLoadingStructure) { // Paper - saved structures will be in the new format, but will not have isConverted
-                 this.messages[i] = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s)[0];
-                 continue;
-             }
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-index f0795f0cff1314604dc58c19b64467a4c8cd4de9..3cbb764c8afd7f0a6b14aad4a4960a25d82ec9d9 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
-@@ -283,7 +283,9 @@ public class StructureTemplate {
-                                         definedstructure_blockinfo.nbt.putLong("LootTableSeed", random.nextLong());
-                                     }
- 
-+                                    tileentity.isLoadingStructure = true; // Paper
-                                     tileentity.load(definedstructure_blockinfo.nbt);
-+                                    tileentity.isLoadingStructure = false; // Paper
-                                 }
-                             }
- 

patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 16 May 2016 23:19:16 -0400
-Subject: [PATCH] Avoid blocking on Network Manager creation
-
-Per Paper issue 294
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 8fffe354d40c5fac4daa03af87c2323e307bd3ea..abcd335f5577dae6d613e5e0dd2656e1ab3ee9f0 100644
---- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -61,6 +61,15 @@ public class ServerConnectionListener {
-     public volatile boolean running;
-     private final List<ChannelFuture> channels = Collections.synchronizedList(Lists.newArrayList());
-     final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
-+    // Paper start - prevent blocking on adding a new network manager while the server is ticking
-+    private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
-+    private final void addPending() {
-+        Connection manager = null;
-+        while ((manager = pending.poll()) != null) {
-+            connections.add(manager);
-+        }
-+    }
-+    // Paper end
- 
-     public ServerConnectionListener(MinecraftServer server) {
-         this.server = server;
-@@ -96,7 +105,8 @@ public class ServerConnectionListener {
-                     int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
-                     Object object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND);
- 
--                    ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
-+                    // ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
-+                    pending.add((Connection) object); // Paper
-                     channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
-                     ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-                 }
-@@ -155,6 +165,7 @@ public class ServerConnectionListener {
- 
-         synchronized (this.connections) {
-             // Spigot Start
-+            this.addPending(); // Paper
-             // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
-             if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
-             {