Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-22 08:29:22 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2022-06-05 13:29:03 +08:00
parent 16fc2ea446
commit acad9def3d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0003-Leaves-Server-Config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..51bdcc4c597b7704bb2449fa80e7fea48416a5a6 100644
index f3bf9df8c0bd56cad461210ce8551ade3a220b6b..d9c6247583990390cfdbe435cb9ad4a08f389d6f 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -238,7 +238,8 @@ public class TimingsExport extends Thread {
@@ -240,7 +240,8 @@ public class TimingsExport extends Thread {
parent.put("config", createObject(
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -19,10 +19,10 @@ index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..51bdcc4c597b7704bb2449fa80e7fea4
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0706891d8b042675eb67b367324925c52b6d8ddc..07f3ac18b83357bfc75aa6b6d3ee0bfeb6bb83e4 100644
index 743cb6da2e21c5f7663f6f87ec4fe94c97d4e6fd..28d1199dc731a5baf8bb05cb517111c6adda559c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1177,7 +1177,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1178,7 +1178,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
String doneTime = String.format(java.util.Locale.ROOT, "%.3fs", (double) (Util.getNanos() - serverStartTime) / 1.0E9D);
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
// Paper end
@@ -67,7 +67,7 @@ index fee8996f35b38fd79946cdfd677763e0201eb57d..a06c329c15769af2cd6bf0ad1e1d73f8
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4ddbfab9c3992e044215cd2b5936893189ab13cc..a559790001fccaa15cbe0ac249e93ca74edbd1b0 100644
index 9387f8a9996d86abfc5fea354108c446fa859228..57edab91d0f807208ebbe1dd7f07fcc50b86814b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -86,7 +86,7 @@ index 4ddbfab9c3992e044215cd2b5936893189ab13cc..a559790001fccaa15cbe0ac249e93ca7
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2706,6 +2708,14 @@ public final class CraftServer implements Server {
@@ -2713,6 +2715,14 @@ public final class CraftServer implements Server {
{
return com.destroystokyo.paper.PaperConfig.config;
}