Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
This commit is contained in:
BillyGalbreath
2022-09-24 08:04:00 -05:00
parent 103965b5b4
commit ec75e5964a
28 changed files with 99 additions and 99 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 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b3b4eb08a 100644
index d76cfd8fbc96a592f79d2ffaf838268b2aade1b2..b507eb5bccf3689cc28a7bce7f4e31114b52a342 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2452,5 +2452,14 @@ public final class Bukkit {
@@ -2472,5 +2472,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 046380115fb3f94d78a420c5197dc89a3a813140..d69a29109b5c991474ff7d59c02bf9a37aa7002f 100644
index 025503596d9febf8d76c82b4fe940e8661de9dce..6843701a22af21d0610bfa1c0eb85f8b0fed82df 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2136,5 +2136,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2157,5 +2157,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();