Merge in Tuinity patches

patches/api/0010-Bring-back-server-name.patch

@@ -1,51 +0,0 @@
-From ff8c9b346b116a2558a9c6499b600ce56c5f7904 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 26 May 2019 15:18:40 -0500
-Subject: [PATCH] Bring back server name
-
----
- src/main/java/org/bukkit/Bukkit.java | 9 +++++++++
- src/main/java/org/bukkit/Server.java | 7 +++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8fbda2aee..a2cf8e29b 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1622,6 +1622,15 @@ public final class Bukkit {
-     }
- 
-     // Purpur start
-+    /**
-+     * Get the name of this server
-+     * @return the name of the server
-+     */
-+    @NotNull
-+    public static String getServerName() {
-+        return server.getServerName();
-+    }
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      * 
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6be24c16c..6690ef00c 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
-     // Paper end
- 
-     // Purpur start
-+    /**
-+     * Get the name of this server
-+     * @return the name of the server
-+     */
-+    @NotNull
-+    String getServerName();
-+
-     /**
-      * Get a sample of the servers last tick times (in nanos)
-      *
--- 
-2.24.0
-