Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-21 07:49:35 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2022-02-03 12:39:53 +08:00
parent b29667ee2b
commit 1dea573cf1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,4 +4,4 @@ version = 1.18.1-R0.1-SNAPSHOT
mcVersion = 1.18.1 mcVersion = 1.18.1
packageVersion = 1_18_R1 packageVersion = 1_18_R1
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
paperRef=2121aed33debae7b53a835bf57411c9cc6e46dbd paperRef=9940bcabcc33585815fa30feb63d22f19f87acb4

4
patches/api/0001-Leaves-Server-Config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e48af3822e9f118399c3a1c9358c56efae12e0da..be0b0191a8ba6a6499709b312d45a451e2c96549 100644 index 73446141e8c50b71a17ff6f0c528a62d5c75751b..ee8f28797089d5d80c1c7fd291ea330e42be2a74 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1777,6 +1777,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -1789,6 +1789,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
// Paper end // Paper end

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

@@ -19,7 +19,7 @@ index 5e3b7fb2e0b7608610555cd23e7ad25a05883181..c419bf7d5bbc5ee1ad001040815de8c8
new TimingsExport(listeners, parent, history).start(); 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cfd0a619cf4a2757f537aa6fc554a4c799229637..97ca545b4a30893a1d403a8c3a94de564d850f2c 100644 index acfdf4687e88ce0cd24498223d32a533007ca2de..d7bc2983c751a81563441e2000ee02965651e8e9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1216,7 +1216,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1216,7 +1216,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -67,7 +67,7 @@ index 4247dcb003626535dbb997f48ad9f61380bd17e9..9dc517509a3f7deaaa64343a26f52f66
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 561d321338d8d79f76ebd8babb62618419dfda9f..df90534c5ff5d61d04afbaab6b238e0101cb80c2 100644 index f83cf0de6ede8cc304c0810457f120d30b40eeb5..9a9817d047872b18613b9e0c51d2dc90ad68392c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -952,6 +952,7 @@ public final class CraftServer implements Server { @@ -952,6 +952,7 @@ public final class CraftServer implements Server {
@@ -86,7 +86,7 @@ index 561d321338d8d79f76ebd8babb62618419dfda9f..df90534c5ff5d61d04afbaab6b238e01
} }
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2661,6 +2663,14 @@ public final class CraftServer implements Server { @@ -2668,6 +2670,14 @@ public final class CraftServer implements Server {
{ {
return com.destroystokyo.paper.PaperConfig.config; return com.destroystokyo.paper.PaperConfig.config;
} }