Remove tick times api (was moved upstream to paper)

This commit is contained in:
William Blake Galbreath
2020-04-12 03:51:46 -05:00
parent 193c511fce
commit 94953a334c
26 changed files with 56 additions and 127 deletions

View File

@@ -1,51 +0,0 @@
From d4f6fbd999d628857801e5d9a405ee5b010e9ab5 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 14e85ac6c..ce82eadb5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1694,6 +1694,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 90b439071..d2a3114eb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1489,6 +1489,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