diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 04254bda2a..f388ca9d3c 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -105,6 +105,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +}
 +
 +relocation {
++    // Order matters here - e.g. craftbukkit proper must be relocated before any of the libs are relocated into the cb package
++    val packageVersion = "1_17_R1"
++    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
++        exclude("org.bukkit.craftbukkit.Main*")
++    }
++
 +    fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
 +
 +    sequenceOf(
@@ -129,11 +135,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    ).forEach { pack ->
 +        relocate(pack to cb(pack))
 +    }
-+
-+    val packageVersion = "1_17_R1"
-+    relocate("org.bukkit.craftbukkit" to "org.bukkit.craftbukkit.v$packageVersion") {
-+        exclude("org.bukkit.craftbukkit.Main*")
-+    }
 +}
 +
 +tasks.shadowJar {