mcmmo-data.patch

diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 1ee539eed..429630e50 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -252,24 +252,6 @@ public class EntityListener implements Listener {
         Bukkit.broadcastMessage("");
     }*/
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onEntityDamageLowest(EntityDamageByEntityEvent event)
-    {
-        Entity defender = event.getEntity();
-
-        if(defender.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() > 0)
-        {
-            if(defender instanceof Player)
-            {
-                LivingEntity defLive = (LivingEntity) defender;
-                defLive.setHealth(Math.max(0, (defLive.getHealth() - event.getFinalDamage())));
-                event.setCancelled(true);
-            }
-
-            return;
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityCombustByEntityEvent(EntityCombustByEntityEvent event) {
         //Prevent players from setting fire to each other if they are in the same party
@@ -330,6 +312,13 @@ public class EntityListener implements Listener {
             return;
         }
 
+        // Don't process this event for marked entities, for players this is handled above,
+        // However, for entities, we do not wanna cancel this event to allow plugins to observe changes
+        // properly (Do players follow sane behavior here, or should they be covered under this?)
+        if (defender.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() > 0) {
+            return;
+        }
+
         if (event.getEntity() instanceof ArmorStand) {
             return;
         }