Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ab7bc3f Remove javadoc that doesn't apply to Paper (#9206)
PaperMC/Paper@57fdc66 Undeprecate Server#getMap (#9185)
PaperMC/Paper@f8603a4 Avoid Lazy Initialization for Enum Fields (#9210)
PaperMC/Paper@5b66d33 Call EntityChangeBlockEvent for frogs egg (#9213)
PaperMC/Paper@4ba5aac More accurate isInOpenWater impl (#9194)
PaperMC/Paper@a61b484 Fix MC-224454 (#9195)
PaperMC/Paper@b681760 Fix note block sound property on player heads (#9158)
PaperMC/Paper@bcd8dc2 Use the spigot config for mangrove propagule / torchflower growth (#8597)
This commit is contained in:
granny
2023-05-16 13:12:04 -07:00
parent b84222981c
commit 3b02c0439a
11 changed files with 31 additions and 31 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 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d29796076d008e1 100644
index 15a4a8d2e6205f4d25f4dcc5218281197cd42732..a2ee324d32c48fa9d71768f9b1cf7efcae02a01d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2471,5 +2471,14 @@ public final class Bukkit {
@@ -2470,5 +2470,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d297960
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3e4ddcc1320eff2be4539f134f15951aaa4fcc8a..d6f126d4f9f84c013b4c9320a38a66c6bab12d8c 100644
index bb2524790008e3b90b16977076d9bb4c8b1461ba..d16c5f0bd920291311ccf9870463aaaa98661578 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2156,5 +2156,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();