Repo-Mirror/EcoSkills
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoSkills.git synced 2026-01-03 22:26:30 +00:00
Code Issues Releases 1 Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
Auxilor
2021-11-10 15:14:42 +00:00
parent 6775433168 e7df356d6c
commit 989a35695f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/DamageIndicatorListener.kt
View File

@@ -5,6 +5,9 @@ import com.willfp.eco.core.integrations.hologram.HologramManager
import com.willfp.eco.util.NumberUtils
import com.willfp.eco.util.StringUtils
import com.willfp.ecoskills.isCrit
import org.bukkit.entity.LivingEntity
import org.bukkit.entity.Player
import org.bukkit.entity.Projectile
import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
import org.bukkit.event.Listener
@@ -23,6 +26,18 @@ class DamageIndicatorListener(
return
}
if (event.damager is Projectile && (event.damager as Projectile).shooter == event.entity) {
return
}
if (event.damage == 0.0) {
return
}
if (event.entity is Player && (event.entity as Player).isBlocking) {
return
}
val location = event.entity.location
location.add(0.0, event.entity.height, 0.0)