mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
4f47e9c368
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9797f08 Sync Starlight SaveUtil with 1.1.1 PaperMC/Paper@ed9cf5c Fix missing null check in ChunkGenerator#findNearestMapStructure PaperMC/Paper@fb2c24b Updated Upstream (Bukkit/CraftBukkit) (#8015) Pufferfish Changes: pufferfish-gg/Pufferfish@892ec46 Fix minecart loading bug. PurpurMC/Purpur#1008 pufferfish-gg/Pufferfish@8780a38 Updated Upstream (Paper)
35 lines
1.8 KiB
Diff
35 lines
1.8 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/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e183cee36 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
@@ -49,6 +49,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 spawnAnimals = this.get("spawn-animals", true);
|
|
public final boolean spawnNpcs = this.get("spawn-npcs", true);
|
|
public final boolean pvp = this.get("pvp", true);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index bad6344243358df99fac031b0fab021493b733a1..5fcd5c23755773613ca7a2926a60327d36c08b51 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2911,4 +2911,11 @@ public final class CraftServer implements Server {
|
|
}
|
|
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public String getServerName() {
|
|
+ return this.getProperties().serverName;
|
|
+ }
|
|
+ // Purpur end
|
|
}
|