Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0012-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 0e528e26a94338b2cee9556c87b7ff071fce58f9..e008983503a4ae45e9dd7f7858291dc4d3746520 100644
index d910fd8a8f254c825da8a2b74a3fae402d1a5c39..61ac743590e85e744664d16e02ba0e7027e8dd49 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2842,5 +2842,14 @@ public final class Bukkit {
@@ -2852,5 +2852,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 0e528e26a94338b2cee9556c87b7ff071fce58f9..e008983503a4ae45e9dd7f7858291dc4
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2b3ec780e02b90f463ec251b46566dffc3b2cda2..410aa885770c3f8be73277e90c4de6409b926f77 100644
index 5a7168111af08c58f0b331dfdbf0ac1d68f6a2a6..e37b5bd4cf7a3ae1d0e7ef01c4718e99392eed59 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2493,5 +2493,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2501,5 +2501,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();