From 930ecd4896e636795e63679d2060e98a8fe7e2bb Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 27 May 2022 14:03:54 +0100 Subject: [PATCH] Improved conflict finder --- .../kotlin/com/willfp/eco/internal/spigot/ConflictFinder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 69ab2510..c0f12465 100644 --- 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) } }