Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2025-12-19 15:09:23 +00:00
Code Issues Releases 1 Activity

Fixed disabled damage indicator entities

Browse Source
This commit is contained in:
Will FP
2025-01-31 11:51:26 +00:00
parent 1fd7ab4b51
commit 7ae4f00a24
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -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")
}

12
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/display/DamageIndicatorListener.kt
View File

@@ -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
}