mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
833bd1cc47
Upstream has released updates that appears to apply and compile correctly Paper Changes: f6f9157b Don't toString block unless actually showing the message b3f0527a Add Spawn Entity SpawnReason API ec8d7387 MC-183249: Don't generate Carving Masks BitSet unless needed 2d401d2d Improve BlockPosition hashCode/equals 2572bd01 Fix world unload toLowercase - Fixes #3326 dda9680b Optimize brigadier child sorting performance a71a4ec2 Fix CraftServer.unloadWorld Leak
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From e40b33149f2d4836c29f4ea74fb64d31ee21a0ba 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
|
|
|
|
---
|
|
.../java/net/minecraft/server/DedicatedServerProperties.java | 1 +
|
|
src/main/java/org/bukkit/craftbukkit/CraftServer.java | 5 +++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
|
|
index 0c3ec8357..309f5562b 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 c075e9d35..b62cfb9a9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2259,6 +2259,11 @@ public final class CraftServer implements Server {
|
|
// Paper end
|
|
|
|
// Purpur start
|
|
+ @Override
|
|
+ public String getServerName() {
|
|
+ return getProperties().serverName;
|
|
+ }
|
|
+
|
|
@Override
|
|
public boolean isLagging() {
|
|
return getServer().lagging;
|
|
--
|
|
2.24.0
|
|
|