Updated Upstream (Paper)

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

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 8b6bc7028414cf005e9de8686a009e6b1f5ce0ec..d0776d18cbfd0d2099b6107c395251adb4b24b94 100644
index 54f11593f4acfb89623cf1fad58819e001505fd1..215647d7f5cc8487d6a173bc0160fec6db1971eb 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 8b6bc7028414cf005e9de8686a009e6b1f5ce0ec..d0776d18cbfd0d2099b6107c395251ad
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4fbd136bc4a352ba26f1e65fd5fa2f58247c33f8..f90401f03566dce125b470a559d4ac7837f44f22 100644
index 1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54..7f9dc209c88a66bd2ee82cc62b948e827c6b1060 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2557,5 +2557,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();