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@156675c Fix lodestone compass target conversion
PaperMC/Paper@5632210 add RegistryAccess for managing registries (#10154)
PaperMC/Paper@6fcca46 Add missing step in V3818
This commit is contained in:
granny
2024-05-04 20:12:36 -07:00
parent 7a63a45588
commit 44858f54ef
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0009-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 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..8b6bc7028414cf005e9de8686a009e6b1f5ce0ec 100644
index 5d1b55fdbcbe63f6b42b694d05211a3cc691a09d..54f11593f4acfb89623cf1fad58819e001505fd1 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 687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76..8b6bc7028414cf005e9de8686a009e6b
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c0d6b38c2676f33698099a439f2c8754155e0030..4fbd136bc4a352ba26f1e65fd5fa2f58247c33f8 100644
index f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c..1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2549,4 +2549,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API