Fix damaged/killed damage types

DenizenScript · Jul 29, 2015 · aed4f41 · aed4f41
1 parent 0c6ee2c
commit aed4f41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -175,7 +175,7 @@ else if (name.equals("projectile") && projectile != null) {
         }
         else if (name.startsWith("damage_")) {
             for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) {
-                if (name.equals("damage_" + dm.name())) {
+                if (name.equals("damage_" + CoreUtilities.toLowerCase(dm.name()))) {
                     return new Element(event.getDamage(dm));
                 }
             }

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java
@@ -163,9 +163,11 @@ else if ((name.equals("damager")) && (damager != null)) {
         else if ((name.equals("projectile")) && (projectile != null)) {
             return projectile;
         }
-        for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) {
-            if (name.equals("damage_" + dm.name())) {
-                return new Element(event.getDamage(dm));
+        else if (name.startsWith("damage_")) {
+            for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) {
+                if (name.equals("damage_" + CoreUtilities.toLowerCase(dm.name()))) {
+                    return new Element(event.getDamage(dm));
+                }
             }
         }
         return super.getContext(name);