diff --git a/build.gradle.kts b/build.gradle.kts index bd2b681..22287ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ allprojects { } dependencies { - compileOnly("com.willfp:eco:6.58.0") + compileOnly("com.willfp:eco:6.75.0") compileOnly("org.jetbrains:annotations:23.0.0") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0") } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt index fe2cdbd..608aed6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt @@ -2,8 +2,9 @@ package com.willfp.ecoskills.skills.display import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.Prerequisite +import com.willfp.eco.core.entities.Entities +import com.willfp.eco.core.entities.impl.EmptyTestableEntity import com.willfp.eco.core.integrations.hologram.HologramManager -import com.willfp.eco.util.containsIgnoreCase import com.willfp.eco.util.formatEco import com.willfp.eco.util.randDouble import com.willfp.eco.util.toNiceString @@ -21,6 +22,10 @@ import org.bukkit.event.entity.EntityRegainHealthEvent class DamageIndicatorListener( private val plugin: EcoPlugin ) : Listener { + private val disabledEntities = plugin.configYml.getStrings("damage-indicators.disabled-for-entities") + .map { Entities.lookup(it) } + .filterNot { it is EmptyTestableEntity } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) fun onEntityDamageByEntity(event: EntityDamageByEntityEvent) { if (!plugin.configYml.getBool("damage-indicators.enabled")) { @@ -41,10 +46,7 @@ class DamageIndicatorListener( return } - val disabledForEntities = plugin.configYml - .getStrings("damage-indicators.disabled-for-entities") - - if (disabledForEntities.containsIgnoreCase(victim.type.name)) { + if (disabledEntities.any { it.matches(victim) }) { return }