From b1ad334c589029d1cf278ece3400f8857af16680 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

---
 .../net/minecraft/server/DedicatedServerProperties.java    | 1 +
 src/main/java/org/bukkit/craftbukkit/CraftServer.java      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
index 0c3ec83570..20c143e314 100644
--- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
+++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
@@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
     public final boolean onlineMode = this.getBoolean("online-mode", true);
     public final boolean preventProxyConnections = this.getBoolean("prevent-proxy-connections", false);
     public final String serverIp = this.getString("server-ip", "");
+    public final String serverName = this.getString("server-name", "Unknown Server"); // Purpur - bring back server name
     public final boolean spawnAnimals = this.getBoolean("spawn-animals", true);
     public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
     public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6d453b6711..210c04f026 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2173,4 +2173,11 @@ public final class CraftServer implements Server {
         return net.minecraft.server.MinecraftServer.currentTick;
     }
     // Paper end
+
+    // Purpur start - bring back server name
+    @Override
+    public String getServerName() {
+        return getProperties().serverName;
+    }
+    // Purpur end
 }
-- 
2.24.0.rc1