Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242)
This commit is contained in:
granny
2024-02-11 21:56:58 -08:00
parent 425889dc45
commit 70a76c42bf
77 changed files with 356 additions and 375 deletions

View File

@@ -25,10 +25,10 @@ index c90a488e41ef65b57818cd91403e65e5f5e19cd9..feece6ec8fda944e2fcbf7c59327d0a1
}
// Paper end - further improve server tick loop
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b0b8c77473d1e81c753cc657c90d8fbdbdda9570..19a306262a617ea3f72ba117a4e0de5ff6bf9a37 100644
index 8a9af4a0d5c59361ffcf0ed572a1f1ee141d1780..152a10866560549d7d8deed328ee9ee2d9ed932c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3258,5 +3258,10 @@ public final class CraftServer implements Server {
@@ -3270,5 +3270,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}