Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02: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@06fdc02 [ci skip] Correct upstream/paper javadoc (#8286)
PaperMC/Paper@11ab383 Don't use plugin-profiling to enable timings
This commit is contained in:
granny
2023-03-31 00:12:09 -07:00
parent 7cb1f466d1
commit bd5c4b67e6
10 changed files with 31 additions and 31 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 d0b36ad1492ce00d89a5cac123985328ecb77a5a..731aaf6090d0ea6c5a4cc40e03067456a12ffb6f 100644
index 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d29796076d008e1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2474,5 +2474,14 @@ public final class Bukkit {
@@ -2471,5 +2471,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index d0b36ad1492ce00d89a5cac123985328ecb77a5a..731aaf6090d0ea6c5a4cc40e03067456
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c21d840f8874409651146b717fd122e10d882464..ee0e26ffc49088011e06489684a2bfce486648ba 100644
index 3e4ddcc1320eff2be4539f134f15951aaa4fcc8a..d6f126d4f9f84c013b4c9320a38a66c6bab12d8c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2159,5 +2159,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2156,5 +2156,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();