diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 5444097a2e..65fcfc83b0 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 for (tld in setOf("net", "com", "org")) { attributes("$tld/bukkit", "Sealed" to true) @@ -0,0 +0,0 @@ relocation { - "org.jline:jline-terminal-jansi" to "jline", + sequenceOf( "commons-codec:commons-codec" to "org.apache.commons.codec", "commons-io:commons-io" to "org.apache.commons.io", - "it.unimi.dsi:fastutil" to "it.unimi", diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index f388ca9d3c..9583c43c4c 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -113,8 +113,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack" + ++ relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline")) + sequenceOf( -+ "org.jline:jline-terminal-jansi" to "jline", + "commons-codec:commons-codec" to "org.apache.commons.codec", + "commons-io:commons-io" to "org.apache.commons.io", + "it.unimi.dsi:fastutil" to "it.unimi",