mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
949a9956ab
Upstream has released updates that appears to apply and compile correctly Paper Changes: b8372fc0 Improve handling of indestructable blocks a2a06640 Add moon phase API 47f71aea Fix SpawnChangeEvent not firing for all use-cases b6c860f2 Don't require FACING data 0c1716a1 Add #setMaxPlayers API 02aed275 [CI-SKIP] Require dependencies script (#4172) 1ccc1c67 Add smithing item helpers 20d9ec6b Fix MC-197271 e9287056 [CI-SKIP] Update issue templates with notices
45 lines
1.3 KiB
Diff
45 lines
1.3 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:18:40 -0500
|
|
Subject: [PATCH] Bring back server name
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 7fd924621..f19d865dd 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1787,4 +1787,15 @@ public final class Bukkit {
|
|
public static Server.Spigot spigot() {
|
|
return server.spigot();
|
|
}
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ public static String getServerName() {
|
|
+ return server.getServerName();
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index dacdcd1f2..ad45e2a4c 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {
|
|
@NotNull
|
|
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ String getServerName();
|
|
+ // Purpur end
|
|
}
|