diff options
| author | MiniDigger | Martin <[email protected]> | 2024-11-17 20:31:50 +0100 |
|---|---|---|
| committer | MiniDigger | Martin <[email protected]> | 2024-11-18 16:49:00 +0100 |
| commit | d8993759615a62cf367b3cc2c6b8774cb831ab41 (patch) | |
| tree | f06c89989d82a90853136c9e960ee71b2dd2d5fa /patches/server/0020-Plugin-remapping.patch | |
| parent | 7b13d936de17be61f6fd65e49f9e2cb8182a0f2f (diff) | |
| download | Paper-d8993759615a62cf367b3cc2c6b8774cb831ab41.tar.gz Paper-d8993759615a62cf367b3cc2c6b8774cb831ab41.zip | |
fix: move to jline-terminal-ffm on java 22+ and fall back to jni on 21, fixes #10405fix/java22-terminal-10405
ffm requires 1) native access allowed (the jdk cracks down on undocumented native access in 22) and 2) reverting the default console back to java.base, so the internal jline doesnt take over
Diffstat (limited to 'patches/server/0020-Plugin-remapping.patch')
| -rw-r--r-- | patches/server/0020-Plugin-remapping.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch index b7aa91fe6c..b4c402e45d 100644 --- a/patches/server/0020-Plugin-remapping.patch +++ b/patches/server/0020-Plugin-remapping.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Plugin remapping Co-authored-by: Nassim Jahnke <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index 429fcd5927cf3259e8cdc83fadf78b41a38eb3bf..fa3476acb77ce5d1247244808ead5b2a994e5fc7 100644 +index dd7900a126ab35ed00af5653a35d361d175f6f76..8678e5bd59a7e085cb1b4e38f29e06ce36d2c1de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -60,6 +60,7 @@ dependencies { +@@ -61,6 +61,7 @@ dependencies { testImplementation("org.ow2.asm:asm-tree:9.7.1") testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling @@ -17,7 +17,7 @@ index 429fcd5927cf3259e8cdc83fadf78b41a38eb3bf..fa3476acb77ce5d1247244808ead5b2a } paperweight { -@@ -187,20 +188,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM +@@ -188,20 +189,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM runtime.filterNot { it.asFile.absolutePath == vanilla } } @@ -1904,7 +1904,7 @@ index 0000000000000000000000000000000000000000..73b20a92f330311e3fef8f03b51a0985 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 600e865688b423d9bb4338f413dc28418ba37748..ad699a4ad555a4d7c85727bd835ebacd24d02c2b 100644 +index 542ff64ce0cb93a9f996fa0a65e8dde7ed39c3a9..5c54c5c525c86bb8037982435b8769ec2ca2c6cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1005,6 +1005,7 @@ public final class CraftServer implements Server { |