take_damage no longer fires with void, kill, or suicide

Auxilor · Nov 10, 2023 · 7e0c0ca · 7e0c0ca
1 parent 93788f1
commit 7e0c0ca
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/core/src/main/kotlin/com/willfp/libreforge/triggers/impl/TriggerTakeDamage.kt b/core/src/main/kotlin/com/willfp/libreforge/triggers/impl/TriggerTakeDamage.kt
@@ -13,6 +13,12 @@ object TriggerTakeDamage : Trigger("take_damage") {
         TriggerParameter.EVENT
     )
 
+    private val ignoredCauses = setOf(
+        EntityDamageEvent.DamageCause.KILL,
+        EntityDamageEvent.DamageCause.VOID,
+        EntityDamageEvent.DamageCause.SUICIDE
+    )
+
     @EventHandler(ignoreCancelled = true)
     fun handle(event: EntityDamageEvent) {
         val victim = event.entity
@@ -21,6 +27,10 @@ object TriggerTakeDamage : Trigger("take_damage") {
             return
         }
 
+        if (event.cause in ignoredCauses) {
+            return
+        }
+
         this.dispatch(
             victim,
             TriggerData(