Improved conflict finder

2022-05-27 14:03:54 +01:00
parent af8d6a4167
commit 930ecd4896
1 changed files with 1 additions and 1 deletions
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/ConflictFinder.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/ConflictFinder.kt
@@ -50,7 +50,7 @@ private fun Plugin.getConflict(): Conflict? {
    val zip = ZipFile(File(this::class.java.protectionDomain.codeSource.location.toURI()))

    for (entry in zip.entries()) {
-        if (entry.name.startsWith("kotlin/")) {
+        if (entry.name.startsWith("kotlin/") || entry.name.startsWith("kotlinx/")) {
            return Conflict(this, ConflictType.KOTLIN_SHADE)
        }
    }