rebuild server patches
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a53bfa4251 100644
|
||||
index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..da5b65786a9fde73b5d4be5d89e4fbad3d3faa87 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -1,6 +1,8 @@
|
||||
@@ -28,7 +28,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
|
||||
// Paper start
|
||||
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||
@@ -80,14 +84,14 @@ tasks.jar {
|
||||
@@ -84,14 +88,14 @@ tasks.jar {
|
||||
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
|
||||
attributes(
|
||||
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||
@@ -48,7 +48,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
|
||||
"Build-Number" to (build ?: ""),
|
||||
"Build-Time" to Instant.now().toString(),
|
||||
"Git-Branch" to gitBranch, // Paper
|
||||
@@ -108,6 +112,27 @@ tasks.compileTestJava {
|
||||
@@ -112,6 +116,27 @@ tasks.compileTestJava {
|
||||
|
||||
publishing {
|
||||
publications.create<MavenPublication>("maven") {
|
||||
@@ -76,7 +76,7 @@ index 299b7b029384c58fed80d53cc0b77c420d62eed7..2e1ac152fc3706fb2b585b5ca9da31a5
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,7 +169,7 @@ fun TaskContainer.registerRunTask(
|
||||
@@ -148,7 +173,7 @@ fun TaskContainer.registerRunTask(
|
||||
name: String,
|
||||
block: JavaExec.() -> Unit
|
||||
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
||||
@@ -112,7 +112,7 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..87db580c74d20714e2ebe01df23811c7
|
||||
final @Nullable Component history = this.getHistory();
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..19ccccb3b7e6ab81504923717ecf5a8e88ca5757 100644
|
||||
index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..a14c5c2d7f55b7336c2327cfe71d46dc7fb3e726 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -273,7 +273,7 @@ public class Main {
|
||||
@@ -138,10 +138,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..6f1b3fa6ebeabc7596034663ed06686f
|
||||
|
||||
if (stream != null) {
|
||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
index e5e41dc2d4f7a8c3fea704212507ca0b951664db..3561e409bc05a97e05216ef10efb800ece42ff67 100644
|
||||
index f7a4fee9bb25ff256dc2e5ea26bfbceca6a49167..ec8552ed502b6628ea723f5667097f01fddbc5e5 100644
|
||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
@@ -90,7 +90,7 @@ public class WatchdogThread extends Thread
|
||||
@@ -162,7 +162,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
|
||||
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
|
||||
log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
|
||||
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
|
||||
|
||||
Reference in New Issue
Block a user