Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488)
PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615)
PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604)
PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621)
PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600)
PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null
PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462)
PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643)
PaperMC/Paper@666a214 [ci skip] rebuild patches
This commit is contained in:
granny
2023-08-20 19:11:32 -07:00
parent aeecb71060
commit c5c7609d0b
18 changed files with 60 additions and 60 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 d3e3f1781ac04e0d3a24476de856ba72f25c02f1..728822f51d615bd2f4cb3cc1f2097309cac15fef 100644
index 7338dad470cd75814cce5be40f82058554484607..a32155e0cc63d4e4714a953edbae0b19544ff3ef 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2724,5 +2724,14 @@ public final class Bukkit {
@@ -2766,5 +2766,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index d3e3f1781ac04e0d3a24476de856ba72f25c02f1..728822f51d615bd2f4cb3cc1f2097309
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 33778dcc7c723ce210b5f5c6e03fd3678dcc11b0..1a1aebe2a398fa433179220e16058c1fb513de94 100644
index fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f..5b8ce8a5658021c6fdfeabca6c7bb31ebc58e71d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2384,5 +2384,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2424,5 +2424,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();