User: rednesto Date: 01 Apr 23 19:30 Revision: 2453f87c817345f79b9be1fc45b2bac3ada6eecf Summary: Fix #1980 Recognize and prefer paper-plugin.yml TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8417&personal=false Index: src/main/kotlin/platform/bukkit/BukkitModule.kt =================================================================== --- src/main/kotlin/platform/bukkit/BukkitModule.kt (revision 558a072eb85763e88685b4a0bbe967f39ab13d31) +++ src/main/kotlin/platform/bukkit/BukkitModule.kt (revision 2453f87c817345f79b9be1fc45b2bac3ada6eecf) @@ -38,7 +38,16 @@ class BukkitModule>(facet: MinecraftFacet, type: T) : AbstractModule(facet) { - var pluginYml by nullable { facet.findFile("plugin.yml", SourceType.RESOURCE) } + var pluginYml by nullable { + if (this.type == PlatformType.PAPER) { + val paperPlugin = facet.findFile("paper-plugin.yml", SourceType.RESOURCE) + if (paperPlugin != null) { + return@nullable paperPlugin + } + } + + facet.findFile("plugin.yml", SourceType.RESOURCE) + } private set override val type: PlatformType = type.platformType