Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-03 22:26:12 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-11-15 00:27:50 +08:00
parent 67e3c6d6da
commit c5b1beaecb
15 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index a79461457ea19339f47572c70705d655ebc55276..e3ef85b9556b93453d6e4b07a3416ffa3f1029a0 100644
index 79beac737c17412913983614bd478d33e3c6ed58..3774c310b30ccef71d5690829c04bd288d35c242 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -153,7 +153,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 97745f0bab8d82d397c6c2a5775aed92bca0a034..2a473825144f69968635d8894f1499af1c39481a 100644
index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..8ac996335015e5d494886f29921c4c3362659daa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -166,7 +166,7 @@ index 97745f0bab8d82d397c6c2a5775aed92bca0a034..2a473825144f69968635d8894f1499af
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..81e3d3dbc74e238c76ead4a0b6efaa2ada3cc49d 100644
index cf605aa56adf7f80d3b409f60a92a5ca7ae8fd07..749087baa24d6c07d09ef0f93fa6bde694d72a93 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -217,11 +217,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -184,10 +184,10 @@ index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..81e3d3dbc74e238c76ead4a0b6efaa2a
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..47b05f315a744b0ad0daa9d354ac1229be5374ce 100644
index 9c08303de2891de92e06de8a939a618b7a6f7321..1988a52030ee026b073ef3f98477dd9ec9827f1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -197,7 +197,7 @@ index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..47b05f315a744b0ad0daa9d354ac1229
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e4cacb17f56c618bef19e1165c07aac86af61150..328cb5980b0d3a15b4fc2b50be10d9b501f7ec27 100644
index 2af0068ef338634d1f44532af5db66c2d0b3dd10..2e7738ed88832c23033ca0396e80efad36a1a127 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -300,7 +300,7 @@ public class Main {
@@ -223,7 +223,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..ca166161ef919c559de9cc02bdf435cb
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 50c72e5db369a180f425eaaa0411cb8871bc3463..db608f17a7a8e360b0854533d6d2434da688aded 100644
index 40dcdf6885e99b26283a9ea2bd4d4bf6ec358e71..5b00c4a50372eda1630f4bae6ef41e242056ac94 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa