From be5956dcb8e34e174b9f0b5d356d4381cc527065 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Tue, 28 Apr 2015 18:34:18 -0700 Subject: [PATCH] Enhance damages event --- .../denizen/events/core/EntityDamageSmartEvent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java index 50f1936a7d..e96bec1d31 100644 --- a/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/core/EntityDamageSmartEvent.java @@ -83,6 +83,7 @@ public void breakDown() { // returns an Element(Decimal) of the amount of damage dealt. // returns an Element(Decimal) of the amount of damage dealt, after armor is calculated. // returns the dEntity that was damaged. + // returns the damage by a given damage type. Types: BASE, HARD_HAT, BLOCKING, ARMOR,RESISTANCE, MAGIC, ABSORPTION // // @Determine // "CANCELLED" to stop the entity from being damaged. @@ -104,6 +105,9 @@ public void entityDamage(EntityDamageEvent event) { context.put("damage", new Element(event.getDamage())); context.put("final_damage", new Element(event.getFinalDamage())); context.put("cause", new Element(event.getCause().name())); + for (EntityDamageEvent.DamageModifier dm: EntityDamageEvent.DamageModifier.values()) { + context.put("damage_" + dm.name(), new Element(event.getDamage(dm))); + } if (entity.isCitizensNPC()) npc = entity.getDenizenNPC(); else if (entity.isPlayer()) player = entity.getDenizenPlayer();