mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
8bc19e524a
Upstream has released updates that appears to apply and compile correctly Paper Changes: 55e2de5c6 Improve per player mob spawning (#3971) 42433c262 Updated Upstream (Bukkit/CraftBukkit) (#3980) e5ede546a Fix IDE Debug JVM Flag for 1.16 (#3983) 2712c6888 [Auto] Updated Upstream (Bukkit/CraftBukkit) 0901ffd04 Use title packet for actionbar methods (#3959) 2e11235d1 Expand MaterialTags (#3964) cc25ae47c Amend last commit to fix decompile error forgot to commit f503db37c Fix AdvancementDataPlayer leak due from quitting early in login 282763b88 Fix SPIGOT-5885 Unable to disable advancements 9b93d122e Fix SPIGOT-5824 Bukkit world-container is not used bede4d304 Load config files early on Tuinity Changes: b0673b3 Merge dev/optimise-notify into ver/1.16 d3dc35c Name craft scheduler threads according to the plugin using them
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
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/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
|
|
index 6786fd094..8a9be3fdb 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
|
|
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 6e15c2690..57a34fb96 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2403,4 +2403,11 @@ public final class CraftServer implements Server {
|
|
return mobGoals;
|
|
}
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public String getServerName() {
|
|
+ return getProperties().serverName;
|
|
+ }
|
|
+ // Purpur end
|
|
}
|