1.0.3 Fix damage/health modifiers ignoring the world whitelist

WeaponMechanics · Aug 13, 2022 · e3aeaae · e3aeaae
1 parent 635f50f
commit e3aeaae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 group = "me.cjcrafter"
-version = "1.0.2"
+version = "1.0.3"
 
 plugins {
     `java-library`

diff --git a/src/main/java/me/cjcrafter/damagemechanics/DamageMechanics.java b/src/main/java/me/cjcrafter/damagemechanics/DamageMechanics.java
@@ -93,12 +93,18 @@ public void onTeleport(PlayerTeleportEvent event) {
 
     @EventHandler (priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onDamage(EntityDamageEvent event) {
+        if (!isEnabled(event.getEntity().getWorld().getName()))
+            return;
+
         double modifier = getConfig().getDouble("Damage_Modifiers." + event.getCause(), 1.0);
         event.setDamage(event.getDamage() * modifier);
     }
 
     @EventHandler (priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onHeal(EntityRegainHealthEvent event) {
+        if (!isEnabled(event.getEntity().getWorld().getName()))
+            return;
+
         double modifier = getConfig().getDouble("Heal_Modifiers." + event.getRegainReason(), 1.0);
         event.setAmount(event.getAmount() * modifier);
     }