Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9ae019a2d8274bdfb5e788cb7aec03bbcbaa7c26..a2f9b8b4a66af1dcb62a0b04bd6b5a447fac6439 100644
index 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b3b4eb08a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2439,5 +2439,14 @@ public final class Bukkit {
@@ -2452,5 +2452,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 9ae019a2d8274bdfb5e788cb7aec03bbcbaa7c26..a2f9b8b4a66af1dcb62a0b04bd6b5a44
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6cbd3636c01dc66125d5049b85205590af202605..1aca80c46a5ab3039ee2e42c6d28b46f141c501a 100644
index 046380115fb3f94d78a420c5197dc89a3a813140..d69a29109b5c991474ff7d59c02bf9a37aa7002f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2125,5 +2125,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2136,5 +2136,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();