Move timings changes to its own patch

This commit is contained in:
William Blake Galbreath
2020-02-18 21:22:51 -06:00
parent 3df05bd5aa
commit 76b5d1cdcf
127 changed files with 687 additions and 587 deletions

View File

@@ -1,51 +0,0 @@
From 2c39363f1617d348182d18c4ef1ba4b60e904140 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 8fbda2aee..a2cf8e29b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1622,6 +1622,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 7d631ac27..92df8f8cd 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1415,6 +1415,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