Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@6178609 Fix tripwire state inconsistency
PaperMC/Paper@ae6fec6 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
PaperMC/Paper@5cb2942 Update paperweight to 1.3.3 and shadow to 7.1.1
PaperMC/Paper@8a9979c Update gradle wrapper to 7.3.2
PaperMC/Paper@df8d28a Update checker framework & log4j-api for paper-api (also rebuild patches)
This commit is contained in:
Encode42
2021-12-21 14:42:52 -05:00
parent a1c3bf0eb1
commit d0431d6c9c
45 changed files with 81 additions and 224 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 a00347d848bc00df2d30a4030837fe960aa658fb..b36fd9bd6b633bb2f8503d1ca19befa8a4936b56 100644
index fdebfab6bdb74756c1bee4b7f03a27c2056388c9..7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2148,5 +2148,14 @@ public final class Bukkit {
@@ -2191,5 +2191,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index a00347d848bc00df2d30a4030837fe960aa658fb..b36fd9bd6b633bb2f8503d1ca19befa8
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7b46448b75cd78d6a6e09a113c59ee41ba12fc70..7fa620281187f17effe178d2e4e306860ebff801 100644
index 3773a4e1c6bdc020b7dbfb967192d17ad08c3813..fa2a5c8ed947cd2beed01df82fcc5e450e3e5782 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1873,5 +1873,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1908,5 +1908,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();