Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@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/0010-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b9b751ea0d11381e846d5f35f39f285c075c171a..6ee89d60fa560b38cef94d4516fe861f2776bf34 100644
index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..bd5147f2c1afd8de5a4be18688e2e95f8719ec7e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2907,4 +2907,15 @@ public final class Bukkit {
@@ -2910,4 +2910,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index b9b751ea0d11381e846d5f35f39f285c075c171a..6ee89d60fa560b38cef94d4516fe861f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 205b684223cfa4cf0b3938e11926e854509bb7c9..6ed3d3108f3124151c863448c01a2d2e6c0ef53d 100644
index c0911b100176f1a797a336a35a374c05a4769a2c..f78b65dff2246c13d653296f2fda76848579081d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2555,4 +2555,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API