[Bleeding] Added DamageCause.POISON/MAGIC and RegainReason.MAGIC/MAGIC_REGEN for potions

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