From a61c134ee01d9eb12a8b59c1dfe95df240072c69 Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Mon, 8 Nov 2021 13:18:28 +0300 Subject: [PATCH 1/2] Added a few more checks to prevent DamageIndicatorListener lag abuse --- .../ecoskills/stats/DamageIndicatorListener.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/DamageIndicatorListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/DamageIndicatorListener.kt index 0fd25f3..1dfbc21 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/DamageIndicatorListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/stats/DamageIndicatorListener.kt @@ -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) From e7df356d6cd025a1d2cc78c35a691ffa50f9d921 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 8 Nov 2021 10:44:42 +0000 Subject: [PATCH 2/2] Updated to 1.10.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b3c0f7d..b99e841 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 1.10.2 +version = 1.10.3 plugin-name = EcoSkills \ No newline at end of file