From aed4f41d5b2696e1e36494cad755db45814276bf Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Tue, 28 Jul 2015 18:59:20 -0700
Subject: [PATCH] Fix damaged/killed damage types

---
 .../denizen/events/entity/EntityDamagedScriptEvent.java   | 2 +-
 .../denizen/events/entity/EntityKilledScriptEvent.java    | 8 +++++---
 2 files changed, 6 insertions(+), 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
index fc8db073a0..615ebf2b23 100644
--- 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
index c5d8a9f156..66222e1099 100644
--- 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);