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@4d20922 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11024)
PaperMC/Paper@2fa5e0e Fix horse inventories (#11028)
PaperMC/Paper@62ed302 Fix entity distance check when applying knockback

closes #1553
This commit is contained in:
granny
2024-07-07 17:53:09 -07:00
parent de2e7a7967
commit cb0f04bd77
59 changed files with 260 additions and 205 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 6ee89d60fa560b38cef94d4516fe861f2776bf34..7c57fe9ce3ee80816a4d2bfe5af6920cebe39c85 100644
index bd5147f2c1afd8de5a4be18688e2e95f8719ec7e..2bdd85284ae4c10fe26594be85aa9d8aa699b84f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2917,5 +2917,14 @@ public final class Bukkit {
@@ -2920,5 +2920,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 6ee89d60fa560b38cef94d4516fe861f2776bf34..7c57fe9ce3ee80816a4d2bfe5af6920c
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6ed3d3108f3124151c863448c01a2d2e6c0ef53d..1cc70661901834cc4c00e8772ae57743d6007b74 100644
index f78b65dff2246c13d653296f2fda76848579081d..988d00a4ad9330e338240db6b0bbe2b5157b342c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2563,5 +2563,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();