diff options
author | Zeerix <zeerix@draig.de> | 2012-01-14 01:25:12 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2012-01-17 19:49:06 +0100 |
commit | 418d18831cb1149bfe46ed225af97ebd6e3f4804 (patch) | |
tree | c460ad982c78043ecd211ffc57b092e36d096d5a | |
parent | d384da1e7c93e35042a1d66d8f81b1aa98be3fb5 (diff) | |
download | bukkit-418d18831cb1149bfe46ed225af97ebd6e3f4804.tar bukkit-418d18831cb1149bfe46ed225af97ebd6e3f4804.tar.gz bukkit-418d18831cb1149bfe46ed225af97ebd6e3f4804.tar.lz bukkit-418d18831cb1149bfe46ed225af97ebd6e3f4804.tar.xz bukkit-418d18831cb1149bfe46ed225af97ebd6e3f4804.zip |
[Bleeding] Added DamageCause.POISON/MAGIC and RegainReason.MAGIC/MAGIC_REGEN for potions
-rw-r--r-- | src/main/java/org/bukkit/event/entity/EntityDamageEvent.java | 12 | ||||
-rw-r--r-- | src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java index 4706bb53..5c10c02e 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -168,6 +168,18 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable { */ STARVATION, /** + * Damage caused due to an ongoing poison effect + * + * Damage: 1 + */ + POISON, + /** + * Damage caused by being hit by a damage potion or spell + * + * Damage: variable + */ + MAGIC, + /** * Custom damage. * <p /> * Damage: variable diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java index 059dea53..3e84de8b 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -84,6 +84,14 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable */ EATING, /** + * When a player is healed by a potion or spell + */ + MAGIC, + /** + * When a player is healed over time by a potion or spell + */ + MAGIC_REGEN, + /** * Any other reason not covered by the reasons above */ CUSTOM |