mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
f2e328d295
Upstream has released updates that appears to apply and compile correctly Paper Changes: ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851) b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 33ce16852b951902d8a9685c5a65837796e94ebf 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 | 9 +++++++++
|
|
src/main/java/org/bukkit/Server.java | 7 +++++++
|
|
2 files changed, 16 insertions(+)
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 6935cf27..abf7caf0 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1666,6 +1666,15 @@ public final class Bukkit {
|
|
}
|
|
|
|
// Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ public static String getServerName() {
|
|
+ return server.getServerName();
|
|
+ }
|
|
+
|
|
/**
|
|
* Get a sample of the servers last tick times (in nanos)
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index df1765b5..39d933aa 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient {
|
|
// Paper end
|
|
|
|
// Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ String getServerName();
|
|
+
|
|
/**
|
|
* Get a sample of the servers last tick times (in nanos)
|
|
*
|
|
--
|
|
2.24.0
|
|
|