mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
dd928e3864
Upstream has released updates that appears to apply and compile correctly Paper Changes: 8d036cea Expose the internal current tick 0c715390 [PATCH] bounding box check for hanging entities (#2664) 527073aa Update config version 0d3b35c3 Rename baby zombie movement config option
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 6b57d8de1bfc0480aaf902eb577f3bbb52a18a7a 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 231bc6e31..21bc13f79 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1605,6 +1605,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 314704790..c12e3ba90 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1406,4 +1406,13 @@ public interface Server extends PluginMessageRecipient {
|
|
*/
|
|
int getCurrentTick();
|
|
// 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.24.0.rc1
|
|
|