-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
65 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: foss-mc <[email protected]> | ||
Date: Mon, 2 Sep 2024 16:23:31 +1200 | ||
Subject: [PATCH] remove getServerName from purpur | ||
|
||
|
||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java | ||
index 2bdd85284ae4c10fe26594be85aa9d8aa699b84f..74f5b552f0e86280cbceb9f0a37ee8d2de173acd 100644 | ||
--- a/src/main/java/org/bukkit/Bukkit.java | ||
+++ b/src/main/java/org/bukkit/Bukkit.java | ||
@@ -2912,15 +2912,6 @@ 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(); | ||
- } | ||
- | ||
/** | ||
* Check if server is lagging according to laggy threshold setting | ||
* | ||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java | ||
index 988d00a4ad9330e338240db6b0bbe2b5157b342c..a70af5242799a3ebfff7465d0184b345431365c1 100644 | ||
--- a/src/main/java/org/bukkit/Server.java | ||
+++ b/src/main/java/org/bukkit/Server.java | ||
@@ -2557,13 +2557,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi | ||
// Paper end - Folia region threading API | ||
|
||
// Purpur start | ||
- /** | ||
- * Get the name of this server | ||
- * @return the name of the server | ||
- */ | ||
- @NotNull | ||
- String getServerName(); | ||
- | ||
/** | ||
* Check if server is lagging according to laggy threshold setting | ||
* |
21 changes: 21 additions & 0 deletions
21
patches/server/0016-remove-getServerName-from-purpur.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: foss-mc <[email protected]> | ||
Date: Mon, 2 Sep 2024 16:22:46 +1200 | ||
Subject: [PATCH] remove getServerName from purpur | ||
|
||
|
||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
index 3c21bde0724e325a1db13f8f02142b2b7372fab1..f5c3a5a8dc0ae2cff8d534a6057e9bb315636cf9 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java | ||
@@ -3233,10 +3233,6 @@ public final class CraftServer implements Server { | ||
return this.potionBrewer; | ||
} | ||
// Paper end | ||
- public String getServerName() { | ||
- return this.getProperties().serverName; | ||
- } | ||
- | ||
@Override | ||
public boolean isLagging() { | ||
return getServer().lagging; |