mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
2f16d3d43e
Upstream has released updates that appears to apply and compile correctly Paper Changes: aa022fda Fix java cross-version compilation 8b7952a9 Implement alternative item-despawn-rate (#2128) 6ccf0bda Reimplement hopper optimization patch (#2388) e264c365 MC-156852 fix (#2396) b6c32b2a Fix recursion in EntityFox (#2418) 7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2415)
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
From 96390b05dddd5db2d85fac861f902356ec8f8719 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 0c3ec8357..20c143e31 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 4cd0bc64b..c14ca997d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2165,4 +2165,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
|
|
|