Bring back server name

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

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 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
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8ab94f8189ebd9d4158231871abdebec399deb2c..c38fa167bbe46dfd34b90b47f6918a399af12c32 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2968,4 +2968,15 @@ public final class Bukkit {
-     public static Server.Spigot spigot() {
-         return server.spigot();
-     }
-+
-+    // Purpur start
-+    /**
-+     * Get the name of this server
-+     * @return the name of the server
-+     */
-+    @NotNull
-+    public static String getServerName() {
-+        return server.getServerName();
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f90da51a8d1003a5cba86decbd42470f7f7e9211..2d17726681b9001179590e9c33ee5b6561fb7789 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -2619,4 +2619,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      */
-     void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
-     // Paper end - API to check if the server is sleeping
-+
-+    // Purpur start
-+    /**
-+     * Get the name of this server
-+     * @return the name of the server
-+     */
-+    @NotNull
-+    String getServerName();
-+    // Purpur end
- }

patches/server/0012-Bring-back-server-name.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 26 May 2019 15:19:14 -0500
-Subject: [PATCH] Bring back server name
-
-
-diff --git a/net/minecraft/server/dedicated/DedicatedServerProperties.java b/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index c3ec370b83b895be0f03662e3884fa4a2442a2a6..05e16103af3fd276f0196ddf1a2e5b729b025c34 100644
---- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -56,6 +56,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     public final boolean onlineMode = this.get("online-mode", true);
-     public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
-     public final String serverIp = this.get("server-ip", "");
-+    public final String serverName = this.get("server-name", "Unknown Server"); // Purpur
-     public final boolean pvp = this.get("pvp", true);
-     public final boolean allowFlight = this.get("allow-flight", false);
-     public final String motd = this.get("motd", "A Minecraft Server");
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc2f23613644126c3f7506b26db8e6a865f78dde..3259d5796287f2e7886b5742b25d9f1f1bc22d6d 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3285,4 +3285,11 @@ public final class CraftServer implements Server {
-         this.console.addPluginAllowingSleep(plugin.getName(), value);
-     }
-     // Paper end - API to check if the server is sleeping
-+
-+    // Purpur start
-+    @Override
-+    public String getServerName() {
-+        return this.getProperties().serverName;
-+    }
-+    // Purpur end
- }

purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch

@@ -0,0 +1,18 @@
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2968,4 +_,15 @@
+     public static Server.Spigot spigot() {
+         return server.spigot();
+     }
++
++    // Purpur start - Bring back server name
++    /**
++     * Get the name of this server
++     * @return the name of the server
++     */
++    @NotNull
++    public static String getServerName() {
++        return server.getServerName();
++    }
++    // Purpur end - Bring back server name
+ }

purpur-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch

@@ -0,0 +1,16 @@
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2607,4 +_,13 @@
+      */
+     void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
+     // Paper end - API to check if the server is sleeping
++
++    // Purpur start - Bring back server name
++    /**
++     * Get the name of this server
++     * @return the name of the server
++     */
++    @NotNull
++    String getServerName();
++    // Purpur end - Bring back server name
+ }

purpur-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
++++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
+@@ -49,6 +_,7 @@
+     public final boolean onlineMode = this.get("online-mode", true);
+     public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
+     public final String serverIp = this.get("server-ip", "");
++    public final String serverName = this.get("server-name", "Unknown Server"); // Purpur - Bring back server name
+     public final boolean pvp = this.get("pvp", true);
+     public final boolean allowFlight = this.get("allow-flight", false);
+     public final String motd = this.get("motd", "A Minecraft Server");

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -24,11 +24,10 @@
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -3048,6 +_,18 @@
+@@ -3049,6 +_,18 @@
-         {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
-+
+ 
 +        // Purpur start - Purpur config files
 +        @Override
 +        public YamlConfiguration getPurpurConfig() {
@@ -40,6 +39,19 @@
 +            return getProperties().properties;
 +        }
 +        // Purpur end - Purpur config files
- 
++
          @Override
          public void restart() {
+             org.spigotmc.RestartCommand.restart();
+@@ -3288,4 +_,11 @@
+         this.console.addPluginAllowingSleep(plugin.getName(), value);
+     }
+     // Paper end - API to check if the server is sleeping
++
++    // Purpur start - Bring back server name
++    @Override
++    public String getServerName() {
++        return this.getProperties().serverName;
++    }
++    // Purpur end - Bring back server name
+ }