diff options
| author | feildmaster <admin@feildmaster.com> | 2012-11-20 16:54:43 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-11-20 17:09:25 -0600 |
| commit | e72fb666d81405ef4fd275fd849a0a5e3da96cb2 (patch) | |
| tree | 5d91fcad8a3a0339daab9659d5f9169a41b2ee1a /src/main | |
| parent | 324436e99c8c5870592dad114a1325f363692531 (diff) | |
| download | bukkit-e72fb666d81405ef4fd275fd849a0a5e3da96cb2.tar bukkit-e72fb666d81405ef4fd275fd849a0a5e3da96cb2.tar.gz bukkit-e72fb666d81405ef4fd275fd849a0a5e3da96cb2.tar.lz bukkit-e72fb666d81405ef4fd275fd849a0a5e3da96cb2.tar.xz bukkit-e72fb666d81405ef4fd275fd849a0a5e3da96cb2.zip | |
Add DamageCause for FallingBlocks. Adds BUKKIT-2781
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/bukkit/event/entity/EntityDamageEvent.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java index 5238cd58..c2b48624 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -166,13 +166,13 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { STARVATION, /** * Damage caused due to an ongoing poison effect - * + * <p /> * Damage: 1 */ POISON, /** * Damage caused by being hit by a damage potion or spell - * + * <p /> * Damage: variable */ MAGIC, @@ -181,6 +181,14 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { */ WITHER, /** + * Damage caused by being hit by a falling block which deals damage + * <p /> + * <b>Note:</b> Not every block deals damage + * <p /> + * Damage: variable + */ + FALLING_BLOCK, + /** * Custom damage. * <p /> * Damage: variable |