Cleanup

Auxilor · Nov 20, 2021 · 9438c2f · 9438c2f
1 parent 8d1532d
commit 9438c2f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/eco-api/src/main/kotlin/com/willfp/libreforge/LibReforge.kt b/eco-api/src/main/kotlin/com/willfp/libreforge/LibReforge.kt
@@ -10,6 +10,7 @@ import com.willfp.libreforge.integrations.aureliumskills.AureliumSkillsIntegrati
 import com.willfp.libreforge.integrations.ecoskills.EcoSkillsIntegration
 import com.willfp.libreforge.triggers.Triggers
 import org.apache.commons.lang.StringUtils
+import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 import java.util.*
 
@@ -46,6 +47,17 @@ object LibReforge {
         }
     }
 
+    @JvmStatic
+    fun disable(plugin: EcoPlugin) {
+        for (player in Bukkit.getOnlinePlayers()) {
+            for (holder in player.getHolders()) {
+                for ((effect) in holder.effects) {
+                    effect.disableForPlayer(player)
+                }
+            }
+        }
+    }
+
     @JvmStatic
     fun getIntegrationLoaders(): List<IntegrationLoader> {
         return listOf(

diff --git a/eco-api/src/main/kotlin/com/willfp/libreforge/effects/effects/EffectDamageMultiplier.kt b/eco-api/src/main/kotlin/com/willfp/libreforge/effects/effects/EffectDamageMultiplier.kt
@@ -19,6 +19,10 @@ class EffectDamageMultiplier : Effect(
         val event = data.event as? WrappedDamageEvent ?: return
 
         event.damage *= config.getDouble("multiplier")
+
+        if (event.damage < 0.01) {
+            event.isCancelled = true
+        }
     }
 
     override fun validateConfig(config: JSONConfig): List<ConfigViolation> {

diff --git a/eco-api/src/main/kotlin/com/willfp/libreforge/triggers/wrappers/WrappedDamageEvent.kt b/eco-api/src/main/kotlin/com/willfp/libreforge/triggers/wrappers/WrappedDamageEvent.kt
@@ -11,4 +11,12 @@ class WrappedDamageEvent(
         set(value) {
             event.damage = value
         }
-}
+
+    var isCancelled: Boolean
+        get() {
+            return event.isCancelled
+        }
+        set(value) {
+            event.isCancelled = value
+        }
+}