Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring back server name

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-26 15:19:27 -05:00
parent bf5a93a669
commit 77e4857c4e
2 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
patches/api/0008-Bring-back-server-name.patch Normal file
View File

@@ -0,0 +1,53 @@
From 9112a0d950d5df2e9823791ed630151758e6d388 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 | 11 +++++++++++
src/main/java/org/bukkit/Server.java | 9 +++++++++
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6db691591..352e13eef 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1601,6 +1601,17 @@ public final class Bukkit {
}
// Paper end
+ // 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
+
@NotNull
public static Server.Spigot spigot()
{
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 27d3b5ad7..5337e3c5a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1399,4 +1399,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
// Paper end
+
+ // Purpur start - bring back server name
+ /**
+ * Get the name of this server
+ * @return the name of the server
+ */
+ @NotNull
+ String getServerName();
+ // Purpur end
}
--
2.20.1

41
patches/server/0023-Bring-back-server-name.patch Normal file
View File

@@ -0,0 +1,41 @@
From d0f5d2cd76bb6b109e08446c937eac7c60b51c19 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 fb092a941..54c0b4247 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 b04abedb2..338acf098 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2149,4 +2149,11 @@ public final class CraftServer implements Server {
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}
// Paper end
+
+ // Purpur start - bring back server name
+ @Override
+ public String getServerName() {
+ return getProperties().serverName;
+ }
+ // Purpur end
}
--
2.20.1