SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Relocate other libraries Spigot added and relocates in 1.17

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Kyle Wood 2021-06-16 20:56:44 -05:00
Ursprung c7a0195cdd
Commit 3dc0a3fafc
2 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
patches/server/Build-system-changes.patch
Datei anzeigen

@ -63,9 +63,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
listOf( listOf(
- "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", - "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil + "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil
"org.apache.commons.lang3", "org.objectweb.asm" "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
"org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
).forEach { pack -> ).forEach { pack ->
relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java

3
patches/server/Setup-Gradle-project.patch
Datei anzeigen

@ -103,7 +103,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ listOf( + listOf(
+ "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", + "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "org.apache.commons.lang3", "org.objectweb.asm" + "org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
+ "org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
+ ).forEach { pack -> + ).forEach { pack ->
+ relocate(pack, "org.bukkit.craftbukkit.libs.$pack") + relocate(pack, "org.bukkit.craftbukkit.libs.$pack")
+ } + }