Update to 1.16.2

patches/server/0002-Rebrand.patch

@@ -5,26 +5,25 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/pom.xml b/pom.xml
-index 6fd5968178..5b540e606e 100644
+index ee19a2874..09119ce8e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,12 +1,11 @@
+@@ -1,11 +1,11 @@
   <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>
 -    <artifactId>tuinity</artifactId>
 +    <artifactId>purpur</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.1-R0.1-SNAPSHOT</version>
+     <version>1.16.2-R0.1-SNAPSHOT</version>
 -    <name>Tuinity-Server</name>
 -    <url>https://github.com/Spottedleaf/Tuinity</url>
--
-+    <name>Purpur</name>
++    <name>Purpur-Server</name>
 +    <url>https://github.com/pl3xgaming/Purpur</url>
+ 
      <properties>
          <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -18,16 +17,16 @@
+@@ -18,16 +18,16 @@
      </properties>
  
      <parent>
@@ -45,7 +44,7 @@ index 6fd5968178..5b540e606e 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -43,6 +42,20 @@
+@@ -43,6 +43,20 @@
              <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
          </dependency>
@@ -66,7 +65,7 @@ index 6fd5968178..5b540e606e 100644
          <dependency>
              <groupId>net.minecrell</groupId>
              <artifactId>terminalconsoleappender</artifactId>
-@@ -164,15 +177,15 @@
+@@ -164,15 +178,15 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -81,12 +80,12 @@ index 6fd5968178..5b540e606e 100644
                  <version>1.3</version>
                  <configuration>
 -                    <outputPrefix>git-Tuinity-</outputPrefix> <!-- Tuinity -->
-+                    <outputPrefix>git-Purpur-</outputPrefix>
++                    <outputPrefix>git-Purpur-</outputPrefix> <!-- Tuinity -->
                      <scmDirectory>..</scmDirectory>
                  </configuration>
                  <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 74ed02fa92..c1280478ee 100644
+index 74ed02fa9..c1280478e 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -99,10 +98,10 @@ index 74ed02fa92..c1280478ee 100644
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bb54a4aa71..0a7dd67516 100644
+index 615a71a78..ba731edd3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -113,7 +112,7 @@ index bb54a4aa71..0a7dd67516 100644
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 new file mode 100644
-index 0000000000..d8b408f061
+index 000000000..d8b408f06
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 @@ -0,0 +1,115 @@
@@ -233,10 +232,10 @@ index 0000000000..d8b408f061
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d434bd93bc..7079c79f7b 100644
+index 61e5a91a7..020bb17b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
+@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -246,7 +245,7 @@ index d434bd93bc..7079c79f7b 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 90c1067ca2..dd2772d8c7 100644
+index c1efe830d..2f319c6e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -259,7 +258,7 @@ index 90c1067ca2..dd2772d8c7 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197..13b9843932 100644
+index 001b1e519..13b984393 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {