Skip to content

Commit 7f0a317

Browse files
committed
Update Paper
1 parent 5652259 commit 7f0a317

5 files changed

+37
-37
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=dev.folia
22

33
version=1.20.4-R0.1-SNAPSHOT
44
mcVersion=1.20.4
5-
paperRef=31699ae9a8f3a57491e9c9276cffa5a51e9a5f60
5+
paperRef=4939f8711884901ddf1c56337f606de71cdae78d
66

77
org.gradle.caching=true
88
org.gradle.parallel=true

patches/api/0003-Require-plugins-to-be-explicitly-marked-as-Folia-sup.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ more helpful than some random error log caused by
1414
a breakage.
1515

1616
diff --git a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
17-
index ef393f1f93ca48264fc1b6e3a27787f6a9152e1b..1325f9fed80731b74b80145dadc843b1a34b851b 100644
17+
index bcf91d048d84144f6acf9bfd2095df9ada2e585f..3072f95dc1cafb47c1820dc67c8d24991540fc4a 100644
1818
--- a/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
1919
+++ b/src/main/java/io/papermc/paper/plugin/configuration/PluginMeta.java
2020
@@ -200,4 +200,12 @@ public interface PluginMeta {

patches/server/0001-Build-changes.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..959e62d800de05b2dd77a252f442c3daf8438490 100644
8+
index ce3747d8d2a8f4327766cf23d5aaa72cfcb380bc..08d434023226af0d2c469055a3b2188fe8a4ed38 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -23,7 +23,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..959e62d800de05b2dd77a252f442c3da
2323
// Paper start
2424
implementation("org.jline:jline-terminal-jansi:3.21.0")
2525
implementation("net.minecrell:terminalconsoleappender:1.3.0")
26-
@@ -69,7 +73,7 @@ tasks.jar {
26+
@@ -70,7 +74,7 @@ tasks.jar {
2727
attributes(
2828
"Main-Class" to "org.bukkit.craftbukkit.Main",
2929
"Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..959e62d800de05b2dd77a252f442c3da
3232
"Implementation-Vendor" to date, // Paper
3333
"Specification-Title" to "Bukkit",
3434
"Specification-Version" to project.version,
35-
@@ -153,7 +157,7 @@ fun TaskContainer.registerRunTask(
35+
@@ -154,7 +158,7 @@ fun TaskContainer.registerRunTask(
3636
name: String,
3737
block: JavaExec.() -> Unit
3838
): TaskProvider<JavaExec> = register<JavaExec>(name) {

0 commit comments

Comments
 (0)