mirror of
https://github.com/PurpurMC/Purpur.git
synced 2025-02-17 13:00:04 +08:00
c5c7609d0b
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488) PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615) PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604) PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621) PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600) PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462) PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643) PaperMC/Paper@666a214 [ci skip] rebuild patches
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 f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f82058554484607 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2756,4 +2756,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 c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2..fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2416,4 +2416,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
|
|
// Paper end - Folia region threading API
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Get the name of this server
|
|
+ * @return the name of the server
|
|
+ */
|
|
+ @NotNull
|
|
+ String getServerName();
|
|
+ // Purpur end
|
|
}
|