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

Update Paper

Browse Source
This commit is contained in:
violetc
2023-10-06 01:43:59 +08:00
parent efb37ffb20
commit 6859b3902f
18 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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 683159586641dd9aa42ae96fa51602469755723f..a0fbd152b6933e198b47abb13acec9004c91d27f 100644
index c187641f0ec6444a10e0e1583e1697d07e8f0267..b54e07850c3eb8120a8d70d7b4192db7e5ac24a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -64,15 +64,6 @@ index 683159586641dd9aa42ae96fa51602469755723f..a0fbd152b6933e198b47abb13acec900
mainClass.set("org.bukkit.craftbukkit.Main")
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
@@ -212,7 +226,6 @@ val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
}
tasks.registerRunTask("runDev") {
description = "Spin up a non-relocated Mojang-mapped test server"
- classpath(tasks.filterProjectDir.flatMap { it.outputJar })
- classpath(runtimeClasspathForRunDev)
+ classpath(sourceSets.main.map { it.runtimeClasspath }) // Leaves - fix it for windows
jvmArgs("-DPaper.isRunDev=true")
}
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c55038fb58 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -193,7 +184,7 @@ 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 fcd5096d64edfaf6bce3ecce8c9b9afb84462786..fab14ca6965d903df220e0f7d0e73e20cfb5f2b1 100644
index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..47b05f315a744b0ad0daa9d354ac1229be5374ce 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