mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
492436a23b
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f6a69de Undeprecate getOfflinePlayer (#7773) PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787) PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037) PaperMC/Paper@4219389 Don't tick markers (#7299) PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985) PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793) PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701) PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
45 lines
1.5 KiB
Diff
45 lines
1.5 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 d8666481f9a407403d0114ff02024fd3c50c27c4..a1374b608c20d47fde15135089bf8aceb98d6129 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2368,4 +2368,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 541da7064f5bd563cde8475be6bc47c82d9cd22b..027e0141995ce8edc11ae0ab3c589ad6ac00b43c 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2070,4 +2070,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ String getServerName();
|
|
+ // Purpur end
|
|
}
|